Fix multi VLAN neighbor learning #3049

theasianpianist · 2024-02-15T01:36:11Z

What I did

When adding a new neighbor, check if the neighbor IP has already been learned on a different VLAN. If it has, remove the old neighbor entry before adding the new one.

Why I did it

On Gemini devices, if a neighbor IP moves from an active port in one VLAN to a second VLAN, then back to the first VLAN (with 3 different MAC addresses), orchagent will crash. Even though the MAC address of the last move is different from the first MAC address, orchagent believes the last MAC address to already be programmed in the hardware and tries to set an attribute of the entry which doesn't exist.

How I verified it

Run the NeighOrch unittests

Details if related

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

theasianpianist · 2024-02-21T03:38:03Z

/Azp run

azure-pipelines · 2024-02-21T03:38:09Z

Commenter does not have sufficient privileges for PR 3049 in repo sonic-net/sonic-swss

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

theasianpianist · 2024-02-21T23:01:16Z

/AzurePipelinesWrapper run

mssonicbld · 2024-02-21T23:01:18Z

/AzurePipelines run

azure-pipelines · 2024-02-21T23:01:28Z

Azure Pipelines successfully started running 1 pipeline(s).

xumia · 2024-02-22T04:46:57Z

/AzurePipelines run

azure-pipelines · 2024-02-22T04:47:07Z

Azure Pipelines successfully started running 1 pipeline(s).

prsunny

Overall approach lgtm, few comments. On the test side, there are some restructurings probably unrelated to the PR. Do you want to separate it?

orchagent/neighorch.cpp

orchagent/portsorch.cpp

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

theasianpianist · 2024-02-26T23:49:54Z

Overall approach lgtm, few comments. On the test side, there are some restructurings probably unrelated to the PR. Do you want to separate it?

I think it would be hard to separate it out since the tests for this change are dependent on the restructuring. If we moved the test changes to a separate PR then this PR would not have any test coverage.

What I did When adding a new neighbor, check if the neighbor IP has already been learned on a different VLAN. If it has, remove the old neighbor entry before adding the new one. Why I did it On Gemini devices, if a neighbor IP moves from an active port in one VLAN to a second VLAN, then back to the first VLAN (with 3 different MAC addresses), orchagent will crash. Even though the MAC address of the last move is different from the first MAC address, orchagent believes the last MAC address to already be programmed in the hardware and tries to set an attribute of the entry which doesn't exist.

* Fixes mock test failure * Fixes mock test run failure fixes pipeline run failure FAIL: p4orch_tests_usan ======================= ../../../orchagent/vrforch.cpp:113:41: runtime error: member call on null pointer of type 'struct RouteOrch' ../../../orchagent/vrforch.cpp:113:41: runtime error: member access within null pointer of type 'struct RouteOrch' FAIL p4orch_tests_usan (exit status: 139) * Fixed orchagent crash in VM with the Qos BUFFER_QUEUE|system-port|Queue-id-range config (sonic-net#3050) * Fixed orchagent crash in VM with the Qos BUFFER_QUEUE|system-port|Queue-id-range config * [intfsorch] Enable ipv6 proxy ndp along with proxy arp (sonic-net#3045) * [intfsorch] Enable ipv6 proxy ndp along with proxy arp setting SAI_VLAN_ATTR_UNKNOWN_MULTICAST_FLOOD_CONTROL_TYPE to SAI_VLAN_FLOOD_CONTROL_TYPE_NONE when proxy arp is enabled. This fixes a bug where ipv6 NS packets were flooding ports with duplicate packets. We now set multicast flood type to none. * Fix multi VLAN neighbor learning (sonic-net#3049) What I did When adding a new neighbor, check if the neighbor IP has already been learned on a different VLAN. If it has, remove the old neighbor entry before adding the new one. Why I did it On Gemini devices, if a neighbor IP moves from an active port in one VLAN to a second VLAN, then back to the first VLAN (with 3 different MAC addresses), orchagent will crash. Even though the MAC address of the last move is different from the first MAC address, orchagent believes the last MAC address to already be programmed in the hardware and tries to set an attribute of the entry which doesn't exist. * [asan] Disable the "maybe-uninitialized" warning when compiled with ASAN enabled. * Set HOST_TX_READY_NOTIFY attribute only after query capabilities(sonic-net#3070) *Set HOST_TX_READY_NOTIFY attribute only after query capabilities * [EVPN] Skip EVPN routes with invalid VNI or router mac field (sonic-net#3073) * Skip EVPN routes with invalid VNI or router mac field * Add port flap count and last flap timestamp to APPL_DB (sonic-net#3052) * Add port flap count and last flap timestamp * Add basic fabric link monitoring counters and states handling. (sonic-net#2988) * Add basic fabric link monitoring counters and states handling. * [Mellanox] Fix inconsistence in the shared headroom pool initialization (sonic-net#3057) * Fix inconsistence in the shared headroom pool initialization * Why I did it During initialization, if SHP is enabled the buffer pool sizes, xoff have initialized to 0, which means SHP is disabled but the buffer profiles already indicate SHP later on the buffer pool sizes are updated with off being non-zero In case the orchagent starts handling buffer configuration between 2 and 3, it is inconsistent between buffer pools and profiles, which fails Mellanox SAI sanity check. To avoid it, it indicates SHP enabled by setting a very small buffer pool and SHP sizes * [acl] Add IN_PORTS qualifier for L3 table (sonic-net#3078) * Apply IN_PORTS qualifiier for L3 table Why I did it IN_PORTS qualifier was allowed for L3 table in 202012 release and below. Changes in sonic-net#1982 removed that support leading to regression in some of our testcases. The following error was observed ERR swss#orchagent: :- validateAclRuleMatch: Match SAI_ACL_ENTRY_ATTR_FIELD_IN_PORTS in rule RULE_1 is not supported by table DATAACL * [bulker] add support for neighbor bulking (sonic-net#2768) Adding support for sai_neighbor_api_t bulking in bulker.h * [buffermgrd] Move switch-statement outside of if-statement in BufferMgr::doTask (sonic-net#3055) * [buffermgr] Moved switch statement outside of if-statmement in Buffermgr::doTask The switch statement which would normally erase buffer events was moved to be inside the if-statement which would only enter if the event is a SET event. This was introduced in commit e5329c39. This would cause an infinite loop, since non-set events would never be erased. The switch statement has now been moved to occur outside the if, allowing for non-set commands to be processed. * [portsorch] process only updated APP_DB fields when port is already created (sonic-net#3025) * [portsorch] process only updated APP_DB fields when port is already created What I did Fixing an issue when setting some port attribute in APPL_DB triggers serdes parameters to be re-programmed with port toggling. Made portsorch to handle only those attributes that were pushed to APPL_DB, so that serdes programming happens only by xcvrd's request to do so. * [Copp]Refactor coppmgr tests (sonic-net#3093) What I did Refactoring coppmgr mock tests Why I did it After migration to bookworm, coppmgr tests started failing due to the use of sudo commands. * Revert "[acl] Add IN_PORTS qualifier for L3 table (sonic-net#3078)" (sonic-net#3092) This reverts commit 9d4a3ad. *Revert "[acl] Add IN_PORTS qualifier for L3 table" * [orchagent] TWAMP Light orchagent implementation (sonic-net#2927) * [orchagent] TWAMP Light orchagent implementation. (sonic-net#2927) * What I did Implemented the TWAMP Light feature according to the SONiC TWAMP Light HLD(sonic-net/SONiC#1320). * Clang format change. (sonic-net#3080) What I did This PR has no real code change. It is purely clang formatting. It only applies to the P4Orch codes. Commands that I run: find orchagent/p4orch -name *.h -o -name .cpp | xargs clang-format -i -style="{BasedOnStyle: Microsoft, DerivePointerAlignment: false}" find orchagent -name response_publisher -o -name return_code.h | xargs clang-format -i -style="{BasedOnStyle: Microsoft, DerivePointerAlignment: false}" * T2-VOQ-VS: Fix iBGP bringup issue (sonic-net#3053) * Fix iBGP bringup issue T2-vswitch * On T2-VOQ chassis Emulation with multi-asic linecards, iBGP sessions dont come up. Related Issue: sonic-net/sonic-buildimage#18129 * [Fdbsyncd] Adding extern_learn flag with fdb entry so Kernel doesn't age out (sonic-net#2985) * Adding extern_learn flag with fdb entry so that Kernel doesn't age out the MAC * [Fdbsyncd] Adding extern_learn flag with fdb entry so Kernel doesn't age out What I did extern_learn flag is added while programming the fdb entry into the Kernel. This will make sure that kernel doesn't age out the fdb entry. (#15004) How I did it A flag extern_learn will be passed while programing the fdb entry. (#15004) How to verify it Tested MAC add/del to the Kernel from the local FDB entry. (#15004) Signed-off-by: kishore.kunal@broadcom.com --------- Signed-off-by: kishore.kunal@broadcom.com Co-authored-by: Sudharsan Dhamal Gopalarathnam <sudharsand@nvidia.com> * Fix oper FEC retrieval after warmboot (sonic-net#3100) Updating oper FEC status in state_db after warm-reboot as part of refresh port status call * [EVPN]Fix fpmsyncd crash when EVPN type5 is received with bgp fib suppression enabled (sonic-net#3101) * [EVPN]Fix fpmsyncd crash when EVPN type5 is received with bgp fib suppression enabled * [portsorch] Handle TRANSCEIVER_INFO table on warm boot (sonic-net#3087) * Add existing data from TRANSCEIVER_INFO table * Introduce a new role for DPU-NPU Interconnect Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com> Co-authored-by: Sudharsan Dhamal Gopalarathnam <sudharsand@nvidia.com> * [p4orch] Clang format change. (sonic-net#3096) What I did [p4orch] This PR has no real code change. It is purely clang formatting. It does the same as sonic-net#3080. * [dash] fix ENI admin state update (sonic-net#3081) * [dash] fix ENI admin state update * Add force option for fabric port unisolate command (sonic-net#3089) What I did Add force option to the unisolate link command, so users can make the links not isolate if they want. depends on sonic-net/sonic-buildimage#18447 * [twamporch] Explicitly initialize local variable (sonic-net#3115) What I did Explicitly initialized local variable. Why I did it We met below error message in sonic-buildimage armhf build (sonic-net/sonic-buildimage#18334) * Add bookworm build to the PR checkers (sonic-net#3114) What I did Add a Bookworm build to the PR checkers. Also fix some Bookworm build errors that crept in. Why I did it Buildimage now builds swss for Bookworm, so the build needs to succeed. * [ACL] Remove flex counter when updating ACL rule (sonic-net#3118) What I did This PR is to fix sonic-net/sonic-buildimage#18719 When ACL rule is created for the first time, a flex counter is created and registered. When the same ACL rule is being updated, the FlexCounter created before is not removed, and another FlexCounter is created and registered. Why I did it Fix the issue that FlexCounter is duplicated when updating existing ACL rule. --------- Signed-off-by: kishore.kunal@broadcom.com Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com> Co-authored-by: saksarav-nokia <sakthivadivu.saravanaraj@nokia.com> Co-authored-by: Nikola Dancejic <26731235+Ndancejic@users.noreply.github.com> Co-authored-by: Lawrence Lee <lawlee@microsoft.com> Co-authored-by: Oleksandr Ivantsiv <oivantsiv@nvidia.com> Co-authored-by: noaOrMlnx <58519608+noaOrMlnx@users.noreply.github.com> Co-authored-by: Lior Avramov <73036155+liorghub@users.noreply.github.com> Co-authored-by: Prince George <45705344+prgeor@users.noreply.github.com> Co-authored-by: jfeng-arista <98421150+jfeng-arista@users.noreply.github.com> Co-authored-by: Stephen Sun <5379172+stephenxs@users.noreply.github.com> Co-authored-by: Neetha John <nejo@microsoft.com> Co-authored-by: Amir <mazora@marvell.com> Co-authored-by: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com> Co-authored-by: Sudharsan Dhamal Gopalarathnam <sudharsand@nvidia.com> Co-authored-by: xiaodong hu <32903206+huseratgithub@users.noreply.github.com> Co-authored-by: mint570 <70396898+mint570@users.noreply.github.com> Co-authored-by: Deepak Singhal <115033986+deepak-singhal0408@users.noreply.github.com> Co-authored-by: KISHORE KUNAL <64033340+kishorekunal01@users.noreply.github.com> Co-authored-by: Vivek <vivekreddykarri98@gmail.com> Co-authored-by: Yakiv Huryk <62013282+Yakiv-Huryk@users.noreply.github.com> Co-authored-by: Saikrishna Arcot <sarcot@microsoft.com> Co-authored-by: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>

theasianpianist added 6 commits February 15, 2024 01:35

Add multi vlan unittest

fcdd648

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

Merge branch 'master' into multi-vlan

3012be9

Cleanup mock test interface

1115ea5

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

fix testing interface

8a5c3bd

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

add multi vlan test scenario

f783d77

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

Implement multi VLAN neighbor learning

64c9386

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

theasianpianist marked this pull request as ready for review February 16, 2024 23:32

theasianpianist requested a review from prsunny as a code owner February 16, 2024 23:32

theasianpianist force-pushed the multi-vlan branch from a4a542a to 18ba6a3 Compare February 21, 2024 03:39

Add gPortsOrch to directory for unittests

c5ada81

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

theasianpianist force-pushed the multi-vlan branch from 18ba6a3 to c5ada81 Compare February 21, 2024 21:11

theasianpianist requested a review from Ndancejic February 23, 2024 00:39

prsunny reviewed Feb 24, 2024

View reviewed changes

orchagent/neighorch.cpp Outdated Show resolved Hide resolved

orchagent/portsorch.cpp Outdated Show resolved Hide resolved

theasianpianist added 2 commits February 26, 2024 23:47

address review comments

a2a3656

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

Merge branch 'master' into multi-vlan

6c38625

theasianpianist requested a review from prsunny February 26, 2024 23:50

Merge branch 'master' into multi-vlan

f8085d7

prsunny approved these changes Feb 27, 2024

View reviewed changes

prsunny merged commit 97c7f3e into sonic-net:master Feb 27, 2024
14 checks passed

prsunny added the Request for 202311 Branch label Feb 27, 2024

mssonicbld added the Cherry Pick Conflict_202311 label Feb 27, 2024

theasianpianist mentioned this pull request Feb 27, 2024

[202311]Fix multi VLAN neighbor learning (#3049) #3064

Merged

yxieca added the Included in 202311 Branch label Mar 21, 2024

dgsudharsan mentioned this pull request May 7, 2024

[Neighbor]When two different Vlans in different VRFs have the same neighbor, one of them is not learnt sonic-net/sonic-buildimage#18890

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix multi VLAN neighbor learning #3049

Fix multi VLAN neighbor learning #3049

theasianpianist commented Feb 15, 2024 •

edited

Loading

theasianpianist commented Feb 21, 2024

azure-pipelines bot commented Feb 21, 2024

theasianpianist commented Feb 21, 2024

mssonicbld commented Feb 21, 2024

azure-pipelines bot commented Feb 21, 2024

xumia commented Feb 22, 2024

azure-pipelines bot commented Feb 22, 2024

prsunny left a comment •

edited

Loading

theasianpianist commented Feb 26, 2024

Fix multi VLAN neighbor learning #3049

Fix multi VLAN neighbor learning #3049

Conversation

theasianpianist commented Feb 15, 2024 • edited Loading

theasianpianist commented Feb 21, 2024

azure-pipelines bot commented Feb 21, 2024

theasianpianist commented Feb 21, 2024

mssonicbld commented Feb 21, 2024

azure-pipelines bot commented Feb 21, 2024

xumia commented Feb 22, 2024

azure-pipelines bot commented Feb 22, 2024

prsunny left a comment • edited Loading

Choose a reason for hiding this comment

theasianpianist commented Feb 26, 2024

theasianpianist commented Feb 15, 2024 •

edited

Loading

prsunny left a comment •

edited

Loading