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

T6373: QoS Policy Limiter - classes for marked traffic do not work #3494

Merged
merged 1 commit into from
May 21, 2024

Conversation

HollyGurza
Copy link
Contributor

Change Summary

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

Component(s) name

Proposed changes

How to test

conf
set qos policy limiter 1G-in class 100 bandwidth '20gbit'
set qos policy limiter 1G-in class 100 burst '3760k'
set qos policy limiter 1G-in class 100 match INTERNAL mark '100'
set qos policy limiter 1G-in class 100 priority '20'
set qos policy limiter 1G-in default bandwidth '1gbit'
set qos policy limiter 1G-in default burst '125000000b'
set qos interface eth0 ingress 1G-in
commit

and check tc filters:

vyos@vyos# tc filter show dev eth0 ingress
filter parent ffff: protocol all pref 20 fw chain 0 
filter parent ffff: protocol all pref 20 fw chain 0 handle 0x64 classid ffff:64 

        action order 1:  police 0x1 rate 20Gbit burst 3847500b mtu 2Kb action drop overhead 0b 
        ref 1 bind 1 

filter parent ffff: protocol all pref 255 basic chain 0 
filter parent ffff: protocol all pref 255 basic chain 0 handle 0x1 flowid ffff:65 
        action order 1:  police 0x2 rate 1Gbit burst 125000000b mtu 2Kb action drop overhead 0b 
        ref 1 bind 1 

Smoketest result

vyos@vyos# python3 /usr/libexec/vyos/tests/smoke/cli/test_qos.py 
test_01_cake (__main__.TestQoS.test_01_cake) ... ok
test_02_drop_tail (__main__.TestQoS.test_02_drop_tail) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_03_fair_queue (__main__.TestQoS.test_03_fair_queue) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_04_fq_codel (__main__.TestQoS.test_04_fq_codel) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_05_limiter (__main__.TestQoS.test_05_limiter) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_06_network_emulator (__main__.TestQoS.test_06_network_emulator) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_07_priority_queue (__main__.TestQoS.test_07_priority_queue) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_08_random_detect (__main__.TestQoS.test_08_random_detect) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_09_rate_control (__main__.TestQoS.test_09_rate_control) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_10_round_robin (__main__.TestQoS.test_10_round_robin) ... 
Selected QoS policy "qos-policy-eth0" does not exist!

ok
test_11_shaper (__main__.TestQoS.test_11_shaper) ... ok
test_12_shaper_with_red_queue (__main__.TestQoS.test_12_shaper_with_red_queue) ... ok
test_13_shaper_delete_only_rule (__main__.TestQoS.test_13_shaper_delete_only_rule) ... ok
test_14_policy_limiter_marked_traffic (__main__.TestQoS.test_14_policy_limiter_marked_traffic) ... ok

----------------------------------------------------------------------
Ran 14 tests in 47.744s

OK

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

@c-po
Copy link
Member

c-po commented May 21, 2024

@Mergifyio backport sagitta

@c-po c-po merged commit 23a4201 into vyos:current May 21, 2024
8 checks passed
Copy link
Contributor

mergify bot commented May 21, 2024

backport sagitta

✅ Backports have been created

Giggum added a commit to Giggum/vyos-1x that referenced this pull request May 22, 2024
T6373: QoS Policy Limiter - classes for marked traffic do not work
c-po added a commit that referenced this pull request May 22, 2024
T6373: QoS Policy Limiter - classes for marked traffic do not work (backport #3494)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

4 participants