| Message ID | 20190416091301.8992-1-bhole_prashant_q7@lab.ntt.co.jp |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf-next] bpf: use BPF_CAST_CALL for casting bpf call | expand |
> On Apr 16, 2019, at 2:13 AM, Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp> wrote: > > verifier.c uses BPF_CAST_CALL for casting bpf call except at one > place in jit_subprogs(). Let's use the macro for consistency. > > Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp> Acked-by: Song Liu <songliubraving@fb.com> > --- > kernel/bpf/verifier.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c > index c7220153c5b1..db301e9b5295 100644 > --- a/kernel/bpf/verifier.c > +++ b/kernel/bpf/verifier.c > @@ -7647,9 +7647,8 @@ static int jit_subprogs(struct bpf_verifier_env *env) > insn->src_reg != BPF_PSEUDO_CALL) > continue; > subprog = insn->off; > - insn->imm = (u64 (*)(u64, u64, u64, u64, u64)) > - func[subprog]->bpf_func - > - __bpf_call_base; > + insn->imm = BPF_CAST_CALL(func[subprog]->bpf_func) - > + __bpf_call_base; > } > > /* we use the aux data to keep a list of the start addresses > -- > 2.17.2 > >
On Tue, Apr 16, 2019 at 2:13 AM Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp> wrote: > > verifier.c uses BPF_CAST_CALL for casting bpf call except at one > place in jit_subprogs(). Let's use the macro for consistency. > > Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp> Applied. Thanks
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index c7220153c5b1..db301e9b5295 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -7647,9 +7647,8 @@ static int jit_subprogs(struct bpf_verifier_env *env) insn->src_reg != BPF_PSEUDO_CALL) continue; subprog = insn->off; - insn->imm = (u64 (*)(u64, u64, u64, u64, u64)) - func[subprog]->bpf_func - - __bpf_call_base; + insn->imm = BPF_CAST_CALL(func[subprog]->bpf_func) - + __bpf_call_base; } /* we use the aux data to keep a list of the start addresses
verifier.c uses BPF_CAST_CALL for casting bpf call except at one place in jit_subprogs(). Let's use the macro for consistency. Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp> --- kernel/bpf/verifier.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)