Skip to content

Commit 12e08cf

Browse files
lipxuarlakshm
authored andcommitted
BROADCOM_LEGACY_SAI_COMPAT: Allow platforms to disable sai_query_stats_st_capability at runtime (sonic-net#26013)
Add SAI_STATS_ST_CAPABILITY_SUPPORTED=0 to sai.profile for Arista 7060cx (BCM56960/Tomahawk-1) to disable sai_query_stats_st_capability at runtime. This prevents a SIGSEGV in brcm_sai_st_pd_ctr_cap_list_get when running the legacy SAI binary which does not initialize p_pdapi_st->vtable for TH1. The runtime guard is implemented in sonic-sairedis PR sonic-net#1788. Signed-off-by: Liping Xu <xuliping@microsoft.com> Signed-off-by: arlakshm <arlakshm@microsoft.com>
1 parent 6ad2f82 commit 12e08cf

File tree

5 files changed

+15
-0
lines changed

5 files changed

+15
-0
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-32x100G-t1.config.bcm
22
SAI_NUM_ECMP_MEMBERS=64
3+
# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver;
4+
# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get.
5+
SAI_STATS_ST_CAPABILITY_SUPPORTED=0
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-8x100G+48x50G.config.bcm
22
SAI_NUM_ECMP_MEMBERS=64
3+
# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver;
4+
# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get.
5+
SAI_STATS_ST_CAPABILITY_SUPPORTED=0
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-8x100G+24x40G.config.bcm
22
SAI_NUM_ECMP_MEMBERS=64
3+
# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver;
4+
# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get.
5+
SAI_STATS_ST_CAPABILITY_SUPPORTED=0
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-8x100G+96x25G.config.bcm
22
SAI_NUM_ECMP_MEMBERS=64
3+
# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver;
4+
# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get.
5+
SAI_STATS_ST_CAPABILITY_SUPPORTED=0
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
SAI_INIT_CONFIG_FILE=/usr/share/sonic/platform/th-a7060-cx32s-flex-all.config.bcm
2+
# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver;
3+
# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get.
4+
SAI_STATS_ST_CAPABILITY_SUPPORTED=0

0 commit comments

Comments
 (0)