From nobody Thu Apr 2 23:54:50 2026 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 C83D81C84DE for ; Sat, 14 Feb 2026 12:41:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771072881; cv=none; b=r2R0ofnqWpcRrn5b3eCMbCBuWdxkj1QOM3K9pjUPnOLliKYQaDmlOtN7q8LUTdg6zq10S+RGZGSB0nLZyKPdLzuG5T0S64mznhHTOOTQR+7Zb0B8jrk9W2aE2PEkboO8uRxTIuZFyGcOdzBsW1I1+EVXD/XH2MpHHU5lDtkHoXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771072881; c=relaxed/simple; bh=bA50R0bu4pcFiczphQwo0OOSupIpSY/EOYDo7M0jk+U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Tl5sb3E3bTQUTUwRdaVwdrpeWQsxb0Wv99XN7V6xK1qT2SbYpQS/K599ZvmZ01Q/vPtwOSZzCzbhkRm22aHwHh+/zePYONptyH6EecSIzyV3+2i6J7CIHtPJuWZWwnN1Kgq8yixUH9XXtSvg6GQ7rm1zXgF3vP+SNMAt3oJyqVI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bzi6/Mbd; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bzi6/Mbd" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-824a9348603so708074b3a.2 for ; Sat, 14 Feb 2026 04:41:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771072879; x=1771677679; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eWhBTVQRjsnIct/t3J+DD3t989mrabDRUagk4xQvzMQ=; b=bzi6/MbdpHDsO0RkKkdNUZMPLI9o+/SLJ+uKnVlpRGNJDmdnlFLrlsdGrQdF3nLcl2 RGlnoh2CzD2FCdxUgkTpK9DszwI8b7J8JSvwvDFY7OSDwzHahHCuDBI/iaAzXERcBXaF cBAaF/9k3No4jMu21OV8Ev0xw48QP8pGXtV+vTNK8V4vGIW1MLWkwl685pmLDxctljC2 W6Tn2CtQaXlZiSYwzYsOYoNwJJxft2ZekO94nyHEbP4iZ5eTU2pHEqfspWeRYTRxJmwv cZvb6lwW4V3lCj7XuIvrplUS69afsbKYWxhRFGFM9Jlm6zNTzHevcsIajO0S5l9jdPq6 097A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771072879; x=1771677679; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=eWhBTVQRjsnIct/t3J+DD3t989mrabDRUagk4xQvzMQ=; b=AX+7E+ilb/qg2euR86KZrA50TVSGajgF+9vFOKBG5LDwxgrOidY8+Fwa06SqO6wd2a suLAcqQJ2iI9F1tOhwHYdOR8YBeacBBMG4WBWa2bFWrLPmQ2lcFEXRWuWEa4dC+30+nE N2f2g239oS/jjZyP0eoDztAFCa/+s1bULp2tHxQ0X+GUsWE/tYhHW3aP7EowbvIXKxoM 3Y4bjIktQIXmUPPadfHphcyrLR+6MQpwJNpL+Jl7lKHd0Ov89b7g189Y3mlCmdocc+fQ Qy/m1Oq7BxTeu4IoYuRcMTFeDpxI8Qv3hACxm9aUM05XMgYkmWKwUDjm0fkOLW5Ep7E0 mU2w== X-Gm-Message-State: AOJu0YxxikRIxJNQ07FlX3AobdSiWd3z8U8j35abl3ot96tDv/NSLgKu 4JV1lv/tmGphwTwKktyfBaPqOnmAOM1jktl0FbrIzHJlnnvwJPfa3Zym X-Gm-Gg: AZuq6aKmSsGI8mCYg/JuCqeOuJ7xsZT8blUJHnswneD8h4Cyq+xAYZbprzX5EdP8A+g JEZ+o/4tQeQC4/IdTa8MREoagaUmgeEpwErxvohNtTgeXL1iODs+ms7fcHQ1m4Bp3z8rZ7r6wTs P7jNoPzPUqFa+GB4n35TuVTHoSd25bJFnTOtCDP4n1wyOwEKd6jOGn3T/8/557rcjmc9GsLbVhl RDq103s35EjfSOoEzDQiT2ApcFZYZKgeYcczh7RrL7oHt+cp55EEGlbeDQPielRf5LLQLoeCZCh wWeJ5qVcmKJUZXd7Gdpiw8HKYqTNS3eBwvuik+9o8+jfQlHqvDD6bp6Tf3iIQDqDaZadc/oeUTX +uriY1m96y7tZJL3Q5n4n2rMFDayj++YhNV2fV4q1MOUia+U+ILxfEYoUGUAbmJlGiLSYSb6C9B vODIejCXo942hF2pMHXLNAZDc6914WN7kcVSMdmwBxlSc4omWvlpEw X-Received: by 2002:a05:6a00:b904:b0:821:81ef:5de8 with SMTP id d2e1a72fcca58-824c9444a20mr4983100b3a.12.1771072879198; Sat, 14 Feb 2026 04:41:19 -0800 (PST) Received: from localhost.localdomain ([113.218.252.61]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-824c6a2e40bsm7064497b3a.11.2026.02.14.04.41.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 14 Feb 2026 04:41:18 -0800 (PST) From: Chengkaitao To: ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, yangfeng@kylinos.cn, alexei.starovoitov@gmail.com Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, Kaitao Cheng Subject: [PATCH RESEND v7 5/5] selftests/bpf: Add test case for rbtree nodes that contain both bpf_refcount and kptr fields. Date: Sat, 14 Feb 2026 20:40:42 +0800 Message-ID: <20260214124042.62229-6-pilgrimtao@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260214124042.62229-1-pilgrimtao@gmail.com> References: <20260214124042.62229-1-pilgrimtao@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Kaitao Cheng Allow bpf_kptr_xchg to directly operate on pointers marked with NON_OWN_REF | MEM_RCU. In the example demonstrated in this patch, as long as "struct bpf_refcount ref" exists, the __kptr pointer is guaranteed to carry the MEM_RCU flag. The ref member itself does not need to be explicitly used. Signed-off-by: Kaitao Cheng --- .../selftests/bpf/progs/rbtree_search_kptr.c | 123 ++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/tools/testing/selftests/bpf/progs/rbtree_search_kptr.c b/tools= /testing/selftests/bpf/progs/rbtree_search_kptr.c index 069fc64b0167..610aae45e2dc 100644 --- a/tools/testing/selftests/bpf/progs/rbtree_search_kptr.c +++ b/tools/testing/selftests/bpf/progs/rbtree_search_kptr.c @@ -18,11 +18,21 @@ struct tree_node { struct node_data __kptr * node_data; }; =20 +struct tree_node_ref { + struct bpf_refcount ref; + struct bpf_rb_node node; + u64 key; + struct node_data __kptr * node_data; +}; + #define private(name) SEC(".data." #name) __hidden __aligned(8) =20 private(A) struct bpf_rb_root root __contains(tree_node, node); private(A) struct bpf_spin_lock lock; =20 +private(B) struct bpf_rb_root root_r __contains(tree_node_ref, node); +private(B) struct bpf_spin_lock lock_r; + static bool less(struct bpf_rb_node *a, const struct bpf_rb_node *b) { struct tree_node *node_a, *node_b; @@ -130,6 +140,119 @@ long rbtree_search_kptr(void *ctx) return ret; } =20 +static bool less_r(struct bpf_rb_node *a, const struct bpf_rb_node *b) +{ + struct tree_node_ref *node_a, *node_b; + + node_a =3D container_of(a, struct tree_node_ref, node); + node_b =3D container_of(b, struct tree_node_ref, node); + + return node_a->key < node_b->key; +} + +SEC("syscall") +__retval(0) +long rbtree_search_kptr_ref(void *ctx) +{ + struct tree_node_ref *tnode_r, *tnode_m; + struct bpf_rb_node *rb_n; + struct node_data __kptr * node_data; + int lookup_key =3D NR_NODES / 2; + int lookup_data =3D NR_NODES / 2; + int i, data, ret =3D 0; + + for (i =3D 0; i < NR_NODES && can_loop; i++) { + tnode_r =3D bpf_obj_new(typeof(*tnode_r)); + if (!tnode_r) + return __LINE__; + + node_data =3D bpf_obj_new(typeof(*node_data)); + if (!node_data) { + bpf_obj_drop(tnode_r); + return __LINE__; + } + + tnode_r->key =3D i; + node_data->data =3D i; + + node_data =3D bpf_kptr_xchg(&tnode_r->node_data, node_data); + if (node_data) + bpf_obj_drop(node_data); + + /* Unused reference */ + tnode_m =3D bpf_refcount_acquire(tnode_r); + if (!tnode_m) + return __LINE__; + + bpf_spin_lock(&lock_r); + bpf_rbtree_add(&root_r, &tnode_r->node, less_r); + bpf_spin_unlock(&lock_r); + + bpf_obj_drop(tnode_m); + } + + bpf_spin_lock(&lock_r); + rb_n =3D bpf_rbtree_root(&root_r); + while (rb_n && can_loop) { + tnode_r =3D container_of(rb_n, struct tree_node_ref, node); + node_data =3D bpf_kptr_xchg(&tnode_r->node_data, NULL); + if (!node_data) { + ret =3D __LINE__; + goto fail; + } + + data =3D node_data->data; + node_data =3D bpf_kptr_xchg(&tnode_r->node_data, node_data); + if (node_data) { + bpf_spin_unlock(&lock_r); + bpf_obj_drop(node_data); + return __LINE__; + } + + if (lookup_key =3D=3D tnode_r->key) { + if (data =3D=3D lookup_data) + break; + + ret =3D __LINE__; + goto fail; + } + + if (lookup_key < tnode_r->key) + rb_n =3D bpf_rbtree_left(&root_r, rb_n); + else + rb_n =3D bpf_rbtree_right(&root_r, rb_n); + } + bpf_spin_unlock(&lock_r); + + while (can_loop) { + bpf_spin_lock(&lock_r); + rb_n =3D bpf_rbtree_first(&root_r); + if (!rb_n) { + bpf_spin_unlock(&lock_r); + return 0; + } + + rb_n =3D bpf_rbtree_remove(&root_r, rb_n); + if (!rb_n) { + ret =3D __LINE__; + goto fail; + } + bpf_spin_unlock(&lock_r); + + tnode_r =3D container_of(rb_n, struct tree_node_ref, node); + + node_data =3D bpf_kptr_xchg(&tnode_r->node_data, NULL); + if (node_data) + bpf_obj_drop(node_data); + + bpf_obj_drop(tnode_r); + } + + return 0; +fail: + bpf_spin_unlock(&lock_r); + return ret; +} =20 SEC("syscall") __failure __msg("R1 type=3Dscalar expected=3Dmap_value, ptr_, ptr_") --=20 2.50.1 (Apple Git-155)