* [Devel] [PATCH vz10 1/3] selftests: net: Adapt ethtool mq tests to fix in qdisc graft
@ 2026-08-21 16:41 Eva Kurchatova
2026-08-21 16:41 ` [Devel] [PATCH vz10 2/3] selftests: netdevsim: skip the rate tc-bw check without tool support Eva Kurchatova
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Eva Kurchatova @ 2026-08-21 16:41 UTC (permalink / raw)
From: Victor Nogueira <victor@mojatatu.com>
Because of patch[1] the graft behaviour changed
So the command:
tcq replace parent 100:1 handle 204:
Is no longer valid and will not delete 100:4 added by command:
tcq replace parent 100:4 handle 204: pfifo_fast
So to maintain the original behaviour, this patch manually deletes 100:4
and grafts 100:1
Note: This change will also work fine without [1]
[1] https://lore.kernel.org/netdev/20250111151455.75480-1-jhs at mojatatu.com/T/#u
Signed-off-by: Victor Nogueira <victor@mojatatu.com>
Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 0a5b8fff01bde1b9908f00004c676f2e2459333b)
https://virtuozzo.atlassian.net/browse/VSTOR-139651
Feature: fix selftests
Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
---
.../selftests/drivers/net/netdevsim/tc-mq-visibility.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh b/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh
index fd13c8cfb7a8..b411fe66510f 100755
--- a/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh
+++ b/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh
@@ -58,9 +58,12 @@ for root in mq mqprio; do
ethtool -L $NDEV combined 4
n_child_assert 4 "One real queue, rest default"
- # Graft some
- tcq replace parent 100:1 handle 204:
- n_child_assert 3 "Grafted"
+ # Remove real one
+ tcq del parent 100:4 handle 204:
+
+ # Replace default with pfifo
+ tcq replace parent 100:1 handle 205: pfifo limit 1000
+ n_child_assert 3 "Deleting real one, replacing default one with pfifo"
ethtool -L $NDEV combined 1
n_child_assert 1 "Grafted, one"
--
2.55.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Devel] [PATCH vz10 2/3] selftests: netdevsim: skip the rate tc-bw check without tool support
2026-08-21 16:41 [Devel] [PATCH vz10 1/3] selftests: net: Adapt ethtool mq tests to fix in qdisc graft Eva Kurchatova
@ 2026-08-21 16:41 ` Eva Kurchatova
2026-08-24 13:48 ` Konstantin Khorenko
2026-08-24 13:50 ` [Devel] [PATCH vz10 v2] " Konstantin Khorenko
2026-08-21 16:41 ` [Devel] [PATCH vz10 3/3] selftests: netdevsim: mark ethtool-features.sh executable Eva Kurchatova
` (2 subsequent siblings)
3 siblings, 2 replies; 11+ messages in thread
From: Eva Kurchatova @ 2026-08-21 16:41 UTC (permalink / raw)
devlink from iproute2 6.11, which vz ships, has no tc-bw option, and
the rate test fails on "Unknown option" rather than skipping.
https://virtuozzo.atlassian.net/browse/VSTOR-139651
Feature: fix selftests
Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
---
tools/testing/selftests/drivers/net/netdevsim/devlink.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
index 030762b203d7..e1dbbfc7da29 100755
--- a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
+++ b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
@@ -616,6 +616,11 @@ rate_attr_tc_bw_check()
local tc_bw=$2
local debug_file=$3
+ if ! devlink port function rate help 2>&1 | grep -q tc-bw; then
+ log_test_skip "tc-bw is not supported by devlink"
+ return
+ fi
+
local tc_bw_str=""
for bw in $tc_bw; do
local tc=${bw%%:*}
--
2.55.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Devel] [PATCH vz10 3/3] selftests: netdevsim: mark ethtool-features.sh executable
2026-08-21 16:41 [Devel] [PATCH vz10 1/3] selftests: net: Adapt ethtool mq tests to fix in qdisc graft Eva Kurchatova
2026-08-21 16:41 ` [Devel] [PATCH vz10 2/3] selftests: netdevsim: skip the rate tc-bw check without tool support Eva Kurchatova
@ 2026-08-21 16:41 ` Eva Kurchatova
2026-08-24 14:35 ` [Devel] [PATCH vz10 v2] " Konstantin Khorenko
2026-08-24 13:36 ` [Devel] [PATCH vz10 1/3] selftests: net: Adapt ethtool mq tests to fix in qdisc graft Konstantin Khorenko
2026-08-24 14:36 ` [Devel] [PATCH RHEL10 COMMIT] ms/selftests: " Konstantin Khorenko
3 siblings, 1 reply; 11+ messages in thread
From: Eva Kurchatova @ 2026-08-21 16:41 UTC (permalink / raw)
The script is in TEST_PROGS but is not executable, so the runner cannot
start it.
https://virtuozzo.atlassian.net/browse/VSTOR-139651
Feature: fix selftests
Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
---
tools/testing/selftests/drivers/net/netdevsim/ethtool-features.sh | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 tools/testing/selftests/drivers/net/netdevsim/ethtool-features.sh
diff --git a/tools/testing/selftests/drivers/net/netdevsim/ethtool-features.sh b/tools/testing/selftests/drivers/net/netdevsim/ethtool-features.sh
old mode 100644
new mode 100755
--
2.55.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Devel] [PATCH vz10 1/3] selftests: net: Adapt ethtool mq tests to fix in qdisc graft
2026-08-21 16:41 [Devel] [PATCH vz10 1/3] selftests: net: Adapt ethtool mq tests to fix in qdisc graft Eva Kurchatova
2026-08-21 16:41 ` [Devel] [PATCH vz10 2/3] selftests: netdevsim: skip the rate tc-bw check without tool support Eva Kurchatova
2026-08-21 16:41 ` [Devel] [PATCH vz10 3/3] selftests: netdevsim: mark ethtool-features.sh executable Eva Kurchatova
@ 2026-08-24 13:36 ` Konstantin Khorenko
2026-08-24 14:36 ` [Devel] [PATCH RHEL10 COMMIT] ms/selftests: " Konstantin Khorenko
3 siblings, 0 replies; 11+ messages in thread
From: Konstantin Khorenko @ 2026-08-24 13:36 UTC (permalink / raw)
ack
--
Best regards,
Konstantin Khorenko,
Virtuozzo Linux Kernel Team
On 8/21/26 18:41, Eva Kurchatova wrote:
> From: Victor Nogueira <victor@mojatatu.com>
>
> Because of patch[1] the graft behaviour changed
>
> So the command:
>
> tcq replace parent 100:1 handle 204:
>
> Is no longer valid and will not delete 100:4 added by command:
>
> tcq replace parent 100:4 handle 204: pfifo_fast
>
> So to maintain the original behaviour, this patch manually deletes 100:4
> and grafts 100:1
>
> Note: This change will also work fine without [1]
>
> [1] https://lore.kernel.org/netdev/20250111151455.75480-1-jhs at mojatatu.com/T/#u
>
> Signed-off-by: Victor Nogueira <victor@mojatatu.com>
> Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> (cherry picked from commit 0a5b8fff01bde1b9908f00004c676f2e2459333b)
>
> https://virtuozzo.atlassian.net/browse/VSTOR-139651
> Feature: fix selftests
> Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
> ---
> .../selftests/drivers/net/netdevsim/tc-mq-visibility.sh | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh b/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh
> index fd13c8cfb7a8..b411fe66510f 100755
> --- a/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh
> +++ b/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh
> @@ -58,9 +58,12 @@ for root in mq mqprio; do
> ethtool -L $NDEV combined 4
> n_child_assert 4 "One real queue, rest default"
>
> - # Graft some
> - tcq replace parent 100:1 handle 204:
> - n_child_assert 3 "Grafted"
> + # Remove real one
> + tcq del parent 100:4 handle 204:
> +
> + # Replace default with pfifo
> + tcq replace parent 100:1 handle 205: pfifo limit 1000
> + n_child_assert 3 "Deleting real one, replacing default one with pfifo"
>
> ethtool -L $NDEV combined 1
> n_child_assert 1 "Grafted, one"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Devel] [PATCH vz10 2/3] selftests: netdevsim: skip the rate tc-bw check without tool support
2026-08-21 16:41 ` [Devel] [PATCH vz10 2/3] selftests: netdevsim: skip the rate tc-bw check without tool support Eva Kurchatova
@ 2026-08-24 13:48 ` Konstantin Khorenko
2026-08-24 13:50 ` [Devel] [PATCH vz10 v2] " Konstantin Khorenko
1 sibling, 0 replies; 11+ messages in thread
From: Konstantin Khorenko @ 2026-08-24 13:48 UTC (permalink / raw)
On 8/21/26 18:41, Eva Kurchatova wrote:
> devlink from iproute2 6.11, which vz ships, has no tc-bw option, and
> the rate test fails on "Unknown option" rather than skipping.
>
> https://virtuozzo.atlassian.net/browse/VSTOR-139651
> Feature: fix selftests
> Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
> ---
> tools/testing/selftests/drivers/net/netdevsim/devlink.sh | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
> index 030762b203d7..e1dbbfc7da29 100755
> --- a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
> +++ b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
> @@ -616,6 +616,11 @@ rate_attr_tc_bw_check()
> local tc_bw=$2
> local debug_file=$3
>
> + if ! devlink port function rate help 2>&1 | grep -q tc-bw; then
> + log_test_skip "tc-bw is not supported by devlink"
It will be printed 5 times, but probably 1 time is enough.
> + return
> + fi
> +
> local tc_bw_str=""
> for bw in $tc_bw; do
> local tc=${bw%%:*}
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Devel] [PATCH vz10 v2] selftests: netdevsim: skip the rate tc-bw check without tool support
2026-08-21 16:41 ` [Devel] [PATCH vz10 2/3] selftests: netdevsim: skip the rate tc-bw check without tool support Eva Kurchatova
2026-08-24 13:48 ` Konstantin Khorenko
@ 2026-08-24 13:50 ` Konstantin Khorenko
2026-08-25 14:41 ` [Devel] [PATCH RHEL10 COMMIT] " Konstantin Khorenko
1 sibling, 1 reply; 11+ messages in thread
From: Konstantin Khorenko @ 2026-08-24 13:50 UTC (permalink / raw)
From: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
The tc-bw attribute was added to devlink in iproute2 6.17, together
with the kernel side in v6.17. An older devlink has no such option and
the rate test fails on "Unknown option" instead of skipping.
Probe once in rate_test() and skip the tc-bw checks as a whole, so that
a missing option costs a single skip line rather than one per rate
object.
https://virtuozzo.atlassian.net/browse/VSTOR-139651
Feature: fix selftests
Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
Changes in v2:
- probe once in rate_test() and guard both tc-bw blocks, instead of
probing inside rate_attr_tc_bw_check(). v1 ran the probe on every
call, so a devlink without tc-bw produced five identical skip lines,
one per rate object, and five devlink invocations.
- say what is actually missing in the skip message, in the form the
bonding tests already use.
- commit message: name the iproute2 release that added the option
instead of the distribution that ships an older one.
.../drivers/net/netdevsim/devlink.sh | 29 +++++++++++++------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
index 030762b203d7..fd17fb0ec020 100755
--- a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
+++ b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
@@ -668,6 +668,13 @@ rate_test()
{
RET=0
+ local tc_bw_supported=false
+ if devlink port function rate help 2>&1 | grep -q tc-bw; then
+ tc_bw_supported=true
+ else
+ log_test_skip "rate tc-bw" "Current iproute doesn't support rate option 'tc-bw'."
+ fi
+
echo $VF_COUNT > /sys/bus/netdevsim/devices/$DEV_NAME/sriov_numvfs
devlink dev eswitch set $DL_HANDLE mode switchdev
local leafs=`rate_leafs_get $DL_HANDLE`
@@ -691,12 +698,14 @@ rate_test()
rate=$(($rate+100))
done
- local tc_bw="0:0 1:40 2:0 3:0 4:0 5:0 6:60 7:0"
- for r_obj in $leafs
- do
- rate_attr_tc_bw_check "$r_obj" "$tc_bw" \
- "$DEBUGFS_DIR"/ports/"${r_obj##*/}"
- done
+ if $tc_bw_supported; then
+ local tc_bw="0:0 1:40 2:0 3:0 4:0 5:0 6:60 7:0"
+ for r_obj in $leafs
+ do
+ rate_attr_tc_bw_check "$r_obj" "$tc_bw" \
+ "$DEBUGFS_DIR"/ports/"${r_obj##*/}"
+ done
+ fi
local node1_name='group1'
local node1="$DL_HANDLE/$node1_name"
@@ -716,9 +725,11 @@ rate_test()
$DEBUGFS_DIR/rate_nodes/${node1##*/}/tx_max
- local tc_bw="0:20 1:0 2:0 3:0 4:0 5:20 6:60 7:0"
- rate_attr_tc_bw_check $node1 "$tc_bw" \
- "$DEBUGFS_DIR"/rate_nodes/"${node1##*/}"
+ if $tc_bw_supported; then
+ local tc_bw="0:20 1:0 2:0 3:0 4:0 5:20 6:60 7:0"
+ rate_attr_tc_bw_check $node1 "$tc_bw" \
+ "$DEBUGFS_DIR"/rate_nodes/"${node1##*/}"
+ fi
rate_node_del "$node1"
--
2.47.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Devel] [PATCH vz10 v2] selftests: netdevsim: mark ethtool-features.sh executable
2026-08-21 16:41 ` [Devel] [PATCH vz10 3/3] selftests: netdevsim: mark ethtool-features.sh executable Eva Kurchatova
@ 2026-08-24 14:35 ` Konstantin Khorenko
2026-08-24 14:37 ` [Devel] [PATCH RHEL10 COMMIT] " Konstantin Khorenko
0 siblings, 1 reply; 11+ messages in thread
From: Konstantin Khorenko @ 2026-08-24 14:35 UTC (permalink / raw)
From: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
The script is listed in TEST_PROGS but, unlike its 14 siblings there,
is not executable. Nothing actually fails: run_kselftest.sh falls back
to running a non-executable test through the interpreter from its
shebang, so the only effect is
# Warning: file ethtool-features.sh is not executable
in the log. Still, the warning reads like a problem, kernel packaging
installs the script 0644 where every other test in the directory is
0755, and running it by hand needs an explicit interpreter.
Set the bit.
https://virtuozzo.atlassian.net/browse/VSTOR-139651
Feature: fix selftests
Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
Reviewed-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
Changes in v2:
- commit message only, the mode change itself is unchanged. v1 said
the runner cannot start the script, which is not true: for a test
that is not executable run_kselftest.sh falls back to the interpreter
from its shebang, so nothing fails today. Say what the patch really
buys instead.
tools/testing/selftests/drivers/net/netdevsim/ethtool-features.sh | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 tools/testing/selftests/drivers/net/netdevsim/ethtool-features.sh
diff --git a/tools/testing/selftests/drivers/net/netdevsim/ethtool-features.sh b/tools/testing/selftests/drivers/net/netdevsim/ethtool-features.sh
old mode 100644
new mode 100755
--
2.47.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Devel] [PATCH RHEL10 COMMIT] ms/selftests: net: Adapt ethtool mq tests to fix in qdisc graft
2026-08-21 16:41 [Devel] [PATCH vz10 1/3] selftests: net: Adapt ethtool mq tests to fix in qdisc graft Eva Kurchatova
` (2 preceding siblings ...)
2026-08-24 13:36 ` [Devel] [PATCH vz10 1/3] selftests: net: Adapt ethtool mq tests to fix in qdisc graft Konstantin Khorenko
@ 2026-08-24 14:36 ` Konstantin Khorenko
3 siblings, 0 replies; 11+ messages in thread
From: Konstantin Khorenko @ 2026-08-24 14:36 UTC (permalink / raw)
The commit is pushed to "branch-rh10-6.12.0-211.39.1.16.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git
after rh10-6.12.0-211.39.1.16.8.vz10
------>
commit edf5885dd6749ceb3a09c536a5d1ff81cc45cf66
Author: Victor Nogueira <victor@mojatatu.com>
Date: Sat Jan 11 18:15:15 2025 -0300
ms/selftests: net: Adapt ethtool mq tests to fix in qdisc graft
Because of patch[1] the graft behaviour changed
So the command:
tcq replace parent 100:1 handle 204:
Is no longer valid and will not delete 100:4 added by command:
tcq replace parent 100:4 handle 204: pfifo_fast
So to maintain the original behaviour, this patch manually deletes 100:4
and grafts 100:1
Note: This change will also work fine without [1]
[1] https://lore.kernel.org/netdev/20250111151455.75480-1-jhs at mojatatu.com/T/#u
Signed-off-by: Victor Nogueira <victor@mojatatu.com>
Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 0a5b8fff01bde1b9908f00004c676f2e2459333b)
https://virtuozzo.atlassian.net/browse/VSTOR-139651
Feature: fix selftests
Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
Reviewed-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
.../testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh b/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh
index fd13c8cfb7a8..b411fe66510f 100755
--- a/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh
+++ b/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh
@@ -58,9 +58,12 @@ for root in mq mqprio; do
ethtool -L $NDEV combined 4
n_child_assert 4 "One real queue, rest default"
- # Graft some
- tcq replace parent 100:1 handle 204:
- n_child_assert 3 "Grafted"
+ # Remove real one
+ tcq del parent 100:4 handle 204:
+
+ # Replace default with pfifo
+ tcq replace parent 100:1 handle 205: pfifo limit 1000
+ n_child_assert 3 "Deleting real one, replacing default one with pfifo"
ethtool -L $NDEV combined 1
n_child_assert 1 "Grafted, one"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Devel] [PATCH RHEL10 COMMIT] selftests: netdevsim: mark ethtool-features.sh executable
2026-08-24 14:35 ` [Devel] [PATCH vz10 v2] " Konstantin Khorenko
@ 2026-08-24 14:37 ` Konstantin Khorenko
0 siblings, 0 replies; 11+ messages in thread
From: Konstantin Khorenko @ 2026-08-24 14:37 UTC (permalink / raw)
The commit is pushed to "branch-rh10-6.12.0-211.39.1.16.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git
after rh10-6.12.0-211.39.1.16.8.vz10
------>
commit f54503861aa682de0a3288b554f6350eac98b099
Author: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
Date: Fri Aug 21 19:41:30 2026 +0300
selftests: netdevsim: mark ethtool-features.sh executable
The script is listed in TEST_PROGS but, unlike its 14 siblings there,
is not executable. Nothing actually fails: run_kselftest.sh falls back
to running a non-executable test through the interpreter from its
shebang, so the only effect is
# Warning: file ethtool-features.sh is not executable
in the log. Still, the warning reads like a problem, kernel packaging
installs the script 0644 where every other test in the directory is
0755, and running it by hand needs an explicit interpreter.
Set the bit.
https://virtuozzo.atlassian.net/browse/VSTOR-139651
Feature: fix selftests
Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
Reviewed-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
tools/testing/selftests/drivers/net/netdevsim/ethtool-features.sh | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/tools/testing/selftests/drivers/net/netdevsim/ethtool-features.sh b/tools/testing/selftests/drivers/net/netdevsim/ethtool-features.sh
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Devel] [PATCH RHEL10 COMMIT] selftests: netdevsim: skip the rate tc-bw check without tool support
2026-08-24 13:50 ` [Devel] [PATCH vz10 v2] " Konstantin Khorenko
@ 2026-08-25 14:41 ` Konstantin Khorenko
0 siblings, 0 replies; 11+ messages in thread
From: Konstantin Khorenko @ 2026-08-25 14:41 UTC (permalink / raw)
The commit is pushed to "branch-rh10-6.12.0-211.39.1.16.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git
after rh10-6.12.0-211.39.1.16.9.vz10
------>
commit 50b3850eecab56c3fe69a1561c523bc4795c6d38
Author: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
Date: Mon Aug 24 15:50:10 2026 +0200
selftests: netdevsim: skip the rate tc-bw check without tool support
The tc-bw attribute was added to devlink in iproute2 6.17, together
with the kernel side in v6.17. An older devlink has no such option and
the rate test fails on "Unknown option" instead of skipping.
Probe once in rate_test() and skip the tc-bw checks as a whole, so that
a missing option costs a single skip line rather than one per rate
object.
https://virtuozzo.atlassian.net/browse/VSTOR-139651
Feature: fix selftests
Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
.../selftests/drivers/net/netdevsim/devlink.sh | 29 +++++++++++++++-------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
index 030762b203d76..fd17fb0ec0202 100755
--- a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
+++ b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
@@ -668,6 +668,13 @@ rate_test()
{
RET=0
+ local tc_bw_supported=false
+ if devlink port function rate help 2>&1 | grep -q tc-bw; then
+ tc_bw_supported=true
+ else
+ log_test_skip "rate tc-bw" "Current iproute doesn't support rate option 'tc-bw'."
+ fi
+
echo $VF_COUNT > /sys/bus/netdevsim/devices/$DEV_NAME/sriov_numvfs
devlink dev eswitch set $DL_HANDLE mode switchdev
local leafs=`rate_leafs_get $DL_HANDLE`
@@ -691,12 +698,14 @@ rate_test()
rate=$(($rate+100))
done
- local tc_bw="0:0 1:40 2:0 3:0 4:0 5:0 6:60 7:0"
- for r_obj in $leafs
- do
- rate_attr_tc_bw_check "$r_obj" "$tc_bw" \
- "$DEBUGFS_DIR"/ports/"${r_obj##*/}"
- done
+ if $tc_bw_supported; then
+ local tc_bw="0:0 1:40 2:0 3:0 4:0 5:0 6:60 7:0"
+ for r_obj in $leafs
+ do
+ rate_attr_tc_bw_check "$r_obj" "$tc_bw" \
+ "$DEBUGFS_DIR"/ports/"${r_obj##*/}"
+ done
+ fi
local node1_name='group1'
local node1="$DL_HANDLE/$node1_name"
@@ -716,9 +725,11 @@ rate_test()
$DEBUGFS_DIR/rate_nodes/${node1##*/}/tx_max
- local tc_bw="0:20 1:0 2:0 3:0 4:0 5:20 6:60 7:0"
- rate_attr_tc_bw_check $node1 "$tc_bw" \
- "$DEBUGFS_DIR"/rate_nodes/"${node1##*/}"
+ if $tc_bw_supported; then
+ local tc_bw="0:20 1:0 2:0 3:0 4:0 5:20 6:60 7:0"
+ rate_attr_tc_bw_check $node1 "$tc_bw" \
+ "$DEBUGFS_DIR"/rate_nodes/"${node1##*/}"
+ fi
rate_node_del "$node1"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Devel] [PATCH RHEL10 COMMIT] ms/selftests: net: Adapt ethtool mq tests to fix in qdisc graft
@ 2026-08-24 14:36 Konstantin Khorenko
0 siblings, 0 replies; 11+ messages in thread
From: Konstantin Khorenko @ 2026-08-24 14:36 UTC (permalink / raw)
The commit is pushed to "branch-rh10-6.12.0-211.39.1.16.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git
after rh10-6.12.0-211.39.1.16.8.vz10
------>
commit b7c858a8bd7145f399251227af90c663ac1154e3
Author: Victor Nogueira <victor@mojatatu.com>
Date: Sat Jan 11 18:15:15 2025 -0300
ms/selftests: net: Adapt ethtool mq tests to fix in qdisc graft
Because of patch[1] the graft behaviour changed
So the command:
tcq replace parent 100:1 handle 204:
Is no longer valid and will not delete 100:4 added by command:
tcq replace parent 100:4 handle 204: pfifo_fast
So to maintain the original behaviour, this patch manually deletes 100:4
and grafts 100:1
Note: This change will also work fine without [1]
[1] https://lore.kernel.org/netdev/20250111151455.75480-1-jhs at mojatatu.com/T/#u
Signed-off-by: Victor Nogueira <victor@mojatatu.com>
Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 0a5b8fff01bde1b9908f00004c676f2e2459333b)
https://virtuozzo.atlassian.net/browse/VSTOR-139651
Feature: fix selftests
Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
---
.../testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh b/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh
index fd13c8cfb7a8..b411fe66510f 100755
--- a/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh
+++ b/tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh
@@ -58,9 +58,12 @@ for root in mq mqprio; do
ethtool -L $NDEV combined 4
n_child_assert 4 "One real queue, rest default"
- # Graft some
- tcq replace parent 100:1 handle 204:
- n_child_assert 3 "Grafted"
+ # Remove real one
+ tcq del parent 100:4 handle 204:
+
+ # Replace default with pfifo
+ tcq replace parent 100:1 handle 205: pfifo limit 1000
+ n_child_assert 3 "Deleting real one, replacing default one with pfifo"
ethtool -L $NDEV combined 1
n_child_assert 1 "Grafted, one"
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2026-08-25 14:41 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-21 16:41 [Devel] [PATCH vz10 1/3] selftests: net: Adapt ethtool mq tests to fix in qdisc graft Eva Kurchatova
2026-08-21 16:41 ` [Devel] [PATCH vz10 2/3] selftests: netdevsim: skip the rate tc-bw check without tool support Eva Kurchatova
2026-08-24 13:48 ` Konstantin Khorenko
2026-08-24 13:50 ` [Devel] [PATCH vz10 v2] " Konstantin Khorenko
2026-08-25 14:41 ` [Devel] [PATCH RHEL10 COMMIT] " Konstantin Khorenko
2026-08-21 16:41 ` [Devel] [PATCH vz10 3/3] selftests: netdevsim: mark ethtool-features.sh executable Eva Kurchatova
2026-08-24 14:35 ` [Devel] [PATCH vz10 v2] " Konstantin Khorenko
2026-08-24 14:37 ` [Devel] [PATCH RHEL10 COMMIT] " Konstantin Khorenko
2026-08-24 13:36 ` [Devel] [PATCH vz10 1/3] selftests: net: Adapt ethtool mq tests to fix in qdisc graft Konstantin Khorenko
2026-08-24 14:36 ` [Devel] [PATCH RHEL10 COMMIT] ms/selftests: " Konstantin Khorenko
2026-08-24 14:36 Konstantin Khorenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.