| From baa7e9fd189ee8fc8356a545de1b696adb33c43b Mon Sep 17 00:00:00 2001 |
| From: John Fastabend <john.fastabend@gmail.com> |
| Date: Sun, 9 Feb 2020 21:44:37 -0800 |
| Subject: [PATCH] bpf: Selftests build error in sockmap_basic.c |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit f2e97dc126b712c0d21219ed0c42710006c1cf52 upstream. |
| |
| Fix following build error. We could push a tcp.h header into one of the |
| include paths, but I think its easy enough to simply pull in the three |
| defines we need here. If we end up using more of tcp.h at some point |
| we can pull it in later. |
| |
| /home/john/git/bpf/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c: In function ‘connected_socket_v4’: |
| /home/john/git/bpf/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c:20:11: error: ‘TCP_REPAIR_ON’ undeclared (first use in this function) |
| repair = TCP_REPAIR_ON; |
| ^ |
| /home/john/git/bpf/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c:20:11: note: each undeclared identifier is reported only once for each function it appears in |
| /home/john/git/bpf/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c:29:11: error: ‘TCP_REPAIR_OFF_NO_WP’ undeclared (first use in this function) |
| repair = TCP_REPAIR_OFF_NO_WP; |
| |
| Then with fix, |
| |
| $ ./test_progs -n 44 |
| #44/1 sockmap create_update_free:OK |
| #44/2 sockhash create_update_free:OK |
| #44 sockmap_basic:OK |
| |
| Fixes: 5d3919a953c3c ("selftests/bpf: Test freeing sockmap/sockhash with a socket in it") |
| Signed-off-by: John Fastabend <john.fastabend@gmail.com> |
| Signed-off-by: Alexei Starovoitov <ast@kernel.org> |
| Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com> |
| Link: https://lore.kernel.org/bpf/158131347731.21414.12120493483848386652.stgit@john-Precision-5820-Tower |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c |
| index 07f5b462c2ef..aa43e0bd210c 100644 |
| --- a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c |
| +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c |
| @@ -3,6 +3,11 @@ |
| |
| #include "test_progs.h" |
| |
| +#define TCP_REPAIR 19 /* TCP sock is under repair right now */ |
| + |
| +#define TCP_REPAIR_ON 1 |
| +#define TCP_REPAIR_OFF_NO_WP -1 /* Turn off without window probes */ |
| + |
| static int connected_socket_v4(void) |
| { |
| struct sockaddr_in addr = { |
| -- |
| 2.7.4 |
| |