From: Liu Jian <liujian56@huawei.com>
To: <john.fastabend@gmail.com>, <jakub@cloudflare.com>,
<ast@kernel.org>, <daniel@iogearbox.net>, <andrii@kernel.org>,
<martin.lau@linux.dev>, <song@kernel.org>,
<yonghong.song@linux.dev>, <kpsingh@kernel.org>, <sdf@google.com>,
<haoluo@google.com>, <jolsa@kernel.org>, <davem@davemloft.net>,
<edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
<dsahern@kernel.org>
Cc: <netdev@vger.kernel.org>, <bpf@vger.kernel.org>, <liujian56@huawei.com>
Subject: [PATCH bpf-next v5 2/7] selftests/bpf: Add txmsg permanently test for sockmap
Date: Wed, 27 Sep 2023 17:30:08 +0800 [thread overview]
Message-ID: <20230927093013.1951659-3-liujian56@huawei.com> (raw)
In-Reply-To: <20230927093013.1951659-1-liujian56@huawei.com>
Add one test for txmsg ingress permanently test for sockmap.
Signed-off-by: Liu Jian <liujian56@huawei.com>
---
tools/testing/selftests/bpf/test_sockmap.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_sockmap.c b/tools/testing/selftests/bpf/test_sockmap.c
index 024a0faafb3b..bf2cef7ae3ae 100644
--- a/tools/testing/selftests/bpf/test_sockmap.c
+++ b/tools/testing/selftests/bpf/test_sockmap.c
@@ -77,6 +77,7 @@ int txmsg_end_push;
int txmsg_start_pop;
int txmsg_pop;
int txmsg_ingress;
+int txmsg_permanent;
int txmsg_redir_skb;
int txmsg_ktls_skb;
int txmsg_ktls_skb_drop;
@@ -107,6 +108,7 @@ static const struct option long_options[] = {
{"txmsg_start_pop", required_argument, NULL, 'w'},
{"txmsg_pop", required_argument, NULL, 'x'},
{"txmsg_ingress", no_argument, &txmsg_ingress, 1 },
+ {"txmsg_permanent", no_argument, &txmsg_permanent, 1 },
{"txmsg_redir_skb", no_argument, &txmsg_redir_skb, 1 },
{"ktls", no_argument, &ktls, 1 },
{"peek", no_argument, &peek_flag, 1 },
@@ -175,7 +177,7 @@ static void test_reset(void)
txmsg_start_push = txmsg_end_push = 0;
txmsg_pass = txmsg_drop = txmsg_redir = 0;
txmsg_apply = txmsg_cork = 0;
- txmsg_ingress = txmsg_redir_skb = 0;
+ txmsg_ingress = txmsg_permanent = txmsg_redir_skb = 0;
txmsg_ktls_skb = txmsg_ktls_skb_drop = txmsg_ktls_skb_redir = 0;
txmsg_omit_skb_parser = 0;
skb_use_parser = 0;
@@ -1165,10 +1167,13 @@ static int run_options(struct sockmap_options *options, int cg_fd, int test)
}
if (txmsg_ingress) {
- int in = BPF_F_INGRESS;
+ int txmsg_flag = BPF_F_INGRESS;
+
+ if (txmsg_permanent)
+ txmsg_flag |= BPF_F_PERMANENT;
i = 0;
- err = bpf_map_update_elem(map_fd[6], &i, &in, BPF_ANY);
+ err = bpf_map_update_elem(map_fd[6], &i, &txmsg_flag, BPF_ANY);
if (err) {
fprintf(stderr,
"ERROR: bpf_map_update_elem (txmsg_ingress): %d (%s)\n",
@@ -1506,6 +1511,14 @@ static void test_txmsg_ingress_redir(int cgrp, struct sockmap_options *opt)
test_send(opt, cgrp);
}
+static void test_txmsg_ingress_redir_permanent(int cgrp, struct sockmap_options *opt)
+{
+ txmsg_pass = txmsg_drop = 0;
+ txmsg_ingress = txmsg_redir = 1;
+ txmsg_permanent = 1;
+ test_send(opt, cgrp);
+}
+
static void test_txmsg_skb(int cgrp, struct sockmap_options *opt)
{
bool data = opt->data_test;
@@ -1862,6 +1875,7 @@ struct _test test[] = {
{"txmsg test redirect wait send mem", test_txmsg_redir_wait_sndmem},
{"txmsg test drop", test_txmsg_drop},
{"txmsg test ingress redirect", test_txmsg_ingress_redir},
+ {"txmsg test ingress redirect permanent", test_txmsg_ingress_redir_permanent},
{"txmsg test skb", test_txmsg_skb},
{"txmsg test apply", test_txmsg_apply},
{"txmsg test cork", test_txmsg_cork},
--
2.34.1
next prev parent reply other threads:[~2023-09-27 9:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-27 9:30 [PATCH bpf-next v5 0/7] add BPF_F_PERMANENT flag for sockmap skmsg redirect Liu Jian
2023-09-27 9:30 ` [PATCH bpf-next v5 1/7] bpf, sockmap: add BPF_F_PERMANENT flag for " Liu Jian
2023-10-03 4:27 ` John Fastabend
2023-10-14 12:05 ` liujian (CE)
2023-10-13 12:34 ` Jakub Sitnicki
2023-09-27 9:30 ` Liu Jian [this message]
2023-09-27 9:30 ` [PATCH bpf-next v5 3/7] selftests/bpf: Add txmsg redir permanently test for sockmap Liu Jian
2023-09-27 9:30 ` [PATCH bpf-next v5 4/7] selftests/bpf: add skmsg verdict tests Liu Jian
2023-09-27 9:30 ` [PATCH bpf-next v5 5/7] selftests/bpf: add two skmsg verdict tests for BPF_F_PERMANENT flag Liu Jian
2023-09-27 9:30 ` [PATCH bpf-next v5 6/7] selftests/bpf: add tests for verdict skmsg to itself Liu Jian
2023-09-27 9:30 ` [PATCH bpf-next v5 7/7] selftests/bpf: add tests for verdict skmsg to closed socket Liu Jian
2023-10-03 4:31 ` [PATCH bpf-next v5 0/7] add BPF_F_PERMANENT flag for sockmap skmsg redirect John Fastabend
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=20230927093013.1951659-3-liujian56@huawei.com \
--to=liujian56@huawei.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=haoluo@google.com \
--cc=jakub@cloudflare.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=martin.lau@linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sdf@google.com \
--cc=song@kernel.org \
--cc=yonghong.song@linux.dev \
/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 NNTP newsgroup(s).