From nobody Thu Apr 9 19:20:02 2026 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 6407B35E947 for ; Tue, 3 Mar 2026 13:52:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772545977; cv=none; b=FIQy3d3Wn8KuU0Tb5C/wsTugD2N1gwKNw094zVSnOnsJ21GJPN0G2APtascz6k7s4n82D3y7/dwwS+8NQnv7/E6m02LZ3kI9Em3bd6mHjYEiOLKuxGHQljOEnSbOag+ERmMjxwCwpr+kL6oMktOk2GLKO/haKop1AEK8zc/xN8s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772545977; c=relaxed/simple; bh=5k3B4Ygo1wjsDMA1EPhJXyhhcMiqhAMzgiy+JUuepVA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZI5dfQnC7SGO16/FU+UmtM+OvivXiimV62X9PmVGEXBuHyrkr08pXXyzKhJ+VWUWZHBdgk7P+CnTDMHdaPSugDifTOUCpNVlnC2687ZsVQfD/vssJ97x0qNGpFBUhwKxpNS13u4EJG5iGOPsDBlC2rOQ4DxsMc19OeS2DDNsvZ0= 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=F1Sb70Tj; arc=none smtp.client-ip=209.85.210.175 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="F1Sb70Tj" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-82418b0178cso3279517b3a.1 for ; Tue, 03 Mar 2026 05:52:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772545976; x=1773150776; 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=9yrYqqdL3L32jfs4+IGyGROm0lZBENJH7/3+fmtOXxw=; b=F1Sb70Tj345lwTMqmngIa4+emLD7oKmaf7Flttjq3fF5f8VJVrpw0U+7A3KQ5OCqBQ MC4+1/gzWhQgRyHdjXh+xPNl91JYQwDe3a/ye7fSVwaJfYz3B6kdnQrYvd624SRmMWty LkDuuSh6TpxUeDl6KNW1FSTmi8SW61tKjoQlpwHdpjFy8xIdJEEZ1egUuRKPO0QcwbQf 0ND+paymfA495tldA6iPlcBGrAcbo7Loe8lMweqcWU0+sTEgAH1ZofsAd4e9Sey/Glds DbqIZYX/T6ycuL/jnx1NfpUILdGmWCY7+WHs/7fOmNv1EYUdKYYOdZjsyYl6kwNXC1wj 7+HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772545976; x=1773150776; 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=9yrYqqdL3L32jfs4+IGyGROm0lZBENJH7/3+fmtOXxw=; b=O73XSjkNSbBL9q5kmMJXHa+sBIAFmFlY7dLCJoHTEgFttBGx9+EnAH6OfzuDXcwGka 3wHcq+Gu6r8jSCD4I5qngYP/4pboBKQQlRtv+cA6binvKBq8SvxC7cFkNiVBoR71fh6v 5MbevMbtkTwW1PFjxsq4d67DU3Mwh3u3nIL81Lq+g34cj9INohsSf5DMGp3x1DF4ksCo q7otnVvspl8UtvUineyjozrZYBgaU73QLxReG3kvNunxcKEujr5qP58qOZflYX4HvpYS I0BLeGT1twG84ZqQ5weDHBeegxr3jx89p7vDJ/8v/3hoW1rehIynsAhiI1Egyh2H4H+E R1Tg== X-Forwarded-Encrypted: i=1; AJvYcCWTZKKZ9BiKU4swzIY6wuGTgd1KPriO1Fx1EOLanWbwZabnS8h5JYo5DXky6XyTgzB8zCGrKwzJTj8uwmQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyC3mVeMqpLKg/Efwak7tYOUEmTJKmsM+qos4VpfpB3miBCQ9/3 8/9kX880WBOdAJBHKOakp+iOH621ugbTYrBEj0aOn50UcwvYvnDpwc94 X-Gm-Gg: ATEYQzzrXXSlOd0oyTsIn9RT0TxlBj+JQelxgcB0SgrptRZPM7L2GHm+lxei9lcDfHO F0gRzSCMz5ieOkefz+Ic0XH4MzdHiOuarE7MupEqzNs2KQtY5JGQ0aAKSNQDICSNwKmQg9I5Uev 4KoanTD485utG4zxRRbZtXmOmUcjetsC+VzkSnZ1cbGPDjiwjPChY/Aj3yW42ThspAjsNm2pcN7 AFLHC/AFL/U+jwVE9T8DkCAH5mDEBi4VASDpQtRCQa/Ri+g8E8xRMwJr99ltT+gvgqd8G6WHrfh yWhoIbHSrbLjunDaPabMeT1DehxmC9KMJ2utQt+y+2syFZeGP9sdI/icM5iaGR5ITb+liI8MHoX ZmIXUEMUsm++I86MjIcHf+pX+oJz5biKv65hQJ/sRHTtRKdsml7LUsMgd5uJAwE6BLrfgUNYLqn H42mz0jR0lGBTippzgnRNnnrsBUjuy6pCdrweegqdy6fQiM+oR X-Received: by 2002:a05:6a21:a341:b0:366:1f1f:3299 with SMTP id adf61e73a8af0-395c39f7a2emr14911659637.6.1772545975553; Tue, 03 Mar 2026 05:52:55 -0800 (PST) Received: from localhost.localdomain ([113.218.252.129]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c70fa62147esm14689782a12.12.2026.03.03.05.52.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 03 Mar 2026 05:52:55 -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 v4 2/6] selftests/bpf: Add test cases for bpf_list_del Date: Tue, 3 Mar 2026 21:52:15 +0800 Message-ID: <20260303135219.33726-3-pilgrimtao@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260303135219.33726-1-pilgrimtao@gmail.com> References: <20260303135219.33726-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 Add a node to both an rbtree and a list, retrieve the node from the rbtree, use the obtained node pointer to remove it from the list, and finally free the node. To verify the validity of bpf_list_del, also expect the verifier to reject calls to bpf_list_del made without holding the spin_lock. Signed-off-by: Kaitao Cheng --- .../testing/selftests/bpf/bpf_experimental.h | 11 +++ .../selftests/bpf/progs/refcounted_kptr.c | 71 +++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/tools/testing/selftests/bpf/bpf_experimental.h b/tools/testing= /selftests/bpf/bpf_experimental.h index 4b7210c318dd..54ec9d307fdc 100644 --- a/tools/testing/selftests/bpf/bpf_experimental.h +++ b/tools/testing/selftests/bpf/bpf_experimental.h @@ -99,6 +99,17 @@ extern struct bpf_list_node *bpf_list_pop_front(struct b= pf_list_head *head) __ks */ extern struct bpf_list_node *bpf_list_pop_back(struct bpf_list_head *head)= __ksym; =20 +/* Description + * Remove 'node' from the BPF linked list with head 'head'. + * The node must be in the list. Caller receives ownership of the + * removed node and must release it with bpf_obj_drop. + * Returns + * Pointer to the removed bpf_list_node, or NULL if 'node' is NULL + * or not in the list. + */ +extern struct bpf_list_node *bpf_list_del(struct bpf_list_head *head, + struct bpf_list_node *node) __ksym; + /* 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 1aca85d86aeb..ac7672cfefb8 100644 --- a/tools/testing/selftests/bpf/progs/refcounted_kptr.c +++ b/tools/testing/selftests/bpf/progs/refcounted_kptr.c @@ -367,6 +367,77 @@ long insert_rbtree_and_stash__del_tree_##rem_tree(void= *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. + */ +SEC("tc") +__description("test_bpf_list_del: remove an arbitrary node from the list") +__success __retval(0) +long test_bpf_list_del(void *ctx) +{ + long err; + struct bpf_rb_node *rb; + struct bpf_list_node *l; + struct node_data *n; + + err =3D __insert_in_tree_and_list(&head, &root, &lock); + if (err) + return err; + + bpf_spin_lock(&lock); + rb =3D bpf_rbtree_first(&root); + if (!rb) { + bpf_spin_unlock(&lock); + return -4; + } + + rb =3D bpf_rbtree_remove(&root, rb); + if (!rb) { + bpf_spin_unlock(&lock); + return -5; + } + + n =3D container_of(rb, struct node_data, r); + l =3D bpf_list_del(&head, &n->l); + bpf_spin_unlock(&lock); + bpf_obj_drop(n); + if (!l) + return -6; + + bpf_obj_drop(container_of(l, struct node_data, l)); + return 0; +} + +SEC("?tc") +__failure __msg("bpf_spin_lock at off=3D32 must be held for bpf_list_head") +long list_del_without_lock_fail(void *ctx) +{ + struct bpf_rb_node *rb; + struct bpf_list_node *l; + struct node_data *n; + + bpf_spin_lock(&lock); + rb =3D bpf_rbtree_first(&root); + if (!rb) { + bpf_spin_unlock(&lock); + return -4; + } + + rb =3D bpf_rbtree_remove(&root, rb); + bpf_spin_unlock(&lock); + if (!rb) + return -5; + + n =3D container_of(rb, struct node_data, r); + l =3D bpf_list_del(&head, &n->l); + bpf_obj_drop(n); + if (!l) + return -6; + + bpf_obj_drop(container_of(l, struct node_data, l)); + return 0; +} + SEC("tc") __success long rbtree_refcounted_node_ref_escapes(void *ctx) --=20 2.50.1 (Apple Git-155)