2015-08-11 09:04:56

by xiakaixu

Subject: [PATCH v3 net-next] bpf: s390: Fix build error caused by the struct bpf_array member name changed

There is a build error that "'struct bpf_array' has no member
named 'prog'" on s390. In commit 2a36f0b92eb6 ("bpf: Make the
bpf_prog_array_map more generic"), the member 'prog' of struct
bpf_array is replaced by 'ptrs'. So this patch fixes it.

Fixes: 2a36f0b92eb6 ("bpf: Make the bpf_prog_array_map more generic")
Reported-by: Wu Fengguang <[email protected]>
Signed-off-by: Kaixu Xia <[email protected]>
---
arch/s390/net/bpf_jit_comp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

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);

--
1.8.3.4

2015-08-11 18:49:57

by David Miller

Subject: Re: [PATCH v3 net-next] bpf: s390: Fix build error caused by the struct bpf_array member name changed

From: Kaixu Xia <[email protected]>
Date: Tue, 11 Aug 2015 08:56:51 +0000

> There is a build error that "'struct bpf_array' has no member
> named 'prog'" on s390. In commit 2a36f0b92eb6 ("bpf: Make the
> bpf_prog_array_map more generic"), the member 'prog' of struct
> bpf_array is replaced by 'ptrs'. So this patch fixes it.
>
> Fixes: 2a36f0b92eb6 ("bpf: Make the bpf_prog_array_map more generic")
> Reported-by: Wu Fengguang <[email protected]>
> Signed-off-by: Kaixu Xia <[email protected]>

Applied, thanks.