netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH bpf-next] selftests/bpf: Fix build of sockmap_ktls.c
@ 2020-02-19 20:55 Alexei Starovoitov
  2020-02-19 21:26 ` John Fastabend
  2020-02-20  0:20 ` Daniel Borkmann
  0 siblings, 2 replies; 3+ messages in thread
From: Alexei Starovoitov @ 2020-02-19 20:55 UTC (permalink / raw)
  To: davem; +Cc: daniel, netdev, bpf, kernel-team

The selftests fails to build with:
tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c: In function ‘test_sockmap_ktls_disconnect_after_delete’:
tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c:72:37: error: ‘TCP_ULP’ undeclared (first use in this function)
   72 |  err = setsockopt(cli, IPPROTO_TCP, TCP_ULP, "tls", strlen("tls"));
      |                                     ^~~~~~~

Similar to commit that fixes build of sockmap_basic.c on systems with old
/usr/include fix the build of sockmap_ktls.c

Fixes: d1ba1204f2ee ("selftests/bpf: Test unhashing kTLS socket after removing from map")
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---
 tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
index 589b50c91b96..06b86addc181 100644
--- a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
@@ -7,6 +7,7 @@
 #include "test_progs.h"
 
 #define MAX_TEST_NAME 80
+#define TCP_ULP 31
 
 static int tcp_server(int family)
 {
-- 
2.23.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* RE: [PATCH bpf-next] selftests/bpf: Fix build of sockmap_ktls.c
  2020-02-19 20:55 [PATCH bpf-next] selftests/bpf: Fix build of sockmap_ktls.c Alexei Starovoitov
@ 2020-02-19 21:26 ` John Fastabend
  2020-02-20  0:20 ` Daniel Borkmann
  1 sibling, 0 replies; 3+ messages in thread
From: John Fastabend @ 2020-02-19 21:26 UTC (permalink / raw)
  To: Alexei Starovoitov, davem; +Cc: daniel, netdev, bpf, kernel-team

Alexei Starovoitov wrote:
> The selftests fails to build with:
> tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c: In function ‘test_sockmap_ktls_disconnect_after_delete’:
> tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c:72:37: error: ‘TCP_ULP’ undeclared (first use in this function)
>    72 |  err = setsockopt(cli, IPPROTO_TCP, TCP_ULP, "tls", strlen("tls"));
>       |                                     ^~~~~~~
> 
> Similar to commit that fixes build of sockmap_basic.c on systems with old
> /usr/include fix the build of sockmap_ktls.c
> 
> Fixes: d1ba1204f2ee ("selftests/bpf: Test unhashing kTLS socket after removing from map")
> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
> ---
>  tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
> index 589b50c91b96..06b86addc181 100644
> --- a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
> +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
> @@ -7,6 +7,7 @@
>  #include "test_progs.h"
>  
>  #define MAX_TEST_NAME 80
> +#define TCP_ULP 31
>  
>  static int tcp_server(int family)
>  {
> -- 
> 2.23.0
> 

Thanks.

Acked-by: John Fastabend <john.fastabend@gmail.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH bpf-next] selftests/bpf: Fix build of sockmap_ktls.c
  2020-02-19 20:55 [PATCH bpf-next] selftests/bpf: Fix build of sockmap_ktls.c Alexei Starovoitov
  2020-02-19 21:26 ` John Fastabend
@ 2020-02-20  0:20 ` Daniel Borkmann
  1 sibling, 0 replies; 3+ messages in thread
From: Daniel Borkmann @ 2020-02-20  0:20 UTC (permalink / raw)
  To: Alexei Starovoitov, davem; +Cc: netdev, bpf, kernel-team

On 2/19/20 9:55 PM, Alexei Starovoitov wrote:
> The selftests fails to build with:
> tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c: In function ‘test_sockmap_ktls_disconnect_after_delete’:
> tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c:72:37: error: ‘TCP_ULP’ undeclared (first use in this function)
>     72 |  err = setsockopt(cli, IPPROTO_TCP, TCP_ULP, "tls", strlen("tls"));
>        |                                     ^~~~~~~
> 
> Similar to commit that fixes build of sockmap_basic.c on systems with old
> /usr/include fix the build of sockmap_ktls.c
> 
> Fixes: d1ba1204f2ee ("selftests/bpf: Test unhashing kTLS socket after removing from map")
> Signed-off-by: Alexei Starovoitov <ast@kernel.org>

Applied, thanks!

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-02-20  0:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-19 20:55 [PATCH bpf-next] selftests/bpf: Fix build of sockmap_ktls.c Alexei Starovoitov
2020-02-19 21:26 ` John Fastabend
2020-02-20  0:20 ` Daniel Borkmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).