diff mbox series

[bpf,v7,11/13] bpf: sockmap, test shutdown() correctly exits epoll and recv()=0

Message ID 20230502155159.305437-12-john.fastabend@gmail.com (mailing list archive)
State Changes Requested
Delegated to: BPF
Headers show
Series bpf sockmap fixes | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for bpf, async
netdev/apply fail Patch does not apply to bpf
bpf/vmtest-bpf-PR fail merge-conflict
bpf/vmtest-bpf-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-VM_Test-2 success Logs for build for aarch64 with gcc
bpf/vmtest-bpf-VM_Test-3 success Logs for build for aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-4 success Logs for build for s390x with gcc
bpf/vmtest-bpf-VM_Test-5 success Logs for build for x86_64 with gcc
bpf/vmtest-bpf-VM_Test-6 success Logs for build for x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-7 success Logs for set-matrix
bpf/vmtest-bpf-VM_Test-8 success Logs for test_maps on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-9 success Logs for test_maps on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-10 success Logs for test_maps on s390x with gcc
bpf/vmtest-bpf-VM_Test-11 success Logs for test_maps on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-12 success Logs for test_maps on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-13 fail Logs for test_progs on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-14 fail Logs for test_progs on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-15 fail Logs for test_progs on s390x with gcc
bpf/vmtest-bpf-VM_Test-16 fail Logs for test_progs on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-17 fail Logs for test_progs on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-18 fail Logs for test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-19 fail Logs for test_progs_no_alu32 on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-20 fail Logs for test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-VM_Test-21 fail Logs for test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-22 fail Logs for test_progs_no_alu32 on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-23 success Logs for test_progs_no_alu32_parallel on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-24 success Logs for test_progs_no_alu32_parallel on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-25 success Logs for test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-26 success Logs for test_progs_no_alu32_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-27 success Logs for test_progs_parallel on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-28 success Logs for test_progs_parallel on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-29 success Logs for test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-30 success Logs for test_progs_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-31 success Logs for test_verifier on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-32 success Logs for test_verifier on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-33 success Logs for test_verifier on s390x with gcc
bpf/vmtest-bpf-VM_Test-34 success Logs for test_verifier on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-35 success Logs for test_verifier on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-36 success Logs for veristat

Commit Message

John Fastabend May 2, 2023, 3:51 p.m. UTC 
When session gracefully shutdowns epoll needs to wake up and any recv()
readers should return 0 not the -EAGAIN they previously returned.

Note we use epoll instead of select to test the epoll wake on shutdown
event as well.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
---
 .../selftests/bpf/prog_tests/sockmap_basic.c  | 68 +++++++++++++++++++
 .../bpf/progs/test_sockmap_pass_prog.c        | 32 +++++++++
 2 files changed, 100 insertions(+)
 create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_pass_prog.c

Comments

Jakub Sitnicki May 8, 2023, 11:04 a.m. UTC | #1 
On Tue, May 02, 2023 at 08:51 AM -07, John Fastabend wrote:
> When session gracefully shutdowns epoll needs to wake up and any recv()
> readers should return 0 not the -EAGAIN they previously returned.
>
> Note we use epoll instead of select to test the epoll wake on shutdown
> event as well.
>
> Signed-off-by: John Fastabend <john.fastabend@gmail.com>
> ---
>  .../selftests/bpf/prog_tests/sockmap_basic.c  | 68 +++++++++++++++++++
>  .../bpf/progs/test_sockmap_pass_prog.c        | 32 +++++++++
>  2 files changed, 100 insertions(+)
>  create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_pass_prog.c
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
> index 0ce25a967481..f9f611618e45 100644
> --- a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
> +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
> @@ -2,6 +2,7 @@
>  // Copyright (c) 2020 Cloudflare
>  #include <error.h>
>  #include <netinet/tcp.h>
> +#include <sys/epoll.h>
>  
>  #include "test_progs.h"
>  #include "test_skmsg_load_helpers.skel.h"
> @@ -9,8 +10,11 @@
>  #include "test_sockmap_invalid_update.skel.h"
>  #include "test_sockmap_skb_verdict_attach.skel.h"
>  #include "test_sockmap_progs_query.skel.h"
> +#include "test_sockmap_pass_prog.skel.h"
>  #include "bpf_iter_sockmap.skel.h"
>  
> +#include "sockmap_helpers.h"
> +
>  #define TCP_REPAIR		19	/* TCP sock is under repair right now */
>  
>  #define TCP_REPAIR_ON		1
> @@ -350,6 +354,68 @@ static void test_sockmap_progs_query(enum bpf_attach_type attach_type)
>  	test_sockmap_progs_query__destroy(skel);
>  }
>  
> +#define MAX_EVENTS 10
> +static void test_sockmap_skb_verdict_shutdown(void)
> +{
> +	int n, err, map, verdict, s, c0, c1, p0, p1;
> +	struct epoll_event ev, events[MAX_EVENTS];
> +	struct test_sockmap_pass_prog *skel;
> +	int epollfd;
> +	int zero = 0;
> +	char b;
> +
> +	skel = test_sockmap_pass_prog__open_and_load();
> +	if (!ASSERT_OK_PTR(skel, "open_and_load"))
> +		return;
> +
> +	verdict = bpf_program__fd(skel->progs.prog_skb_verdict);
> +	map = bpf_map__fd(skel->maps.sock_map_rx);
> +
> +	err = bpf_prog_attach(verdict, map, BPF_SK_SKB_STREAM_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_socket_pairs(s, AF_INET, SOCK_STREAM, &c0, &c1, &p0, &p1);
> +	if (err < 0)
> +		goto out;
> +
> +	err = bpf_map_update_elem(map, &zero, &c1, BPF_NOEXIST);
> +	if (err < 0)
> +		goto out_close;
> +
> +	shutdown(c0, SHUT_RDWR);
> +	shutdown(p1, SHUT_WR);
> +
> +	ev.events = EPOLLIN;
> +	ev.data.fd = c1;
> +
> +	epollfd = epoll_create1(0);
> +	if (!ASSERT_GT(epollfd, -1, "epoll_create(0)"))
> +		goto out_close;
> +	err = epoll_ctl(epollfd, EPOLL_CTL_ADD, c1, &ev);
> +	if (!ASSERT_OK(err, "epoll_ctl(EPOLL_CTL_ADD)"))
> +		goto out_close;
> +	err = epoll_wait(epollfd, events, MAX_EVENTS, -1);
> +	if (!ASSERT_EQ(err, 1, "epoll_wait(fd)"))
> +		goto out_close;
> +
> +	n = recv(c1, &b, 1, SOCK_NONBLOCK);
> +	ASSERT_EQ(n, 0, "recv_timeout(fin)");
> +	n = recv(p0, &b, 1, SOCK_NONBLOCK);
> +	ASSERT_EQ(n, 0, "recv_timeout(fin)");
> +
> +out_close:
> +	close(c0);
> +	close(p0);
> +	close(c1);
> +	close(p1);
> +out:
> +	test_sockmap_pass_prog__destroy(skel);
> +}
> +

This test has me scratching my head. I don't grasp what we're testing
with (c0, p0) socket pair, since c0 is not in any sockmap?
John Fastabend May 16, 2023, 1:51 a.m. UTC | #2 
Jakub Sitnicki wrote:
> On Tue, May 02, 2023 at 08:51 AM -07, John Fastabend wrote:
> > When session gracefully shutdowns epoll needs to wake up and any recv()
> > readers should return 0 not the -EAGAIN they previously returned.
> >
> > Note we use epoll instead of select to test the epoll wake on shutdown
> > event as well.
> >
> > Signed-off-by: John Fastabend <john.fastabend@gmail.com>
> > ---
> >  .../selftests/bpf/prog_tests/sockmap_basic.c  | 68 +++++++++++++++++++
> >  .../bpf/progs/test_sockmap_pass_prog.c        | 32 +++++++++
> >  2 files changed, 100 insertions(+)
> >  create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_pass_prog.c
> >
> > diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
> > index 0ce25a967481..f9f611618e45 100644
> > --- a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
> > +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
> > @@ -2,6 +2,7 @@
> >  // Copyright (c) 2020 Cloudflare
> >  #include <error.h>
> >  #include <netinet/tcp.h>
> > +#include <sys/epoll.h>
> >  
> >  #include "test_progs.h"
> >  #include "test_skmsg_load_helpers.skel.h"
> > @@ -9,8 +10,11 @@
> >  #include "test_sockmap_invalid_update.skel.h"
> >  #include "test_sockmap_skb_verdict_attach.skel.h"
> >  #include "test_sockmap_progs_query.skel.h"
> > +#include "test_sockmap_pass_prog.skel.h"
> >  #include "bpf_iter_sockmap.skel.h"
> >  
> > +#include "sockmap_helpers.h"
> > +
> >  #define TCP_REPAIR		19	/* TCP sock is under repair right now */
> >  
> >  #define TCP_REPAIR_ON		1
> > @@ -350,6 +354,68 @@ static void test_sockmap_progs_query(enum bpf_attach_type attach_type)
> >  	test_sockmap_progs_query__destroy(skel);
> >  }
> >  
> > +#define MAX_EVENTS 10
> > +static void test_sockmap_skb_verdict_shutdown(void)
> > +{
> > +	int n, err, map, verdict, s, c0, c1, p0, p1;
> > +	struct epoll_event ev, events[MAX_EVENTS];
> > +	struct test_sockmap_pass_prog *skel;
> > +	int epollfd;
> > +	int zero = 0;
> > +	char b;
> > +
> > +	skel = test_sockmap_pass_prog__open_and_load();
> > +	if (!ASSERT_OK_PTR(skel, "open_and_load"))
> > +		return;
> > +
> > +	verdict = bpf_program__fd(skel->progs.prog_skb_verdict);
> > +	map = bpf_map__fd(skel->maps.sock_map_rx);
> > +
> > +	err = bpf_prog_attach(verdict, map, BPF_SK_SKB_STREAM_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_socket_pairs(s, AF_INET, SOCK_STREAM, &c0, &c1, &p0, &p1);
> > +	if (err < 0)
> > +		goto out;
> > +
> > +	err = bpf_map_update_elem(map, &zero, &c1, BPF_NOEXIST);
> > +	if (err < 0)
> > +		goto out_close;
> > +
> > +	shutdown(c0, SHUT_RDWR);
> > +	shutdown(p1, SHUT_WR);
> > +
> > +	ev.events = EPOLLIN;
> > +	ev.data.fd = c1;
> > +
> > +	epollfd = epoll_create1(0);
> > +	if (!ASSERT_GT(epollfd, -1, "epoll_create(0)"))
> > +		goto out_close;
> > +	err = epoll_ctl(epollfd, EPOLL_CTL_ADD, c1, &ev);
> > +	if (!ASSERT_OK(err, "epoll_ctl(EPOLL_CTL_ADD)"))
> > +		goto out_close;
> > +	err = epoll_wait(epollfd, events, MAX_EVENTS, -1);
> > +	if (!ASSERT_EQ(err, 1, "epoll_wait(fd)"))
> > +		goto out_close;
> > +
> > +	n = recv(c1, &b, 1, SOCK_NONBLOCK);
> > +	ASSERT_EQ(n, 0, "recv_timeout(fin)");
> > +	n = recv(p0, &b, 1, SOCK_NONBLOCK);
> > +	ASSERT_EQ(n, 0, "recv_timeout(fin)");
> > +
> > +out_close:
> > +	close(c0);
> > +	close(p0);
> > +	close(c1);
> > +	close(p1);
> > +out:
> > +	test_sockmap_pass_prog__destroy(skel);
> > +}
> > +
> 
> This test has me scratching my head. I don't grasp what we're testing
> with (c0, p0) socket pair, since c0 is not in any sockmap?

Yeah the test is on (c1,p1) I was just lazy and using the API as is
I can fix the API to allow single set c1,p1.
Jakub Sitnicki May 16, 2023, 1:41 p.m. UTC | #3 
On Mon, May 15, 2023 at 06:51 PM -07, John Fastabend wrote:
> Jakub Sitnicki wrote:
>> On Tue, May 02, 2023 at 08:51 AM -07, John Fastabend wrote:
>> > When session gracefully shutdowns epoll needs to wake up and any recv()
>> > readers should return 0 not the -EAGAIN they previously returned.
>> >
>> > Note we use epoll instead of select to test the epoll wake on shutdown
>> > event as well.
>> >
>> > Signed-off-by: John Fastabend <john.fastabend@gmail.com>
>> > ---
>> >  .../selftests/bpf/prog_tests/sockmap_basic.c  | 68 +++++++++++++++++++
>> >  .../bpf/progs/test_sockmap_pass_prog.c        | 32 +++++++++
>> >  2 files changed, 100 insertions(+)
>> >  create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_pass_prog.c
>> >
>> > diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
>> > index 0ce25a967481..f9f611618e45 100644
>> > --- a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
>> > +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
>> > @@ -2,6 +2,7 @@
>> >  // Copyright (c) 2020 Cloudflare
>> >  #include <error.h>
>> >  #include <netinet/tcp.h>
>> > +#include <sys/epoll.h>
>> >  
>> >  #include "test_progs.h"
>> >  #include "test_skmsg_load_helpers.skel.h"
>> > @@ -9,8 +10,11 @@
>> >  #include "test_sockmap_invalid_update.skel.h"
>> >  #include "test_sockmap_skb_verdict_attach.skel.h"
>> >  #include "test_sockmap_progs_query.skel.h"
>> > +#include "test_sockmap_pass_prog.skel.h"
>> >  #include "bpf_iter_sockmap.skel.h"
>> >  
>> > +#include "sockmap_helpers.h"
>> > +
>> >  #define TCP_REPAIR		19	/* TCP sock is under repair right now */
>> >  
>> >  #define TCP_REPAIR_ON		1
>> > @@ -350,6 +354,68 @@ static void test_sockmap_progs_query(enum bpf_attach_type attach_type)
>> >  	test_sockmap_progs_query__destroy(skel);
>> >  }
>> >  
>> > +#define MAX_EVENTS 10
>> > +static void test_sockmap_skb_verdict_shutdown(void)
>> > +{
>> > +	int n, err, map, verdict, s, c0, c1, p0, p1;
>> > +	struct epoll_event ev, events[MAX_EVENTS];
>> > +	struct test_sockmap_pass_prog *skel;
>> > +	int epollfd;
>> > +	int zero = 0;
>> > +	char b;
>> > +
>> > +	skel = test_sockmap_pass_prog__open_and_load();
>> > +	if (!ASSERT_OK_PTR(skel, "open_and_load"))
>> > +		return;
>> > +
>> > +	verdict = bpf_program__fd(skel->progs.prog_skb_verdict);
>> > +	map = bpf_map__fd(skel->maps.sock_map_rx);
>> > +
>> > +	err = bpf_prog_attach(verdict, map, BPF_SK_SKB_STREAM_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_socket_pairs(s, AF_INET, SOCK_STREAM, &c0, &c1, &p0, &p1);
>> > +	if (err < 0)
>> > +		goto out;
>> > +
>> > +	err = bpf_map_update_elem(map, &zero, &c1, BPF_NOEXIST);
>> > +	if (err < 0)
>> > +		goto out_close;
>> > +
>> > +	shutdown(c0, SHUT_RDWR);
>> > +	shutdown(p1, SHUT_WR);
>> > +
>> > +	ev.events = EPOLLIN;
>> > +	ev.data.fd = c1;
>> > +
>> > +	epollfd = epoll_create1(0);
>> > +	if (!ASSERT_GT(epollfd, -1, "epoll_create(0)"))
>> > +		goto out_close;
>> > +	err = epoll_ctl(epollfd, EPOLL_CTL_ADD, c1, &ev);
>> > +	if (!ASSERT_OK(err, "epoll_ctl(EPOLL_CTL_ADD)"))
>> > +		goto out_close;
>> > +	err = epoll_wait(epollfd, events, MAX_EVENTS, -1);
>> > +	if (!ASSERT_EQ(err, 1, "epoll_wait(fd)"))
>> > +		goto out_close;
>> > +
>> > +	n = recv(c1, &b, 1, SOCK_NONBLOCK);
>> > +	ASSERT_EQ(n, 0, "recv_timeout(fin)");
>> > +	n = recv(p0, &b, 1, SOCK_NONBLOCK);
>> > +	ASSERT_EQ(n, 0, "recv_timeout(fin)");
>> > +
>> > +out_close:
>> > +	close(c0);
>> > +	close(p0);
>> > +	close(c1);
>> > +	close(p1);
>> > +out:
>> > +	test_sockmap_pass_prog__destroy(skel);
>> > +}
>> > +
>> 
>> This test has me scratching my head. I don't grasp what we're testing
>> with (c0, p0) socket pair, since c0 is not in any sockmap?
>
> Yeah the test is on (c1,p1) I was just lazy and using the API as is
> I can fix the API to allow single set c1,p1.

It's not an issue that one pair is unused, IMO. I was just surprised
that you operated on (c0, p0) rather than closing them immediately.
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
index 0ce25a967481..f9f611618e45 100644
--- a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
@@ -2,6 +2,7 @@ 
 // Copyright (c) 2020 Cloudflare
 #include <error.h>
 #include <netinet/tcp.h>
+#include <sys/epoll.h>
 
 #include "test_progs.h"
 #include "test_skmsg_load_helpers.skel.h"
@@ -9,8 +10,11 @@ 
 #include "test_sockmap_invalid_update.skel.h"
 #include "test_sockmap_skb_verdict_attach.skel.h"
 #include "test_sockmap_progs_query.skel.h"
+#include "test_sockmap_pass_prog.skel.h"
 #include "bpf_iter_sockmap.skel.h"
 
+#include "sockmap_helpers.h"
+
 #define TCP_REPAIR		19	/* TCP sock is under repair right now */
 
 #define TCP_REPAIR_ON		1
@@ -350,6 +354,68 @@  static void test_sockmap_progs_query(enum bpf_attach_type attach_type)
 	test_sockmap_progs_query__destroy(skel);
 }
 
+#define MAX_EVENTS 10
+static void test_sockmap_skb_verdict_shutdown(void)
+{
+	int n, err, map, verdict, s, c0, c1, p0, p1;
+	struct epoll_event ev, events[MAX_EVENTS];
+	struct test_sockmap_pass_prog *skel;
+	int epollfd;
+	int zero = 0;
+	char b;
+
+	skel = test_sockmap_pass_prog__open_and_load();
+	if (!ASSERT_OK_PTR(skel, "open_and_load"))
+		return;
+
+	verdict = bpf_program__fd(skel->progs.prog_skb_verdict);
+	map = bpf_map__fd(skel->maps.sock_map_rx);
+
+	err = bpf_prog_attach(verdict, map, BPF_SK_SKB_STREAM_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_socket_pairs(s, AF_INET, SOCK_STREAM, &c0, &c1, &p0, &p1);
+	if (err < 0)
+		goto out;
+
+	err = bpf_map_update_elem(map, &zero, &c1, BPF_NOEXIST);
+	if (err < 0)
+		goto out_close;
+
+	shutdown(c0, SHUT_RDWR);
+	shutdown(p1, SHUT_WR);
+
+	ev.events = EPOLLIN;
+	ev.data.fd = c1;
+
+	epollfd = epoll_create1(0);
+	if (!ASSERT_GT(epollfd, -1, "epoll_create(0)"))
+		goto out_close;
+	err = epoll_ctl(epollfd, EPOLL_CTL_ADD, c1, &ev);
+	if (!ASSERT_OK(err, "epoll_ctl(EPOLL_CTL_ADD)"))
+		goto out_close;
+	err = epoll_wait(epollfd, events, MAX_EVENTS, -1);
+	if (!ASSERT_EQ(err, 1, "epoll_wait(fd)"))
+		goto out_close;
+
+	n = recv(c1, &b, 1, SOCK_NONBLOCK);
+	ASSERT_EQ(n, 0, "recv_timeout(fin)");
+	n = recv(p0, &b, 1, SOCK_NONBLOCK);
+	ASSERT_EQ(n, 0, "recv_timeout(fin)");
+
+out_close:
+	close(c0);
+	close(p0);
+	close(c1);
+	close(p1);
+out:
+	test_sockmap_pass_prog__destroy(skel);
+}
+
 void test_sockmap_basic(void)
 {
 	if (test__start_subtest("sockmap create_update_free"))
@@ -384,4 +450,6 @@  void test_sockmap_basic(void)
 		test_sockmap_progs_query(BPF_SK_SKB_STREAM_VERDICT);
 	if (test__start_subtest("sockmap skb_verdict progs query"))
 		test_sockmap_progs_query(BPF_SK_SKB_VERDICT);
+	if (test__start_subtest("sockmap skb_verdict shutdown"))
+		test_sockmap_skb_verdict_shutdown();
 }
diff --git a/tools/testing/selftests/bpf/progs/test_sockmap_pass_prog.c b/tools/testing/selftests/bpf/progs/test_sockmap_pass_prog.c
new file mode 100644
index 000000000000..1d86a717a290
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/test_sockmap_pass_prog.c
@@ -0,0 +1,32 @@ 
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+#include <bpf/bpf_endian.h>
+
+struct {
+	__uint(type, BPF_MAP_TYPE_SOCKMAP);
+	__uint(max_entries, 20);
+	__type(key, int);
+	__type(value, int);
+} sock_map_rx SEC(".maps");
+
+struct {
+	__uint(type, BPF_MAP_TYPE_SOCKMAP);
+	__uint(max_entries, 20);
+	__type(key, int);
+	__type(value, int);
+} sock_map_tx SEC(".maps");
+
+struct {
+	__uint(type, BPF_MAP_TYPE_SOCKMAP);
+	__uint(max_entries, 20);
+	__type(key, int);
+	__type(value, int);
+} sock_map_msg SEC(".maps");
+
+SEC("sk_skb")
+int prog_skb_verdict(struct __sk_buff *skb)
+{
+	return SK_PASS;
+}
+
+char _license[] SEC("license") = "GPL";