Skip to content

Commit

Permalink
Merge pull request #2065 from sever-sever/T5295
Browse files Browse the repository at this point in the history 
T5295: QoS fix policy limiter tc filter rate limit
  • Loading branch information
@c-po
c-po authored Jul 1, 2023
2 parents 55d6c57 + 4917d7a commit 9c4c2f4
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 49 deletions.
101 changes: 52 additions & 49 deletions python/vyos/qos/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class QoSBase:
"CS7": 0xE0,
"EF": 0xB8
}
qostype = None

def __init__(self, interface):
if os.path.exists('/tmp/vyos.qos.debug'):
Expand Down Expand Up @@ -203,18 +204,20 @@ def update(self, config, direction, priority=None):
self._build_base_qdisc(cls_config, int(cls))

# every match criteria has it's tc instance
filter_cmd = f'tc filter replace dev {self._interface} parent {self._parent:x}:'
filter_cmd_base = f'tc filter add dev {self._interface} parent {self._parent:x}:'

if priority:
filter_cmd += f' prio {cls}'
filter_cmd_base += f' prio {cls}'
elif 'priority' in cls_config:
prio = cls_config['priority']
filter_cmd += f' prio {prio}'
filter_cmd_base += f' prio {prio}'

filter_cmd += ' protocol all'
filter_cmd_base += ' protocol all'

if 'match' in cls_config:
for match, match_config in cls_config['match'].items():
for index, (match, match_config) in enumerate(cls_config['match'].items(), start=1):
filter_cmd = filter_cmd_base
filter_cmd += f' prio {index}'
if 'mark' in match_config:
mark = match_config['mark']
filter_cmd += f' handle {mark} fw'
Expand Down Expand Up @@ -289,10 +292,19 @@ def update(self, config, direction, priority=None):
elif af == 'ipv6':
filter_cmd += f' match u8 {mask} {mask} at 53'

cls = int(cls)
filter_cmd += f' flowid {self._parent:x}:{cls:x}'
self._cmd(filter_cmd)

else:

filter_cmd += ' basic'

cls = int(cls)
filter_cmd += f' flowid {self._parent:x}:{cls:x}'
self._cmd(filter_cmd)


# The police block allows limiting of the byte or packet rate of
# traffic matched by the filter it is attached to.
# https://man7.org/linux/man-pages/man8/tc-police.8.html
Expand All @@ -318,48 +330,39 @@ def update(self, config, direction, priority=None):
# burst = cls_config['burst']
# filter_cmd += f' burst {burst}'

cls = int(cls)
filter_cmd += f' flowid {self._parent:x}:{cls:x}'
self._cmd(filter_cmd)
if self.qostype == 'limiter':
if 'default' in config:
if 'class' in config:
class_id_max = self._get_class_max_id(config)
default_cls_id = int(class_id_max) + 1
self._build_base_qdisc(config['default'], default_cls_id)

filter_cmd = f'tc filter replace dev {self._interface} parent {self._parent:x}: '
filter_cmd += 'prio 255 protocol all basic'

# The police block allows limiting of the byte or packet rate of
# traffic matched by the filter it is attached to.
# https://man7.org/linux/man-pages/man8/tc-police.8.html
if any(tmp in ['exceed', 'bandwidth', 'burst'] for tmp in
config['default']):
filter_cmd += f' action police'

if 'exceed' in config['default']:
action = config['default']['exceed']
filter_cmd += f' conform-exceed {action}'
if 'not_exceed' in config['default']:
action = config['default']['not_exceed']
filter_cmd += f'/{action}'

if 'bandwidth' in config['default']:
rate = self._rate_convert(config['default']['bandwidth'])
filter_cmd += f' rate {rate}'

# T5295: Do not do any tc filter action for 'default'
# In VyOS 1.4, we have the following configuration:
# tc filter replace dev eth0 parent 1: prio 255 protocol all basic action police rate 300000000 burst 15k
# However, this caused unexpected random speeds.
# In VyOS 1.3, we do not use any 'tc filter' for rate limits,
# It gets rate from tc class classid 1:1
#
# if 'default' in config:
# if 'class' in config:
# class_id_max = self._get_class_max_id(config)
# default_cls_id = int(class_id_max) +1
# self._build_base_qdisc(config['default'], default_cls_id)
#
# filter_cmd = f'tc filter replace dev {self._interface} parent {self._parent:x}: '
# filter_cmd += 'prio 255 protocol all basic'
#
# # The police block allows limiting of the byte or packet rate of
# # traffic matched by the filter it is attached to.
# # https://man7.org/linux/man-pages/man8/tc-police.8.html
# if any(tmp in ['exceed', 'bandwidth', 'burst'] for tmp in config['default']):
# filter_cmd += f' action police'
#
# if 'exceed' in config['default']:
# action = config['default']['exceed']
# filter_cmd += f' conform-exceed {action}'
# if 'not_exceed' in config['default']:
# action = config['default']['not_exceed']
# filter_cmd += f'/{action}'
#
# if 'bandwidth' in config['default']:
# rate = self._rate_convert(config['default']['bandwidth'])
# filter_cmd += f' rate {rate}'
#
# if 'burst' in config['default']:
# burst = config['default']['burst']
# filter_cmd += f' burst {burst}'
#
# if 'class' in config:
# filter_cmd += f' flowid {self._parent:x}:{default_cls_id:x}'
#
# self._cmd(filter_cmd)
if 'burst' in config['default']:
burst = config['default']['burst']
filter_cmd += f' burst {burst}'

if 'class' in config:
filter_cmd += f' flowid {self._parent:x}:{default_cls_id:x}'

self._cmd(filter_cmd)
1 change: 1 addition & 0 deletions python/vyos/qos/limiter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

class Limiter(QoSBase):
_direction = ['ingress']
qostype = 'limiter'

def update(self, config, direction):
tmp = f'tc qdisc add dev {self._interface} handle {self._parent:x}: {direction}'
Expand Down

0 comments on commit 9c4c2f4

Please sign in to comment.