Update qos config to clear queues for bounced back traffic by bingwang-ms · Pull Request #10176 · sonic-net/sonic-buildimage

bingwang-ms · 2022-03-08T06:29:39Z

Signed-off-by: bingwang [email protected]

Why I did it

This PR is to redefine DSCP_TO_DC_MAP , TC_TO_QUEUE_MAP and TC_TO_PRIORITY_GROUP_MAP table to clear queue 2 and queue 6 for bounced back traffic.
To support the extra lossless queue 2 and 6, the table pfc_enable, pfcwd_sw_enable and SCHEDULER are also updated in the template.

HLD sonic-net/SONiC#950

SKU includes

Arista-7050CX3-32S-C32
Arista-7050CX3-32S-D48C8
Arista-7260CX3-D108C8
Arista-7260CX3-C64
Arista-7260CX3-Q64

Changed table:

DSCP_TO_TC_MAP

Original	Leaf	Dual-ToR	Why do this change
"2" : "1"	"2" : "2"	"2" : "1"	Only change for leaf router to map DSCP 2 to TC 2 as TC 2 will be used for lossless TC
"5" : "2"	"5" : "1"	"5" : "1"	To clear TC 2 for bounced back traffic
"6" : "1"	"6" : "6"	"6" : "1"	Only change for leaf router to map DSCP 6 to TC 6 as TC 6 will be used for lossless TC
"33" : "1"	"33" : "1"	"33" : "2"	Only change for Tor router. To map DSCP33->TC 2 as we need to conserve DSCP 33 for bounced back traffic. The tunnel level map will map TC 2 -> DSCP 33
"48" : "6"	"48" : "7"	"48" : "7"	To clear TC 6 for bounced back traffic

TC_TO_PRIORITY_GROUP_MAP

Original	Leaf	Dual-ToR	Why do this change
"2" : "0"	"2" : "2"	"2" : "0"	Only change for leaf router to map TC 2 to PG 2 as PG 2 will be used for lossless PG
"6" : "0"	"6" : "6"	"6" : "0"	Only change for leaf router to map TC 6 to PG 6 as PG 6 will be used for lossless PG

TC_TO_QUEUE_MAP

Original	Leaf	Dual-ToR	Why do this change
"2" : "2"	"2" : "2"	"2" : "1"	Only change for ToR router to map TC 2 to Queue 1. As we mapped DSCP33->TC2 on ToR router, we need to remap TC2 to a lossy queue

How I did it

Define a macro for SKUs that requires remapping.

How to verify it

Verified by rendering the J2 template with sonic-cfggen.
Verified by UT.

Which release branch to backport (provide reason below if selected)

Description for the changelog

Update qos config to clear queues for bounced back traffic.

Link to config_db schema for YANG module changes

YANG model is not changed.

A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: bingwang <[email protected]>

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2

files/build_templates/qos_config.j2

neethajohn · 2022-03-08T23:27:23Z

@bingwang-ms, we also need to add unit tests for the template rendering. refer to src/sonic-config-engine/tests/test_j2files.py

Signed-off-by: bingwang <[email protected]>

bingwang-ms · 2022-03-09T12:20:19Z

@neethajohn All comments are addressed, and UT is also updated and passing. Please help take a look. Thanks so much!

bingwang-ms · 2022-03-16T06:46:20Z

The new QoS map for tunnel DSCP mapping is now covered in this PR. Will raise another PR to add that after this one is merged.

bingwang-ms · 2022-03-29T00:55:59Z

/azp run

azure-pipelines · 2022-03-29T00:56:04Z

You have several pipelines (over 10) configured to build pull requests in this repository. Specify which pipelines you would like to run by using /azp run [pipelines] command. You can specify multiple pipelines using a comma separated list.

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2

files/build_templates/qos_config.j2

neethajohn · 2022-03-30T04:47:34Z

@bingwang-ms, can you also update the PR description to include all the changes done in this PR

Signed-off-by: bingwang <[email protected]>

bingwang-ms · 2022-03-30T12:18:36Z

All comments addressed. Please take a look one more time. Thanks

Signed-off-by: bingwang <[email protected]>

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2

files/build_templates/qos_config.j2

Signed-off-by: bingwang <[email protected]>

bingwang-ms · 2022-03-31T08:29:52Z

/azp run

azure-pipelines · 2022-03-31T08:29:57Z

You have several pipelines (over 10) configured to build pull requests in this repository. Specify which pipelines you would like to run by using /azp run [pipelines] command. You can specify multiple pipelines using a comma separated list.

bingwang-ms · 2022-03-31T08:30:37Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2022-03-31T08:30:50Z

Azure Pipelines successfully started running 1 pipeline(s).

bingwang-ms · 2022-04-02T04:33:57Z

YANG model update at #10444
PR testing will pass after #10444 is merged.

qiluo-msft · 2022-04-07T22:59:32Z

This commit could not be cleanly cherry-picked to 202012. Please submit another PR.

Signed-off-by: bingwang <[email protected]> Why I did it This PR brings two changes Add lossy PG profile for PG2 and PG6 on T1 for ports between T1 and T2. After PR Update qos config to clear queues for bounced back traffic #10176 , the DSCP_TO_TC_MAP and TC_TO_PG_MAP is updated when remapping is enable DSCP_TO_TC_MAP Before After Why do this change "2" : "1" "2" : "2" Only change for leaf router to map DSCP 2 to TC 2 as TC 2 will be used for lossless TC "6" : "1" "6" : "6" Only change for leaf router to map DSCP 6 to TC 6 as TC 6 will be used for lossless TC TC_TO_PRIORITY_GROUP_MAP Before After Why do this change "2" : "0" "2" : "2" Only change for leaf router to map TC 2 to PG 2 as PG 2 will be used for lossless PG "6" : "0" "6" : "6" Only change for leaf router to map TC 6 to PG 6 as PG 6 will be used for lossless PG So, we have two new lossy PGs (2 and 6) for the T2 facing ports on T1, and two new lossless PGs (2 and 6) for the T0 facing port on T1. However, there is no lossy PG profile for the T2 facing ports on T1. The lossless PGs for ports between T1 and T0 have been handled by buffermgrd .Therefore, We need to add lossy PG profiles for T2 facing ports on T1. We don't have this issue on T0 because PG 2 and PG 6 are lossless PGs, and there is no lossy traffic mapped to PG 2 and PG 6 Map port level TC7 to PG0 Before the PCBB change, DSCP48 -> TC 6 -> PG 0. After the PCBB change, DSCP48 -> TC 7 -> PG 7 Actually, we can map TC7 to PG0 to save a lossy PG. How I did it Update the qos and buffer template. How to verify it Verified by UT.

Signed-off-by: bingwang <[email protected]> Why I did it This PR brings two changes Add lossy PG profile for PG2 and PG6 on T1 for ports between T1 and T2. After PR Update qos config to clear queues for bounced back traffic sonic-net#10176 , the DSCP_TO_TC_MAP and TC_TO_PG_MAP is updated when remapping is enable DSCP_TO_TC_MAP Before After Why do this change "2" : "1" "2" : "2" Only change for leaf router to map DSCP 2 to TC 2 as TC 2 will be used for lossless TC "6" : "1" "6" : "6" Only change for leaf router to map DSCP 6 to TC 6 as TC 6 will be used for lossless TC TC_TO_PRIORITY_GROUP_MAP Before After Why do this change "2" : "0" "2" : "2" Only change for leaf router to map TC 2 to PG 2 as PG 2 will be used for lossless PG "6" : "0" "6" : "6" Only change for leaf router to map TC 6 to PG 6 as PG 6 will be used for lossless PG So, we have two new lossy PGs (2 and 6) for the T2 facing ports on T1, and two new lossless PGs (2 and 6) for the T0 facing port on T1. However, there is no lossy PG profile for the T2 facing ports on T1. The lossless PGs for ports between T1 and T0 have been handled by buffermgrd .Therefore, We need to add lossy PG profiles for T2 facing ports on T1. We don't have this issue on T0 because PG 2 and PG 6 are lossless PGs, and there is no lossy traffic mapped to PG 2 and PG 6 Map port level TC7 to PG0 Before the PCBB change, DSCP48 -> TC 6 -> PG 0. After the PCBB change, DSCP48 -> TC 7 -> PG 7 Actually, we can map TC7 to PG0 to save a lossy PG. How I did it Update the qos and buffer template. How to verify it Verified by UT.

Update qos config to clear queues for bounced back traffic

0d37da4

Signed-off-by: bingwang <[email protected]>

bingwang-ms requested review from lguohan, prgeor, sujinmkang and vdahiya12 as code owners March 8, 2022 06:29

bingwang-ms added the Request for 202012 Branch label Mar 8, 2022

neethajohn reviewed Mar 8, 2022

View reviewed changes

Address comments

6565c2e

Signed-off-by: bingwang <[email protected]>

bingwang-ms force-pushed the clear_q_for_tunnel_remapping branch from f5fcedb to 6565c2e Compare March 9, 2022 11:40

bingwang-ms added 2 commits March 9, 2022 04:06

Fix UT

0e0fffe

Signed-off-by: bingwang <[email protected]>

Fix UT

9a491e1

Signed-off-by: bingwang <[email protected]>

bingwang-ms mentioned this pull request Mar 24, 2022

[HLD] DSCP/TC remapping for tunnel traffic sonic-net/SONiC#950

Merged

neethajohn requested changes Mar 30, 2022

View reviewed changes

bingwang-ms added 3 commits March 30, 2022 02:59

Update qos table

a44c156

Signed-off-by: bingwang <[email protected]>

Check NEIGH type

598cf86

Signed-off-by: bingwang <[email protected]>

Fix UT

f1d9c0f

Signed-off-by: bingwang <[email protected]>

bingwang-ms added 3 commits March 30, 2022 06:23

Fix py2 UT

eb399f8

Signed-off-by: bingwang <[email protected]>

Merge branch 'master' into clear_q_for_tunnel_remapping

5da008b

Fix py2 UT

ba5b35d

Signed-off-by: bingwang <[email protected]>

neethajohn reviewed Mar 30, 2022

View reviewed changes

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2 Outdated Show resolved Hide resolved

files/build_templates/qos_config.j2 Outdated Show resolved Hide resolved

Remove TC_TO_QUEUE_MAP for leaf

da726a6

Signed-off-by: bingwang <[email protected]>

bingwang-ms mentioned this pull request Apr 2, 2022

[YANG] Update YANG model for pfcwd_sw_enable #10444

Merged

6 tasks

Merge branch 'master' into clear_q_for_tunnel_remapping

dab2fc0

neethajohn approved these changes Apr 4, 2022

View reviewed changes

bingwang-ms merged commit b9dd1df into sonic-net:master Apr 5, 2022

bingwang-ms mentioned this pull request Apr 19, 2022

[cherry-pick] [202012] Update qos config to clear queues for bounced back traffic #10608

Merged

6 tasks

qiluo-msft removed the Request for 202012 Branch label Apr 21, 2022

This was referenced Jun 16, 2022

Add extra lossy PG profile for ports between T1 and T2 #11157

Merged

[202012] [cherry-pick] Add extra lossy PG profile for ports between T1 and T2 #11160

Closed

bingwang-ms added the Request for 202205 Branch label Jun 21, 2022

yxieca removed the Request for 202205 Branch label Jun 22, 2022

This was referenced Nov 3, 2022

Add lossy scheduler for queue 7 #12596

Merged

[202012] Add lossy scheduler for queue 7 #12600

Merged

Conversation

bingwang-ms commented Mar 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Why I did it

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

neethajohn commented Mar 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bingwang-ms commented Mar 9, 2022

Uh oh!

bingwang-ms commented Mar 16, 2022

Uh oh!

bingwang-ms commented Mar 29, 2022

Uh oh!

azure-pipelines bot commented Mar 29, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

neethajohn commented Mar 30, 2022

Uh oh!

bingwang-ms commented Mar 30, 2022

Uh oh!

Uh oh!

Uh oh!

bingwang-ms commented Mar 31, 2022

Uh oh!

azure-pipelines bot commented Mar 31, 2022

Uh oh!

bingwang-ms commented Mar 31, 2022

Uh oh!

azure-pipelines bot commented Mar 31, 2022

Uh oh!

bingwang-ms commented Apr 2, 2022

Uh oh!

qiluo-msft commented Apr 7, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

bingwang-ms commented Mar 8, 2022 •

edited

Loading

neethajohn commented Mar 8, 2022 •

edited

Loading