Re: [PATCH bpf] samples: bpf: fix test_lru_dist

From: Kumar Kartikeya Dwivedi
Date: Tue Sep 28 2021 - 00:15:40 EST


On Tue, Sep 28, 2021 at 08:08:16AM IST, Matteo Croce wrote:
> From: Matteo Croce <mcroce@xxxxxxxxxxxxx>
>
> 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@xxxxxxxxxxxxx>
> ---
> 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@xxxxxxxxx
[1]: https://lore.kernel.org/bpf/87mtnyj9d4.fsf@xxxxxxx

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

--
Kartikeya