Skip to content

[QoS] Support designating the packet size when testing water mark of shared buffer #1663

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
neethajohn merged 2 commits into from
May 26, 2020
Merged

[QoS] Support designating the packet size when testing water mark of shared buffer #1663

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79b4853
[qos] Support designating the packet size when testing water mark of …
May 6, 2020
885e51f
Update qos_sai.yml
stephenxs May 21, 2020
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
27 changes: 18 additions & 9 deletions ansible/roles/test/files/saitests/sai_qos_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1394,12 +1394,17 @@ def runTest(self):
pkts_num_fill_min = int(self.test_params['pkts_num_fill_min'])
pkts_num_fill_shared = int(self.test_params['pkts_num_fill_shared'])
cell_size = int(self.test_params['cell_size'])
if 'packet_size' in self.test_params.keys():
default_packet_length = int(self.test_params['packet_size'])
else:
default_packet_length = 64

cell_occupancy = (default_packet_length + cell_size - 1) / cell_size

# Prepare TCP packet data
tos = dscp << 2
tos |= ecn
ttl = 64
default_packet_length = 64
pkt = simple_tcp_packet(pktlen=default_packet_length,
eth_dst=router_mac if router_mac != '' else dst_port_mac,
eth_src=src_port_mac,
Expand Down Expand Up @@ -1438,13 +1443,16 @@ def runTest(self):
# first round sends only 1 packet
expected_wm = 0
total_shared = pkts_num_fill_shared - pkts_num_fill_min
pkts_inc = total_shared >> 2
pkts_inc = (total_shared / cell_occupancy) >> 2
pkts_num = 1 + margin
while (expected_wm < total_shared):
expected_wm += pkts_num
fragment = 0
while (expected_wm < total_shared - fragment):
expected_wm += pkts_num * cell_occupancy
if (expected_wm > total_shared):
pkts_num -= (expected_wm - total_shared)
expected_wm = total_shared
diff = (expected_wm - total_shared + cell_occupancy - 1) / cell_occupancy
pkts_num -= diff
expected_wm -= diff * cell_occupancy
fragment = total_shared - expected_wm
print >> sys.stderr, "pkts num to send: %d, total pkts: %d, pg shared: %d" % (pkts_num, expected_wm, total_shared)

send_packet(self, src_port_id, pkt, pkts_num)
Expand All @@ -1460,10 +1468,11 @@ def runTest(self):
send_packet(self, src_port_id, pkt, pkts_num)
time.sleep(8)
q_wm_res, pg_shared_wm_res, pg_headroom_wm_res = sai_thrift_read_port_watermarks(self.client, port_list[src_port_id])
print >> sys.stderr, "exceeded pkts num sent: %d, expected watermark: %d, actual value: %d" % (pkts_num, (expected_wm * cell_size), pg_shared_wm_res[pg])
assert(expected_wm == total_shared)
print >> sys.stderr, "exceeded pkts num sent: %d, expected watermark: %d, actual value: %d" % (pkts_num, ((expected_wm + cell_occupancy) * cell_size), pg_shared_wm_res[pg])
# assert(expected_wm == total_shared)
assert(fragment < cell_occupancy)
assert(expected_wm * cell_size <= pg_shared_wm_res[pg])
assert(pg_shared_wm_res[pg] <= (expected_wm + margin) * cell_size)
assert(pg_shared_wm_res[pg] <= (expected_wm + margin + cell_occupancy) * cell_size)

finally:
sai_thrift_port_tx_enable(self.client, asic_type, [dst_port_id])
Expand Down