| Message ID | 1439276026-60789-1-git-send-email-xiakaixu@huawei.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On 08/11/2015 08:53 AM, Kaixu Xia wrote: > There is a build error that "'struct bpf_array' has no member > named 'prog'" on s390. In commit 2a36f0b, the member 'prog' of > struct bpf_array is replaced by 'ptrs'. So this patch fixes it. > > Signed-off-by: Kaixu Xia <xiakaixu@huawei.com> You were also asked to add a proper Fixes tag : Fixes: 2a36f0b92eb6 ("bpf: Make the bpf_prog_array_map more generic") I guess this bug was reported by Fengguang as you have him in Cc ? If that should be the case, then please also add a "Reported-by:" tag for his bug report. Code looks good to me. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
δΊ 2015/8/11 16:24, Daniel Borkmann ει: > On 08/11/2015 08:53 AM, Kaixu Xia wrote: >> There is a build error that "'struct bpf_array' has no member >> named 'prog'" on s390. In commit 2a36f0b, the member 'prog' of >> struct bpf_array is replaced by 'ptrs'. So this patch fixes it. >> >> Signed-off-by: Kaixu Xia <xiakaixu@huawei.com> > > You were also asked to add a proper Fixes tag : > > Fixes: 2a36f0b92eb6 ("bpf: Make the bpf_prog_array_map more generic") > > I guess this bug was reported by Fengguang as you have him in Cc ? > > If that should be the case, then please also add a "Reported-by:" tag > for his bug report. > > Code looks good to me. Thanks for your review. Will follow them in the resubmit version. > > . > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 9f4bbc0..eeda051 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -1032,7 +1032,7 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i MAX_TAIL_CALL_CNT, 0, 0x2); /* - * prog = array->prog[index]; + * prog = array->ptrs[index]; * if (prog == NULL) * goto out; */ @@ -1041,7 +1041,7 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i EMIT6_DISP_LH(0xeb000000, 0x000d, REG_1, BPF_REG_3, REG_0, 3); /* lg %r1,prog(%b2,%r1) */ EMIT6_DISP_LH(0xe3000000, 0x0004, REG_1, BPF_REG_2, - REG_1, offsetof(struct bpf_array, prog)); + REG_1, offsetof(struct bpf_array, ptrs)); /* clgij %r1,0,0x8,label0 */ EMIT6_PCREL_IMM_LABEL(0xec000000, 0x007d, REG_1, 0, 0, 0x8);
There is a build error that "'struct bpf_array' has no member named 'prog'" on s390. In commit 2a36f0b, the member 'prog' of struct bpf_array is replaced by 'ptrs'. So this patch fixes it. Signed-off-by: Kaixu Xia <xiakaixu@huawei.com> --- arch/s390/net/bpf_jit_comp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)