Message ID | 20180529024018.12740-1-yuehaibing@huawei.com |
---|---|
State | Accepted, archived |
Delegated to: | BPF Maintainers |
Headers | show |
Series | [bpf-next] bpf: hide the unused 'off' variable | expand |
On Tue, May 29, 2018 at 4:40 AM, YueHaibing <yuehaibing@huawei.com> wrote: > The local variable is only used while CONFIG_IPV6 enabled > > net/core/filter.c: In function ‘sk_msg_convert_ctx_access’: > net/core/filter.c:6489:6: warning: unused variable ‘off’ [-Wunused-variable] > int off; > ^ > This puts it into #ifdef. > > Fixes: 303def35f64e ("bpf: allow sk_msg programs to read sock fields") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> I was about to send the same patch and found you had already sent one. Acked-by: Arnd Bergmann <arnd@arndb.de>
On 05/29/2018 03:35 AM, Arnd Bergmann wrote: > On Tue, May 29, 2018 at 4:40 AM, YueHaibing <yuehaibing@huawei.com> wrote: >> The local variable is only used while CONFIG_IPV6 enabled >> >> net/core/filter.c: In function ‘sk_msg_convert_ctx_access’: >> net/core/filter.c:6489:6: warning: unused variable ‘off’ [-Wunused-variable] >> int off; >> ^ >> This puts it into #ifdef. >> >> Fixes: 303def35f64e ("bpf: allow sk_msg programs to read sock fields") >> Signed-off-by: YueHaibing <yuehaibing@huawei.com> > > I was about to send the same patch and found you had already sent one. > > Acked-by: Arnd Bergmann <arnd@arndb.de> > Thanks! I'm curious why kbuild bot didn't catch this. Will try to dig into that in a bit. Acked-by: John Fastabend <john.fastabend@gmail.com>
On Tue, May 29, 2018 at 8:53 AM, John Fastabend <john.fastabend@gmail.com> wrote: > On 05/29/2018 03:35 AM, Arnd Bergmann wrote: >> On Tue, May 29, 2018 at 4:40 AM, YueHaibing <yuehaibing@huawei.com> wrote: >>> The local variable is only used while CONFIG_IPV6 enabled >>> >>> net/core/filter.c: In function ‘sk_msg_convert_ctx_access’: >>> net/core/filter.c:6489:6: warning: unused variable ‘off’ [-Wunused-variable] >>> int off; >>> ^ >>> This puts it into #ifdef. >>> >>> Fixes: 303def35f64e ("bpf: allow sk_msg programs to read sock fields") >>> Signed-off-by: YueHaibing <yuehaibing@huawei.com> >> >> I was about to send the same patch and found you had already sent one. >> >> Acked-by: Arnd Bergmann <arnd@arndb.de> >> > > Thanks! I'm curious why kbuild bot didn't catch this. Will > try to dig into that in a bit. > > Acked-by: John Fastabend <john.fastabend@gmail.com> Acked-by: Song Liu <songliubraving@fb.com>
On 05/29/2018 08:18 PM, Song Liu wrote: > On Tue, May 29, 2018 at 8:53 AM, John Fastabend > <john.fastabend@gmail.com> wrote: >> On 05/29/2018 03:35 AM, Arnd Bergmann wrote: >>> On Tue, May 29, 2018 at 4:40 AM, YueHaibing <yuehaibing@huawei.com> wrote: >>>> The local variable is only used while CONFIG_IPV6 enabled >>>> >>>> net/core/filter.c: In function ‘sk_msg_convert_ctx_access’: >>>> net/core/filter.c:6489:6: warning: unused variable ‘off’ [-Wunused-variable] >>>> int off; >>>> ^ >>>> This puts it into #ifdef. >>>> >>>> Fixes: 303def35f64e ("bpf: allow sk_msg programs to read sock fields") >>>> Signed-off-by: YueHaibing <yuehaibing@huawei.com> >>> >>> I was about to send the same patch and found you had already sent one. >>> >>> Acked-by: Arnd Bergmann <arnd@arndb.de> >> >> Thanks! I'm curious why kbuild bot didn't catch this. Will >> try to dig into that in a bit. >> >> Acked-by: John Fastabend <john.fastabend@gmail.com> > > Acked-by: Song Liu <songliubraving@fb.com> Applied to bpf-next, thanks Yue!
diff --git a/net/core/filter.c b/net/core/filter.c index 24e6ce8..0ce93ed 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -6486,7 +6486,9 @@ static u32 sk_msg_convert_ctx_access(enum bpf_access_type type, struct bpf_prog *prog, u32 *target_size) { struct bpf_insn *insn = insn_buf; +#if IS_ENABLED(CONFIG_IPV6) int off; +#endif switch (si->off) { case offsetof(struct sk_msg_md, data):
The local variable is only used while CONFIG_IPV6 enabled net/core/filter.c: In function ‘sk_msg_convert_ctx_access’: net/core/filter.c:6489:6: warning: unused variable ‘off’ [-Wunused-variable] int off; ^ This puts it into #ifdef. Fixes: 303def35f64e ("bpf: allow sk_msg programs to read sock fields") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- net/core/filter.c | 2 ++ 1 file changed, 2 insertions(+)