VyOS command definitions, scripts, and utilities (mirror of https://github.com/marekm72/vyos-1x.git) https://git.amelek.net/marekm72/vyos-1x.git/atom?h=1.4.0-epa2 2024-03-04T17:27:51+00:00 2024-03-04T17:27:51+00:00 Nataliia Solomko natalirs1985@gmail.com 2024-03-01T10:47:08+00:00 urn:sha1:b0a4e646b4179ac51f937f40cf865b933afb6370 (cherry picked from commit 2104424c1a43dc027567e051262e1eed6506491f) 2024-03-01T21:28:30+00:00 Nataliia Solomko natalirs1985@gmail.com 2024-03-01T15:51:31+00:00 urn:sha1:21f9892d0840974b6d54e5746feb3c572dd907bf (cherry picked from commit c7f5b510cfd117e57f2d22e259c843600ef4cc76) 2024-02-09T11:44:35+00:00 Viacheslav Hletenko v.gletenko@vyos.io 2024-02-09T10:51:00+00:00 urn:sha1:a6781cd008998200d491fbf86f6976d81323a7bd The `class_id_max` is wrong due to `tmp.sort` of Strings If we have class 5 and class 10 we get sorted max value 5, expected 10 ``` >>> tmp = ['5', '10'] >>> tmp.sort() >>> tmp ['10', '5'] >>> >>> hex(5+1) '0x6' >>> >>> hex(10+1) '0xb' >>> ``` This way we get wrong default maximum class value: ``` tc qdisc replace dev eth1 root handle 1: htb r2q 444 default 6 ``` Expect: ``` tc qdisc replace dev eth1 root handle 1: htb r2q 444 default b ``` Fix this converting Strings to Integers and get max value. (cherry picked from commit 2e8fa45c7f0663549edd118622b3381e7c428b2e) 2024-02-07T17:02:13+00:00 Viacheslav Hletenko v.gletenko@vyos.io 2024-02-07T16:34:27+00:00 urn:sha1:6c3c5389bdd3f6b9d40e53596f9f22a2a36bfee9 The current calculation `r2q` is wrong as it uses `Floor division` but expecting `division` This way `math.ceil` calculate wrong value as we expect round a number upward to its nearest integer For example for speed 710 mbits expected value `444` but we get `443` ``` from math import ceil MAXQUANTUM = 200000 speed = 710000000 speed_bps = int(speed) // 8 >>> speed_bps // MAXQUANTUM 443 >>> speed_bps / MAXQUANTUM 443.75 >>> >>> >>> ceil(speed_bps // MAXQUANTUM) 443 >>> ceil(speed_bps / MAXQUANTUM) 444 >>> ``` (cherry picked from commit ce1035e1e8642bf740e2a21693a72fe2127b8f72) 2024-02-02T12:12:02+00:00 Matthew Kobayashi matthew@kobayashi.au 2023-12-22T01:50:29+00:00 urn:sha1:628877a46a049142cffd5d98de74f652d4a9dde7 (cherry picked from commit 61342083d7db8c30d015474fae5cb71f480487d8) 2024-02-01T16:03:36+00:00 Viacheslav Hletenko v.gletenko@vyos.io 2024-01-23T10:53:08+00:00 urn:sha1:050b2eb42b0356ff446fe6fed1be4bad1f754f77 The default `bandwidth` and `ceiling` should calculate values based on <tag> bandwidth but currently it gets the value from qos.base `/sys/class/net/{self._interface}/speed` ``` set qos policy shaper SHAPER bandwidth '20mbit' set qos policy shaper SHAPER default bandwidth '95%' set qos policy shaper SHAPER default ceiling '100%' ``` It causes wrong calculations for class `default` i.e 950Mbit for bandwidth (expected 95% of bandwidth, 19Mbit) 1Gbit for ceil (expected 100% of bandwidth, 20Mbit) Gets incorrect values ``` r4# tc class show dev eth1 class htb 1:1 root rate 20Mbit ceil 20Mbit burst 1600b cburst 1600b class htb 1:a parent 1:1 leaf 8053: prio 0 rate 200Kbit ceil 200Kbit burst 1Mb cburst 1600b class htb 1:b parent 1:1 leaf 8054: prio 7 rate 950Mbit ceil 1Gbit burst 15200b cburst 1375b ``` Fix this (cherry picked from commit 6ddfe6328e1cbdde1b70763b39e3a87f8374755a) 2024-01-22T11:22:35+00:00 Viacheslav Hletenko v.gletenko@vyos.io 2024-01-18T19:26:18+00:00 urn:sha1:8362b19bbfac3cc41d3fe5b85e43a0d9374b98a8 QoS policy shaper-hfsc was not implemented after rewriting the traffic-policy to qos policy. We had CLI but it does not use the correct class. Add a basic implementation of policy shaper-hfsc. Write the class `TrafficShaperHFS` (cherry picked from commit f6b6ee636e34f98d336ee53599666afd1f395d78) 2024-01-21T12:23:17+00:00 Viacheslav Hletenko v.gletenko@vyos.io 2024-01-20T15:01:57+00:00 urn:sha1:7f277e0e93cac0678ef101f0c36d1a916ec778b0 If we have QoS policy shaper class match `vif` (VLAN) we have to use `basic match "meta(vlan mask 0xfff eq xxx)` instead of `action policy` Actual incorrect TC filter: tc filter add dev eth1 parent 1: protocol all prio 1 action police rate 100000000 burst 15k flowid 1:64 The correct TC filter after fix: tc filter add dev eth1 parent 1: protocol all prio 1 basic match "meta(vlan mask 0xfff eq 100)" flowid 1:64 (cherry picked from commit bb532f7f65930f8bc42e3bf3ebbcc690bffcfd0a) 2024-01-20T09:04:49+00:00 Viacheslav Hletenko v.gletenko@vyos.io 2024-01-19T13:21:56+00:00 urn:sha1:885a6335a50e63a0b9cc8d1e716150518bf19025 It is impossible to detect interface speed for some devices for exmaple virtio interfaces: ``` vyos@r4:~$ cat /sys/class/net/eth1/speed -1 ``` It causes wrong negative calcultaions like: - bandwidth: -1000000 - 4% of bandwidth: -40000 tc class replace dev eth1 parent 1: classid 1:1 htb rate -1000000 tc class replace dev eth1 parent 1:1 classid 1:a htb rate -40000 Fix this with checking negative value. Add default interface speed to 1000 Mbit if we cannot detect the interface speed, the current default value 10 Mbit is too low for nowadays (cherry picked from commit a7fe02e989cf7034609cb833c86143660eb609d5) 2023-10-22T16:54:26+00:00 Viacheslav Hletenko v.gletenko@vyos.io 2023-10-22T13:15:20+00:00 urn:sha1:7fdf77b6b339bc12f1104b2d84945a82119c0eb4 Add missed option `ceil` for QoS class 'trafficshaper' (cherry picked from commit 5218241e6293317f8837b3f7c3893d653d960993)