]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
bpf: sockmap test remove shutdown() calls
authorJohn Fastabend <john.fastabend@gmail.com>
Tue, 28 Aug 2018 16:10:45 +0000 (09:10 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Wed, 29 Aug 2018 15:29:54 +0000 (17:29 +0200)
Currently, we do a shutdown(sk, SHUT_RDWR) on both peer sockets and
a shutdown on the sender as well. However, this is incorrect and can
occasionally cause issues if you happen to have bad timing. First
peer1 or peer2 may still be in use depending on the test and timing.
Second we really should only be closing the read side and/or write
side depending on if the test is receiving or sending.

But, really none of this is needed just remove the shutdown calls.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
tools/testing/selftests/bpf/test_sockmap.c

index 0c7d9e556b47d0a8129586a634a423e4ad1af067..a0e77c6bb0cf2262de42172c295c162a270b3c87 100644 (file)
@@ -469,8 +469,6 @@ static int sendmsg_test(struct sockmap_options *opt)
                        fprintf(stderr,
                                "msg_loop_rx: iov_count %i iov_buf %i cnt %i err %i\n",
                                iov_count, iov_buf, cnt, err);
-               shutdown(p2, SHUT_RDWR);
-               shutdown(p1, SHUT_RDWR);
                if (s.end.tv_sec - s.start.tv_sec) {
                        sent_Bps = sentBps(s);
                        recvd_Bps = recvdBps(s);
@@ -500,7 +498,6 @@ static int sendmsg_test(struct sockmap_options *opt)
                        fprintf(stderr,
                                "msg_loop_tx: iov_count %i iov_buf %i cnt %i err %i\n",
                                iov_count, iov_buf, cnt, err);
-               shutdown(c1, SHUT_RDWR);
                if (s.end.tv_sec - s.start.tv_sec) {
                        sent_Bps = sentBps(s);
                        recvd_Bps = recvdBps(s);