From 9286452d293d59e99710ba0f6c9b586120618305 Mon Sep 17 00:00:00 2001 From: Liping Xu Date: Wed, 11 Mar 2026 03:00:22 +0000 Subject: [PATCH] BROADCOM_LEGACY_SAI_COMPAT: Allow platforms to disable sai_query_stats_st_capability at runtime 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 #1788. Signed-off-by: Liping Xu --- .../x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/sai.profile | 3 +++ .../Arista-7060CX-32S-D48C8/sai.profile | 3 +++ .../Arista-7060CX-32S-Q24C8/sai.profile | 3 +++ .../Arista-7060CX-32S-T96C8/sai.profile | 3 +++ .../x86_64-arista_7060_cx32s/Arista-7060CX-32S/sai.profile | 3 +++ 5 files changed, 15 insertions(+) diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/sai.profile b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/sai.profile index 66f88f894c3..b318477871f 100644 --- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/sai.profile +++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/sai.profile @@ -1,2 +1,5 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-32x100G-t1.config.bcm SAI_NUM_ECMP_MEMBERS=64 +# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver; +# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get. +SAI_STATS_ST_CAPABILITY_SUPPORTED=0 diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/sai.profile b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/sai.profile index 692f79decc1..a783acd52ee 100644 --- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/sai.profile +++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/sai.profile @@ -1,2 +1,5 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-8x100G+48x50G.config.bcm SAI_NUM_ECMP_MEMBERS=64 +# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver; +# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get. +SAI_STATS_ST_CAPABILITY_SUPPORTED=0 diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/sai.profile b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/sai.profile index 08abf119894..84794af8a2a 100644 --- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/sai.profile +++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/sai.profile @@ -1,2 +1,5 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-8x100G+24x40G.config.bcm SAI_NUM_ECMP_MEMBERS=64 +# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver; +# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get. +SAI_STATS_ST_CAPABILITY_SUPPORTED=0 diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/sai.profile b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/sai.profile index f9a1e2bdc4d..68a6fac961e 100644 --- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/sai.profile +++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/sai.profile @@ -1,2 +1,5 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-8x100G+96x25G.config.bcm SAI_NUM_ECMP_MEMBERS=64 +# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver; +# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get. +SAI_STATS_ST_CAPABILITY_SUPPORTED=0 diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S/sai.profile b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S/sai.profile index 28ab4255723..60ce19f0168 100644 --- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S/sai.profile +++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S/sai.profile @@ -1 +1,4 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/platform/th-a7060-cx32s-flex-all.config.bcm +# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver; +# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get. +SAI_STATS_ST_CAPABILITY_SUPPORTED=0