| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250502201624.3663079-6-ameryhung@gmail.com>
Date: Fri, 2 May 2025 13:16:24 -0700
From: Amery Hung <ameryhung@...il.com>
To: bpf@...r.kernel.org
Cc: netdev@...r.kernel.org,
alexei.starovoitov@...il.com,
andrii@...nel.org,
daniel@...earbox.net,
martin.lau@...nel.org,
xiyou.wangcong@...il.com,
kernel-team@...a.com
Subject: [PATCH bpf-next/net v2 5/5] selftests/bpf: Cleanup bpf qdisc selftests
Some cleanups:
- Remove unnecessary kfuncs declaration
- Use _ns in the test name to run tests in a separate net namespace
- Call skeleton __attach() instead of bpf_map__attach_struct_ops() to
simplify tests.
Signed-off-by: Amery Hung <ameryhung@...il.com>
---
.../selftests/bpf/prog_tests/bpf_qdisc.c | 50 ++++---------------
.../selftests/bpf/progs/bpf_qdisc_common.h | 6 ---
2 files changed, 11 insertions(+), 45 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c b/tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c
index 53154544b28c..c4d797f95da9 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c
@@ -50,42 +50,32 @@ static void do_test(char *qdisc)
static void test_fifo(void)
{
struct bpf_qdisc_fifo *fifo_skel;
- struct bpf_link *link;
fifo_skel = bpf_qdisc_fifo__open_and_load();
if (!ASSERT_OK_PTR(fifo_skel, "bpf_qdisc_fifo__open_and_load"))
return;
- link = bpf_map__attach_struct_ops(fifo_skel->maps.fifo);
- if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) {
- bpf_qdisc_fifo__destroy(fifo_skel);
- return;
- }
+ if (!ASSERT_OK(bpf_qdisc_fifo__attach(fifo_skel), "bpf_qdisc_fifo__attach"))
+ goto out;
do_test("bpf_fifo");
-
- bpf_link__destroy(link);
+out:
bpf_qdisc_fifo__destroy(fifo_skel);
}
static void test_fq(void)
{
struct bpf_qdisc_fq *fq_skel;
- struct bpf_link *link;
fq_skel = bpf_qdisc_fq__open_and_load();
if (!ASSERT_OK_PTR(fq_skel, "bpf_qdisc_fq__open_and_load"))
return;
- link = bpf_map__attach_struct_ops(fq_skel->maps.fq);
- if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) {
- bpf_qdisc_fq__destroy(fq_skel);
- return;
- }
+ if (!ASSERT_OK(bpf_qdisc_fq__attach(fq_skel), "bpf_qdisc_fq__attach"))
+ goto out;
do_test("bpf_fq");
-
- bpf_link__destroy(link);
+out:
bpf_qdisc_fq__destroy(fq_skel);
}
@@ -97,18 +87,14 @@ static void test_qdisc_attach_to_mq(void)
.handle = 0x11 << 16,
.qdisc = "bpf_fifo");
struct bpf_qdisc_fifo *fifo_skel;
- struct bpf_link *link;
int err;
fifo_skel = bpf_qdisc_fifo__open_and_load();
if (!ASSERT_OK_PTR(fifo_skel, "bpf_qdisc_fifo__open_and_load"))
return;
- link = bpf_map__attach_struct_ops(fifo_skel->maps.fifo);
- if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) {
- bpf_qdisc_fifo__destroy(fifo_skel);
- return;
- }
+ if (!ASSERT_OK(bpf_qdisc_fifo__attach(fifo_skel), "bpf_qdisc_fifo__attach"))
+ goto out;
SYS(out, "ip link add veth0 type veth peer veth1");
hook.ifindex = if_nametoindex("veth0");
@@ -121,7 +107,6 @@ static void test_qdisc_attach_to_mq(void)
SYS(out, "tc qdisc delete dev veth0 root mq");
out:
- bpf_link__destroy(link);
bpf_qdisc_fifo__destroy(fifo_skel);
}
@@ -133,18 +118,14 @@ static void test_qdisc_attach_to_non_root(void)
.handle = 0x11 << 16,
.qdisc = "bpf_fifo");
struct bpf_qdisc_fifo *fifo_skel;
- struct bpf_link *link;
int err;
fifo_skel = bpf_qdisc_fifo__open_and_load();
if (!ASSERT_OK_PTR(fifo_skel, "bpf_qdisc_fifo__open_and_load"))
return;
- link = bpf_map__attach_struct_ops(fifo_skel->maps.fifo);
- if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) {
- bpf_qdisc_fifo__destroy(fifo_skel);
- return;
- }
+ if (!ASSERT_OK(bpf_qdisc_fifo__attach(fifo_skel), "bpf_qdisc_fifo__attach"))
+ goto out;
SYS(out, "tc qdisc add dev lo root handle 1: htb");
SYS(out_del_htb, "tc class add dev lo parent 1: classid 1:1 htb rate 75Kbit");
@@ -156,7 +137,6 @@ static void test_qdisc_attach_to_non_root(void)
out_del_htb:
SYS(out, "tc qdisc delete dev lo root htb");
out:
- bpf_link__destroy(link);
bpf_qdisc_fifo__destroy(fifo_skel);
}
@@ -232,14 +212,8 @@ static void test_default_qdisc_attach_to_mq(void)
bpf_qdisc_fifo__destroy(fifo_skel);
}
-void test_bpf_qdisc(void)
+void test_ns_bpf_qdisc(void)
{
- struct netns_obj *netns;
-
- netns = netns_new("bpf_qdisc_ns", true);
- if (!ASSERT_OK_PTR(netns, "netns_new"))
- return;
-
if (test__start_subtest("fifo"))
test_fifo();
if (test__start_subtest("fq"))
@@ -250,8 +224,6 @@ void test_bpf_qdisc(void)
test_qdisc_attach_to_non_root();
if (test__start_subtest("incompl_ops"))
test_incompl_ops();
-
- netns_free(netns);
}
void serial_test_bpf_qdisc_default(void)
diff --git a/tools/testing/selftests/bpf/progs/bpf_qdisc_common.h b/tools/testing/selftests/bpf/progs/bpf_qdisc_common.h
index 7e7f2fe04f22..3754f581b328 100644
--- a/tools/testing/selftests/bpf/progs/bpf_qdisc_common.h
+++ b/tools/testing/selftests/bpf/progs/bpf_qdisc_common.h
@@ -14,12 +14,6 @@
struct bpf_sk_buff_ptr;
-u32 bpf_skb_get_hash(struct sk_buff *p) __ksym;
-void bpf_kfree_skb(struct sk_buff *p) __ksym;
-void bpf_qdisc_skb_drop(struct sk_buff *p, struct bpf_sk_buff_ptr *to_free) __ksym;
-void bpf_qdisc_watchdog_schedule(struct Qdisc *sch, u64 expire, u64 delta_ns) __ksym;
-void bpf_qdisc_bstats_update(struct Qdisc *sch, const struct sk_buff *skb) __ksym;
-
static struct qdisc_skb_cb *qdisc_skb_cb(const struct sk_buff *skb)
{
return (struct qdisc_skb_cb *)skb->cb;
--
2.47.1
Powered by blists - more mailing lists