Skip to content

[202012 qos] fix HdrmPoolSizeTest's upper bound, when margin is not zero #7119

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

Merged
XuChen-MSFT merged 1 commit into from
Dec 28, 2022
Merged

[202012 qos] fix HdrmPoolSizeTest's upper bound, when margin is not zero #7119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 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 @@ -642,6 +642,14 @@ def testQosSaiHeadroomPoolWatermark(
"hwsku":dutTestParams['hwsku']
})

margin = qosConfig["hdrm_pool_size"].get("margin")
if margin:
testParams["margin"] = margin

dynamic_threshold = qosConfig["hdrm_pool_size"].get("dynamic_threshold", False)
if dynamic_threshold:
testParams["dynamic_threshold"] = dynamic_threshold

if "pkts_num_egr_mem" in qosConfig.keys():
testParams["pkts_num_egr_mem"] = qosConfig["pkts_num_egr_mem"]

Expand Down
27 changes: 14 additions & 13 deletions tests/saitests/sai_qos_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1858,7 +1858,7 @@ def tearDown(self):
sai_base_test.ThriftInterfaceDataPlane.tearDown(self)

def show_port_counter(self, rx_base, tx_base, banner):
port_counter_indexes = self.pgs
port_counter_indexes = [pg for pg in self.pgs]
port_counter_indexes += self.ingress_counters
port_counter_indexes += self.egress_counters
port_counter_indexes += [TRANSMITTED_PKTS, RECEIVED_PKTS, RECEIVED_NON_UC_PKTS, TRANSMITTED_NON_UC_PKTS, EGRESS_PORT_QLEN]
Expand Down Expand Up @@ -1980,7 +1980,7 @@ def runTest(self):
print >> sys.stderr, "PFC triggered"
sys.stderr.flush()

upper_bound = 2
upper_bound = 2 * margin + 1
if self.wm_multiplier:
hdrm_pool_wm = sai_thrift_read_headroom_pool_watermark(self.client, self.buf_pool_roid)
print >> sys.stderr, "Actual headroom pool watermark value to start: %d" % hdrm_pool_wm
Expand Down Expand Up @@ -2061,17 +2061,18 @@ def runTest(self):

print >> sys.stderr, "pg hdrm filled"
if self.wm_multiplier:
# assert hdrm pool wm still remains the same
hdrm_pool_wm = sai_thrift_read_headroom_pool_watermark(
self.client, self.buf_pool_roid)
if 'innovium' not in self.asic_type:
assert(expected_wm <= hdrm_pool_wm)
assert(hdrm_pool_wm <= upper_bound_wm)
# at this point headroom pool should be full. send few more packets to continue causing drops
print >> sys.stderr, "overflow headroom pool"
send_packet(self, self.src_port_ids[sidx_dscp_pg_tuples[i][0]], pkt, 10)
hdrm_pool_wm = sai_thrift_read_headroom_pool_watermark(self.client, self.buf_pool_roid)
assert(hdrm_pool_wm <= self.max_headroom)
# assert hdrm pool wm still remains the same
hdrm_pool_wm = sai_thrift_read_headroom_pool_watermark(
self.client, self.buf_pool_roid)
sys.stderr.write('After PG headroom filled, actual headroom pool watermark {}, upper_bound {}\n'.format(hdrm_pool_wm, upper_bound_wm))
if 'innovium' not in self.asic_type:
assert(expected_wm <= hdrm_pool_wm)
assert(hdrm_pool_wm <= upper_bound_wm)
# at this point headroom pool should be full. send few more packets to continue causing drops
print >> sys.stderr, "overflow headroom pool"
send_packet(self, self.src_port_ids[sidx_dscp_pg_tuples[i][0]], pkt, 10)
hdrm_pool_wm = sai_thrift_read_headroom_pool_watermark(self.client, self.buf_pool_roid)
assert(hdrm_pool_wm <= self.max_headroom)
sys.stderr.flush()

finally:
Expand Down