2017-12-01 19:06:20

by Jason Gunthorpe

Subject: [PATCH] bpf: Fix compile warnings when !CONFIG_BPF_SYSCALL

Such as:

In file included from ./include/trace/events/xdp.h:10:0,
from ./include/linux/bpf_trace.h:6,
from drivers/net/ethernet/intel/i40e/i40e_txrx.c:29:
./include/trace/events/xdp.h:94:17: warning: ‘struct bpf_map’ declared inside parameter list
const struct bpf_map *map, u32 map_index),
^

By adding a forward declaration for struct bpf_map. In the
CONFIG_BPF_SYSCALL case the declaration comes in via
trace/events/bpf.h

Fixes: 59a308967589 ("xdp: separate xdp_redirect tracepoint in map case")
Signed-off-by: Jason Gunthorpe <[email protected]>
---
include/trace/events/xdp.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/include/trace/events/xdp.h b/include/trace/events/xdp.h
index 4cd0f05d01134d..36b2a9043189be 100644
--- a/include/trace/events/xdp.h
+++ b/include/trace/events/xdp.h
@@ -9,6 +9,8 @@
#include <linux/filter.h>
#include <linux/tracepoint.h>

+struct bpf_map;
+
#define __XDP_ACT_MAP(FN) \
FN(ABORTED) \
FN(DROP) \
--
2.7.4

2017-12-01 19:33:00

by Daniel Borkmann

Subject: Re: [PATCH] bpf: Fix compile warnings when !CONFIG_BPF_SYSCALL

On 12/01/2017 08:06 PM, Jason Gunthorpe wrote:
> Such as:
>
> In file included from ./include/trace/events/xdp.h:10:0,
> from ./include/linux/bpf_trace.h:6,
> from drivers/net/ethernet/intel/i40e/i40e_txrx.c:29:
> ./include/trace/events/xdp.h:94:17: warning: ‘struct bpf_map’ declared inside parameter list
> const struct bpf_map *map, u32 map_index),
> ^
>
> By adding a forward declaration for struct bpf_map. In the
> CONFIG_BPF_SYSCALL case the declaration comes in via
> trace/events/bpf.h
>
> Fixes: 59a308967589 ("xdp: separate xdp_redirect tracepoint in map case")
> Signed-off-by: Jason Gunthorpe <[email protected]>

Thanks! Fixed here already in the bpf tree:

https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/commit/?id=23721a755f98ac846897a013c92cccb281c1bcc8

> include/trace/events/xdp.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/include/trace/events/xdp.h b/include/trace/events/xdp.h
> index 4cd0f05d01134d..36b2a9043189be 100644
> --- a/include/trace/events/xdp.h
> +++ b/include/trace/events/xdp.h
> @@ -9,6 +9,8 @@
> #include <linux/filter.h>
> #include <linux/tracepoint.h>
>
> +struct bpf_map;
> +
> #define __XDP_ACT_MAP(FN) \
> FN(ABORTED) \
> FN(DROP) \
>

2017-12-01 19:48:54

by Steven Rostedt

Subject: Re: [PATCH] bpf: Fix compile warnings when !CONFIG_BPF_SYSCALL

On Fri, 1 Dec 2017 12:06:05 -0700
Jason Gunthorpe <[email protected]> wrote:

> Such as:
>
> In file included from ./include/trace/events/xdp.h:10:0,
> from ./include/linux/bpf_trace.h:6,
> from drivers/net/ethernet/intel/i40e/i40e_txrx.c:29:
> ./include/trace/events/xdp.h:94:17: warning: ‘struct bpf_map’ declared inside parameter list
> const struct bpf_map *map, u32 map_index),
> ^
>
> By adding a forward declaration for struct bpf_map. In the
> CONFIG_BPF_SYSCALL case the declaration comes in via
> trace/events/bpf.h

This was already fixed:

http://lkml.kernel.org/r/[email protected]

-- Steve

>
> Fixes: 59a308967589 ("xdp: separate xdp_redirect tracepoint in map case")
> Signed-off-by: Jason Gunthorpe <[email protected]>
> ---
> include/trace/events/xdp.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/include/trace/events/xdp.h b/include/trace/events/xdp.h
> index 4cd0f05d01134d..36b2a9043189be 100644
> --- a/include/trace/events/xdp.h
> +++ b/include/trace/events/xdp.h
> @@ -9,6 +9,8 @@
> #include <linux/filter.h>
> #include <linux/tracepoint.h>
>
> +struct bpf_map;
> +
> #define __XDP_ACT_MAP(FN) \
> FN(ABORTED) \
> FN(DROP) \