Skip to content

Commit e6fc812

Browse files
r12fmssonicbldjianyuewukcudnikstephenxs
authored
Merge sonic-net/sonic-sairedis 202411 to 202412 (sonic-net#44)
* [syncd] Support bulk set in INIT_VIEW mode (sonic-net#1517) Support bulk set in INIT_VIEW mode. * Use sonictest pool instead of sonic-common and fix arm64 issue. (sonic-net#1516) 1. Use sonictest pool instead of sonic-common 2. Fix arm64 build error. * [nvidia] Skip SAI discovery on ports (sonic-net#1524) 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 (sonic-net#1528) Define bulk chunk size and bulk chunk size per counter ID. This is to resolve the VS test failure in sonic-net#1457, which is caused by loop dependency. In PR sonic-net#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. sonic-net#1519 which updates the header sairedis.h only. the motivation is to compile swss(orchagent) with both new fields initiated. 2. sonic-net#1457 contains all the rest of code The order to merge: 1. sonic-net#1519 2. sonic-net/sonic-swss#3391 3. sonic-net#1457 * [syncd] Update log level for bulk api (sonic-net#1532) [syncd] Update log level for bulk api * [FC] Support Policer Counter (sonic-net#1533) Added the implantation for policer counter - Support in POLICER group and sai_serialize functions Unit Tests: Included unit tests to add and remove policer counter. * Fix pipeline errors related to rsyslogd and libswsscommon installation (sonic-net#1535) On arm64 (and maybe sometimes amd64), rsyslogd appears to need a second or two to actually fully exit. The current code expects it to exit practically instantly. Add a sleep of 2 seconds to give it some time. Also enable some logging so that the commands being run can be seen. Also, fix an error related to libswsscommon not getting installed due to new dependencies being added. Solve this by using apt install to install the package, which brings in any necessary dependencies. * [syncd] Move logSet logGet under mutex to prevent race condition (sonic-net#1520) (sonic-net#1538) [syncd] Move logSet logGet under mutex to prevent race condition * Optimize counter polling interval by making it more accurate (sonic-net#1457) (sonic-net#1534) What I did Optimize the counter-polling performance in terms of polling interval accuracy Enable bulk counter-polling to run at a smaller chunk size There is one counter-polling thread for each counter group. All such threads can compete for the critical sections at the vendor SAI level, which means a counter-polling thread can wait for a critical section if another thread has been in it, which introduces latency for the waiting counter group. An example is the competition between the PFC watchdog and the port counter groups. The port counter group contains many counters and is polled in a bulk mode which takes a relatively longer time. The PFC watchdog counter group contains only a few counters but is polled at a short interval. Sometimes, PFC watchdog counters need to wait before polling, which makes the polling interval inaccurate and prevents the PFC storm from being detected in time. To resolve this issue, we can reduce the chunk size of the port counter group. The port counter group polls the counters of all ports in a single bulk operation by default. By using a smaller chunk size, it polls the counters in several bulk operations with each polling counter of a subset (whose size <= chunk size) of all ports. By doing so, the port counter group stays in the critical section for a shorter time and the PFC watchdog is more likely to be scheduled to poll counters and detect the PFC storm in time. Collect the time stamp immediately after vendor SAI API returns. Currently, many counter groups require a Lua plugin to execute based on polling interval, to calculate rates, detect certain events, etc. Eg. For PFC watchdog counter group to PFC storm. In this case, the polling interval is calculated based on the difference of time stamps between the current and last poll to avoid deviation due to scheduling latency. However, the timestamp is collected in the Lua plugin which is several steps after the SAI API returns and is executed in a different context (redis-server). Both introduce even larger deviations. To overcome this, we collect the timestamp immediately after the SAI API returns. * Revert "Do not enter vendor SAI critical section for counter polling/clearing operations (sonic-net#1450)" (sonic-net#1541) Revert "Do not enter vendor SAI critical section for counter polling/clearing operations (sonic-net#1450)" This reverts commit 0317b16. * [vslib] SAI_KEY_VS_OPER_SPEED_IS_CONFIGURED_SPEED, SAI_PORT_ATTR_HOST_TX_READY_STATUS support (sonic-net#1553) This PR adds two features to `vslib`. - `SAI_KEY_VS_OPER_SPEED_IS_CONFIGURED_SPEED`: when `true`, `SAI_PORT_ATTR_SPEED` returns the configured speed instead of the value retrieved via [`/sys/class/net/<name>/speed`](https://github.com/sonic-net/sonic-sairedis/blob/master/vslib/SwitchStateBaseHostif.cpp#L892-L893). - fixes sonic-net/sonic-buildimage#19735 - `SAI_PORT_ATTR_HOST_TX_READY_STATUS`: always returns `true`. Required to support running `xcvrd` in the VS env. - ref: https://github.com/sonic-net/SONiC/pull/1849/files#diff-6f3e95e6c57a3edc2e30e1f13edb9fd9a32a0db44e1035ac1f0b1b9a191762a5R46 * Update build_and_install_module.sh to match newer Linux kernel version (sonic-net#1561) sonic-sairedis will checkout sonic-swss to do vstest but using local build_and_install_module.sh to setup test environment, which is out of date with newer Linux kernel version. The build_and_install_module.sh in sonic-swss is up to date with latest Ubuntu 20.04, so we need to update the build sh file with the file in sonic-swss. In a long term, we may need to do some automatically sync, but now we have some azure agent security issue need to fix immediately, so just update the build_and_install_module.sh manually. * Revert "Optimize counter polling interval by making it more accurate (sonic-net#1457) …" (sonic-net#1570) Revert "Optimize counter polling interval by making it more accurate --------- Co-authored-by: mssonicbld <[email protected]> Co-authored-by: Jianyue Wu <[email protected]> Co-authored-by: Kamil Cudnik <[email protected]> Co-authored-by: Stephen Sun <[email protected]> Co-authored-by: Kumaresh Perumal <[email protected]>
1 parent 75ecb0f commit e6fc812

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

syncd/FlexCounter.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -2750,6 +2750,14 @@ void FlexCounter::addCounter(
27502750
idStrings,
27512751
"");
27522752
}
2753+
else if (objectType == SAI_OBJECT_TYPE_POLICER && field == POLICER_COUNTER_ID_LIST)
2754+
{
2755+
getCounterContext(COUNTER_TYPE_POLICER)->addObject(
2756+
vid,
2757+
rid,
2758+
idStrings,
2759+
"");
2760+
}
27532761
else if (objectType == SAI_OBJECT_TYPE_BUFFER_POOL && field == BUFFER_POOL_COUNTER_ID_LIST)
27542762
{
27552763
counterIds = idStrings;

unittest/syncd/TestFlexCounter.cpp

+11
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,17 @@ void testAddRemoveCounter(
157157
}
158158
}
159159

160+
if (bulkChunkSizeAfterPort)
161+
{
162+
fc.addCounterPlugin(bulkChunkSizeValues);
163+
if (immediatelyRemoveBulkChunkSizePerCounter)
164+
{
165+
bulkChunkSizeValues.clear();
166+
bulkChunkSizeValues.emplace_back(BULK_CHUNK_SIZE_PER_PREFIX_FIELD, "");
167+
fc.addCounterPlugin(bulkChunkSizeValues);
168+
}
169+
}
170+
160171
EXPECT_EQ(fc.isEmpty(), false);
161172

162173
usleep(1000*1050);

0 commit comments

Comments
 (0)