From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 C876B2DFA4A for ; Wed, 25 Feb 2026 09:28:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772011695; cv=none; b=Hpj/4iXmQonIio92IRoTU1nT+PohbckCcgoAy7vBa24wb1CBKASk54RZED/glxh9o6ECN0iHmX7gho2ojWmncnB5dPMAXbxgybr2iUOKXWgKy/0otKlKu/osH/kvrlEuaU2IQIsCUmfPL9LO9tTmmW0cNJcdew/yB8YPrY4qHvk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772011695; c=relaxed/simple; bh=TUkrUM5RCj94MKh5jKoSSPGDxsIxViCDTq4/BrGFtiE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G9s+8vIZUeL3QMsfEt/SqHRXO0Hs87hp4cVmKh3qDFAJkLjw5jrQvYsOWmSRDwHzF/AqXCJza0PDgF7RJK/mA0i+lRTo0sM4nmXNnME9PHgPPzJGVTdx6jiGyZaXRNQ/Glhtg3VXQj9tgxrYQcb9gTV3tzVXNLyMCnh4dwBiMPI= 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=DJZ6UwZT; arc=none smtp.client-ip=209.85.216.48 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="DJZ6UwZT" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-354c67da885so5506537a91.3 for ; Wed, 25 Feb 2026 01:28:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772011694; x=1772616494; 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=DGuc+6wfePsL6aB6sAwQhLsZz/tjnZCJ1WumwwWFEEU=; b=DJZ6UwZTyMr0W95Lb1AuEzuqv9N/ofOUmirFuomUadNy69TSoZ4MdslSzSX+UJsc12 I2KR1hjsVkrW3mrPbt7eBdm5yE5Spyj5QnTvqVIoxt/Lh4HA1kTBsfxjl3OjvPe93qE3 BDfD71rTDtaf+0nl3lJYji7Ta07jaXXgr935EwJOIks7jmi9fkVXhYSOKk+gaVSZxwar lYJ9sgMgFjEoXJqlydV0go1S+c0eyhYAOfUV4Y70tOLCyjZeprvFFPdXaEFX3UwW2DAy 8rRHYaLyYWKlek9433FyakUkV+UlUylVcnOCeCaoASRwUjczfLND2JeUJhcrUOP2vcuq A65A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772011694; x=1772616494; 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=DGuc+6wfePsL6aB6sAwQhLsZz/tjnZCJ1WumwwWFEEU=; b=OZB2Bo6sdSqUmfifhy8gmgFP7t9sIHwPbpw7NnApD+SMIs3ywx3M9O6q/ofhspvZ1I JbpZUcqWgLhvpldW2nyvF7KzL/Arpk0s7bJ3/wmNvdvaao+m8EE3EmJUf9qki5WHQOYl yrPfcLXhlCdPFm4YUnNwQHfE6irn5eu/urOcbbnbilvDTZU3dcgsGlCr5rHYts5wz6jP qBksyEf8qV2oFWsaNuD7UrS6p6fzY2Jkp6a8ItBDDteia1m5dbw2cGAXFC++tlYk7M8y 9aRscHyzQefY7HzS5tNoiPRnl4FVeo0SFqlA3PER4y2ZLmnA9EYZCqCwFko+pjeffHvb 3VkA== X-Forwarded-Encrypted: i=1; AJvYcCW4mxPmZwPHvgTezYSv7ggcRPSTfs5UZ3epSi8hM19ucSrXPW4id2Sc3/fsz3BHU+BJ5PFc0f50LqJe6/E=@vger.kernel.org X-Gm-Message-State: AOJu0Ywm+hEtNQQXBQ04AfXwIixDvjdKVIMo50VribFzMXd1/TDWyaNG pk+kXirVLFNa+BpSSBUeo6qihF6aHDebUCz7VW0HtXbFGiJrElrz5WDT X-Gm-Gg: ATEYQzxNMOW4x3czZFG8Uwwyvv0x81LcCNgh3sfxhfMsPngRaabdp+O52B9K8ttNomw F5VUMnLIK7mfIEpOZEgOdCWfM21LVf1d0sZtLywdEyF1jGFhaTBtMvuxYgEaQ+ij78pgF4v56ke 7TRwIrCfnJpa1v5BCrQtoHYlThBT4s1PJKQfLWKueEKZiCXHsQGqL+39JATbwMsafk1INKy04qe Rbfn0+cccCg2tth6NLG4AUlc612wB0KE+heIBqCIwmsDP9teVp4uhS0GpRqpx2cbAutZYBWbjoC UkD9H3DcYfYMPyvTdtFsA+8uGE/eRQ0R3OVN4tkmIA8hq3kFHaCgyhPs54otmsEpM6P+R06GV9r xGlvR4VmBKK1bDvgjF8A9lujIoPsvijVI1/DyJWBAA3PvoljbZJ7daEZK5FEtcj3P2ckB5v7h0u Fnt49GuK0+w4brXygSlkHSsomsB4mrh/0B/+Fp/Xu7VfguWWd7AUVavw== X-Received: by 2002:a17:90b:2250:b0:354:a546:5edd with SMTP id 98e67ed59e1d1-3590f060ffcmr1820592a91.11.1772011694049; Wed, 25 Feb 2026 01:28:14 -0800 (PST) Received: from localhost.localdomain ([113.218.252.140]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35912f5f29fsm837901a91.1.2026.02.25.01.27.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 25 Feb 2026 01:28:13 -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, leon.hwang@linux.dev, linux-kselftest@vger.kernel.org Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/6] selftests/bpf: Add test case for bpf_list_add_impl Date: Wed, 25 Feb 2026 17:26:49 +0800 Message-ID: <20260225092651.94689-5-pilgrimtao@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260225092651.94689-1-pilgrimtao@gmail.com> References: <20260225092651.94689-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: 8bit 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 | 13 +++++ .../selftests/bpf/progs/refcounted_kptr.c | 51 +++++++++++++++---- 2 files changed, 53 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_experimental.h b/tools/testing/selftests/bpf/bpf_experimental.h index c7c950e10501..dc3919deab89 100644 --- a/tools/testing/selftests/bpf/bpf_experimental.h +++ b/tools/testing/selftests/bpf/bpf_experimental.h @@ -109,6 +109,19 @@ 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) __ksym; +/* Description + * Insert 'node' after 'prev' in the BPF linked list. Both must be in the + * same list; 'prev' must be in the 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_node *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/testing/selftests/bpf/progs/refcounted_kptr.c index 86f7f5f8e4c8..a3d5995d4302 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(void *ctx) \ INSERT_STASH_READ(true, "insert_stash_read: remove from tree"); INSERT_STASH_READ(false, "insert_stash_read: don't remove from tree"); -/* Insert node_data into both rbtree and list, remove from tree, then remove - * 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 = 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 = __insert_in_tree_and_list(&head, &root, &lock); if (err) @@ -397,15 +398,43 @@ long test_bpf_list_del(void *ctx) return -5; n = container_of(rb, struct node_data, r); + n_1 = bpf_obj_new(typeof(*n_1)); + if (!n_1) { + bpf_obj_drop(n); + return -1; + } + m_1 = 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 = bpf_list_del(&n->l); + l_1 = bpf_list_del(&m_1->l); bpf_spin_unlock(&lock); bpf_obj_drop(n); - if (!l) - return -6; + bpf_obj_drop(m_1); - 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 = -6; + + if (l_1) + bpf_obj_drop(container_of(l_1, struct node_data, l)); + else + err = -6; + + return err; } SEC("tc") -- 2.50.1 (Apple Git-155)