Skip to content

Commit 81af0af

Browse files
mssonicbldmssonicbld
authored
[chassis][multi-asic]: Add support for vendor LC ip range for macvlan ip (#22125)
Signed-off-by: Anand Mehra [[email protected]](mailto:[email protected]) <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### 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/<platform>/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. <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 - [x] 202405 - [x] 202411 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### 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 ```
1 parent a4f5972 commit 81af0af

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

‎files/build_templates/docker_image_ctl.j2

+11-1
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,18 @@ function postStartAction()
201201
ip link set dev ns-eth1"$NET_NS" netns "$NET_NS"
202202
ip netns exec "$NET_NS" ip link set ns-eth1"$NET_NS" name eth1
203203

204+
if [[ -n "$lc_ip_offset" ]]; then
205+
# Use ip offset provided by platform vendor via chassisdb.conf to prevent any conflict
206+
# with any platform IP range, e.g., LC eth1-midplane IP.
207+
ip_offset=$lc_ip_offset
208+
else
209+
# If Vendor has not provided an ip offset, Use 10 as default offset. Platform vendor should
210+
# ensure there is no conflict with platform IP range for any slot.
211+
ip_offset=10
212+
fi
213+
204214
# Configure IP address and enable eth1
205-
slot_ip_address=`echo $midplane_subnet | awk -F. '{print $1 "." $2}'`.$slot_id.$(($DEV + 10))
215+
slot_ip_address=`echo $midplane_subnet | awk -F. '{print $1 "." $2}'`.$slot_id.$(($DEV + $ip_offset))
206216
slot_subnet_mask=${midplane_subnet#*/}
207217
ip netns exec "$NET_NS" ip addr add $slot_ip_address/$slot_subnet_mask dev eth1
208218
ip netns exec "$NET_NS" ip link set dev eth1 up

0 commit comments

Comments
 (0)