* [PATCH bpf-next] bpf: change 'BPF_ADD' to 'BPF_AND' in print_bpf_insn()
@ 2021-01-27 2:25 menglong8.dong
2021-01-27 11:53 ` Brendan Jackman
2021-01-27 21:30 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: menglong8.dong @ 2021-01-27 2:25 UTC (permalink / raw)
To: ast
Cc: daniel, andrii, kafai, songliubraving, yhs, john.fastabend,
kpsingh, jackmanb, netdev, bpf, linux-kernel, Menglong Dong
From: Menglong Dong <dong.menglong@zte.com.cn>
This 'BPF_ADD' is duplicated, and I belive it should be 'BPF_AND'.
Fixes: 981f94c3e921 ("bpf: Add bitwise atomic instructions")
Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
---
kernel/bpf/disasm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/bpf/disasm.c b/kernel/bpf/disasm.c
index 19ff8fed7f4b..3acc7e0b6916 100644
--- a/kernel/bpf/disasm.c
+++ b/kernel/bpf/disasm.c
@@ -161,7 +161,7 @@ void print_bpf_insn(const struct bpf_insn_cbs *cbs,
insn->dst_reg,
insn->off, insn->src_reg);
else if (BPF_MODE(insn->code) == BPF_ATOMIC &&
- (insn->imm == BPF_ADD || insn->imm == BPF_ADD ||
+ (insn->imm == BPF_ADD || insn->imm == BPF_AND ||
insn->imm == BPF_OR || insn->imm == BPF_XOR)) {
verbose(cbs->private_data, "(%02x) lock *(%s *)(r%d %+d) %s r%d\n",
insn->code,
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH bpf-next] bpf: change 'BPF_ADD' to 'BPF_AND' in print_bpf_insn()
2021-01-27 2:25 [PATCH bpf-next] bpf: change 'BPF_ADD' to 'BPF_AND' in print_bpf_insn() menglong8.dong
@ 2021-01-27 11:53 ` Brendan Jackman
2021-01-27 21:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Brendan Jackman @ 2021-01-27 11:53 UTC (permalink / raw)
To: menglong8.dong
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, kafai,
songliubraving, Yonghong Song, John Fastabend, KP Singh, netdev,
bpf, LKML, Menglong Dong
Thanks!
On Wed, 27 Jan 2021 at 03:25, <menglong8.dong@gmail.com> wrote:
>
> From: Menglong Dong <dong.menglong@zte.com.cn>
>
> This 'BPF_ADD' is duplicated, and I belive it should be 'BPF_AND'.
>
> Fixes: 981f94c3e921 ("bpf: Add bitwise atomic instructions")
> Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
Acked-by: Brendan Jackman <jackmanb@google.com>
> ---
> kernel/bpf/disasm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/bpf/disasm.c b/kernel/bpf/disasm.c
> index 19ff8fed7f4b..3acc7e0b6916 100644
> --- a/kernel/bpf/disasm.c
> +++ b/kernel/bpf/disasm.c
> @@ -161,7 +161,7 @@ void print_bpf_insn(const struct bpf_insn_cbs *cbs,
> insn->dst_reg,
> insn->off, insn->src_reg);
> else if (BPF_MODE(insn->code) == BPF_ATOMIC &&
> - (insn->imm == BPF_ADD || insn->imm == BPF_ADD ||
> + (insn->imm == BPF_ADD || insn->imm == BPF_AND ||
> insn->imm == BPF_OR || insn->imm == BPF_XOR)) {
> verbose(cbs->private_data, "(%02x) lock *(%s *)(r%d %+d) %s r%d\n",
> insn->code,
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH bpf-next] bpf: change 'BPF_ADD' to 'BPF_AND' in print_bpf_insn()
2021-01-27 2:25 [PATCH bpf-next] bpf: change 'BPF_ADD' to 'BPF_AND' in print_bpf_insn() menglong8.dong
2021-01-27 11:53 ` Brendan Jackman
@ 2021-01-27 21:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-01-27 21:30 UTC (permalink / raw)
To: Menglong Dong
Cc: ast, daniel, andrii, kafai, songliubraving, yhs, john.fastabend,
kpsingh, jackmanb, netdev, bpf, linux-kernel, dong.menglong
Hello:
This patch was applied to bpf/bpf-next.git (refs/heads/master):
On Tue, 26 Jan 2021 18:25:07 -0800 you wrote:
> From: Menglong Dong <dong.menglong@zte.com.cn>
>
> This 'BPF_ADD' is duplicated, and I belive it should be 'BPF_AND'.
>
> Fixes: 981f94c3e921 ("bpf: Add bitwise atomic instructions")
> Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
>
> [...]
Here is the summary with links:
- [bpf-next] bpf: change 'BPF_ADD' to 'BPF_AND' in print_bpf_insn()
https://git.kernel.org/bpf/bpf-next/c/60e578e82b7d
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-27 21:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-27 2:25 [PATCH bpf-next] bpf: change 'BPF_ADD' to 'BPF_AND' in print_bpf_insn() menglong8.dong
2021-01-27 11:53 ` Brendan Jackman
2021-01-27 21:30 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox