bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH bpf-next] selftests/bpf: Fix endianness issues in atomic tests
@ 2021-02-10  2:07 Ilya Leoshkevich
  2021-02-10 20:20 ` patchwork-bot+netdevbpf
  2021-02-10 20:28 ` Andrii Nakryiko
  0 siblings, 2 replies; 3+ messages in thread
From: Ilya Leoshkevich @ 2021-02-10  2:07 UTC (permalink / raw)
  To: Alexei Starovoitov, Daniel Borkmann
  Cc: bpf, Heiko Carstens, Vasily Gorbik, Ilya Leoshkevich

Atomic tests store a DW, but then load it back as a W from the same
address. This doesn't work on big-endian systems, and since the point
of those tests is not testing narrow loads, fix simply by loading a
DW.

Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Fixes: 98d666d05a1d ("bpf: Add tests for new BPF atomic operations")
---
 tools/testing/selftests/bpf/verifier/atomic_and.c | 2 +-
 tools/testing/selftests/bpf/verifier/atomic_or.c  | 2 +-
 tools/testing/selftests/bpf/verifier/atomic_xor.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/bpf/verifier/atomic_and.c b/tools/testing/selftests/bpf/verifier/atomic_and.c
index 600bc5e0f143..1bdc8e6684f7 100644
--- a/tools/testing/selftests/bpf/verifier/atomic_and.c
+++ b/tools/testing/selftests/bpf/verifier/atomic_and.c
@@ -7,7 +7,7 @@
 		BPF_MOV64_IMM(BPF_REG_1, 0x011),
 		BPF_ATOMIC_OP(BPF_DW, BPF_AND, BPF_REG_10, BPF_REG_1, -8),
 		/* if (val != 0x010) exit(2); */
-		BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_10, -8),
+		BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_10, -8),
 		BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0x010, 2),
 		BPF_MOV64_IMM(BPF_REG_0, 2),
 		BPF_EXIT_INSN(),
diff --git a/tools/testing/selftests/bpf/verifier/atomic_or.c b/tools/testing/selftests/bpf/verifier/atomic_or.c
index ebe6e51455ba..70f982e1f9f0 100644
--- a/tools/testing/selftests/bpf/verifier/atomic_or.c
+++ b/tools/testing/selftests/bpf/verifier/atomic_or.c
@@ -7,7 +7,7 @@
 		BPF_MOV64_IMM(BPF_REG_1, 0x011),
 		BPF_ATOMIC_OP(BPF_DW, BPF_OR, BPF_REG_10, BPF_REG_1, -8),
 		/* if (val != 0x111) exit(2); */
-		BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_10, -8),
+		BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_10, -8),
 		BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0x111, 2),
 		BPF_MOV64_IMM(BPF_REG_0, 2),
 		BPF_EXIT_INSN(),
diff --git a/tools/testing/selftests/bpf/verifier/atomic_xor.c b/tools/testing/selftests/bpf/verifier/atomic_xor.c
index eb791e547b47..74e8fb46694b 100644
--- a/tools/testing/selftests/bpf/verifier/atomic_xor.c
+++ b/tools/testing/selftests/bpf/verifier/atomic_xor.c
@@ -7,7 +7,7 @@
 		BPF_MOV64_IMM(BPF_REG_1, 0x011),
 		BPF_ATOMIC_OP(BPF_DW, BPF_XOR, BPF_REG_10, BPF_REG_1, -8),
 		/* if (val != 0x101) exit(2); */
-		BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_10, -8),
+		BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_10, -8),
 		BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0x101, 2),
 		BPF_MOV64_IMM(BPF_REG_0, 2),
 		BPF_EXIT_INSN(),
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH bpf-next] selftests/bpf: Fix endianness issues in atomic tests
  2021-02-10  2:07 [PATCH bpf-next] selftests/bpf: Fix endianness issues in atomic tests Ilya Leoshkevich
@ 2021-02-10 20:20 ` patchwork-bot+netdevbpf
  2021-02-10 20:28 ` Andrii Nakryiko
  1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-02-10 20:20 UTC (permalink / raw)
  To: Ilya Leoshkevich; +Cc: ast, daniel, bpf, heiko.carstens, gor

Hello:

This patch was applied to bpf/bpf-next.git (refs/heads/master):

On Wed, 10 Feb 2021 03:07:13 +0100 you wrote:
> Atomic tests store a DW, but then load it back as a W from the same
> address. This doesn't work on big-endian systems, and since the point
> of those tests is not testing narrow loads, fix simply by loading a
> DW.
> 
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> Fixes: 98d666d05a1d ("bpf: Add tests for new BPF atomic operations")
> 
> [...]

Here is the summary with links:
  - [bpf-next] selftests/bpf: Fix endianness issues in atomic tests
    https://git.kernel.org/bpf/bpf-next/c/45df30526825

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

* Re: [PATCH bpf-next] selftests/bpf: Fix endianness issues in atomic tests
  2021-02-10  2:07 [PATCH bpf-next] selftests/bpf: Fix endianness issues in atomic tests Ilya Leoshkevich
  2021-02-10 20:20 ` patchwork-bot+netdevbpf
@ 2021-02-10 20:28 ` Andrii Nakryiko
  1 sibling, 0 replies; 3+ messages in thread
From: Andrii Nakryiko @ 2021-02-10 20:28 UTC (permalink / raw)
  To: Ilya Leoshkevich
  Cc: Alexei Starovoitov, Daniel Borkmann, bpf, Heiko Carstens, Vasily Gorbik

On Tue, Feb 9, 2021 at 6:11 PM Ilya Leoshkevich <iii@linux.ibm.com> wrote:
>
> Atomic tests store a DW, but then load it back as a W from the same
> address. This doesn't work on big-endian systems, and since the point
> of those tests is not testing narrow loads, fix simply by loading a
> DW.
>
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> Fixes: 98d666d05a1d ("bpf: Add tests for new BPF atomic operations")
> ---

Applied to bpf-next.

>  tools/testing/selftests/bpf/verifier/atomic_and.c | 2 +-
>  tools/testing/selftests/bpf/verifier/atomic_or.c  | 2 +-
>  tools/testing/selftests/bpf/verifier/atomic_xor.c | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-02-10 20:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-10  2:07 [PATCH bpf-next] selftests/bpf: Fix endianness issues in atomic tests Ilya Leoshkevich
2021-02-10 20:20 ` patchwork-bot+netdevbpf
2021-02-10 20:28 ` Andrii Nakryiko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).