[code sync] Merge code from sonic-net/sonic-sairedis:202411 to 202412#6
Merged
Merged
Conversation
Collaborator
mssonicbld
commented
Feb 11, 2025
mssonicbld
commented
Support bulk set in INIT_VIEW mode.
1. Use sonictest pool instead of sonic-common 2. Fix arm64 build error.
Given that modern systems have lots of ports, performing SAI discovery takes very long time, e.g. (8 sec) for 256 port system. This has a big impact of fast-boot downtime and the discovery itself is not required for Nvidia platform fast-boot. Same applies to Nvidia fastfast-boot (aka warm-boot), yet needs to be tested separately.
Define bulk chunk size and bulk chunk size per counter ID. This is to resolve the VS test failure in #1457, which is caused by loop dependency. In PR #1457, new fields `bulk_chunk_size` and `bulk_chunk_size_per_prefix` have been introduced to `sai_redis_flex_counter_group_parameter_t` whose instances are initialized by orchagent. However, the orchagent is still compiled with the old sairedis header, which prevents both new fields from being uninitialized which in turn fails vs test. We have to split this PR into two: 1. #1519 which updates the header sairedis.h only. the motivation is to compile swss(orchagent) with both new fields initiated. 2. #1457 contains all the rest of code The order to merge: 1. #1519 2. sonic-net/sonic-swss#3391 3. #1457
mssonicbld
added a commit
that referenced
this pull request
Apr 30, 2026
<!-- Please make sure you've read and understood our contributing guidelines; https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md Please provide following information to help code review process a bit easier: --> ### Description of PR <!-- - Please include a summary of the change and which issue is fixed. - Please also include relevant motivation and context. Where should reviewer start? background context? - List any dependencies that are required for this change. --> Summary: Fixes a race condition during init_switch causing syncd crash ### Type of change <!-- - Fill x for your type of change. - e.g. - [x] Bug fix --> - [x] Bug fix - [ ] New feature - [ ] Refactor / cleanup - [ ] Documentation update - [ ] Test improvement ### Approach #### What is the motivation for this PR? We saw below core dump during init_switch. ``` #0 0x0000ffffb5c369d0 in vpp_ev_enqueue (ev=0xaaaabe182c50) at vpp/vppxlate/SaiVppXlate.c:397 #1 vl_api_sw_interface_event_t_handler (mp=<optimized out>) at vpp/vppxlate/SaiVppXlate.c:687 #2 0x0000ffffb5264470 in vl_msg_api_handler_no_free () from /nobackup/yuega2/sonic-buildimage-cisco.202603.arctos-periodic-40135/syncd_dbg/rootfs/lib/aarch64-linux-gnu/libvlibapi.so.25.02.0 #3 0x0000ffffb5205648 in ?? () from /nobackup/yuega2/sonic-buildimage-cisco.202603.arctos-periodic-40135/syncd_dbg/rootfs/lib/aarch64-linux-gnu/libvlibmemoryclient.so.25.02.0 #4 0x0000ffffb5c3cd54 in vpp_intf_events_enable_disable (enable=true) at vpp/vppxlate/SaiVppXlate.c:1839 #5 init_vpp_client () at vpp/vppxlate/SaiVppXlate.c:1704 #6 0x0000ffffb5c208bc in saivs::SwitchVpp::vpp_dp_initialize (this=this@entry=0xaaaabe17a3d0) at vpp/SwitchVppRif.cpp:468 #7 0x0000ffffb5c0508c in saivs::SwitchVpp::SwitchVpp (this=this@entry=0xaaaabe17a3d0, switch_id=switch_id@entry=141733920768, manager=..., config=..., warmBootState=...) at vpp/SwitchVpp.cpp:44 ``` This happened during init_switch right after vpp_intf_events_enable_disable, an event came in but event_queue had not been properly initialized. ##### Work item tracking - Microsoft ADO **(number only)**: #### How did you do it? Move event queue initialization before enabling events from vpp. #### How did you verify/test it? Run sonic-mgmt via sonic-net/sonic-buildimage#27039 #### Any platform specific information? vpp specific ### Documentation <!-- (If it's a new feature, new test case) Did you update documentation/Wiki relevant to your implementation? Link to the wiki page? --> Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.