| Message ID | 1512006089-180279-1-git-send-email-xiexiuqi@huawei.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [resend] trace/xdp: fix compile warning: 'struct bpf_map' declared inside parameter list | expand |
On 11/30/2017 02:41 AM, Xie XiuQi wrote: > We meet this compile warning, which caused by missing bpf.h in xdp.h. > > 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:93:17: warning: ‘struct bpf_map’ declared inside parameter list will not be visible outside of this definition or declaration > const struct bpf_map *map, u32 map_index), > ^ > ./include/linux/tracepoint.h:187:34: note: in definition of macro ‘__DECLARE_TRACE’ > static inline void trace_##name(proto) \ > ^~~~~ > ./include/linux/tracepoint.h:352:24: note: in expansion of macro ‘PARAMS’ > __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \ > ^~~~~~ > ./include/linux/tracepoint.h:477:2: note: in expansion of macro ‘DECLARE_TRACE’ > DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) > ^~~~~~~~~~~~~ > ./include/linux/tracepoint.h:477:22: note: in expansion of macro ‘PARAMS’ > DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) > ^~~~~~ > ./include/trace/events/xdp.h:89:1: note: in expansion of macro ‘DEFINE_EVENT’ > DEFINE_EVENT(xdp_redirect_template, xdp_redirect, > ^~~~~~~~~~~~ > ./include/trace/events/xdp.h:90:2: note: in expansion of macro ‘TP_PROTO’ > TP_PROTO(const struct net_device *dev, > ^~~~~~~~ > ./include/trace/events/xdp.h:93:17: warning: ‘struct bpf_map’ declared inside parameter list will not be visible outside of this definition or declaration > const struct bpf_map *map, u32 map_index), > ^ > ./include/linux/tracepoint.h:203:38: note: in definition of macro ‘__DECLARE_TRACE’ > register_trace_##name(void (*probe)(data_proto), void *data) \ > ^~~~~~~~~~ > ./include/linux/tracepoint.h:354:4: note: in expansion of macro ‘PARAMS’ > PARAMS(void *__data, proto), \ > ^~~~~~ > > Reported-by: Huang Daode <huangdaode@hisilicon.com> > Cc: Hanjun Guo <guohanjun@huawei.com> > Fixes: 8d3b778ff544 ("xdp: tracepoint xdp_redirect also need a map argument") > Signed-off-by: Xie XiuQi <xiexiuqi@huawei.com> > Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> > Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Applied to bpf tree, thanks Xie!
diff --git a/include/trace/events/xdp.h b/include/trace/events/xdp.h index 4cd0f05..8989a92 100644 --- a/include/trace/events/xdp.h +++ b/include/trace/events/xdp.h @@ -8,6 +8,7 @@ #include <linux/netdevice.h> #include <linux/filter.h> #include <linux/tracepoint.h> +#include <linux/bpf.h> #define __XDP_ACT_MAP(FN) \ FN(ABORTED) \
We meet this compile warning, which caused by missing bpf.h in xdp.h. 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:93:17: warning: ‘struct bpf_map’ declared inside parameter list will not be visible outside of this definition or declaration const struct bpf_map *map, u32 map_index), ^ ./include/linux/tracepoint.h:187:34: note: in definition of macro ‘__DECLARE_TRACE’ static inline void trace_##name(proto) \ ^~~~~ ./include/linux/tracepoint.h:352:24: note: in expansion of macro ‘PARAMS’ __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \ ^~~~~~ ./include/linux/tracepoint.h:477:2: note: in expansion of macro ‘DECLARE_TRACE’ DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) ^~~~~~~~~~~~~ ./include/linux/tracepoint.h:477:22: note: in expansion of macro ‘PARAMS’ DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) ^~~~~~ ./include/trace/events/xdp.h:89:1: note: in expansion of macro ‘DEFINE_EVENT’ DEFINE_EVENT(xdp_redirect_template, xdp_redirect, ^~~~~~~~~~~~ ./include/trace/events/xdp.h:90:2: note: in expansion of macro ‘TP_PROTO’ TP_PROTO(const struct net_device *dev, ^~~~~~~~ ./include/trace/events/xdp.h:93:17: warning: ‘struct bpf_map’ declared inside parameter list will not be visible outside of this definition or declaration const struct bpf_map *map, u32 map_index), ^ ./include/linux/tracepoint.h:203:38: note: in definition of macro ‘__DECLARE_TRACE’ register_trace_##name(void (*probe)(data_proto), void *data) \ ^~~~~~~~~~ ./include/linux/tracepoint.h:354:4: note: in expansion of macro ‘PARAMS’ PARAMS(void *__data, proto), \ ^~~~~~ Reported-by: Huang Daode <huangdaode@hisilicon.com> Cc: Hanjun Guo <guohanjun@huawei.com> Fixes: 8d3b778ff544 ("xdp: tracepoint xdp_redirect also need a map argument") Signed-off-by: Xie XiuQi <xiexiuqi@huawei.com> Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org> --- include/trace/events/xdp.h | 1 + 1 file changed, 1 insertion(+)