From: Jakub Kicinski <kuba@kernel•org>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, edumazet@google•com, pabeni@redhat•com,
andrew+netdev@lunn•ch, horms@kernel•org, jdamato@fastly•com,
stfomichev@gmail•com, petrm@nvidia•com,
Jakub Kicinski <kuba@kernel•org>,
Stanislav Fomichev <sdf@fomichev•me>
Subject: [PATCH net-next v2 6/7] selftests: drv-net: improve the use of ksft helpers in XSK queue test
Date: Wed, 19 Feb 2025 15:49:55 -0800 [thread overview]
Message-ID: <20250219234956.520599-7-kuba@kernel.org> (raw)
In-Reply-To: <20250219234956.520599-1-kuba@kernel.org>
Avoid exceptions when xsk attr is not present, and add a proper ksft
helper for "not in" condition.
Acked-by: Stanislav Fomichev <sdf@fomichev•me>
Reviewed-by: Joe Damato <jdamato@fastly•com>
Signed-off-by: Jakub Kicinski <kuba@kernel•org>
---
tools/testing/selftests/drivers/net/queues.py | 9 +++++----
tools/testing/selftests/net/lib/py/ksft.py | 5 +++++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/drivers/net/queues.py b/tools/testing/selftests/drivers/net/queues.py
index 7af2adb61c25..a49f1a146e28 100755
--- a/tools/testing/selftests/drivers/net/queues.py
+++ b/tools/testing/selftests/drivers/net/queues.py
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: GPL-2.0
from lib.py import ksft_disruptive, ksft_exit, ksft_run
-from lib.py import ksft_eq, ksft_raises, KsftSkipEx, KsftFailEx
+from lib.py import ksft_eq, ksft_not_in, ksft_raises, KsftSkipEx, KsftFailEx
from lib.py import EthtoolFamily, NetdevFamily, NlError
from lib.py import NetDrvEnv
from lib.py import bkg, cmd, defer, ip
@@ -47,10 +47,11 @@ import struct
if q['type'] == 'tx':
tx = True
- ksft_eq(q['xsk'], {})
+ ksft_eq(q.get('xsk', None), {},
+ comment="xsk attr on queue we configured")
else:
- if 'xsk' in q:
- _fail("Check failed: xsk attribute set.")
+ ksft_not_in('xsk', q,
+ comment="xsk attr on queue we didn't configure")
ksft_eq(rx, True)
ksft_eq(tx, True)
diff --git a/tools/testing/selftests/net/lib/py/ksft.py b/tools/testing/selftests/net/lib/py/ksft.py
index 3efe005436cd..fd23349fa8ca 100644
--- a/tools/testing/selftests/net/lib/py/ksft.py
+++ b/tools/testing/selftests/net/lib/py/ksft.py
@@ -71,6 +71,11 @@ KSFT_DISRUPTIVE = True
_fail("Check failed", a, "not in", b, comment)
+def ksft_not_in(a, b, comment=""):
+ if a in b:
+ _fail("Check failed", a, "in", b, comment)
+
+
def ksft_is(a, b, comment=""):
if a is not b:
_fail("Check failed", a, "is not", b, comment)
--
2.48.1
next prev parent reply other threads:[~2025-02-19 23:50 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-19 23:49 [PATCH net-next v2 0/7] selftests: drv-net: improve the queue test for XSK Jakub Kicinski
2025-02-19 23:49 ` [PATCH net-next v2 1/7] selftests: drv-net: add a warning for bkg + shell + terminate Jakub Kicinski
2025-02-20 17:27 ` Stanislav Fomichev
2025-02-20 17:48 ` Joe Damato
2025-02-20 19:31 ` Joe Damato
2025-02-20 21:10 ` Jakub Kicinski
2025-02-20 22:53 ` Joe Damato
2025-02-19 23:49 ` [PATCH net-next v2 2/7] selftests: drv-net: use cfg.rpath() in netlink xsk attr test Jakub Kicinski
2025-02-19 23:49 ` [PATCH net-next v2 3/7] selftests: drv-net: add missing new line in xdp_helper Jakub Kicinski
2025-02-20 7:26 ` Kurt Kanzenbach
2025-02-20 17:48 ` Joe Damato
2025-02-19 23:49 ` [PATCH net-next v2 4/7] selftests: drv-net: probe for AF_XDP sockets more explicitly Jakub Kicinski
2025-02-20 17:27 ` Stanislav Fomichev
2025-02-20 18:16 ` Joe Damato
2025-02-19 23:49 ` [PATCH net-next v2 5/7] selftests: drv-net: add a way to wait for a local process Jakub Kicinski
2025-02-20 17:29 ` Stanislav Fomichev
2025-02-20 19:28 ` Joe Damato
2025-02-19 23:49 ` Jakub Kicinski [this message]
2025-02-20 7:31 ` [PATCH net-next v2 6/7] selftests: drv-net: improve the use of ksft helpers in XSK queue test Kurt Kanzenbach
2025-02-19 23:49 ` [PATCH net-next v2 7/7] selftests: drv-net: rename queues check_xdp to check_xsk Jakub Kicinski
2025-02-20 19:35 ` [PATCH net-next v2 0/7] selftests: drv-net: improve the queue test for XSK Joe Damato
2025-02-21 2:17 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250219234956.520599-7-kuba@kernel.org \
--to=kuba@kernel$(echo .)org \
--cc=andrew+netdev@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=horms@kernel$(echo .)org \
--cc=jdamato@fastly$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=petrm@nvidia$(echo .)com \
--cc=sdf@fomichev$(echo .)me \
--cc=stfomichev@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox