From: John Fastabend <john.fastabend@gmail.com>
To: ast@kernel.org, daniel@iogearbox.net
Cc: netdev@vger.kernel.org
Subject: [bpf PATCH 6/6] bpf: selftest remove attempts to add LISTEN sockets to sockmap
Date: Wed, 13 Jun 2018 10:50:24 -0700 [thread overview]
Message-ID: <20180613175024.4264.50461.stgit@john-Precision-Tower-5810> (raw)
In-Reply-To: <20180613174202.4264.59970.stgit@john-Precision-Tower-5810>
In selftest test_maps the sockmap test case attempts to add a socket
in listening state to the sockmap. This is no longer a valid operation
so it fails as expected. However, the test wrongly reports this as an
error now. Fix the test to avoid adding sockets in listening state.
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
---
tools/testing/selftests/bpf/test_maps.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c
index 6c25334..9fed5f0 100644
--- a/tools/testing/selftests/bpf/test_maps.c
+++ b/tools/testing/selftests/bpf/test_maps.c
@@ -564,7 +564,7 @@ static void test_sockmap(int tasks, void *data)
}
/* Test update without programs */
- for (i = 0; i < 6; i++) {
+ for (i = 2; i < 6; i++) {
err = bpf_map_update_elem(fd, &i, &sfd[i], BPF_ANY);
if (err) {
printf("Failed noprog update sockmap '%i:%i'\n",
@@ -727,7 +727,7 @@ static void test_sockmap(int tasks, void *data)
}
/* Test map update elem afterwards fd lives in fd and map_fd */
- for (i = 0; i < 6; i++) {
+ for (i = 2; i < 6; i++) {
err = bpf_map_update_elem(map_fd_rx, &i, &sfd[i], BPF_ANY);
if (err) {
printf("Failed map_fd_rx update sockmap %i '%i:%i'\n",
prev parent reply other threads:[~2018-06-13 17:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-13 17:49 [bpf PATCH 0/6] BPF fixes for sockhash John Fastabend
2018-06-13 17:49 ` [bpf PATCH 1/6] bpf: sockmap, fix crash when ipv6 sock is added John Fastabend
2018-06-13 17:50 ` [bpf PATCH 2/6] bpf: sockmap only allow ESTABLISHED sock state John Fastabend
2018-06-13 17:50 ` [bpf PATCH 3/6] bpf: sockhash fix omitted bucket lock in sock_close John Fastabend
2018-06-13 17:50 ` [bpf PATCH 4/6] bpf: sockmap, tcp_disconnect to listen transition John Fastabend
2018-06-14 0:56 ` Martin KaFai Lau
2018-06-14 5:48 ` John Fastabend
2018-06-14 16:47 ` John Fastabend
2018-06-13 17:50 ` [bpf PATCH 5/6] bpf: sockhash, add release routine John Fastabend
2018-06-13 17:50 ` John Fastabend [this message]
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=20180613175024.4264.50461.stgit@john-Precision-Tower-5810 \
--to=john.fastabend@gmail.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=netdev@vger.kernel.org \
/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