soreuseport: pass skb to secondary UDP socket lookup

This socket-lookup path did not pass along the skb in question
in my original BPF-based socket selection patch.  The skb in the
udpN_lib_lookup2 path can be used for BPF-based socket selection just
like it is in the 'traditional' udpN_lib_lookup path.

udpN_lib_lookup2 kicks in when there are greater than 10 sockets in
the same hlist slot.  Coincidentally, I chose 10 sockets per
reuseport group in my functional test, so the lookup2 path was not
excersised. This adds an additional set of tests with 20 sockets.

Fixes: 538950a1b752 ("soreuseport: setsockopt SO_ATTACH_REUSEPORT_[CE]BPF")
Fixes: 3ca8e4029969 ("soreuseport: BPF selection functional test")
Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Craig Gallek <kraig@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 47 insertions, 0 deletions

diff --git a/tools/testing/selftests/net/reuseport_bpf.c b/tools/testing/selftests/net/reuseport_bpf.c
index 74ff09988958..bec1b5dd2530 100644
--- a/tools/testing/selftests/net/reuseport_bpf.c
+++ b/tools/testing/selftests/net/reuseport_bpf.c
@@ -123,6 +123,8 @@ static void attach_ebpf(int fd, uint16_t mod)
         if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_REUSEPORT_EBPF, &bpf_fd,
                         sizeof(bpf_fd)))
                 error(1, errno, "failed to set SO_ATTACH_REUSEPORT_EBPF");
+
+        close(bpf_fd);
 }
 
 static void attach_cbpf(int fd, uint16_t mod)
@@ -396,6 +398,9 @@ static void test_filter_without_bind(void)
 int main(void)
 {
         fprintf(stderr, "---- IPv4 UDP ----\n");
+        /* NOTE: UDP socket lookups traverse a different code path when there
+         * are > 10 sockets in a group.  Run the bpf test through both paths.
+         */
         test_reuseport_ebpf((struct test_params) {
                 .recv_family = AF_INET,
                 .send_family = AF_INET,
@@ -403,6 +408,13 @@ int main(void)
                 .recv_socks = 10,
                 .recv_port = 8000,
                 .send_port_min = 9000});
+        test_reuseport_ebpf((struct test_params) {
+                .recv_family = AF_INET,
+                .send_family = AF_INET,
+                .protocol = SOCK_DGRAM,
+                .recv_socks = 20,
+                .recv_port = 8000,
+                .send_port_min = 9000});
         test_reuseport_cbpf((struct test_params) {
                 .recv_family = AF_INET,
                 .send_family = AF_INET,
@@ -410,6 +422,13 @@ int main(void)
                 .recv_socks = 10,
                 .recv_port = 8001,
                 .send_port_min = 9020});
+        test_reuseport_cbpf((struct test_params) {
+                .recv_family = AF_INET,
+                .send_family = AF_INET,
+                .protocol = SOCK_DGRAM,
+                .recv_socks = 20,
+                .recv_port = 8001,
+                .send_port_min = 9020});
         test_extra_filter((struct test_params) {
                 .recv_family = AF_INET,
                 .protocol = SOCK_DGRAM,
@@ -427,6 +446,13 @@ int main(void)
                 .recv_socks = 10,
                 .recv_port = 8003,
                 .send_port_min = 9040});
+        test_reuseport_ebpf((struct test_params) {
+                .recv_family = AF_INET6,
+                .send_family = AF_INET6,
+                .protocol = SOCK_DGRAM,
+                .recv_socks = 20,
+                .recv_port = 8003,
+                .send_port_min = 9040});
         test_reuseport_cbpf((struct test_params) {
                 .recv_family = AF_INET6,
                 .send_family = AF_INET6,
@@ -434,6 +460,13 @@ int main(void)
                 .recv_socks = 10,
                 .recv_port = 8004,
                 .send_port_min = 9060});
+        test_reuseport_cbpf((struct test_params) {
+                .recv_family = AF_INET6,
+                .send_family = AF_INET6,
+                .protocol = SOCK_DGRAM,
+                .recv_socks = 20,
+                .recv_port = 8004,
+                .send_port_min = 9060});
         test_extra_filter((struct test_params) {
                 .recv_family = AF_INET6,
                 .protocol = SOCK_DGRAM,
@@ -448,6 +481,13 @@ int main(void)
                 .recv_family = AF_INET6,
                 .send_family = AF_INET,
                 .protocol = SOCK_DGRAM,
+                .recv_socks = 20,
+                .recv_port = 8006,
+                .send_port_min = 9080});
+        test_reuseport_ebpf((struct test_params) {
+                .recv_family = AF_INET6,
+                .send_family = AF_INET,
+                .protocol = SOCK_DGRAM,
                 .recv_socks = 10,
                 .recv_port = 8006,
                 .send_port_min = 9080});
@@ -458,6 +498,13 @@ int main(void)
                 .recv_socks = 10,
                 .recv_port = 8007,
                 .send_port_min = 9100});
+        test_reuseport_cbpf((struct test_params) {
+                .recv_family = AF_INET6,
+                .send_family = AF_INET,
+                .protocol = SOCK_DGRAM,
+                .recv_socks = 20,
+                .recv_port = 8007,
+                .send_port_min = 9100});
 
 
         test_filter_without_bind();