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.

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

Update qos sai due to no lossless pg for some platforms #16440

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

Conversation

JibinBao
Copy link
Contributor

@JibinBao JibinBao commented Jan 10, 2025

Description of PR

  1. For spc4 and above, there is only the lossy buffer, so the buffer for the lossless buffer will be taken by the lossy buffer. If the packet size is too small, the packet number sent to occupy the shared buffer will increase a lot, which will lead to the descriptor being exhausted, so update testQosSaiPgSharedWatermark, testQosSaiQSharedWatermark, and testQosSaiLossyQueue accordingly.
  2. Remove the test config of scheduler.block_data_plane, otherwise it might raise yang validation error when do config reload
  3. When there is no lossless buffer, return a dump buffer lossless pg profile, and skip tests related to lossless buffer case dynamically
  4. Skip fixture reaseAllports for mellanox device, because after qos test is finished, the teardown will do config reload, it will restore the config of ports, we don't need this fixture before running tests. Also it can save 2 minutes
  5. list the relevant Prs:
    [Mellanox] Update buffer calculations for Mellanox-SN5600-C224O8 SKU sonic-buildimage#20992
    [Mellanox] Add x86_64-nvidia_sn5610n-r0 new platform and SKUs sonic-buildimage#21056
    [Mellanox] Update Mellanox-SN5600-C256S1 buffer calculations sonic-buildimage#20991
    [Mellanox] Add x86_64-nvidia_sn5610n-r0 new platform and SKUs sonic-buildimage#21056
    [Mellanox] Update Mellanox-SN5600-C256S1, Mellanox-SN5600-C224O8 buffers and DSCP mapping sonic-buildimage#21427
    [Mellanox] Add x86_64-nvidia_sn5610n-r0 new platform and SKUs sonic-buildimage#21056
    [Mellanox] Update DSCP mapping for SN5600, SN5610 SKUs sonic-buildimage#21762

Summary:
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
    • Skipped for non-supported platforms
    • Add ownership here(Microsft required only)
  • Test case improvement

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • 202405
  • 202411

Approach

What is the motivation for this PR?

update the qos sai test for no pg lossless buffer platform

How did you do it?

update for lossy case and skip test relatd to pg buffer lossless

How did you verify/test it?

Run qos sai test on platform without pg lossless buffer plaform

Any platform specific information?

sn5600 and sn5610

Supported testbed topology if it's a new test case?

Documentation

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JibinBao
Copy link
Contributor Author

/azpw run Azure.sonic-mgmt

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-mgmt

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JibinBao JibinBao changed the title Update qos sai due to no lossless pg for some platform Update qos sai due to no lossless pg for some platforms Jan 10, 2025
@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Pull request contains merge conflicts.

1. For spc4, there is only lossy buffer, so the buffer for lossless buffer will be taken by lossy buffer, if the packet size is too small, the packet number sent to occupy the shared buffer will increase a lot, so it will lead that descriptor will be exhausted, so update testQosSaiPgSharedWatermark, testQosSaiQSharedWatermark and testQosSaiLossyQueue accordingly.
2. Remove the test config of scheduler.block_data_plane, otherwise it might rise yang validation error when do config reload
3. list the relevant Prs:
   sonic-net/sonic-buildimage#20992
   sonic-net/sonic-buildimage#21056
   sonic-net/sonic-buildimage#20991
1. When there is no lossless buffer, return a dump buffer lossless pg profile
2. Skip tests related to lossless buffer case dynamically
1. Update qos sai lossy tests because all lossless queues has changed as lossy queues
2. Skip fixture reaseAllports for mellanox device, because after qos test is finished, the teardown will do config reload, it will restore the config of ports, we don't need this fixture before running tests. Also it can save 2 minutes
3. Relevant PRs: sonic-net/sonic-buildimage#21427, sonic-net/sonic-buildimage#21056
@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants