From: Martin Doucha <mdoucha@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH v2 2/2] tcindex01: Pass if the tcindex module is blacklisted
Date: Wed, 15 May 2024 15:44:30 +0200 [thread overview]
Message-ID: <20240515134432.27996-2-mdoucha@suse.cz> (raw)
In-Reply-To: <20240515134432.27996-1-mdoucha@suse.cz>
The tcindex01 test currently fails if the tcindex module is enabled
in kernel config but cannot be autoloaded. Some distros chose
to blacklist the module rather than remove it completely, thus
check for autoload failure and pass in that case.
Signed-off-by: Martin Doucha <mdoucha@suse.cz>
---
Changes since v1:
- Use NETDEV_ADD_TRAFFIC_FILTER_RET() macro instead of the underlying function
testcases/cve/tcindex01.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/testcases/cve/tcindex01.c b/testcases/cve/tcindex01.c
index 70e5639f1..e9c8a9a90 100644
--- a/testcases/cve/tcindex01.c
+++ b/testcases/cve/tcindex01.c
@@ -106,12 +106,23 @@ static void run(void)
NETDEV_ADD_QDISC(DEVNAME, AF_UNSPEC, TC_H_ROOT, qd_handle, "htb",
qd_config);
NETDEV_ADD_TRAFFIC_CLASS(DEVNAME, qd_handle, clsid, "htb", cls_config);
- NETDEV_ADD_TRAFFIC_FILTER(DEVNAME, qd_handle, 10, ETH_P_IP, 1,
- "tcindex", f_config);
+ ret = NETDEV_ADD_TRAFFIC_FILTER_RET(DEVNAME, qd_handle, 10, ETH_P_IP,
+ 1, "tcindex", f_config);
+ TST_ERR = tst_netlink_errno;
+
+ if (!ret && TST_ERR == ENOENT) {
+ tst_res(TPASS | TTERRNO,
+ "tcindex module is blacklisted or unavailable");
+ return;
+ }
+
+ if (!ret)
+ tst_brk(TBROK | TTERRNO, "Cannot add tcindex filter");
+
NETDEV_REMOVE_TRAFFIC_FILTER(DEVNAME, qd_handle, 10, ETH_P_IP,
1, "tcindex");
- ret = tst_netdev_add_traffic_filter(__FILE__, __LINE__, 0, DEVNAME,
- qd_handle, 10, ETH_P_IP, 1, "tcindex", f_config);
+ ret = NETDEV_ADD_TRAFFIC_FILTER_RET(DEVNAME, qd_handle, 10, ETH_P_IP,
+ 1, "tcindex", f_config);
TST_ERR = tst_netlink_errno;
NETDEV_REMOVE_QDISC(DEVNAME, AF_UNSPEC, TC_H_ROOT, qd_handle, "htb");
--
2.44.0
--
Mailing list info: https://lists.linux.it/listinfo/ltp
next prev parent reply other threads:[~2024-05-15 13:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-15 13:44 [LTP] [PATCH v2 1/2] tst_netdevice: Add permissive macro for adding traffic filters Martin Doucha
2024-05-15 13:44 ` Martin Doucha [this message]
2024-05-15 14:03 ` [LTP] [PATCH v2 2/2] tcindex01: Pass if the tcindex module is blacklisted Cyril Hrubis
2024-05-16 1:12 ` Petr Vorel
2024-05-15 14:03 ` [LTP] [PATCH v2 1/2] tst_netdevice: Add permissive macro for adding traffic filters Cyril Hrubis
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=20240515134432.27996-2-mdoucha@suse.cz \
--to=mdoucha@suse.cz \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).