From nobody Thu Apr 9 13:32:15 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.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 246F138CFFA for ; Mon, 2 Mar 2026 12:41:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772455273; cv=none; b=EHSk38isPEvhkcyHNMUXTO7sY4oRYT3qeO5G7lgF9qSBYxihMVqgwPf0Dobg8q7+0935Yf5c6UEa+gZpOuFK1RaLUWA/l7uzdrIuGvwDnNnudpSpXmAAYr9XgoFiacQ0gZfGEUjSOcJoQUtAhHDOuINll2U3MiBFpRk/3k0UF6Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772455273; c=relaxed/simple; bh=jtGIjlDuLik+f2Igu18fW3dt4LdjvlRBZPoRTTUs1G0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QdHvdupmWtvsb4uKDRTtkioY8J85MrXpkVPPWEXcJxmUNKkLUf9McRvfhYlG91genm33vbvzexRpjsRuTImIs/86yPvtusuMkKo7bEFOh8mKdEMBc1+qncilj7FzvECWsXSvTranfbdxoIpgOcCxbIGIskzYd1zKCxUcQvmHp7Y= 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=eUIjTelB; arc=none smtp.client-ip=209.85.214.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="eUIjTelB" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2ad9516a653so18248615ad.0 for ; Mon, 02 Mar 2026 04:41:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772455271; x=1773060071; 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=9Eyq8baO3YE83K4ftV/rGILwVlXJCLjJ+D4XOH4RDSs=; b=eUIjTelB/AJ7fRjWkqUGTDs/F87KHVkjklwGXnDrxjZzPbgbQ96c88sAZRIPUgPHJ/ 5cC8A2ddandV1hao6rhaKQv7j8GR8BqFA51Fe9DrT0I593OskRR3wt829/Fvf2dHsCzX jF6VKpmGoptFDkLR9uHSf2QiJqGn9ZS8Y1ZdDkpo2pyBBuhwgNF1AzwsmeDwy1ZKlqQ+ I3ETzhS8cBZgHMkdjXanAJc3LtFPFmCI96QRm2oO8jFlvxShvgvwHh8QtJAwrWXJhRrp E9jDDq4468H1BgxdC3CatEwlk0VafdNioDHSsl/9xf2Ptye4KhMI46LiaWJGaDEZAsSK EQLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772455271; x=1773060071; 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=9Eyq8baO3YE83K4ftV/rGILwVlXJCLjJ+D4XOH4RDSs=; b=AMsriA4FpkQNNnEVG2tqMZwEMMvAsvEZD6g6T8ZeRB87ul/R5kAYGiUhg9P9jiBTI5 KParS1GWMfp7InLSHdeCxC1+RmGiDAYK9vb1ymWrZCnusAo9oUKG1ts/TWUhq/qVmQZb Kdr93RcvKjD52gS31kbCAWDF4n19sbqzRuCWp6fOpk+YcoK5zGp3+TWzrCV1g9a5t+X/ jQEUOTXdGeY879SFnmHoV/Yh4CAKbIHLE9rt/qm7eaKnHG+X2AVa9i8ZzIj9gVlU2dJT HaNzremhWqxgby3va+EY4PpeVNAEDVUwfkFjEgksVGz12QjWM0phpHuS5mYj4rxyDHaL eMxA== X-Forwarded-Encrypted: i=1; AJvYcCUCvvYxJ0aAyd+LnFBa2FJodEdexH4bi7RJ4RWgjYSRZ5TOIUTX3F9ZRHtp1xfe8ZdlZQ26Y6KKkc74ZjQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwWWaaWMyshHjR4qMn6j7jQeyDGEGJKtv6TaA+dnwDYhxnItmay RTonAEAUaaCKzGPIRnXhfuNLX2OAqh51eOeF51VJqqjo+Cj+sjIA0o87 X-Gm-Gg: ATEYQzyRMM+FJ/dVhgH0txp+mdSO8bOwThSl46hbKJaK1A+BfsuhHz0GwvmnuXuGdtl QMAkZ3ukW9A9d5bNJu4QoT0gQZp28riurZToHKfesvH9udL60uejBch8y0e/8GS9Ol0DPblEabH t0SergOX8ZN2QRfHjeFjRGO1weZQUEBxrx26nr/O8xzkOrmMwZD9zyTFUXWr47iMfm/SCy6+nIU f5yBYjTcGjUZrh7k/0xnT7OPyNcH7H4DJ9yQh35qqecLvIFIOYvD+q+LLejxIAss0z1Rlgg7Pri J7XmmwBr6Itr6qbV9GFPOLvGTxcCxEJBh9VZEsuiKWB1dBlgBvRclBG+FvIrggRBDj2sGrcoglL Zywl1Rs1j+4ruebTtVepSga/d2eKfjddBtkW5hVWWiPOZpuHPw5t83VBs8XxRu8IhG37uTsqmu3 7W7pTZmX9vvhdHSzUndUaQi4wQBNJ3ORYYH5+OyF2fRRsiUOvm56ytZa62h8TTJVyM X-Received: by 2002:a17:902:d592:b0:2ad:d0ff:2ed4 with SMTP id d9443c01a7336-2ae2e3e3c91mr110237765ad.6.1772455271425; Mon, 02 Mar 2026 04:41:11 -0800 (PST) Received: from localhost.localdomain ([116.128.244.171]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ae3d1956absm67910225ad.14.2026.03.02.04.41.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 02 Mar 2026 04:41:11 -0800 (PST) From: Chengkaitao To: martin.lau@linux.dev, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, chengkaitao@kylinos.cn, linux-kselftest@vger.kernel.org Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/6] selftests/bpf: Add test case for bpf_list_add_impl Date: Mon, 2 Mar 2026 20:40:26 +0800 Message-ID: <20260302124028.82420-5-pilgrimtao@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260302124028.82420-1-pilgrimtao@gmail.com> References: <20260302124028.82420-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 Extend refcounted_kptr test (test_list_add_del) to exercise bpf_list_add: add a second node after the first, then bpf_list_del both nodes. Signed-off-by: Kaitao Cheng --- .../testing/selftests/bpf/bpf_experimental.h | 14 +++ .../selftests/bpf/progs/refcounted_kptr.c | 105 ++++++++++++++---- 2 files changed, 97 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_experimental.h b/tools/testing= /selftests/bpf/bpf_experimental.h index b4fb0459f11f..48106ea5dda8 100644 --- a/tools/testing/selftests/bpf/bpf_experimental.h +++ b/tools/testing/selftests/bpf/bpf_experimental.h @@ -109,6 +109,20 @@ extern struct bpf_list_node *bpf_list_pop_back(struct = bpf_list_head *head) __ksy */ extern struct bpf_list_node *bpf_list_del(struct bpf_list_node *node) __ks= ym; =20 +/* Description + * Insert 'node' after 'prev' in the BPF linked list. 'prev' must already + * be in a list; 'node' must not be in any list. The 'meta' and 'off' + * parameters are rewritten by the verifier, no need for BPF programs to + * set them. + * Returns + * 0 on success, -EINVAL if prev is not in a list or node is already in a = list. + */ +extern int bpf_list_add_impl(struct bpf_list_node *prev, struct bpf_list_n= ode *node, + void *meta, __u64 off) __ksym; + +/* Convenience macro to wrap over bpf_list_add_impl */ +#define bpf_list_add(prev, node) bpf_list_add_impl(prev, node, NULL, 0) + /* Description * Remove 'node' from rbtree with root 'root' * Returns diff --git a/tools/testing/selftests/bpf/progs/refcounted_kptr.c b/tools/te= sting/selftests/bpf/progs/refcounted_kptr.c index c4fb5615d08b..4d979f5ad9e8 100644 --- a/tools/testing/selftests/bpf/progs/refcounted_kptr.c +++ b/tools/testing/selftests/bpf/progs/refcounted_kptr.c @@ -367,18 +367,19 @@ long insert_rbtree_and_stash__del_tree_##rem_tree(voi= d *ctx) \ INSERT_STASH_READ(true, "insert_stash_read: remove from tree"); INSERT_STASH_READ(false, "insert_stash_read: don't remove from tree"); =20 -/* Insert node_data into both rbtree and list, remove from tree, then remo= ve - * from list via bpf_list_del using the node obtained from the tree. +/* Insert one node in tree and list, remove it from tree, add a second + * node after it in list with bpf_list_add, then remove both nodes from + * list via bpf_list_del. */ SEC("tc") -__description("test_bpf_list_del: remove an arbitrary node from the list") +__description("test_list_add_del: test bpf_list_add/del") __success __retval(0) -long test_bpf_list_del(void *ctx) +long test_list_add_del(void *ctx) { - long err; + long err =3D 0; struct bpf_rb_node *rb; - struct bpf_list_node *l; - struct node_data *n; + struct bpf_list_node *l, *l_1; + struct node_data *n, *n_1, *m_1; =20 err =3D __insert_in_tree_and_list(&head, &root, &lock); if (err) @@ -392,29 +393,62 @@ long test_bpf_list_del(void *ctx) } =20 rb =3D bpf_rbtree_remove(&root, rb); - if (!rb) { - bpf_spin_unlock(&lock); + bpf_spin_unlock(&lock); + if (!rb) return -5; - } =20 n =3D container_of(rb, struct node_data, r); + n_1 =3D bpf_obj_new(typeof(*n_1)); + if (!n_1) { + bpf_obj_drop(n); + return -1; + } + m_1 =3D bpf_refcount_acquire(n_1); + if (!m_1) { + bpf_obj_drop(n); + bpf_obj_drop(n_1); + return -1; + } + + bpf_spin_lock(&lock); + if (bpf_list_add(&n->l, &n_1->l)) { + bpf_spin_unlock(&lock); + bpf_obj_drop(n); + bpf_obj_drop(m_1); + return -8; + } + l =3D bpf_list_del(&n->l); + l_1 =3D bpf_list_del(&m_1->l); bpf_spin_unlock(&lock); bpf_obj_drop(n); - if (!l) - return -6; + bpf_obj_drop(m_1); =20 - bpf_obj_drop(container_of(l, struct node_data, l)); - return 0; + if (l) + bpf_obj_drop(container_of(l, struct node_data, l)); + else + err =3D -6; + + if (l_1) + bpf_obj_drop(container_of(l_1, struct node_data, l)); + else + err =3D -6; + + return err; } =20 SEC("?tc") -__failure __msg("bpf_spin_lock must be held for bpf_list_del") -long list_del_without_lock_fail(void *ctx) +__failure __msg("bpf_spin_lock must be held for bpf_list api") +long list_add_del_without_lock_fail(void *ctx) { + long err =3D 0; struct bpf_rb_node *rb; - struct bpf_list_node *l; - struct node_data *n; + struct bpf_list_node *l, *l_1; + struct node_data *n, *n_1, *m_1; + + err =3D __insert_in_tree_and_list(&head, &root, &lock); + if (err) + return err; =20 bpf_spin_lock(&lock); rb =3D bpf_rbtree_first(&root); @@ -429,13 +463,40 @@ long list_del_without_lock_fail(void *ctx) return -5; =20 n =3D container_of(rb, struct node_data, r); + n_1 =3D bpf_obj_new(typeof(*n_1)); + if (!n_1) { + bpf_obj_drop(n); + return -1; + } + m_1 =3D bpf_refcount_acquire(n_1); + if (!m_1) { + bpf_obj_drop(n); + bpf_obj_drop(n_1); + return -1; + } + + if (bpf_list_add(&n->l, &n_1->l)) { + bpf_obj_drop(n); + bpf_obj_drop(m_1); + return -8; + } + l =3D bpf_list_del(&n->l); + l_1 =3D bpf_list_del(&m_1->l); bpf_obj_drop(n); - if (!l) - return -6; + bpf_obj_drop(m_1); =20 - bpf_obj_drop(container_of(l, struct node_data, l)); - return 0; + if (l) + bpf_obj_drop(container_of(l, struct node_data, l)); + else + err =3D -6; + + if (l_1) + bpf_obj_drop(container_of(l_1, struct node_data, l)); + else + err =3D -6; + + return err; } =20 SEC("tc") --=20 2.50.1 (Apple Git-155)