diff mbox series

[v3,bpf-next,5/5] selftests/bpf: Test bpf_kptr_xchg stashing into local kptr

Message ID 20240809005131.3916464-6-amery.hung@bytedance.com (mailing list archive)
State Superseded
Delegated to: BPF
Headers show
Series Support bpf_kptr_xchg into local kptr | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for bpf-next, async
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 7 this patch: 7
netdev/build_tools success Errors and warnings before: 10 this patch: 10
netdev/cc_maintainers warning 12 maintainers not CCed: kpsingh@kernel.org shuah@kernel.org haoluo@google.com john.fastabend@gmail.com jolsa@kernel.org yonghong.song@linux.dev martin.lau@linux.dev mykolal@fb.com song@kernel.org linux-kselftest@vger.kernel.org eddyz87@gmail.com sdf@fomichev.me
netdev/build_clang success Errors and warnings before: 7 this patch: 7
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 7 this patch: 7
netdev/checkpatch warning CHECK: spaces preferred around that '*' (ctx:WxV) WARNING: line length of 88 exceeds 80 columns WARNING: line length of 96 exceeds 80 columns
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-next-VM_Test-42 success Logs for x86_64-llvm-18 / veristat
bpf/vmtest-bpf-next-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-next-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-next-VM_Test-3 success Logs for Validate matrix.py
bpf/vmtest-bpf-next-VM_Test-12 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-10 success Logs for aarch64-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-4 success Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-11 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-16 success Logs for s390x-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-18 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-17 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-19 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-27 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-33 success Logs for x86_64-llvm-17 / veristat
bpf/vmtest-bpf-next-VM_Test-34 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-35 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18-O2
bpf/vmtest-bpf-next-VM_Test-41 success Logs for x86_64-llvm-18 / veristat
bpf/vmtest-bpf-next-VM_Test-28 success Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17-O2
bpf/vmtest-bpf-next-VM_Test-14 success Logs for s390x-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-15 success Logs for s390x-gcc / test (test_verifier, false, 360) / test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-9 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-8 success Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-6 success Logs for aarch64-gcc / test (test_maps, false, 360) / test_maps on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-7 success Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-13 success Logs for s390x-gcc / test (test_progs, false, 360) / test_progs on s390x with gcc
bpf/vmtest-bpf-next-PR fail PR summary
bpf/vmtest-bpf-next-VM_Test-20 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-21 success Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-22 success Logs for x86_64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-23 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-24 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-25 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-26 fail Logs for x86_64-gcc / veristat / veristat on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-29 success Logs for x86_64-llvm-17 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-30 success Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-31 success Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-32 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-36 success Logs for x86_64-llvm-18 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-37 success Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-38 success Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-39 success Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-40 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18

Commit Message

Amery Hung Aug. 9, 2024, 12:51 a.m. UTC 
From: Dave Marchevsky <davemarchevsky@fb.com>

Test stashing both referenced kptr and local kptr into local kptrs. Then,
test unstashing them.

Acked-by: Martin KaFai Lau <martin.lau@kernel.org>
Signed-off-by: Dave Marchevsky <davemarchevsky@fb.com>
Signed-off-by: Amery Hung <amery.hung@bytedance.com>
---
 .../selftests/bpf/progs/local_kptr_stash.c    | 58 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 2 deletions(-)

Comments

Hou Tao Aug. 10, 2024, 10:32 a.m. UTC | #1 
On 8/9/2024 8:51 AM, Amery Hung wrote:
> From: Dave Marchevsky <davemarchevsky@fb.com>
>
> Test stashing both referenced kptr and local kptr into local kptrs. Then,
> test unstashing them.
>
> Acked-by: Martin KaFai Lau <martin.lau@kernel.org>
> Signed-off-by: Dave Marchevsky <davemarchevsky@fb.com>
> Signed-off-by: Amery Hung <amery.hung@bytedance.com>

Acked-by: Hou Tao <houtao1@huawei.com>
> ---
>  .../selftests/bpf/progs/local_kptr_stash.c    | 58 ++++++++++++++++++-
>  1 file changed, 56 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/progs/local_kptr_stash.c b/tools/testing/selftests/bpf/progs/local_kptr_stash.c
> index 75043ffc5dad..ce7bf7790917 100644
> --- a/tools/testing/selftests/bpf/progs/local_kptr_stash.c
> +++ b/tools/testing/selftests/bpf/progs/local_kptr_stash.c
> @@ -8,9 +8,13 @@
>  #include "../bpf_experimental.h"
>  #include "../bpf_testmod/bpf_testmod_kfunc.h"
>  
> +struct plain_local;
> +
>  struct node_data {
>  	long key;
>  	long data;
> +	struct prog_test_ref_kfunc __kptr *stashed_in_kptr;
> +	struct plain_local __kptr *stashed_in_local_kptr;
>  	struct bpf_rb_node node;
>  };
>  
> @@ -85,18 +89,52 @@ static bool less(struct bpf_rb_node *a, const struct bpf_rb_node *b)
>  
>  static int create_and_stash(int idx, int val)
>  {
> +	struct prog_test_ref_kfunc *inner_kptr;
> +	struct plain_local *inner_local_kptr;
>  	struct map_value *mapval;
>  	struct node_data *res;
> +	unsigned long dummy;
>  
>  	mapval = bpf_map_lookup_elem(&some_nodes, &idx);
>  	if (!mapval)
>  		return 1;
>  
> +	dummy = 0;
> +	inner_kptr = bpf_kfunc_call_test_acquire(&dummy);
> +	if (!inner_kptr)
> +		return 2;
> +
> +	inner_local_kptr = bpf_obj_new(typeof(*inner_local_kptr));
> +	if (!inner_local_kptr) {
> +		bpf_kfunc_call_test_release(inner_kptr);
> +		return 3;
> +	}
> +
>  	res = bpf_obj_new(typeof(*res));
> -	if (!res)
> -		return 1;
> +	if (!res) {
> +		bpf_kfunc_call_test_release(inner_kptr);
> +		bpf_obj_drop(inner_local_kptr);
> +		return 4;
> +	}
>  	res->key = val;
>  
> +	inner_kptr = bpf_kptr_xchg(&res->stashed_in_kptr, inner_kptr);
> +	if (inner_kptr) {
> +		/* Should never happen, we just obj_new'd res */
> +		bpf_kfunc_call_test_release(inner_kptr);
> +		bpf_obj_drop(inner_local_kptr);
> +		bpf_obj_drop(res);
> +		return 5;
> +	}
> +
> +	inner_local_kptr = bpf_kptr_xchg(&res->stashed_in_local_kptr, inner_local_kptr);
> +	if (inner_local_kptr) {
> +		/* Should never happen, we just obj_new'd res */
> +		bpf_obj_drop(inner_local_kptr);
> +		bpf_obj_drop(res);
> +		return 6;
> +	}
> +
>  	res = bpf_kptr_xchg(&mapval->node, res);
>  	if (res)
>  		bpf_obj_drop(res);
> @@ -169,6 +207,8 @@ long stash_local_with_root(void *ctx)
>  SEC("tc")
>  long unstash_rb_node(void *ctx)
>  {
> +	struct prog_test_ref_kfunc *inner_kptr = NULL;
> +	struct plain_local *inner_local_kptr = NULL;
>  	struct map_value *mapval;
>  	struct node_data *res;
>  	long retval;
> @@ -180,6 +220,20 @@ long unstash_rb_node(void *ctx)
>  
>  	res = bpf_kptr_xchg(&mapval->node, NULL);
>  	if (res) {
> +		inner_kptr = bpf_kptr_xchg(&res->stashed_in_kptr, inner_kptr);
> +		if (!inner_kptr) {
> +			bpf_obj_drop(res);
> +			return 1;
> +		}
> +		bpf_kfunc_call_test_release(inner_kptr);
> +
> +		inner_local_kptr = bpf_kptr_xchg(&res->stashed_in_local_kptr, inner_local_kptr);
> +		if (!inner_local_kptr) {
> +			bpf_obj_drop(res);
> +			return 1;
> +		}
> +		bpf_obj_drop(inner_local_kptr);
> +
>  		retval = res->key;
>  		bpf_obj_drop(res);
>  		return retval;
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/progs/local_kptr_stash.c b/tools/testing/selftests/bpf/progs/local_kptr_stash.c
index 75043ffc5dad..ce7bf7790917 100644
--- a/tools/testing/selftests/bpf/progs/local_kptr_stash.c
+++ b/tools/testing/selftests/bpf/progs/local_kptr_stash.c
@@ -8,9 +8,13 @@ 
 #include "../bpf_experimental.h"
 #include "../bpf_testmod/bpf_testmod_kfunc.h"
 
+struct plain_local;
+
 struct node_data {
 	long key;
 	long data;
+	struct prog_test_ref_kfunc __kptr *stashed_in_kptr;
+	struct plain_local __kptr *stashed_in_local_kptr;
 	struct bpf_rb_node node;
 };
 
@@ -85,18 +89,52 @@  static bool less(struct bpf_rb_node *a, const struct bpf_rb_node *b)
 
 static int create_and_stash(int idx, int val)
 {
+	struct prog_test_ref_kfunc *inner_kptr;
+	struct plain_local *inner_local_kptr;
 	struct map_value *mapval;
 	struct node_data *res;
+	unsigned long dummy;
 
 	mapval = bpf_map_lookup_elem(&some_nodes, &idx);
 	if (!mapval)
 		return 1;
 
+	dummy = 0;
+	inner_kptr = bpf_kfunc_call_test_acquire(&dummy);
+	if (!inner_kptr)
+		return 2;
+
+	inner_local_kptr = bpf_obj_new(typeof(*inner_local_kptr));
+	if (!inner_local_kptr) {
+		bpf_kfunc_call_test_release(inner_kptr);
+		return 3;
+	}
+
 	res = bpf_obj_new(typeof(*res));
-	if (!res)
-		return 1;
+	if (!res) {
+		bpf_kfunc_call_test_release(inner_kptr);
+		bpf_obj_drop(inner_local_kptr);
+		return 4;
+	}
 	res->key = val;
 
+	inner_kptr = bpf_kptr_xchg(&res->stashed_in_kptr, inner_kptr);
+	if (inner_kptr) {
+		/* Should never happen, we just obj_new'd res */
+		bpf_kfunc_call_test_release(inner_kptr);
+		bpf_obj_drop(inner_local_kptr);
+		bpf_obj_drop(res);
+		return 5;
+	}
+
+	inner_local_kptr = bpf_kptr_xchg(&res->stashed_in_local_kptr, inner_local_kptr);
+	if (inner_local_kptr) {
+		/* Should never happen, we just obj_new'd res */
+		bpf_obj_drop(inner_local_kptr);
+		bpf_obj_drop(res);
+		return 6;
+	}
+
 	res = bpf_kptr_xchg(&mapval->node, res);
 	if (res)
 		bpf_obj_drop(res);
@@ -169,6 +207,8 @@  long stash_local_with_root(void *ctx)
 SEC("tc")
 long unstash_rb_node(void *ctx)
 {
+	struct prog_test_ref_kfunc *inner_kptr = NULL;
+	struct plain_local *inner_local_kptr = NULL;
 	struct map_value *mapval;
 	struct node_data *res;
 	long retval;
@@ -180,6 +220,20 @@  long unstash_rb_node(void *ctx)
 
 	res = bpf_kptr_xchg(&mapval->node, NULL);
 	if (res) {
+		inner_kptr = bpf_kptr_xchg(&res->stashed_in_kptr, inner_kptr);
+		if (!inner_kptr) {
+			bpf_obj_drop(res);
+			return 1;
+		}
+		bpf_kfunc_call_test_release(inner_kptr);
+
+		inner_local_kptr = bpf_kptr_xchg(&res->stashed_in_local_kptr, inner_local_kptr);
+		if (!inner_local_kptr) {
+			bpf_obj_drop(res);
+			return 1;
+		}
+		bpf_obj_drop(inner_local_kptr);
+
 		retval = res->key;
 		bpf_obj_drop(res);
 		return retval;