From nobody Sun Dec 22 07:45:46 2024 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 11BFB225D7 for ; Sat, 21 Dec 2024 01:26:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734744392; cv=none; b=ZAIBlpjb3LIV0ZNud0ZTuXMgm62TtKXyJ51TRqR7db/8IT5hyjoNYrbFsYuaCXr1C5H6hZzFXCxScIQfV/RkgBxHbWVo9/Ro0WN+Tw91RV5Anuu0aEIyAuEWOYxq7THE8RsCidsbHb4vtYIMuIDbJnhXgsAzg2DP3Qu5lNzHgvk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734744392; c=relaxed/simple; bh=J0uIY6A8JDdMj0JP8IBJHPjr9rJz9TpI6m3buHqW2A4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=kUYOLoRzWOt8Zu7cTO/hN9nLFEICHzpMcHw3/eip9trGo53/q/XmqIRh9tJwh1mrGLMOk4fCXis5Ktxw1znR78LQpvTahMFpV/wQjldmlBYWYDzG4FKjNx/4CEsNlYWZODLipjFgmQWr41anP5RlAilo0geevFskXsAqh4pCtcs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--yepeilin.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=l2cb+nCJ; arc=none smtp.client-ip=209.85.215.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--yepeilin.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="l2cb+nCJ" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-7f8af3950ecso1669579a12.3 for ; Fri, 20 Dec 2024 17:26:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1734744389; x=1735349189; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=VR7rs6YOw8kz1O0c5Uzbutq8ohP0Q1FipY0UTTgo7LE=; b=l2cb+nCJSik41QOImqI8GxGYRNfi/n/g2fus62qMU7mZVrR0BBzfhm9qk4ZyBGGqz7 3BGG66HDRcaq8X3YfSufQwZDBiGVGiOPYA7RAFqShsBePjk+3pSBe8hvt0dobWL6bde9 KzSrN733tpuqxH0lS2xCPEa7uHmdlq481mjoeWT8GYmE/5fLcnpmXim8RSlD+AqwN+YJ CvhY0f6vc7Fmgk1DbFODRV16tJvvObGi+qVbtVNbO8kCh4vDz+abCg68xnBleXMuS7ub 9DJ6n8WTeenBukJsa4gzpxdvgJvsIUgf3Js1rsw7oySRbEadkd1ieynIHyzbcoPu0Fzo gHwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734744389; x=1735349189; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VR7rs6YOw8kz1O0c5Uzbutq8ohP0Q1FipY0UTTgo7LE=; b=ElNpvc/xwQzj1HD9ew3eqBU5R5ggNG6xcHn6pltMPsrTqNeHKSmswuq/liuqBWUgwB XvVrqRfTGFf5jtoaYY9CqD0SUas1T6z8k+U/Bu2ZoLD7OR74IgWItnFIzbEKL+OakCa2 ccwHjdSbrOH/Ml1Pn8qJI83cu6uK0Z+QkLZLEqTtaTELm6tE4uHkeI4z7nVkMwILufsZ wH1kfgmU35m5yHOanDf3wl8SI8tmZ1Y76DQAau/4OQaR23q3qYzAejuMlxirQeEsyl3T wfMWemrUZ58v1YM0Z8mb58tSlo4/4FGCQP9ptKwRKanJWf6UvFOFS5Rqp+cxzg7/foTC l54w== X-Forwarded-Encrypted: i=1; AJvYcCWxexbwXWJ/NJ7D3s7ItudHLO5w0cmKkncHKPk5i8+xR9ShNmmgJQTB14AWUvNTaav6NNX6OBzpq0YIbPU=@vger.kernel.org X-Gm-Message-State: AOJu0YwERUH6X3OYeg1KDyaKCw0lsUGjZoBRs/Fu3roiNJoO3qjDDfue ypyizbVUDneNZEtnNTm7XS4w3S/WYXbXAmpdij1QtOy8gc3rcoBObzw9oIBens1bkOQxbjvmO6/ dj+rHpT/GGw== X-Google-Smtp-Source: AGHT+IHGZp1lynJxLzXDf8EUHjWFT+6nZOfXQ5lWLeGO4NjDXJwuXl7Ffxd61IwVMu1NkWUgA5vbthCTJTEeJA== X-Received: from pgab186.prod.google.com ([2002:a63:34c3:0:b0:7fd:4e21:2f5a]) (user=yepeilin job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:d045:b0:1e4:8fda:78ea with SMTP id adf61e73a8af0-1e5e08661eemr9682713637.46.1734744389307; Fri, 20 Dec 2024 17:26:29 -0800 (PST) Date: Sat, 21 Dec 2024 01:26:13 +0000 In-Reply-To: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Message-ID: <114f23ac20d73eeb624a9677e39a87b766f4bcc2.1734742802.git.yepeilin@google.com> Subject: [PATCH RFC bpf-next v1 4/4] selftests/bpf: Add selftests for load-acquire and store-release instructions From: Peilin Ye To: bpf@vger.kernel.org Cc: Peilin Ye , Alexei Starovoitov , Eduard Zingerman , Song Liu , Yonghong Song , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , "Paul E. McKenney" , Puranjay Mohan , Xu Kuohai , Catalin Marinas , Will Deacon , Quentin Monnet , Mykola Lysenko , Shuah Khan , Josh Don , Barret Rhoden , Neel Natu , Benjamin Segall , David Vernet , Dave Marchevsky , linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add the following ./test_progs tests: * atomics/load_acquire * atomics/store_release * arena_atomics/load_acquire * arena_atomics/store_release They depend on the pre-defined __BPF_FEATURE_LOAD_ACQ_STORE_REL feature macro, which implies -mcpu>=3Dv4. $ ALLOWLIST=3Datomics/load_acquire,atomics/store_release, $ ALLOWLIST+=3Darena_atomics/load_acquire,arena_atomics/store_release $ ./test_progs-cpuv4 -a $ALLOWLIST #3/9 arena_atomics/load_acquire:OK #3/10 arena_atomics/store_release:OK ... #10/8 atomics/load_acquire:OK #10/9 atomics/store_release:OK $ ./test_progs -v -a $ALLOWLIST test_load_acquire:SKIP:Clang does not support BPF load-acquire or addr_sp= ace_cast #3/9 arena_atomics/load_acquire:SKIP test_store_release:SKIP:Clang does not support BPF store-release or addr_= space_cast #3/10 arena_atomics/store_release:SKIP ... test_load_acquire:SKIP:Clang does not support BPF load-acquire #10/8 atomics/load_acquire:SKIP test_store_release:SKIP:Clang does not support BPF store-release #10/9 atomics/store_release:SKIP Additionally, add several ./test_verifier tests: #65/u atomic BPF_LOAD_ACQ access through non-pointer OK #65/p atomic BPF_LOAD_ACQ access through non-pointer OK #66/u atomic BPF_STORE_REL access through non-pointer OK #66/p atomic BPF_STORE_REL access through non-pointer OK #67/u BPF_ATOMIC load-acquire, 8-bit OK #67/p BPF_ATOMIC load-acquire, 8-bit OK #68/u BPF_ATOMIC load-acquire, 16-bit OK #68/p BPF_ATOMIC load-acquire, 16-bit OK #69/u BPF_ATOMIC load-acquire, 32-bit OK #69/p BPF_ATOMIC load-acquire, 32-bit OK #70/u BPF_ATOMIC load-acquire, 64-bit OK #70/p BPF_ATOMIC load-acquire, 64-bit OK #71/u Cannot load-acquire from uninitialized src_reg OK #71/p Cannot load-acquire from uninitialized src_reg OK #76/u BPF_ATOMIC store-release, 8-bit OK #76/p BPF_ATOMIC store-release, 8-bit OK #77/u BPF_ATOMIC store-release, 16-bit OK #77/p BPF_ATOMIC store-release, 16-bit OK #78/u BPF_ATOMIC store-release, 32-bit OK #78/p BPF_ATOMIC store-release, 32-bit OK #79/u BPF_ATOMIC store-release, 64-bit OK #79/p BPF_ATOMIC store-release, 64-bit OK #80/u Cannot store-release from uninitialized src_reg OK #80/p Cannot store-release from uninitialized src_reg OK Reviewed-by: Josh Don Signed-off-by: Peilin Ye --- include/linux/filter.h | 2 + .../selftests/bpf/prog_tests/arena_atomics.c | 61 +++++++++++++++- .../selftests/bpf/prog_tests/atomics.c | 57 ++++++++++++++- .../selftests/bpf/progs/arena_atomics.c | 62 +++++++++++++++- tools/testing/selftests/bpf/progs/atomics.c | 62 +++++++++++++++- .../selftests/bpf/verifier/atomic_invalid.c | 26 +++---- .../selftests/bpf/verifier/atomic_load.c | 71 +++++++++++++++++++ .../selftests/bpf/verifier/atomic_store.c | 70 ++++++++++++++++++ 8 files changed, 393 insertions(+), 18 deletions(-) create mode 100644 tools/testing/selftests/bpf/verifier/atomic_load.c create mode 100644 tools/testing/selftests/bpf/verifier/atomic_store.c diff --git a/include/linux/filter.h b/include/linux/filter.h index 0477254bc2d3..c264d723dc9e 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -364,6 +364,8 @@ static inline bool insn_is_cast_user(const struct bpf_i= nsn *insn) * BPF_XOR | BPF_FETCH src_reg =3D atomic_fetch_xor(dst_reg + off16= , src_reg); * BPF_XCHG src_reg =3D atomic_xchg(dst_reg + off16, src= _reg) * BPF_CMPXCHG r0 =3D atomic_cmpxchg(dst_reg + off16, r0, s= rc_reg) + * BPF_LOAD_ACQ dst_reg =3D smp_load_acquire(src_reg + off16) + * BPF_STORE_REL smp_store_release(dst_reg + off16, src_reg) */ =20 #define BPF_ATOMIC_OP(SIZE, OP, DST, SRC, OFF) \ diff --git a/tools/testing/selftests/bpf/prog_tests/arena_atomics.c b/tools= /testing/selftests/bpf/prog_tests/arena_atomics.c index 26e7c06c6cb4..81d3575d7652 100644 --- a/tools/testing/selftests/bpf/prog_tests/arena_atomics.c +++ b/tools/testing/selftests/bpf/prog_tests/arena_atomics.c @@ -162,6 +162,60 @@ static void test_uaf(struct arena_atomics *skel) ASSERT_EQ(skel->arena->uaf_recovery_fails, 0, "uaf_recovery_fails"); } =20 +static void test_load_acquire(struct arena_atomics *skel) +{ + LIBBPF_OPTS(bpf_test_run_opts, topts); + int err, prog_fd; + + if (skel->data->skip_lacq_srel_tests) { + printf("%s:SKIP:Clang does not support BPF load-acquire or addr_space_ca= st\n", + __func__); + test__skip(); + return; + } + + /* No need to attach it, just run it directly */ + prog_fd =3D bpf_program__fd(skel->progs.load_acquire); + err =3D bpf_prog_test_run_opts(prog_fd, &topts); + if (!ASSERT_OK(err, "test_run_opts err")) + return; + if (!ASSERT_OK(topts.retval, "test_run_opts retval")) + return; + + ASSERT_EQ(skel->arena->load_acquire8_result, 0x12, "load_acquire8_result"= ); + ASSERT_EQ(skel->arena->load_acquire16_result, 0x1234, "load_acquire16_res= ult"); + ASSERT_EQ(skel->arena->load_acquire32_result, 0x12345678, "load_acquire32= _result"); + ASSERT_EQ(skel->arena->load_acquire64_result, 0x1234567890abcdef, + "load_acquire64_result"); +} + +static void test_store_release(struct arena_atomics *skel) +{ + LIBBPF_OPTS(bpf_test_run_opts, topts); + int err, prog_fd; + + if (skel->data->skip_lacq_srel_tests) { + printf("%s:SKIP:Clang does not support BPF store-release or addr_space_c= ast\n", + __func__); + test__skip(); + return; + } + + /* No need to attach it, just run it directly */ + prog_fd =3D bpf_program__fd(skel->progs.store_release); + err =3D bpf_prog_test_run_opts(prog_fd, &topts); + if (!ASSERT_OK(err, "test_run_opts err")) + return; + if (!ASSERT_OK(topts.retval, "test_run_opts retval")) + return; + + ASSERT_EQ(skel->arena->store_release8_result, 0x12, "store_release8_resul= t"); + ASSERT_EQ(skel->arena->store_release16_result, 0x1234, "store_release16_r= esult"); + ASSERT_EQ(skel->arena->store_release32_result, 0x12345678, "store_release= 32_result"); + ASSERT_EQ(skel->arena->store_release64_result, 0x1234567890abcdef, + "store_release64_result"); +} + void test_arena_atomics(void) { struct arena_atomics *skel; @@ -171,7 +225,7 @@ void test_arena_atomics(void) if (!ASSERT_OK_PTR(skel, "arena atomics skeleton open")) return; =20 - if (skel->data->skip_tests) { + if (skel->data->skip_all_tests) { printf("%s:SKIP:no ENABLE_ATOMICS_TESTS or no addr_space_cast support in= clang", __func__); test__skip(); @@ -199,6 +253,11 @@ void test_arena_atomics(void) if (test__start_subtest("uaf")) test_uaf(skel); =20 + if (test__start_subtest("load_acquire")) + test_load_acquire(skel); + if (test__start_subtest("store_release")) + test_store_release(skel); + cleanup: arena_atomics__destroy(skel); } diff --git a/tools/testing/selftests/bpf/prog_tests/atomics.c b/tools/testi= ng/selftests/bpf/prog_tests/atomics.c index 13e101f370a1..5d7cff3eed2b 100644 --- a/tools/testing/selftests/bpf/prog_tests/atomics.c +++ b/tools/testing/selftests/bpf/prog_tests/atomics.c @@ -162,6 +162,56 @@ static void test_xchg(struct atomics_lskel *skel) ASSERT_EQ(skel->bss->xchg32_result, 1, "xchg32_result"); } =20 +static void test_load_acquire(struct atomics_lskel *skel) +{ + LIBBPF_OPTS(bpf_test_run_opts, topts); + int err, prog_fd; + + if (skel->data->skip_lacq_srel_tests) { + printf("%s:SKIP:Clang does not support BPF load-acquire\n", __func__); + test__skip(); + return; + } + + /* No need to attach it, just run it directly */ + prog_fd =3D skel->progs.load_acquire.prog_fd; + err =3D bpf_prog_test_run_opts(prog_fd, &topts); + if (!ASSERT_OK(err, "test_run_opts err")) + return; + if (!ASSERT_OK(topts.retval, "test_run_opts retval")) + return; + + ASSERT_EQ(skel->bss->load_acquire8_result, 0x12, "load_acquire8_result"); + ASSERT_EQ(skel->bss->load_acquire16_result, 0x1234, "load_acquire16_resul= t"); + ASSERT_EQ(skel->bss->load_acquire32_result, 0x12345678, "load_acquire32_r= esult"); + ASSERT_EQ(skel->bss->load_acquire64_result, 0x1234567890abcdef, "load_acq= uire64_result"); +} + +static void test_store_release(struct atomics_lskel *skel) +{ + LIBBPF_OPTS(bpf_test_run_opts, topts); + int err, prog_fd; + + if (skel->data->skip_lacq_srel_tests) { + printf("%s:SKIP:Clang does not support BPF store-release\n", __func__); + test__skip(); + return; + } + + /* No need to attach it, just run it directly */ + prog_fd =3D skel->progs.store_release.prog_fd; + err =3D bpf_prog_test_run_opts(prog_fd, &topts); + if (!ASSERT_OK(err, "test_run_opts err")) + return; + if (!ASSERT_OK(topts.retval, "test_run_opts retval")) + return; + + ASSERT_EQ(skel->bss->store_release8_result, 0x12, "store_release8_result"= ); + ASSERT_EQ(skel->bss->store_release16_result, 0x1234, "store_release16_res= ult"); + ASSERT_EQ(skel->bss->store_release32_result, 0x12345678, "store_release32= _result"); + ASSERT_EQ(skel->bss->store_release64_result, 0x1234567890abcdef, "store_r= elease64_result"); +} + void test_atomics(void) { struct atomics_lskel *skel; @@ -170,7 +220,7 @@ void test_atomics(void) if (!ASSERT_OK_PTR(skel, "atomics skeleton load")) return; =20 - if (skel->data->skip_tests) { + if (skel->data->skip_all_tests) { printf("%s:SKIP:no ENABLE_ATOMICS_TESTS (missing Clang BPF atomics suppo= rt)", __func__); test__skip(); @@ -193,6 +243,11 @@ void test_atomics(void) if (test__start_subtest("xchg")) test_xchg(skel); =20 + if (test__start_subtest("load_acquire")) + test_load_acquire(skel); + if (test__start_subtest("store_release")) + test_store_release(skel); + cleanup: atomics_lskel__destroy(skel); } diff --git a/tools/testing/selftests/bpf/progs/arena_atomics.c b/tools/test= ing/selftests/bpf/progs/arena_atomics.c index 40dd57fca5cc..fe8b67d9c87b 100644 --- a/tools/testing/selftests/bpf/progs/arena_atomics.c +++ b/tools/testing/selftests/bpf/progs/arena_atomics.c @@ -19,9 +19,15 @@ struct { } arena SEC(".maps"); =20 #if defined(ENABLE_ATOMICS_TESTS) && defined(__BPF_FEATURE_ADDR_SPACE_CAST) -bool skip_tests __attribute((__section__(".data"))) =3D false; +bool skip_all_tests __attribute((__section__(".data"))) =3D false; #else -bool skip_tests =3D true; +bool skip_all_tests =3D true; +#endif + +#if defined(__BPF_FEATURE_LOAD_ACQ_STORE_REL) && defined(__BPF_FEATURE_ADD= R_SPACE_CAST) +bool skip_lacq_srel_tests __attribute((__section__(".data"))) =3D false; +#else +bool skip_lacq_srel_tests =3D true; #endif =20 __u32 pid =3D 0; @@ -274,4 +280,56 @@ int uaf(const void *ctx) return 0; } =20 +__u8 __arena_global load_acquire8_value =3D 0x12; +__u16 __arena_global load_acquire16_value =3D 0x1234; +__u32 __arena_global load_acquire32_value =3D 0x12345678; +__u64 __arena_global load_acquire64_value =3D 0x1234567890abcdef; + +__u8 __arena_global load_acquire8_result =3D 0; +__u16 __arena_global load_acquire16_result =3D 0; +__u32 __arena_global load_acquire32_result =3D 0; +__u64 __arena_global load_acquire64_result =3D 0; + +SEC("raw_tp/sys_enter") +int load_acquire(const void *ctx) +{ + if (pid !=3D (bpf_get_current_pid_tgid() >> 32)) + return 0; + +#ifdef __BPF_FEATURE_LOAD_ACQ_STORE_REL + load_acquire8_result =3D __atomic_load_n(&load_acquire8_value, __ATOMIC_A= CQUIRE); + load_acquire16_result =3D __atomic_load_n(&load_acquire16_value, __ATOMIC= _ACQUIRE); + load_acquire32_result =3D __atomic_load_n(&load_acquire32_value, __ATOMIC= _ACQUIRE); + load_acquire64_result =3D __atomic_load_n(&load_acquire64_value, __ATOMIC= _ACQUIRE); +#endif + + return 0; +} + +__u8 __arena_global store_release8_result =3D 0; +__u16 __arena_global store_release16_result =3D 0; +__u32 __arena_global store_release32_result =3D 0; +__u64 __arena_global store_release64_result =3D 0; + +SEC("raw_tp/sys_enter") +int store_release(const void *ctx) +{ + if (pid !=3D (bpf_get_current_pid_tgid() >> 32)) + return 0; + +#ifdef __BPF_FEATURE_LOAD_ACQ_STORE_REL + __u8 val8 =3D 0x12; + __u16 val16 =3D 0x1234; + __u32 val32 =3D 0x12345678; + __u64 val64 =3D 0x1234567890abcdef; + + __atomic_store_n(&store_release8_result, val8, __ATOMIC_RELEASE); + __atomic_store_n(&store_release16_result, val16, __ATOMIC_RELEASE); + __atomic_store_n(&store_release32_result, val32, __ATOMIC_RELEASE); + __atomic_store_n(&store_release64_result, val64, __ATOMIC_RELEASE); +#endif + + return 0; +} + char _license[] SEC("license") =3D "GPL"; diff --git a/tools/testing/selftests/bpf/progs/atomics.c b/tools/testing/se= lftests/bpf/progs/atomics.c index f89c7f0cc53b..4c23d7d0d37d 100644 --- a/tools/testing/selftests/bpf/progs/atomics.c +++ b/tools/testing/selftests/bpf/progs/atomics.c @@ -5,9 +5,15 @@ #include =20 #ifdef ENABLE_ATOMICS_TESTS -bool skip_tests __attribute((__section__(".data"))) =3D false; +bool skip_all_tests __attribute((__section__(".data"))) =3D false; #else -bool skip_tests =3D true; +bool skip_all_tests =3D true; +#endif + +#ifdef __BPF_FEATURE_LOAD_ACQ_STORE_REL +bool skip_lacq_srel_tests __attribute((__section__(".data"))) =3D false; +#else +bool skip_lacq_srel_tests =3D true; #endif =20 __u32 pid =3D 0; @@ -168,3 +174,55 @@ int xchg(const void *ctx) =20 return 0; } + +__u8 load_acquire8_value =3D 0x12; +__u16 load_acquire16_value =3D 0x1234; +__u32 load_acquire32_value =3D 0x12345678; +__u64 load_acquire64_value =3D 0x1234567890abcdef; + +__u8 load_acquire8_result =3D 0; +__u16 load_acquire16_result =3D 0; +__u32 load_acquire32_result =3D 0; +__u64 load_acquire64_result =3D 0; + +SEC("raw_tp/sys_enter") +int load_acquire(const void *ctx) +{ + if (pid !=3D (bpf_get_current_pid_tgid() >> 32)) + return 0; + +#ifdef __BPF_FEATURE_LOAD_ACQ_STORE_REL + load_acquire8_result =3D __atomic_load_n(&load_acquire8_value, __ATOMIC_A= CQUIRE); + load_acquire16_result =3D __atomic_load_n(&load_acquire16_value, __ATOMIC= _ACQUIRE); + load_acquire32_result =3D __atomic_load_n(&load_acquire32_value, __ATOMIC= _ACQUIRE); + load_acquire64_result =3D __atomic_load_n(&load_acquire64_value, __ATOMIC= _ACQUIRE); +#endif + + return 0; +} + +__u8 store_release8_result =3D 0; +__u16 store_release16_result =3D 0; +__u32 store_release32_result =3D 0; +__u64 store_release64_result =3D 0; + +SEC("raw_tp/sys_enter") +int store_release(const void *ctx) +{ + if (pid !=3D (bpf_get_current_pid_tgid() >> 32)) + return 0; + +#ifdef __BPF_FEATURE_LOAD_ACQ_STORE_REL + __u8 val8 =3D 0x12; + __u16 val16 =3D 0x1234; + __u32 val32 =3D 0x12345678; + __u64 val64 =3D 0x1234567890abcdef; + + __atomic_store_n(&store_release8_result, val8, __ATOMIC_RELEASE); + __atomic_store_n(&store_release16_result, val16, __ATOMIC_RELEASE); + __atomic_store_n(&store_release32_result, val32, __ATOMIC_RELEASE); + __atomic_store_n(&store_release64_result, val64, __ATOMIC_RELEASE); +#endif + + return 0; +} diff --git a/tools/testing/selftests/bpf/verifier/atomic_invalid.c b/tools/= testing/selftests/bpf/verifier/atomic_invalid.c index 8c52ad682067..3f90d8f8a9c0 100644 --- a/tools/testing/selftests/bpf/verifier/atomic_invalid.c +++ b/tools/testing/selftests/bpf/verifier/atomic_invalid.c @@ -1,4 +1,4 @@ -#define __INVALID_ATOMIC_ACCESS_TEST(op) \ +#define __INVALID_ATOMIC_ACCESS_TEST(op, reg) \ { \ "atomic " #op " access through non-pointer ", \ .insns =3D { \ @@ -9,15 +9,17 @@ BPF_EXIT_INSN(), \ }, \ .result =3D REJECT, \ - .errstr =3D "R1 invalid mem access 'scalar'" \ + .errstr =3D #reg " invalid mem access 'scalar'" \ } -__INVALID_ATOMIC_ACCESS_TEST(BPF_ADD), -__INVALID_ATOMIC_ACCESS_TEST(BPF_ADD | BPF_FETCH), -__INVALID_ATOMIC_ACCESS_TEST(BPF_AND), -__INVALID_ATOMIC_ACCESS_TEST(BPF_AND | BPF_FETCH), -__INVALID_ATOMIC_ACCESS_TEST(BPF_OR), -__INVALID_ATOMIC_ACCESS_TEST(BPF_OR | BPF_FETCH), -__INVALID_ATOMIC_ACCESS_TEST(BPF_XOR), -__INVALID_ATOMIC_ACCESS_TEST(BPF_XOR | BPF_FETCH), -__INVALID_ATOMIC_ACCESS_TEST(BPF_XCHG), -__INVALID_ATOMIC_ACCESS_TEST(BPF_CMPXCHG), +__INVALID_ATOMIC_ACCESS_TEST(BPF_ADD, R1), +__INVALID_ATOMIC_ACCESS_TEST(BPF_ADD | BPF_FETCH, R1), +__INVALID_ATOMIC_ACCESS_TEST(BPF_AND, R1), +__INVALID_ATOMIC_ACCESS_TEST(BPF_AND | BPF_FETCH, R1), +__INVALID_ATOMIC_ACCESS_TEST(BPF_OR, R1), +__INVALID_ATOMIC_ACCESS_TEST(BPF_OR | BPF_FETCH, R1), +__INVALID_ATOMIC_ACCESS_TEST(BPF_XOR, R1), +__INVALID_ATOMIC_ACCESS_TEST(BPF_XOR | BPF_FETCH, R1), +__INVALID_ATOMIC_ACCESS_TEST(BPF_XCHG, R1), +__INVALID_ATOMIC_ACCESS_TEST(BPF_CMPXCHG, R1), +__INVALID_ATOMIC_ACCESS_TEST(BPF_LOAD_ACQ, R0), +__INVALID_ATOMIC_ACCESS_TEST(BPF_STORE_REL, R1), \ No newline at end of file diff --git a/tools/testing/selftests/bpf/verifier/atomic_load.c b/tools/tes= ting/selftests/bpf/verifier/atomic_load.c new file mode 100644 index 000000000000..5186f71b6009 --- /dev/null +++ b/tools/testing/selftests/bpf/verifier/atomic_load.c @@ -0,0 +1,71 @@ +{ + "BPF_ATOMIC load-acquire, 8-bit", + .insns =3D { + BPF_MOV64_IMM(BPF_REG_0, 0), + /* Write 1 to stack. */ + BPF_ST_MEM(BPF_B, BPF_REG_10, -1, 0x12), + /* Load-acquire it from stack to R1. */ + BPF_ATOMIC_OP(BPF_B, BPF_LOAD_ACQ, BPF_REG_1, BPF_REG_10, -1), + /* Check loaded value is 0x12. */ + BPF_JMP32_IMM(BPF_JEQ, BPF_REG_1, 0x12, 1), + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .result =3D ACCEPT, +}, +{ + "BPF_ATOMIC load-acquire, 16-bit", + .insns =3D { + BPF_MOV64_IMM(BPF_REG_0, 0), + /* Write 0x1234 to stack. */ + BPF_ST_MEM(BPF_H, BPF_REG_10, -2, 0x1234), + /* Load-acquire it from stack to R1. */ + BPF_ATOMIC_OP(BPF_H, BPF_LOAD_ACQ, BPF_REG_1, BPF_REG_10, -2), + /* Check loaded value is 0x1234. */ + BPF_JMP32_IMM(BPF_JEQ, BPF_REG_1, 0x1234, 1), + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .result =3D ACCEPT, +}, +{ + "BPF_ATOMIC load-acquire, 32-bit", + .insns =3D { + BPF_MOV64_IMM(BPF_REG_0, 0), + /* Write 0x12345678 to stack. */ + BPF_ST_MEM(BPF_W, BPF_REG_10, -4, 0x12345678), + /* Load-acquire it from stack to R1. */ + BPF_ATOMIC_OP(BPF_W, BPF_LOAD_ACQ, BPF_REG_1, BPF_REG_10, -4), + /* Check loaded value is 0x12345678. */ + BPF_JMP32_IMM(BPF_JEQ, BPF_REG_1, 0x12345678, 1), + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .result =3D ACCEPT, +}, +{ + "BPF_ATOMIC load-acquire, 64-bit", + .insns =3D { + BPF_MOV64_IMM(BPF_REG_0, 0), + /* Save 0x1234567890abcdef to R1, then write it to stack. */ + BPF_LD_IMM64(BPF_REG_1, 0x1234567890abcdef), + BPF_STX_MEM(BPF_DW, BPF_REG_10, BPF_REG_1, -8), + /* Load-acquire it from stack to R2. */ + BPF_ATOMIC_OP(BPF_DW, BPF_LOAD_ACQ, BPF_REG_2, BPF_REG_10, -8), + /* Check loaded value is 0x1234567890abcdef. */ + BPF_JMP_REG(BPF_JEQ, BPF_REG_2, BPF_REG_1, 1), + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .result =3D ACCEPT, +}, +{ + "Cannot load-acquire from uninitialized src_reg", + .insns =3D { + BPF_MOV64_IMM(BPF_REG_0, 0), + BPF_ATOMIC_OP(BPF_DW, BPF_LOAD_ACQ, BPF_REG_1, BPF_REG_2, -8), + BPF_EXIT_INSN(), + }, + .result =3D REJECT, + .errstr =3D "R2 !read_ok", +}, diff --git a/tools/testing/selftests/bpf/verifier/atomic_store.c b/tools/te= sting/selftests/bpf/verifier/atomic_store.c new file mode 100644 index 000000000000..23f2d5c46ea5 --- /dev/null +++ b/tools/testing/selftests/bpf/verifier/atomic_store.c @@ -0,0 +1,70 @@ +{ + "BPF_ATOMIC store-release, 8-bit", + .insns =3D { + BPF_MOV64_IMM(BPF_REG_0, 0), + /* Store-release 0x12 to stack. */ + BPF_MOV64_IMM(BPF_REG_1, 0x12), + BPF_ATOMIC_OP(BPF_B, BPF_STORE_REL, BPF_REG_10, BPF_REG_1, -1), + /* Check loaded value is 0x12. */ + BPF_LDX_MEM(BPF_B, BPF_REG_2, BPF_REG_10, -1), + BPF_JMP32_REG(BPF_JEQ, BPF_REG_2, BPF_REG_1, 1), + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .result =3D ACCEPT, +}, +{ + "BPF_ATOMIC store-release, 16-bit", + .insns =3D { + BPF_MOV64_IMM(BPF_REG_0, 0), + /* Store-release 0x1234 to stack. */ + BPF_MOV64_IMM(BPF_REG_1, 0x1234), + BPF_ATOMIC_OP(BPF_H, BPF_STORE_REL, BPF_REG_10, BPF_REG_1, -2), + /* Check loaded value is 0x1234. */ + BPF_LDX_MEM(BPF_H, BPF_REG_2, BPF_REG_10, -2), + BPF_JMP32_REG(BPF_JEQ, BPF_REG_2, BPF_REG_1, 1), + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .result =3D ACCEPT, +}, +{ + "BPF_ATOMIC store-release, 32-bit", + .insns =3D { + BPF_MOV64_IMM(BPF_REG_0, 0), + /* Store-release 0x12345678 to stack. */ + BPF_MOV64_IMM(BPF_REG_1, 0x12345678), + BPF_ATOMIC_OP(BPF_W, BPF_STORE_REL, BPF_REG_10, BPF_REG_1, -4), + /* Check loaded value is 0x12345678. */ + BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_10, -4), + BPF_JMP32_REG(BPF_JEQ, BPF_REG_2, BPF_REG_1, 1), + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .result =3D ACCEPT, +}, +{ + "BPF_ATOMIC store-release, 64-bit", + .insns =3D { + BPF_MOV64_IMM(BPF_REG_0, 0), + /* Store-release 0x1234567890abcdef to stack. */ + BPF_LD_IMM64(BPF_REG_1, 0x1234567890abcdef), + BPF_ATOMIC_OP(BPF_DW, BPF_STORE_REL, BPF_REG_10, BPF_REG_1, -8), + /* Check loaded value is 0x1234567890abcdef. */ + BPF_LDX_MEM(BPF_DW, BPF_REG_2, BPF_REG_10, -8), + BPF_JMP_REG(BPF_JEQ, BPF_REG_2, BPF_REG_1, 1), + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .result =3D ACCEPT, +}, +{ + "Cannot store-release with uninitialized src_reg", + .insns =3D { + BPF_MOV64_IMM(BPF_REG_0, 0), + BPF_ATOMIC_OP(BPF_DW, BPF_STORE_REL, BPF_REG_10, BPF_REG_2, -8), + BPF_EXIT_INSN(), + }, + .result =3D REJECT, + .errstr =3D "R2 !read_ok", +}, --=20 2.47.1.613.gc27f4b7a9f-goog