Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 28 Sep 2021 09:45:34 +0530
From:   Kumar Kartikeya Dwivedi <memxor@gmail.com>
To:     Matteo Croce <mcroce@linux.microsoft.com>
Cc:     bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>, Yonghong Song <yhs@fb.com>
Subject: Re: [PATCH bpf] samples: bpf: fix test_lru_dist
Message-ID: <20210928041534.dee5uqoz7ymrzfbr@apollo.localdomain>
References: <20210928023816.14488-1-mcroce@linux.microsoft.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20210928023816.14488-1-mcroce@linux.microsoft.com>
Precedence: bulk

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