-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
Port QoS & buffer changes in 0330 to master #2239
Conversation
…ault; 4) DWRR equal weight; Signed-off-by: Wenda <[email protected]>
…ha 1/8 Signed-off-by: Wenda <[email protected]>
@wendani Should't these changes be applicable for z9100 in master as well? |
Signed-off-by: Wenda <[email protected]>
It is applicable |
@@ -90,7 +90,7 @@ | |||
"xon":"18432", | |||
"xoff":"40560", | |||
"size":"41808", | |||
"dynamic_th":"-4", | |||
"dynamic_th":"-3", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there is dynamic_th in pg_profile_lookup.ini, why do we have two places to for alpha?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this hwsku and s6000 have not used pg_profile lookup. only Arista-7050-QX-32S is using the lookup method. Will update the former two.
10000 5m 1248 2288 35776 -3 2288 | ||
25000 5m 1248 2288 53248 -3 2288 | ||
40000 5m 1248 2288 66560 -3 2288 | ||
50000 5m 1248 2288 79872 -3 2288 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wendani 50G speed numbers are not correct. it should be 90272.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vharish02, can you create a separate PR to propose the correct change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wendani Yes I can create, but the number in 201803 branch is correct link given below, I am not sure why your PR numbers are not reflecting correctly, that's the reason I am confused, because the PR is forward porting the S6100 from 201803 to master.
https://github.com/Azure/sonic-buildimage/blob/201803/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini
10000 40m 1248 2288 37024 -3 2288 | ||
25000 40m 1248 2288 56160 -3 2288 | ||
40000 40m 1248 2288 71552 -3 2288 | ||
50000 40m 1248 2288 85696 -3 2288 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wendani this should be 96096
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as above
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wendani same comment as above.
10000 300m 1248 2288 46176 -3 2288 | ||
25000 300m 1248 2288 79040 -3 2288 | ||
40000 300m 1248 2288 108160 -3 2288 | ||
50000 300m 1248 2288 131456 -3 2288 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wendani this should be 141856
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as above
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wendani same comment as above.
Signed-off-by: Wenda <[email protected]>
…and s6000 Signed-off-by: Wenda <[email protected]>
Signed-off-by: Wenda <[email protected]>
@@ -83,6 +83,9 @@ | |||
}, | |||
"{{ port_names }}|0-1": { | |||
"profile" : "[BUFFER_PROFILE|q_lossy_profile]" | |||
}, | |||
"{{ port_names }}|5": { | |||
"profile" : "[BUFFER_PROFILE|q_lossy_profile]" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@andriymoroz-mlnx Is it the correct change to link queue 5 to lossy profile? pg 5 is handled by buffers_config.j2?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, the code which handles these tables is common for all platforms
to be completely sure, I will test new buffers_config on one of the devices and confirm...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it applies fine on MLNX
@@ -83,6 +83,9 @@ | |||
}, | |||
"{{ port_names }}|0-1": { | |||
"profile" : "[BUFFER_PROFILE|q_lossy_profile]" | |||
}, | |||
"{{ port_names }}|5": { | |||
"profile" : "[BUFFER_PROFILE|q_lossy_profile]" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it applies fine on MLNX
retest this please |
DO NOT MERGE. Please merge after or along with PR 2239 sonic-net#2239 This commit has the forward porting of changes from 20180330 to master. Unit tested by checking the broadcom registers for the values. The values in hardware reflect the correct values except for TC to PFC priority group map values. Master branch values for TC to PFC priority group map for both z9100 and s6100 in incorrect, I have a build of Oct 12 master and the values are correct in that build. Signed-off-by: Harish Venkatraman <[email protected]>
* [Vnetorch] Delete vnet vrf object when scope is not default
079f80a (HEAD -> 202111, origin/202111) Fix: if routestr does not exist, skip (#257) 8fd0fe1 Fix: not to use blocking get_all() after keys() (#255) 981107a Add VoQ Recirc interface (i.e., Ethernet-Rec) to interface maps for S… (#244) f4ecfb6 (HEAD -> 202111, origin/202111) Removing Vnet with scope default (#2239)
7919077f Add FEC correctable and uncorrectable port stats (sonic-net#2027) ecb91367 Add CLI to configure YANG config validation (sonic-net#2147) e9ab5235 Add override testcase to verify removal (sonic-net#2288) c6794b55 Fix version in db_migrator for `PORT_QOS_MAP|global` (sonic-net#2289) 92b889b7 [intfutil] Check whether the FEC mode is supported on the platform before configuring it to CONFIG_DB (sonic-net#2223) dab0d065 Transfer organization from Azure to sonic-net (sonic-net#2284) 6de18a1d [watermarkstat] Fix CLI script for unconfigured PG counters (sonic-net#2239) ac2f5530 Improve the way to check port type of RJ45 port (sonic-net#2249) Signed-off-by: Stephen Sun <[email protected]>
7919077f Add FEC correctable and uncorrectable port stats (sonic-net#2027) ecb91367 Add CLI to configure YANG config validation (sonic-net#2147) e9ab5235 Add override testcase to verify removal (sonic-net#2288) c6794b55 Fix version in db_migrator for `PORT_QOS_MAP|global` (sonic-net#2289) 92b889b7 [intfutil] Check whether the FEC mode is supported on the platform before configuring it to CONFIG_DB (sonic-net#2223) dab0d065 Transfer organization from Azure to sonic-net (sonic-net#2284) 6de18a1d [watermarkstat] Fix CLI script for unconfigured PG counters (sonic-net#2239) ac2f5530 Improve the way to check port type of RJ45 port (sonic-net#2249) 142185c9 Fix the issue that sonic_platform is not installed on vs image (sonic-net#2300) ca14133f [crm] add checking for CRM interval range (sonic-net#2293) Signed-off-by: Stephen Sun <[email protected]>
Update sonic-utilities submodule pointer to include the following: * Fix GCU bug when backend service modifying config ([sonic-net#2295](sonic-net/sonic-utilities#2295)) * Fix issues for sonic_installer upgrade-docker and sonic_installer rollback-docker ([sonic-net#2278](sonic-net/sonic-utilities#2278)) * [crm] add checking for CRM interval range ([sonic-net#2293](sonic-net/sonic-utilities#2293)) * Fix the issue that sonic_platform is not installed on vs image ([sonic-net#2300](sonic-net/sonic-utilities#2300)) * Add FEC correctable and uncorrectable port stats ([sonic-net#2027](sonic-net/sonic-utilities#2027)) * Add CLI to configure YANG config validation ([sonic-net#2147](sonic-net/sonic-utilities#2147)) * Add override testcase to verify removal ([sonic-net#2288](sonic-net/sonic-utilities#2288)) * Fix version in db_migrator for ([sonic-net#2289](sonic-net/sonic-utilities#2289)) * [intfutil] Check whether the FEC mode is supported on the platform before configuring it to CONFIG_DB ([sonic-net#2223](sonic-net/sonic-utilities#2223)) * Transfer organization from Azure to sonic-net ([sonic-net#2284](sonic-net/sonic-utilities#2284)) * [watermarkstat] Fix CLI script for unconfigured PG counters ([sonic-net#2239](sonic-net/sonic-utilities#2239)) * Improve the way to check port type of RJ45 port ([sonic-net#2249](sonic-net/sonic-utilities#2249)) Signed-off-by: dprital <[email protected]>
…aemon] advance submodule head linkmgrd: * 17240f1 2022-08-02 | [active-active] Update unhealthy label definition (sonic-net#102) (HEAD -> 202205, github/202205) [Jing Zhang] * 99a7b4b 2022-07-28 | Update the definition of healthy label (sonic-net#99) [Jing Zhang] * 551144b 2022-08-08 | [Active-Standby]Remove unnecessary `handleMuxWaitTimeout` logs (sonic-net#100) [Jing Zhang] utilities: * 8cbbe4f 2022-08-08 | [crm] add checking for CRM interval range (sonic-net#2293) (HEAD -> 202205, github/202205) [Andriy Yurkiv] * 7dac7a7 2022-08-03 | Fix version in db_migrator for `PORT_QOS_MAP|global` (sonic-net#2289) [bingwang-ms] * e14f0c9 2022-08-03 | Add override testcase to verify removal (sonic-net#2288) [jingwenxie] * 61ea21d 2022-07-29 | [watermarkstat] Fix CLI script for unconfigured PG counters (sonic-net#2239) [Nazarii Hnydyn] * e206e2d 2022-05-19 | [portconfig] Allow to configure interface mtu for physical ports only [Sudharsan Dhamal Gopalarathnam] * 9751479 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#2285) [Liu Shilong] * 218b175 2022-07-29 | [202205][counters] Keep counters cache in a single directory (sonic-net#2280) [Stepan Blyshchak] swss: * d772a70 2022-08-09 | [muxorch] return true if the nbr IP is in the skip_neighbors list (sonic-net#2407) (HEAD -> 202205) [Nikola Dancejic] * a3ac275 2022-08-08 | [EVPN]Modified tunnel creation logic when creating tunnel in VRF-VNI map creation flow (sonic-net#2404) (HEAD -> 202205) [Sudharsan Dhamal Gopalarathnam] * 67c1376 2022-08-09 | [QoS] Fix issue: the WRED profile can not be set if current min > new max or current max < new min (sonic-net#2379) [Stephen Sun] * 0295a35 2022-07-21 | [Buffer Orch] Support removing buffer port profile list (sonic-net#2371) [Stephen Sun] * 450e9ec 2022-07-07 | Fix: missing sonic-db-cli in docker-sonic-vs image (sonic-net#2357) [Qi Luo] * c1c1147 2022-06-02 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#2308) [Qi Luo] swss-common: * 749cd6f 2022-07-21 | Fix PING database command not backward compatible with python version issue. (sonic-net#650) (HEAD -> 202205) [Hua Liu] * 4fa7484 2022-06-27 | Fix: missing sonic-db-cli in docker-sonic-vs image (sonic-net#640) [Qi Luo] * 4d0dc7a 2022-06-23 | [sonic-cli] Fix sonic-db-cli output format not backward compatible with python version issue. (sonic-net#631) [Hua Liu] * c5573fe 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#628) [Qi Luo] * 0ade483 2022-08-02 | Add docker-mux related table names (sonic-net#627) [Jing Zhang] * 675d793 2022-05-26 | Re-write sonic-db-cli with c++ for sonic startup performance issue (sonic-net#607) [Hua Liu] * 1155773 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#661) (github/202205) [Liu Shilong] sairedis: * c62a453 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#1057) (HEAD -> 202205) [Qi Luo] * 8be9292 2022-07-20 | [syncd] Remove error message when tryTranslateVidToRid fails (sonic-net#1048) [Kamil Cudnik] * eb552ee 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#1099) (github/202205) [Liu Shilong] platform-daemon: * d150229 2022-08-11 | Correct the peer forwarding state table (sonic-net#281) (HEAD -> 202205) [Longxiang Lyu] * 9507e6c 2022-08-10 | [ycabled] remove some spurious logs (sonic-net#282) (HEAD -> 202205) [vdahiya12] Signed-off-by: Ying Xie <[email protected]>
* Advance sonic-utilities pointer 7919077f Add FEC correctable and uncorrectable port stats (#2027) ecb91367 Add CLI to configure YANG config validation (#2147) e9ab5235 Add override testcase to verify removal (#2288) c6794b55 Fix version in db_migrator for `PORT_QOS_MAP|global` (#2289) 92b889b7 [intfutil] Check whether the FEC mode is supported on the platform before configuring it to CONFIG_DB (#2223) dab0d065 Transfer organization from Azure to sonic-net (#2284) 6de18a1d [watermarkstat] Fix CLI script for unconfigured PG counters (#2239) ac2f5530 Improve the way to check port type of RJ45 port (#2249) 142185c9 Fix the issue that sonic_platform is not installed on vs image (#2300) ca14133f [crm] add checking for CRM interval range (#2293) Signed-off-by: Stephen Sun <[email protected]> * Advance swss dc8bc1c [portsorch] Expose supported FEC modes to STABE_DB and check whether FEC mode is supported before setting it (#2333) 6565b50 Revert "[portsorch] Expose supported FEC modes to STABE_DB and check whether FEC mode is supported before setting it (#2333)" (#2396) dc88d55 Revert hwinfo count change (#2383) 75fc965 [DualToR] Handle race condition between tunnel_decap and mux orchestrator (#2397) 525a57f Fix for remote system interface not getting created (#2364) 3161eaa portsorch: initial support for link-training (#2359) dc477fb [swss/cfgmgr] teammgr configure lacp rate (#2121) 2489ad5 Improve pytest speend by grouping 20 tests together. (#2390) 168bd3b [EVPN]Modified tunnel creation logic when creating tunnel in VRF-VNI map creation flow (#2404) 1e1438e [portsorch] Expose supported FEC modes to STABE_DB and check whether FEC mode is supported before setting it (#2400) 9f2e27b [QoS] Fix issue: the WRED profile can not be set if current min > new max or current max < new min (#2379) d36c17d [asan][aclorch] fix a memory leak in the SaiAttrWrapper::swap() (#2382) Signed-off-by: Stephen Sun <[email protected]> * More sonic-utilities PRs be1866fd Fix GCU bug when backend service modifying config (#2295) bcf36eb3 Fix issues for sonic_installer upgrade-docker and sonic_installer rollback-docker (#2278) Signed-off-by: Stephen Sun <[email protected]> Signed-off-by: Stephen Sun <[email protected]>
…aemon] advance submodule head (#11652) linkmgrd: * 17240f1 2022-08-02 | [active-active] Update unhealthy label definition (#102) (HEAD -> 202205, github/202205) [Jing Zhang] * 99a7b4b 2022-07-28 | Update the definition of healthy label (#99) [Jing Zhang] * 551144b 2022-08-08 | [Active-Standby]Remove unnecessary `handleMuxWaitTimeout` logs (#100) [Jing Zhang] utilities: * 8cbbe4f 2022-08-08 | [crm] add checking for CRM interval range (#2293) (HEAD -> 202205, github/202205) [Andriy Yurkiv] * 7dac7a7 2022-08-03 | Fix version in db_migrator for `PORT_QOS_MAP|global` (#2289) [bingwang-ms] * e14f0c9 2022-08-03 | Add override testcase to verify removal (#2288) [jingwenxie] * 61ea21d 2022-07-29 | [watermarkstat] Fix CLI script for unconfigured PG counters (#2239) [Nazarii Hnydyn] * e206e2d 2022-05-19 | [portconfig] Allow to configure interface mtu for physical ports only [Sudharsan Dhamal Gopalarathnam] * 9751479 2022-08-01 | Transfer organization from Azure to sonic-net (#2285) [Liu Shilong] * 218b175 2022-07-29 | [202205][counters] Keep counters cache in a single directory (#2280) [Stepan Blyshchak] swss: * d772a70 2022-08-09 | [muxorch] return true if the nbr IP is in the skip_neighbors list (#2407) (HEAD -> 202205) [Nikola Dancejic] * a3ac275 2022-08-08 | [EVPN]Modified tunnel creation logic when creating tunnel in VRF-VNI map creation flow (#2404) (HEAD -> 202205) [Sudharsan Dhamal Gopalarathnam] * 67c1376 2022-08-09 | [QoS] Fix issue: the WRED profile can not be set if current min > new max or current max < new min (#2379) [Stephen Sun] * 0295a35 2022-07-21 | [Buffer Orch] Support removing buffer port profile list (#2371) [Stephen Sun] * 450e9ec 2022-07-07 | Fix: missing sonic-db-cli in docker-sonic-vs image (#2357) [Qi Luo] * c1c1147 2022-06-02 | Purge package sonic-db-cli which depends on libswsscommon (#2308) [Qi Luo] swss-common: * 749cd6f 2022-07-21 | Fix PING database command not backward compatible with python version issue. (#650) (HEAD -> 202205) [Hua Liu] * 4fa7484 2022-06-27 | Fix: missing sonic-db-cli in docker-sonic-vs image (#640) [Qi Luo] * 4d0dc7a 2022-06-23 | [sonic-cli] Fix sonic-db-cli output format not backward compatible with python version issue. (#631) [Hua Liu] * c5573fe 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (#628) [Qi Luo] * 0ade483 2022-08-02 | Add docker-mux related table names (#627) [Jing Zhang] * 675d793 2022-05-26 | Re-write sonic-db-cli with c++ for sonic startup performance issue (#607) [Hua Liu] * 1155773 2022-08-01 | Transfer organization from Azure to sonic-net (#661) (github/202205) [Liu Shilong] sairedis: * c62a453 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (#1057) (HEAD -> 202205) [Qi Luo] * 8be9292 2022-07-20 | [syncd] Remove error message when tryTranslateVidToRid fails (#1048) [Kamil Cudnik] * eb552ee 2022-08-01 | Transfer organization from Azure to sonic-net (#1099) (github/202205) [Liu Shilong] platform-daemon: * d150229 2022-08-11 | Correct the peer forwarding state table (#281) (HEAD -> 202205) [Longxiang Lyu] * 9507e6c 2022-08-10 | [ycabled] remove some spurious logs (#282) (HEAD -> 202205) [vdahiya12] Signed-off-by: Ying Xie <[email protected]>
…aemon] advance submodule head (sonic-net#11652) linkmgrd: * 17240f1 2022-08-02 | [active-active] Update unhealthy label definition (sonic-net#102) (HEAD -> 202205, github/202205) [Jing Zhang] * 99a7b4b 2022-07-28 | Update the definition of healthy label (sonic-net#99) [Jing Zhang] * 551144b 2022-08-08 | [Active-Standby]Remove unnecessary `handleMuxWaitTimeout` logs (sonic-net#100) [Jing Zhang] utilities: * 8cbbe4f 2022-08-08 | [crm] add checking for CRM interval range (sonic-net#2293) (HEAD -> 202205, github/202205) [Andriy Yurkiv] * 7dac7a7 2022-08-03 | Fix version in db_migrator for `PORT_QOS_MAP|global` (sonic-net#2289) [bingwang-ms] * e14f0c9 2022-08-03 | Add override testcase to verify removal (sonic-net#2288) [jingwenxie] * 61ea21d 2022-07-29 | [watermarkstat] Fix CLI script for unconfigured PG counters (sonic-net#2239) [Nazarii Hnydyn] * e206e2d 2022-05-19 | [portconfig] Allow to configure interface mtu for physical ports only [Sudharsan Dhamal Gopalarathnam] * 9751479 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#2285) [Liu Shilong] * 218b175 2022-07-29 | [202205][counters] Keep counters cache in a single directory (sonic-net#2280) [Stepan Blyshchak] swss: * d772a70 2022-08-09 | [muxorch] return true if the nbr IP is in the skip_neighbors list (sonic-net#2407) (HEAD -> 202205) [Nikola Dancejic] * a3ac275 2022-08-08 | [EVPN]Modified tunnel creation logic when creating tunnel in VRF-VNI map creation flow (sonic-net#2404) (HEAD -> 202205) [Sudharsan Dhamal Gopalarathnam] * 67c1376 2022-08-09 | [QoS] Fix issue: the WRED profile can not be set if current min > new max or current max < new min (sonic-net#2379) [Stephen Sun] * 0295a35 2022-07-21 | [Buffer Orch] Support removing buffer port profile list (sonic-net#2371) [Stephen Sun] * 450e9ec 2022-07-07 | Fix: missing sonic-db-cli in docker-sonic-vs image (sonic-net#2357) [Qi Luo] * c1c1147 2022-06-02 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#2308) [Qi Luo] swss-common: * 749cd6f 2022-07-21 | Fix PING database command not backward compatible with python version issue. (sonic-net#650) (HEAD -> 202205) [Hua Liu] * 4fa7484 2022-06-27 | Fix: missing sonic-db-cli in docker-sonic-vs image (sonic-net#640) [Qi Luo] * 4d0dc7a 2022-06-23 | [sonic-cli] Fix sonic-db-cli output format not backward compatible with python version issue. (sonic-net#631) [Hua Liu] * c5573fe 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#628) [Qi Luo] * 0ade483 2022-08-02 | Add docker-mux related table names (sonic-net#627) [Jing Zhang] * 675d793 2022-05-26 | Re-write sonic-db-cli with c++ for sonic startup performance issue (sonic-net#607) [Hua Liu] * 1155773 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#661) (github/202205) [Liu Shilong] sairedis: * c62a453 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#1057) (HEAD -> 202205) [Qi Luo] * 8be9292 2022-07-20 | [syncd] Remove error message when tryTranslateVidToRid fails (sonic-net#1048) [Kamil Cudnik] * eb552ee 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#1099) (github/202205) [Liu Shilong] platform-daemon: * d150229 2022-08-11 | Correct the peer forwarding state table (sonic-net#281) (HEAD -> 202205) [Longxiang Lyu] * 9507e6c 2022-08-10 | [ycabled] remove some spurious logs (sonic-net#282) (HEAD -> 202205) [vdahiya12] Signed-off-by: Ying Xie <[email protected]>
Do not merge as it can break test.
QoS affected all hwskus
Linking pg & queue 5 to lossy profile affects all hwskus
Buffer affected hwskus: a7050, a7060, a7260, and S6100
- What I did
- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)