Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

T2: Change XOFF threshold for backplane links on long link line card #16550

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

T2: Change XOFF threshold for backplane links on long link line card #16550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ded477
Made changes for handling the XOFF threshold change for BP port of lo…
sreejithsreekumaran Jan 16, 2025
7032718
Merge branch 'sonic-net:master' into longlink_xoff_reduction
sreejithsreekumaran Jan 17, 2025
d765ea1
Modified for change in HR and Xoff threshold in BP port of Long Link …
sreejithsreekumaran Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/qos/files/qos_params.gb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ qos_params:
100000_300m:
pkts_num_leak_out: 0
pkts_num_egr_mem: 6884
pkts_num_egr_mem_short_long: 3588
pg_drop:
dscp: 3
ecn: 1
Expand Down Expand Up @@ -509,6 +510,7 @@ qos_params:
400000_300m:
pkts_num_leak_out: 0
pkts_num_egr_mem: 6884
pkts_num_egr_mem_short_long: 3588
pg_drop:
dscp: 3
ecn: 1
Expand Down
8 changes: 7 additions & 1 deletion tests/qos/qos_sai_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,8 @@ def select_src_dst_dut_and_asic(self, duthosts, request, tbinfo, lower_tor_host)
dst_dut_index = 0
src_asic_index = 0
dst_asic_index = 0
src_long_link = False
dst_long_link = False
topo = tbinfo["topo"]["name"]
if 'dualtor' in tbinfo['topo']['name']:
# index of lower_tor_host
Expand Down Expand Up @@ -695,9 +697,11 @@ def select_src_dst_dut_and_asic(self, duthosts, request, tbinfo, lower_tor_host)
if test_port_selection_criteria == 'multi_dut_longlink_to_shortlink':
src_dut_index = is_longlink_list.index(True)
dst_dut_index = is_longlink_list.index(False)
src_long_link = True
else:
src_dut_index = is_longlink_list.index(False)
dst_dut_index = is_longlink_list.index(True)
dst_long_link = True

src_asic_index = 0
dst_asic_index = 0
Expand All @@ -706,7 +710,9 @@ def select_src_dst_dut_and_asic(self, duthosts, request, tbinfo, lower_tor_host)
"src_dut_index": src_dut_index,
"dst_dut_index": dst_dut_index,
"src_asic_index": src_asic_index,
"dst_asic_index": dst_asic_index
"dst_asic_index": dst_asic_index,
"src_long_link": src_long_link,
"dst_long_link": dst_long_link
}

@pytest.fixture(scope='class')
Expand Down
24 changes: 24 additions & 0 deletions tests/qos/test_qos_sai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,14 @@ def testQosSaiPfcXoffLimit(
if "pkts_num_egr_mem" in list(qosConfig.keys()):
testParams["pkts_num_egr_mem"] = qosConfig["pkts_num_egr_mem"]

if dutTestParams["basicParams"].get("platform_asic", None) == "cisco-8000" \
and not get_src_dst_asic_and_duts["src_long_link"] and get_src_dst_asic_and_duts["dst_long_link"]:
if "pkts_num_egr_mem_short_long" in list(qosConfig.keys()):
testParams["pkts_num_egr_mem"] = qosConfig["pkts_num_egr_mem_short_long"]
else:
pytest.skip(
"pkts_num_egr_mem_short_long is missing in yaml file ")

if "pkts_num_margin" in list(qosConfig[xoffProfile].keys()):
testParams["pkts_num_margin"] = qosConfig[xoffProfile]["pkts_num_margin"]

Expand Down Expand Up @@ -686,6 +694,14 @@ def testQosSaiPfcXonLimit(
if "pkts_num_egr_mem" in list(qosConfig.keys()):
testParams["pkts_num_egr_mem"] = qosConfig["pkts_num_egr_mem"]

if dutTestParams["basicParams"].get("platform_asic", None) == "cisco-8000" \
and not get_src_dst_asic_and_duts["src_long_link"] and get_src_dst_asic_and_duts["dst_long_link"]:
if "pkts_num_egr_mem_short_long" in list(qosConfig.keys()):
testParams["pkts_num_egr_mem"] = qosConfig["pkts_num_egr_mem_short_long"]
else:
pytest.skip(
"pkts_num_egr_mem_short_long is missing in yaml file ")

if "pkts_num_hysteresis" in list(qosConfig[xonProfile].keys()):
testParams["pkts_num_hysteresis"] = qosConfig[xonProfile]["pkts_num_hysteresis"]

Expand Down Expand Up @@ -1698,6 +1714,14 @@ def testQosSaiPgSharedWatermark(
if "pkts_num_egr_mem" in list(qosConfig.keys()):
testParams["pkts_num_egr_mem"] = qosConfig["pkts_num_egr_mem"]

if dutTestParams["basicParams"].get("platform_asic", None) == "cisco-8000" \
and not get_src_dst_asic_and_duts["src_long_link"] and get_src_dst_asic_and_duts["dst_long_link"]:
if "pkts_num_egr_mem_short_long" in list(qosConfig.keys()):
testParams["pkts_num_egr_mem"] = qosConfig["pkts_num_egr_mem_short_long"]
else:
pytest.skip(
"PGSharedWatermark: pkts_num_egr_mem_short_long is missing in yaml file ")

if "packet_size" in list(qosConfig[pgProfile].keys()):
testParams["packet_size"] = qosConfig[pgProfile]["packet_size"]

Expand Down
Loading