[chassis][multi-asic]: Add support for vendor LC ip range for macvlan ip by anamehra · Pull Request #22008 · sonic-net/sonic-buildimage

anamehra · 2025-03-12T02:02:04Z

Signed-off-by: Anand Mehra anamehra@cisco.com

Why I did it

As per current design, macvlan IP start with an offset of 10 from miplane Ip subnet base ip on a namespace.
In some platforms this may cause conflict if the LC midplane ip for any slot falls in that range. The IP conflict cause midplane traffic loss.

In Cisco Chassis, macvlan IP may conflict with LC midplane IP range. This conflict causes midplane traffic loss for conflicting ip and affects any LC namespace transaction with Supervisor.

To prevent any conflict, Venddor may provide an offset to be used to generate macvlan IP address to prevent any conflict with midplane IP address.

Work item tracking

Microsoft ADO (31798758):

How I did it

Added an ip_offset value which Vendor may provide based on their midplane ip range to generate safe IP address for macvlan in namespace.

The lc_ip_offset offset needs to be set in /usr/share/sonic/device//chassisdb.conf file for the LC where an offset is required.

cat chassisdb.conf
chassis_db_address=127.0.0.3
midplane_subnet=127.0.0.0/16
lc_ip_offset=100

How to verify it

After boot, check eth1 IP address in namespaces. The IP addresses should not conflict with any expected LC eth1-midplane IP or any other IP in the system.

Which release branch to backport (provide reason below if selected)

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

journalctl ouptput from database@0
Mar 10 05:36:43 sonic database.sh[2454102]: + ip link set dev ns-eth1asic0 netns asic0
Mar 10 05:36:43 sonic database.sh[2454102]: + ip netns exec asic0 ip link set ns-eth1asic0 name eth1
Mar 10 05:36:43 sonic database.sh[2454102]: + [[ -n 100 ]]
Mar 10 05:36:43 sonic database.sh[2454102]: + ip_offset=100
Mar 10 05:36:43 sonic database.sh[2454808]: ++ echo 1.0.0.0/16
Mar 10 05:36:43 sonic database.sh[2454809]: ++ awk -F. '{print $1 "." $2}'
Mar 10 05:36:43 sonic database.sh[2454102]: + slot_ip_address=1.0.1.100
Mar 10 05:36:43 sonic database.sh[2454102]: + slot_subnet_mask=16
Mar 10 05:36:43 sonic database.sh[2454102]: + ip netns exec asic0 ip addr add 1.0.1.100/16 dev eth1
Mar 10 05:36:43 sonic database.sh[2454102]: + ip netns exec asic0 ip link set dev eth1 up
Mar 10 05:36:43 sonic database.sh[2454102]: + [[ 1.0.0.0/16 != \1\.\0\.\0\.\0\/\1\6 ]]
Mar 10 05:36:43 sonic database.sh[2454102]: + ebtables_config
Mar 10 05:36:43 sonic database.sh[2454102]: + [[ -n 0 ]]
Mar 10 05:36:43 sonic database.sh[2454102]: + [[ '' != \d\p\u\d\b ]]
Mar 10 05:36:43 sonic database.sh[2454102]: + ip netns exec asic0 ebtables-restore
Mar 10 05:36:43 sonic database.sh[2454102]: + [[ '' != \c\h\a\s\s\i\s\d\b ]]
Mar 10 05:36:43 sonic database.sh[2454102]: + waitForAllInstanceDatabaseConfigJsonFilesReady


root@sonic:/home/cisco# ip netns exec asic0 ifconfig eth1
eth1: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
        inet 1.0.0.100  netmask 255.255.0.0  broadcast 0.0.0.0
        RX packets 161  bytes 13091 (12.7 KiB)
        RX errors 0  dropped 0  overruns 0  frame 0
        TX packets 100  bytes 8490 (8.2 KiB)
        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0

root@sonic:/home/cisco# ip netns exec asic1 ifconfig eth1
eth1: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
        inet 1.0.0.101  netmask 255.255.0.0  broadcast 0.0.0.0
        RX packets 166  bytes 13417 (13.1 KiB)
        RX errors 0  dropped 0  overruns 0  frame 0
        TX packets 99  bytes 8304 (8.1 KiB)
        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0

root@sonic:/home/cisco# ip netns exec asic1 sonic-db-cli PING
PONG
root@sonic:/home/cisco# ip netns exec asic0 sonic-db-cli PING
PONG
root@sonic:/home/cisco# ifconfig eth1-midplane
eth1-midplane: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
        inet 1.0.0.1  netmask 255.255.0.0  broadcast 1.0.255.255
        RX packets 4855267  bytes 692674212 (660.5 MiB)
        RX errors 0  dropped 0  overruns 0  frame 0
        TX packets 6112503  bytes 1094211643 (1.0 GiB)
        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0

root@sonic:/home/cisco# show chassis modules midplane-status 
       Name    IP-Address    Reachability
-----------  ------------  --------------
 LINE-CARD0       1.0.0.1           False
 LINE-CARD1       1.0.0.2            True
 LINE-CARD2       1.0.0.3           False
 LINE-CARD3       1.0.0.4           False
 LINE-CARD4       1.0.0.5           False
 LINE-CARD5       1.0.0.6           False
 LINE-CARD6       1.0.0.7           Fals

anamehra · 2025-03-12T02:02:58Z

Hi @abdosi , for your viz. Thanks

mssonicbld · 2025-03-12T02:03:54Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-12T02:04:05Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-03-12T07:07:13Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-12T07:07:23Z

Azure Pipelines successfully started running 1 pipeline(s).

files/build_templates/docker_image_ctl.j2

judyjoseph

LGTM

rlhui · 2025-03-13T02:30:45Z

@anamehra can we please check failure?

rlhui · 2025-03-13T02:31:09Z

@abdosi , can we please file ado? thanks.

anamehra · 2025-03-13T22:13:22Z

@yejianquan , for your viz.

anamehra · 2025-03-13T22:14:21Z

@anamehra can we please check failure?

Hi @rlhui , looks like some tests are failing across the board. I see same failure on other PRs as well. Not related to my change.

yejianquan · 2025-03-13T22:33:20Z

There's a known issue and has been discussed in Elastictest group chat.
Ze will take a look(may be next week)
For this PR, it's safe to be merged no that all other tests passed.
@rlhui could you please force merge it so that we can include in the candidate golden image?

mssonicbld · 2025-03-13T22:56:10Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-13T22:56:22Z

Azure Pipelines successfully started running 1 pipeline(s).

anamehra · 2025-03-14T01:58:16Z

PR for 202405 sonic-buildimage-msft
Azure/sonic-buildimage-msft#870

mssonicbld · 2025-03-14T01:58:50Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-14T01:58:56Z

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

wangxin · 2025-03-14T02:10:51Z

/azp run

azure-pipelines · 2025-03-14T02:11:06Z

Azure Pipelines successfully started running 1 pipeline(s).

yejianquan

LGTM

mssonicbld · 2025-03-16T04:32:29Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-16T04:32:42Z

Azure Pipelines successfully started running 1 pipeline(s).

arlakshm · 2025-03-19T17:07:28Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-19T17:07:45Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-03-22T05:43:24Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-03-22T05:43:35Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-03-25T00:45:59Z

Cherry-pick PR to 202411: #22125

… ip (sonic-net#22008) Signed-off-by: Anand Mehra anamehra@cisco.com

[chassis][multi-asic]: Add support for vendor LC ip range for macvlan ip (sonic-net#22008) Signed-off-by: Anand Mehra anamehra@cisco.com Why I did it As per current design, macvlan IP start with an offset of 10 from miplane Ip subnet base ip on a namespace. In some platforms this may cause conflict if the LC midplane ip for any slot falls in that range. The IP conflict cause midplane traffic loss. In Cisco Chassis, macvlan IP may conflict with LC midplane IP range. This conflict causes midplane traffic loss for conflicting ip and affects any LC namespace transaction with Supervisor. To prevent any conflict, Venddor may provide an offset to be used to generate macvlan IP address to prevent any conflict with midplane IP address. Work item tracking Microsoft ADO (31798758): How I did it Added an ip_offset value which Vendor may provide based on their midplane ip range to generate safe IP address for macvlan in namespace. The lc_ip_offset offset needs to be set in /usr/share/sonic/device//chassisdb.conf file for the LC where an offset is required. cat chassisdb.conf chassis_db_address=127.0.0.3 midplane_subnet=127.0.0.0/16 lc_ip_offset=100 How to verify it After boot, check eth1 IP address in namespaces. The IP addresses should not conflict with any expected LC eth1-midplane IP or any other IP in the system. co-authorized by: jianquanye@microsoft.com

[chassis][multi-asic]: Add support for vendor LC ip range for macvlan ip

a89624b

anamehra requested a review from lguohan as a code owner March 12, 2025 02:02

Merge branch 'sonic-net:master' into anamehra/ip_offset

2ef9114

abdosi added Request for msft-202405 Branch Request for 202411 Branch labels Mar 12, 2025

abdosi added this to SONiC Chassis and SONiC 202405 Release Mar 12, 2025

abdosi previously approved these changes Mar 12, 2025

View reviewed changes

abdosi added the P0 Priority of the issue label Mar 12, 2025

rlhui requested a review from judyjoseph March 12, 2025 17:14

judyjoseph reviewed Mar 12, 2025

View reviewed changes

files/build_templates/docker_image_ctl.j2 Show resolved Hide resolved

judyjoseph previously approved these changes Mar 12, 2025

View reviewed changes

Update docker_image_ctl.j2

9390a76

anamehra dismissed stale reviews from judyjoseph and abdosi via 9390a76 March 13, 2025 22:39

anamehra mentioned this pull request Mar 13, 2025

Update cisco-8000.ini to 202405.1.2.2 release Azure/sonic-buildimage-msft#871

Merged

10 tasks

Merge branch 'sonic-net:master' into anamehra/ip_offset

9576eb8

yejianquan approved these changes Mar 14, 2025

View reviewed changes

Merge branch 'sonic-net:master' into anamehra/ip_offset

d253202

mssonicbld added the Cherry Pick Conflict_msft-202405 label Mar 16, 2025

Merge branch 'sonic-net:master' into anamehra/ip_offset

4c3259e

yxieca merged commit 4a81a69 into sonic-net:master Mar 25, 2025
21 checks passed

github-project-automation bot moved this to Done in SONiC Chassis Mar 25, 2025

yejianquan added the Approved for 202411 Branch label Mar 25, 2025

mssonicbld mentioned this pull request Mar 25, 2025

[action] [PR:22008] [chassis][multi-asic]: Add support for vendor LC ip range for macvlan ip #22125

Merged

13 tasks

mssonicbld added the Created PR to 202411 Branch label Mar 25, 2025

mssonicbld added Included in 202411 Branch and removed Created PR to 202411 Branch labels Mar 25, 2025

patrickmacarthur pushed a commit to patrickmacarthur/sonic-buildimage that referenced this pull request Aug 6, 2025

[chassis][multi-asic]: Add support for vendor LC ip range for macvlan…

fc9ebc6

… ip (sonic-net#22008) Signed-off-by: Anand Mehra anamehra@cisco.com

Conversation

anamehra commented Mar 12, 2025 • edited by abdosi Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Why I did it

Work item tracking

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

Uh oh!

anamehra commented Mar 12, 2025

Uh oh!

mssonicbld commented Mar 12, 2025

Uh oh!

azure-pipelines bot commented Mar 12, 2025

Uh oh!

mssonicbld commented Mar 12, 2025

Uh oh!

azure-pipelines bot commented Mar 12, 2025

Uh oh!

Uh oh!

judyjoseph left a comment

Choose a reason for hiding this comment

Uh oh!

rlhui commented Mar 13, 2025

Uh oh!

rlhui commented Mar 13, 2025

Uh oh!

anamehra commented Mar 13, 2025

Uh oh!

anamehra commented Mar 13, 2025

Uh oh!

yejianquan commented Mar 13, 2025

Uh oh!

mssonicbld commented Mar 13, 2025

Uh oh!

azure-pipelines bot commented Mar 13, 2025

Uh oh!

anamehra commented Mar 14, 2025

Uh oh!

mssonicbld commented Mar 14, 2025

Uh oh!

azure-pipelines bot commented Mar 14, 2025

Uh oh!

wangxin commented Mar 14, 2025

Uh oh!

azure-pipelines bot commented Mar 14, 2025

Uh oh!

yejianquan left a comment

Choose a reason for hiding this comment

Uh oh!

mssonicbld commented Mar 16, 2025

Uh oh!

azure-pipelines bot commented Mar 16, 2025

Uh oh!

arlakshm commented Mar 19, 2025

Uh oh!

azure-pipelines bot commented Mar 19, 2025

Uh oh!

mssonicbld commented Mar 22, 2025

Uh oh!

azure-pipelines bot commented Mar 22, 2025

Uh oh!

Uh oh!

mssonicbld commented Mar 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

anamehra commented Mar 12, 2025 •

edited by abdosi

Loading