All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH bpf] samples: bpf: fix test_lru_dist
@ 2021-09-28  2:38 Matteo Croce
  2021-09-28  4:15 ` Kumar Kartikeya Dwivedi
  0 siblings, 1 reply; 2+ messages in thread
From: Matteo Croce @ 2021-09-28  2:38 UTC (permalink / raw)
  To: bpf
  Cc: linux-kernel, Alexei Starovoitov, Daniel Borkmann,
	Andrii Nakryiko, Yonghong Song

From: Matteo Croce <mcroce@microsoft.com>

Fix this build error:

  CC  samples/bpf/test_lru_dist
samples/bpf/test_lru_dist.c:36:8: error: redefinition of ‘struct list_head’
   36 | struct list_head {
      |        ^~~~~~~~~

This happens even after running `make headers_install`

Signed-off-by: Matteo Croce <mcroce@microsoft.com>
---
 samples/bpf/xdp_redirect_map_multi.bpf.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/samples/bpf/xdp_redirect_map_multi.bpf.c b/samples/bpf/xdp_redirect_map_multi.bpf.c
index 8f59d430cb64..bb0a5a3bfcf0 100644
--- a/samples/bpf/xdp_redirect_map_multi.bpf.c
+++ b/samples/bpf/xdp_redirect_map_multi.bpf.c
@@ -5,11 +5,6 @@
 #include "xdp_sample.bpf.h"
 #include "xdp_sample_shared.h"
 
-enum {
-	BPF_F_BROADCAST		= (1ULL << 3),
-	BPF_F_EXCLUDE_INGRESS	= (1ULL << 4),
-};
-
 struct {
 	__uint(type, BPF_MAP_TYPE_DEVMAP_HASH);
 	__uint(key_size, sizeof(int));
-- 
2.31.1


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

* Re: [PATCH bpf] samples: bpf: fix test_lru_dist
  2021-09-28  2:38 [PATCH bpf] samples: bpf: fix test_lru_dist Matteo Croce
@ 2021-09-28  4:15 ` Kumar Kartikeya Dwivedi
  0 siblings, 0 replies; 2+ messages in thread
From: Kumar Kartikeya Dwivedi @ 2021-09-28  4:15 UTC (permalink / raw)
  To: Matteo Croce
  Cc: bpf, linux-kernel, Alexei Starovoitov, Daniel Borkmann,
	Andrii Nakryiko, Yonghong Song

On Tue, Sep 28, 2021 at 08:08:16AM IST, Matteo Croce wrote:
> From: Matteo Croce <mcroce@microsoft.com>
>
> Fix this build error:
>
>   CC  samples/bpf/test_lru_dist
> samples/bpf/test_lru_dist.c:36:8: error: redefinition of ‘struct list_head’
>    36 | struct list_head {
>       |        ^~~~~~~~~
>

Description does not match the fix?

> This happens even after running `make headers_install`
>
> Signed-off-by: Matteo Croce <mcroce@microsoft.com>
> ---
>  samples/bpf/xdp_redirect_map_multi.bpf.c | 5 -----
>  1 file changed, 5 deletions(-)
>
> diff --git a/samples/bpf/xdp_redirect_map_multi.bpf.c b/samples/bpf/xdp_redirect_map_multi.bpf.c
> index 8f59d430cb64..bb0a5a3bfcf0 100644
> --- a/samples/bpf/xdp_redirect_map_multi.bpf.c
> +++ b/samples/bpf/xdp_redirect_map_multi.bpf.c
> @@ -5,11 +5,6 @@
>  #include "xdp_sample.bpf.h"
>  #include "xdp_sample_shared.h"
>
> -enum {
> -	BPF_F_BROADCAST		= (1ULL << 3),
> -	BPF_F_EXCLUDE_INGRESS	= (1ULL << 4),
> -};
> -

I sent what is hopefully the right fix for this in [0], also see [1] for
background.

[0]: https://lore.kernel.org/bpf/20210928041329.1735524-1-memxor@gmail.com
[1]: https://lore.kernel.org/bpf/87mtnyj9d4.fsf@toke.dk

>  struct {
>  	__uint(type, BPF_MAP_TYPE_DEVMAP_HASH);
>  	__uint(key_size, sizeof(int));
> --
> 2.31.1
>

--
Kartikeya

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

end of thread, other threads:[~2021-09-28  4:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-28  2:38 [PATCH bpf] samples: bpf: fix test_lru_dist Matteo Croce
2021-09-28  4:15 ` Kumar Kartikeya Dwivedi

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.