From: John Fastabend <john.fastabend@gmail•com>
To: jakub@cloudflare•com, bpf@vger•kernel.org
Cc: netdev@vger•kernel.org, john.fastabend@gmail•com, andrii@kernel•org
Subject: [PATCH bpf-next v2 3/4] bpf: sockmap, add a cork to force buffering of the scatterlist
Date: Wed, 24 Jan 2024 10:54:02 -0800 [thread overview]
Message-ID: <20240124185403.1104141-4-john.fastabend@gmail.com> (raw)
In-Reply-To: <20240124185403.1104141-1-john.fastabend@gmail.com>
By using cork we can force multiple sends into a single scatterlist
and test that first the cork gives us the correct number of bytes,
but then also test the pop over the corked data.
Signed-off-by: John Fastabend <john.fastabend@gmail•com>
---
.../bpf/prog_tests/sockmap_msg_helpers.c | 81 +++++++++++++++++++
.../bpf/progs/test_sockmap_msg_helpers.c | 3 +
2 files changed, 84 insertions(+)
diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_msg_helpers.c b/tools/testing/selftests/bpf/prog_tests/sockmap_msg_helpers.c
index e5e618e84950..8ced54fe1a0b 100644
--- a/tools/testing/selftests/bpf/prog_tests/sockmap_msg_helpers.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockmap_msg_helpers.c
@@ -21,6 +21,85 @@ struct msg_test_opts {
#define POP_END -1
+static void cork_send(struct msg_test_opts *opts, int cork)
+{
+ struct test_sockmap_msg_helpers *skel = opts->skel;
+ char buf[] = "abcdefghijklmnopqrstuvwxyz";
+ size_t sent, total = 0, recv;
+ char *recvbuf;
+ int i;
+
+ skel->bss->pop = false;
+ skel->bss->cork = cork;
+
+ /* Send N bytes in 27B chunks */
+ for (i = 0; i < cork / sizeof(buf); i++) {
+ sent = xsend(opts->client, buf, sizeof(buf), 0);
+ if (sent < sizeof(buf))
+ FAIL("xsend failed");
+ total += sent;
+ }
+
+ recvbuf = malloc(total);
+ if (!recvbuf)
+ FAIL("cork send malloc failure\n");
+
+ ASSERT_OK(skel->bss->err, "cork error");
+ ASSERT_EQ(skel->bss->size, cork, "cork did not receive all bytes");
+
+ recv = xrecv_nonblock(opts->server, recvbuf, total, 0);
+ if (recv != total)
+ FAIL("Received incorrect number of bytes");
+
+ free(recvbuf);
+}
+
+static void test_sockmap_cork()
+{
+ struct test_sockmap_msg_helpers *skel;
+ struct msg_test_opts opts;
+ int s, client, server;
+ int err, map, prog;
+
+ skel = test_sockmap_msg_helpers__open_and_load();
+ if (!ASSERT_OK_PTR(skel, "open_and_load"))
+ return;
+
+ map = bpf_map__fd(skel->maps.sock_map);
+ prog = bpf_program__fd(skel->progs.msg_helpers);
+ err = bpf_prog_attach(prog, map, BPF_SK_MSG_VERDICT, 0);
+ if (!ASSERT_OK(err, "bpf_prog_attach"))
+ goto out;
+
+ s = socket_loopback(AF_INET, SOCK_STREAM);
+ if (s < 0)
+ goto out;
+
+ err = create_pair(s, AF_INET, SOCK_STREAM, &client, &server);
+ if (err < 0)
+ goto close_loopback;
+
+ err = add_to_sockmap(map, client, server);
+ if (err < 0)
+ goto close_sockets;
+
+ opts.client = client;
+ opts.server = server;
+ opts.skel = skel;
+
+ /* Small cork */
+ cork_send(&opts, 54);
+ /* Full cork */
+ cork_send(&opts, 270);
+close_sockets:
+ close(client);
+ close(server);
+close_loopback:
+ close(s);
+out:
+ test_sockmap_msg_helpers__destroy(skel);
+}
+
static void pop_simple_send(struct msg_test_opts *opts, int start, int len)
{
struct test_sockmap_msg_helpers *skel = opts->skel;
@@ -260,4 +339,6 @@ void test_sockmap_msg_helpers(void)
test_sockmap_pop();
if (test__start_subtest("sockmap pop errors"))
test_sockmap_pop_errors();
+ if (test__start_subtest("sockmap cork"))
+ test_sockmap_cork();
}
diff --git a/tools/testing/selftests/bpf/progs/test_sockmap_msg_helpers.c b/tools/testing/selftests/bpf/progs/test_sockmap_msg_helpers.c
index c721a00b6001..9622f154d016 100644
--- a/tools/testing/selftests/bpf/progs/test_sockmap_msg_helpers.c
+++ b/tools/testing/selftests/bpf/progs/test_sockmap_msg_helpers.c
@@ -30,10 +30,13 @@ int pop_start = 0;
int pop_len = 0;
int err;
+int size;
SEC("sk_msg")
int msg_helpers(struct sk_msg_md *msg)
{
+ size = msg->size;
+
if (cork)
err = bpf_msg_cork_bytes(msg, cork);
--
2.33.0
next prev parent reply other threads:[~2024-01-24 18:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-24 18:53 [PATCH bpf-next v2 0/4] transition sockmap testing to test_progs John Fastabend
2024-01-24 18:54 ` [PATCH bpf-next v2 1/4] bpf: sockmap, add test for sk_msg prog pop msg helper John Fastabend
2024-01-26 11:48 ` Jakub Sitnicki
2024-01-26 15:37 ` John Fastabend
2024-01-24 18:54 ` [PATCH bpf-next v2 2/4] bpf: sockmap, add a sendmsg test so we can check that path John Fastabend
2024-01-26 12:17 ` Jakub Sitnicki
2024-01-26 14:24 ` Jakub Sitnicki
2024-01-26 15:38 ` John Fastabend
2024-01-24 18:54 ` John Fastabend [this message]
2024-01-26 14:19 ` [PATCH bpf-next v2 3/4] bpf: sockmap, add a cork to force buffering of the scatterlist Jakub Sitnicki
2024-01-26 15:38 ` John Fastabend
2024-01-24 18:54 ` [PATCH bpf-next v2 4/4] bpf: sockmap test cork and pop combined John Fastabend
2024-01-24 22:58 ` [PATCH bpf-next v2 0/4] transition sockmap testing to test_progs John Fastabend
2024-01-26 14:39 ` Jakub Sitnicki
2024-01-26 15:40 ` 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=20240124185403.1104141-4-john.fastabend@gmail.com \
--to=john.fastabend@gmail$(echo .)com \
--cc=andrii@kernel$(echo .)org \
--cc=bpf@vger$(echo .)kernel.org \
--cc=jakub@cloudflare$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/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