From nobody Sun Oct 5 23:57:03 2025 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) (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 DE5EE217716; Mon, 28 Jul 2025 04:13:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753675985; cv=none; b=QmfVANw9pxJEZYt/qXmaY7AclQHPhAY63bM64SeE3HFPb4tp0f78MgE61dlm7fsfLE0ZiivYQi4asGdx10sCAuy1jFuu7musVtbnwY8/mhupPvCfiyUOnUa/68+kOacp0CzBGxs2JIzoGJDhXmQcyc7osQ+Kor3KUVGJf35cIXU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753675985; c=relaxed/simple; bh=/Xj3sOaOCNeqUFX5P0Wp28TH0ulruXkgsD0ebXMyvfk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Frgj+n46SiRnzjNjZ5LlP9Ff2oef8r6sqedvRpDGvNwyRt6FXxeJ6JCA7GpTrezG/9jsVM2Qdpqnd1l7KFYIguKs/9H2KFbGrQKtprlhSaICFPHmSh0p047Nb5esCJJFtkgHdH47K0WuPyk9S9PlnOGX/0EqzeyFLWoeQlWnG/Y= 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=NwAic8/I; arc=none smtp.client-ip=209.85.214.194 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="NwAic8/I" Received: by mail-pl1-f194.google.com with SMTP id d9443c01a7336-23636167afeso33922125ad.3; Sun, 27 Jul 2025 21:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753675983; x=1754280783; 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=4dDuLpi2XdML7z9q3X9SSRyeitTIxFEVOUJtDB7FRXM=; b=NwAic8/I645j9PJw6OAAvOHA19DCwloI38xMt5YyiqBcJfJbSxoyiCZfr1XMnt+S6Z L/qT8ZTrC032UaoAk+f6u8K7M7sW41fnkL2rkS2wuuUSuKqfqFz3HMIvmv+ZEeHi+eoD izaAddtrYVPjApKY9CNb0BpyQo7CAuQq/uOnni39Mw7tFk5IVfuXpYZxS09SQ+RcRe/p JCSApWH3Hy+9ALbUzyes/yXpVVjJAVNXwi0e13rIFhCTR8Fal2SabRroIhyR3DwfgY4y W9xxunPKbfHVFZHhIqKwu/HOT/+tSfNK5rZakxcaGaooVFDexRxHTpvZFWXWQcEsUcne J2uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753675983; x=1754280783; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4dDuLpi2XdML7z9q3X9SSRyeitTIxFEVOUJtDB7FRXM=; b=EfDl2lP9Q+/89V8IXlwMZU9eWeYDkAyIn4EYMubGFFGov8uJrtyCv8qUyz2x/XYPse iU7QjMRcRA+Wa4kJVUc2luHBKw3TN+SOcNihk9+BIIK0egxAmwMkaS3m8Wxrg0VDyEpA 54Mr06w6g5Lf5BLQ/6oEQwYYR8S1gGwfLlBZWgaRIpY5hr0KD9sqSnI0iL22uGXE3XeC acezXm16q+zL2aUogkTZKnMsuxBcpkOpQgH2X2Iqw8jQjk7fSD1iy9nbY2YMg0H9viZn zNgkZSqybnbkJR7F2vLxAE7C+N9eOXTMmohv7/RlQA/orhryeD7SZjlVL3XwsBKFo3g2 qHrA== X-Forwarded-Encrypted: i=1; AJvYcCVM2D1Ff7xfv8qegH12RBqE7nw39TkfwElgmLNx+yI90zGw0oU0vC5i5t2FGiG4il3NaQA=@vger.kernel.org, AJvYcCVQFRus1Osfnn82fuKorUR3nqo7V8bRRZkgBfOXeyEYd0402d+Sp1TiQSs088UAfJ2KxNlnAvGLc3xKQsWo@vger.kernel.org, AJvYcCXpJt79mkKKMbCEPQ/Z5HZ7YAoNkM/7yOqQhTyqBZBE5JET3tfp4qgc1HVeQV9+dv9xslW7K7CU4+Q8x1nefOqrk7NU@vger.kernel.org X-Gm-Message-State: AOJu0YxT7YZg/yIswTyAVCK4m3Ry/fnSUutTwLk31m6uA5E9BUKe24rg xysTK8qwZuHoK+M/4ZMfS0nLbnfyZdhhXqOTFx7/ukJeyN73kmLJpud6 X-Gm-Gg: ASbGncuUMlhA3haKPxy8zHDMptXGbEa/ky/xCs2C9MMm4XHAugpi13rYCNjRJzQbZme ybGeS+SitbEOiyU3WH19WfoijKgRkg8nco6wCP9CQHUIC+g82EbKZTKVSzhRy+ulXdiJ3LzVtYO vfFqsEQ7qbNkgDmqYlOkYgkNKf+YHF7Gf/0ANyU6d/IaE2/41hjmmqX/B1IPI59Lw/X0TXILsI6 TeC8EisPphRb5BPTWIaoHRmuFo/EI9inu2DQCBqNEs7+1vSsWnJ1+oAHrcvMTtcJv9/jNMGYNi/ 10yUXAKneh79Bocw/uDoemecauAcdOl7KhLnTzjkReGyKNlfmaQir6dEHgr4FMxNhLg+aqizBx2 aU2NO398xd1MLWP9eMdI= X-Google-Smtp-Source: AGHT+IGX01LFBZYPPzjW+WAT4Mc3ZMKmNo/fMqJ2YCdk7j9r8w1TpTyxdQeiS3f8wUgLHP7lKowHXw== X-Received: by 2002:a17:903:1c2:b0:234:ef42:5d69 with SMTP id d9443c01a7336-23fb30995c3mr161420655ad.13.1753675983055; Sun, 27 Jul 2025 21:13:03 -0700 (PDT) Received: from 7950hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-24008efc073sm20599175ad.58.2025.07.27.21.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Jul 2025 21:13:02 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: alexei.starovoitov@gmail.com, mhiramat@kernel.org Cc: rostedt@goodmis.org, mathieu.desnoyers@efficios.com, hca@linux.ibm.com, revest@chromium.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH bpf-next 1/4] fprobe: use rhashtable Date: Mon, 28 Jul 2025 12:12:48 +0800 Message-ID: <20250728041252.441040-2-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728041252.441040-1-dongml2@chinatelecom.cn> References: <20250728041252.441040-1-dongml2@chinatelecom.cn> 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" For now, all the kernel functions who are hooked by the fprobe will be added to the hash table "fprobe_ip_table". The key of it is the function address, and the value of it is "struct fprobe_hlist_node". The budget of the hash table is FPROBE_IP_TABLE_SIZE, which is 256. And this means the overhead of the hash table lookup will grow linearly if the count of the functions in the fprobe more than 256. When we try to hook all the kernel functions, the overhead will be huge. Therefore, replace the hash table with rhashtable to reduce the overhead. Signed-off-by: Menglong Dong --- include/linux/fprobe.h | 2 +- kernel/trace/fprobe.c | 144 +++++++++++++++++++++++------------------ 2 files changed, 82 insertions(+), 64 deletions(-) diff --git a/include/linux/fprobe.h b/include/linux/fprobe.h index 702099f08929..0c9b239f5485 100644 --- a/include/linux/fprobe.h +++ b/include/linux/fprobe.h @@ -26,7 +26,7 @@ typedef void (*fprobe_exit_cb)(struct fprobe *fp, unsigne= d long entry_ip, * @fp: The fprobe which owns this. */ struct fprobe_hlist_node { - struct hlist_node hlist; + struct rhash_head hlist; unsigned long addr; struct fprobe *fp; }; diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c index ba7ff14f5339..b3e16303fc6a 100644 --- a/kernel/trace/fprobe.c +++ b/kernel/trace/fprobe.c @@ -12,6 +12,7 @@ #include #include #include +#include =20 #include =20 @@ -41,47 +42,47 @@ * - RCU hlist traversal under disabling preempt */ static struct hlist_head fprobe_table[FPROBE_TABLE_SIZE]; -static struct hlist_head fprobe_ip_table[FPROBE_IP_TABLE_SIZE]; +static struct rhashtable fprobe_ip_table; static DEFINE_MUTEX(fprobe_mutex); =20 -/* - * Find first fprobe in the hlist. It will be iterated twice in the entry - * probe, once for correcting the total required size, the second time is - * calling back the user handlers. - * Thus the hlist in the fprobe_table must be sorted and new probe needs to - * be added *before* the first fprobe. - */ -static struct fprobe_hlist_node *find_first_fprobe_node(unsigned long ip) +static u32 fprobe_node_hashfn(const void *data, u32 len, u32 seed) { - struct fprobe_hlist_node *node; - struct hlist_head *head; + return hash_ptr(*(unsigned long **)data, 32); +} =20 - head =3D &fprobe_ip_table[hash_ptr((void *)ip, FPROBE_IP_HASH_BITS)]; - hlist_for_each_entry_rcu(node, head, hlist, - lockdep_is_held(&fprobe_mutex)) { - if (node->addr =3D=3D ip) - return node; - } - return NULL; +static int fprobe_node_cmp(struct rhashtable_compare_arg *arg, + const void *ptr) +{ + unsigned long key =3D *(unsigned long *)arg->key; + const struct fprobe_hlist_node *n =3D ptr; + + return n->addr !=3D key; +} + +static u32 fprobe_node_obj_hashfn(const void *data, u32 len, u32 seed) +{ + const struct fprobe_hlist_node *n =3D data; + + return hash_ptr((void *)n->addr, 32); } -NOKPROBE_SYMBOL(find_first_fprobe_node); + +static const struct rhashtable_params fprobe_rht_params =3D { + .head_offset =3D offsetof(struct fprobe_hlist_node, hlist), + .key_offset =3D offsetof(struct fprobe_hlist_node, addr), + .key_len =3D sizeof_field(struct fprobe_hlist_node, addr), + .hashfn =3D fprobe_node_hashfn, + .obj_hashfn =3D fprobe_node_obj_hashfn, + .obj_cmpfn =3D fprobe_node_cmp, + .automatic_shrinking =3D true, +}; =20 /* Node insertion and deletion requires the fprobe_mutex */ static void insert_fprobe_node(struct fprobe_hlist_node *node) { - unsigned long ip =3D node->addr; - struct fprobe_hlist_node *next; - struct hlist_head *head; - lockdep_assert_held(&fprobe_mutex); =20 - next =3D find_first_fprobe_node(ip); - if (next) { - hlist_add_before_rcu(&node->hlist, &next->hlist); - return; - } - head =3D &fprobe_ip_table[hash_ptr((void *)ip, FPROBE_IP_HASH_BITS)]; - hlist_add_head_rcu(&node->hlist, head); + rhashtable_insert_fast(&fprobe_ip_table, &node->hlist, + fprobe_rht_params); } =20 /* Return true if there are synonims */ @@ -92,9 +93,11 @@ static bool delete_fprobe_node(struct fprobe_hlist_node = *node) /* Avoid double deleting */ if (READ_ONCE(node->fp) !=3D NULL) { WRITE_ONCE(node->fp, NULL); - hlist_del_rcu(&node->hlist); + rhashtable_remove_fast(&fprobe_ip_table, &node->hlist, + fprobe_rht_params); } - return !!find_first_fprobe_node(node->addr); + return !!rhashtable_lookup_fast(&fprobe_ip_table, &node->addr, + fprobe_rht_params); } =20 /* Check existence of the fprobe */ @@ -249,25 +252,28 @@ static inline int __fprobe_kprobe_handler(unsigned lo= ng ip, unsigned long parent static int fprobe_entry(struct ftrace_graph_ent *trace, struct fgraph_ops = *gops, struct ftrace_regs *fregs) { - struct fprobe_hlist_node *node, *first; + struct rhash_lock_head __rcu *const *bkt; + struct fprobe_hlist_node *node; unsigned long *fgraph_data =3D NULL; unsigned long func =3D trace->func; + struct bucket_table *tbl; + struct rhash_head *head; unsigned long ret_ip; int reserved_words; struct fprobe *fp; + unsigned int key; int used, ret; =20 if (WARN_ON_ONCE(!fregs)) return 0; =20 - first =3D node =3D find_first_fprobe_node(func); - if (unlikely(!first)) - return 0; - + tbl =3D rht_dereference_rcu(fprobe_ip_table.tbl, &fprobe_ip_table); + key =3D rht_key_hashfn(&fprobe_ip_table, tbl, &func, fprobe_rht_params); + bkt =3D rht_bucket(tbl, key); reserved_words =3D 0; - hlist_for_each_entry_from_rcu(node, hlist) { + rht_for_each_entry_rcu_from(node, head, rht_ptr_rcu(bkt), tbl, key, hlist= ) { if (node->addr !=3D func) - break; + continue; fp =3D READ_ONCE(node->fp); if (!fp || !fp->exit_handler) continue; @@ -278,13 +284,13 @@ static int fprobe_entry(struct ftrace_graph_ent *trac= e, struct fgraph_ops *gops, reserved_words +=3D FPROBE_HEADER_SIZE_IN_LONG + SIZE_IN_LONG(fp->entry_data_size); } - node =3D first; if (reserved_words) { fgraph_data =3D fgraph_reserve_data(gops->idx, reserved_words * sizeof(l= ong)); if (unlikely(!fgraph_data)) { - hlist_for_each_entry_from_rcu(node, hlist) { + rht_for_each_entry_rcu_from(node, head, rht_ptr_rcu(bkt), + tbl, key, hlist) { if (node->addr !=3D func) - break; + continue; fp =3D READ_ONCE(node->fp); if (fp && !fprobe_disabled(fp)) fp->nmissed++; @@ -299,12 +305,12 @@ static int fprobe_entry(struct ftrace_graph_ent *trac= e, struct fgraph_ops *gops, */ ret_ip =3D ftrace_regs_get_return_address(fregs); used =3D 0; - hlist_for_each_entry_from_rcu(node, hlist) { + rht_for_each_entry_rcu_from(node, head, rht_ptr_rcu(bkt), tbl, key, hlist= ) { int data_size; void *data; =20 if (node->addr !=3D func) - break; + continue; fp =3D READ_ONCE(node->fp); if (!fp || fprobe_disabled(fp)) continue; @@ -448,25 +454,21 @@ static int fprobe_addr_list_add(struct fprobe_addr_li= st *alist, unsigned long ad return 0; } =20 -static void fprobe_remove_node_in_module(struct module *mod, struct hlist_= head *head, - struct fprobe_addr_list *alist) +static void fprobe_remove_node_in_module(struct module *mod, struct fprobe= _hlist_node *node, + struct fprobe_addr_list *alist) { - struct fprobe_hlist_node *node; int ret =3D 0; =20 - hlist_for_each_entry_rcu(node, head, hlist, - lockdep_is_held(&fprobe_mutex)) { - if (!within_module(node->addr, mod)) - continue; - if (delete_fprobe_node(node)) - continue; - /* - * If failed to update alist, just continue to update hlist. - * Therefore, at list user handler will not hit anymore. - */ - if (!ret) - ret =3D fprobe_addr_list_add(alist, node->addr); - } + if (!within_module(node->addr, mod)) + return; + if (delete_fprobe_node(node)) + return; + /* + * If failed to update alist, just continue to update hlist. + * Therefore, at list user handler will not hit anymore. + */ + if (!ret) + ret =3D fprobe_addr_list_add(alist, node->addr); } =20 /* Handle module unloading to manage fprobe_ip_table. */ @@ -474,8 +476,9 @@ static int fprobe_module_callback(struct notifier_block= *nb, unsigned long val, void *data) { struct fprobe_addr_list alist =3D {.size =3D FPROBE_IPS_BATCH_INIT}; + struct fprobe_hlist_node *node; + struct rhashtable_iter iter; struct module *mod =3D data; - int i; =20 if (val !=3D MODULE_STATE_GOING) return NOTIFY_DONE; @@ -486,8 +489,16 @@ static int fprobe_module_callback(struct notifier_bloc= k *nb, return NOTIFY_DONE; =20 mutex_lock(&fprobe_mutex); - for (i =3D 0; i < FPROBE_IP_TABLE_SIZE; i++) - fprobe_remove_node_in_module(mod, &fprobe_ip_table[i], &alist); + rhashtable_walk_enter(&fprobe_ip_table, &iter); + do { + rhashtable_walk_start(&iter); + + while ((node =3D rhashtable_walk_next(&iter)) && !IS_ERR(node)) + fprobe_remove_node_in_module(mod, node, &alist); + + rhashtable_walk_stop(&iter); + } while (node =3D=3D ERR_PTR(-EAGAIN)); + rhashtable_walk_exit(&iter); =20 if (alist.index < alist.size && alist.index > 0) ftrace_set_filter_ips(&fprobe_graph_ops.ops, @@ -819,3 +830,10 @@ int unregister_fprobe(struct fprobe *fp) return ret; } EXPORT_SYMBOL_GPL(unregister_fprobe); + +static int __init fprobe_initcall(void) +{ + rhashtable_init(&fprobe_ip_table, &fprobe_rht_params); + return 0; +} +late_initcall(fprobe_initcall); --=20 2.50.1 From nobody Sun Oct 5 23:57:03 2025 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) (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 9438B21ABB0; Mon, 28 Jul 2025 04:13:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753675989; cv=none; b=QPq1J8Y5+KNntpJGJVqjPwO6nuneNXMGNQAczAaAUUvz5BAkXAUoHL9Hf2AqQbFEiYyeqs4hBRMNjE9KGqftoZZy43WLesTp6uJbCs2ul9+BXQGYVWV7d2VGTlCigMY1LOyNERiV5ZhehmV0KkplPTjQDDr4hSb8Uy3SFs0PO0k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753675989; c=relaxed/simple; bh=zudiWkkAlg6yySZkWMGW/IXw6hzgirR0YopZ0oI3JAs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HLK+EzJrDTHin/nL7ltwB7rqHGBuSx8NBe4RhlS+iS5LgALFsIKnlcg1aDbxOG9Z4Yyzz9QFz2qLJpNveIUtZLDrdLmCJcEwmbhESrYjYU+T1Rzd8yS/IEUq68TKZWFUaXyhO3WisPaUYDvLLJdEuZ//KCSU3iOhSQpYJw1iVK0= 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=mNmhiDDA; arc=none smtp.client-ip=209.85.214.194 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="mNmhiDDA" Received: by mail-pl1-f194.google.com with SMTP id d9443c01a7336-234c5b57557so32828955ad.3; Sun, 27 Jul 2025 21:13:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753675987; x=1754280787; 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=y8iwRQl4S0Ri7auKWOImDztrR8W3w7sQvsgC0R12G/0=; b=mNmhiDDA+dvuMlAEcr3CChg4hiqGPbwdw4p9vCoZiw977QD2E24lq1d9GkuJ1dekou pF6GOGhv2XsKN7wIYbTk1dK9Uf8P8OHWLLWM7nZc4Z1rZeyp2KoA156CT7Uhj1OTLFyD zynhVXtGx6/gPQyFHqZ9QLlzssx0nnNxFy17kcTwkwYKvCkGse7xmkolybowzLd67y17 k20aNrfpKBI8TWt7CAaIVaB1Z+G9ZHBMZtDWR+1jOi2jJdpjLbqNQsYfSFGydtV8pb+C rOzWkrzi+hUfhmAIzMT5ot/p0JHQJ6JyBzBtyoVBo6boEcWXkKwufmm2yGOdMxDTKPzI yWTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753675987; x=1754280787; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y8iwRQl4S0Ri7auKWOImDztrR8W3w7sQvsgC0R12G/0=; b=AZo94ALMNfldTNfGDZMYhvwJ+4oH7bskb0UlgjvXJWDsOXQzspF2xKFjAm8FX3uuDp qW7oFkXMqh+1/fMpaSVIr4exR8/xmolzaza3+wXZ0gPx9UnqfaMiaNW7y4Kpjf4hAQz3 uoQObxDAAnGd9SE2IMaP/7hOF9RubyH3l2101wXorBWpfbpYSKqNCyGRaAfKgiYdv63U 2Pkk4RDrUCfTG0gLu4ZGd/zcWDZIT9v7L+B7cURVbfSgvrjJgCHk4mqw9ftc0KhPbGhe DtxAFwgtR9ucGu37/qmq2ShGo6OMceE8gfpadPa5XjWVL8atW1b+57f9u4NaKuTTouwf wEYA== X-Forwarded-Encrypted: i=1; AJvYcCUk5F6sO+FqPfZ9vCoEQ36IQv2KgyjeRKwijPMn/QqSmopR6jQoItPx4UHeA88PzCmRwPU=@vger.kernel.org, AJvYcCV6rBdFKltKleCc3GPHZMfOR/RCzWaB0Pz2UO3h+7s2xbwIHa/W6IVLKy3MwytP0iTkqptPrPwwVEQs/Q5y@vger.kernel.org, AJvYcCVRyKK7nOiT/rSQUfAKtGmBzTc83LPBrjj4N16+6zaXlbBTuaWui5loG8Cq8CyxZoK2+U6friHmeroqD957eGfNjxml@vger.kernel.org X-Gm-Message-State: AOJu0YwCwm6YZTm3OaNbdHyCps7c8CmBMxVvs1kwMfBRaxcd2KIU0Bvs NzN5VUBhxwDy/Bu7qAWDALZKd5tLj4JxPLBeztTy8XKzn+MjEg6dVdEU X-Gm-Gg: ASbGncvGEnnezg9EUt8Y7njb5bLnKy+g/72C4Zw/UWiYhiOMhogeIRoDrFJoXVsIdJ8 khJhdAxlu+5uunLSmT/TK4xkTYc2BpkUc5tCMYMInfI05ghM97nw3lIwiSxentZKyiP2giq9Ceb /P6uhTp5FxrLfesdCuaYnrFEhnAlr/G2/pR3iu/7cjzNDSaivRyQumRAnsN6f4ZiaO7OSVryFwx Hv8IYZnIPKfukEM2TI5PRmg/21f+HIu5H/Yy4WxfjCmK5P5cVnkYw1UA/kdH4hJiiovemQBPZFC zzPO0P2FYtVxvt7XNQrXEOilvCWLiWymagfEhOgoTEz4QXc+r6sIKfVZ8M0dOs1X+tfZXziK1zc RCRjD4kmhgKIqxfdzvCU= X-Google-Smtp-Source: AGHT+IGwtqmpSHudD7CUmmpKMgJ9sWb4H32pd44LkaxBtJGu1kz6YvGAo4FC9U1zduDH6tDvyyamoA== X-Received: by 2002:a17:902:f610:b0:240:14c:c648 with SMTP id d9443c01a7336-240014cc9c4mr53755115ad.25.1753675986561; Sun, 27 Jul 2025 21:13:06 -0700 (PDT) Received: from 7950hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-24008efc073sm20599175ad.58.2025.07.27.21.13.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Jul 2025 21:13:06 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: alexei.starovoitov@gmail.com, mhiramat@kernel.org Cc: rostedt@goodmis.org, mathieu.desnoyers@efficios.com, hca@linux.ibm.com, revest@chromium.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH bpf-next 2/4] selftests/bpf: move get_ksyms and get_addrs to trace_helpers.c Date: Mon, 28 Jul 2025 12:12:49 +0800 Message-ID: <20250728041252.441040-3-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728041252.441040-1-dongml2@chinatelecom.cn> References: <20250728041252.441040-1-dongml2@chinatelecom.cn> 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" We need to get all the kernel function that can be traced sometimes, so we move the get_syms() and get_addrs() in kprobe_multi_test.c to trace_helpers.c and rename it to bpf_get_ksyms() and bpf_get_addrs(). Signed-off-by: Menglong Dong --- .../bpf/prog_tests/kprobe_multi_test.c | 220 +----------------- tools/testing/selftests/bpf/trace_helpers.c | 214 +++++++++++++++++ tools/testing/selftests/bpf/trace_helpers.h | 3 + 3 files changed, 220 insertions(+), 217 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c b/t= ools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c index e19ef509ebf8..171706e78da8 100644 --- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c @@ -422,220 +422,6 @@ static void test_unique_match(void) kprobe_multi__destroy(skel); } =20 -static size_t symbol_hash(long key, void *ctx __maybe_unused) -{ - return str_hash((const char *) key); -} - -static bool symbol_equal(long key1, long key2, void *ctx __maybe_unused) -{ - return strcmp((const char *) key1, (const char *) key2) =3D=3D 0; -} - -static bool is_invalid_entry(char *buf, bool kernel) -{ - if (kernel && strchr(buf, '[')) - return true; - if (!kernel && !strchr(buf, '[')) - return true; - return false; -} - -static bool skip_entry(char *name) -{ - /* - * We attach to almost all kernel functions and some of them - * will cause 'suspicious RCU usage' when fprobe is attached - * to them. Filter out the current culprits - arch_cpu_idle - * default_idle and rcu_* functions. - */ - if (!strcmp(name, "arch_cpu_idle")) - return true; - if (!strcmp(name, "default_idle")) - return true; - if (!strncmp(name, "rcu_", 4)) - return true; - if (!strcmp(name, "bpf_dispatcher_xdp_func")) - return true; - if (!strncmp(name, "__ftrace_invalid_address__", - sizeof("__ftrace_invalid_address__") - 1)) - return true; - return false; -} - -/* Do comparision by ignoring '.llvm.' suffixes. */ -static int compare_name(const char *name1, const char *name2) -{ - const char *res1, *res2; - int len1, len2; - - res1 =3D strstr(name1, ".llvm."); - res2 =3D strstr(name2, ".llvm."); - len1 =3D res1 ? res1 - name1 : strlen(name1); - len2 =3D res2 ? res2 - name2 : strlen(name2); - - if (len1 =3D=3D len2) - return strncmp(name1, name2, len1); - if (len1 < len2) - return strncmp(name1, name2, len1) <=3D 0 ? -1 : 1; - return strncmp(name1, name2, len2) >=3D 0 ? 1 : -1; -} - -static int load_kallsyms_compare(const void *p1, const void *p2) -{ - return compare_name(((const struct ksym *)p1)->name, ((const struct ksym = *)p2)->name); -} - -static int search_kallsyms_compare(const void *p1, const struct ksym *p2) -{ - return compare_name(p1, p2->name); -} - -static int get_syms(char ***symsp, size_t *cntp, bool kernel) -{ - size_t cap =3D 0, cnt =3D 0; - char *name =3D NULL, *ksym_name, **syms =3D NULL; - struct hashmap *map; - struct ksyms *ksyms; - struct ksym *ks; - char buf[256]; - FILE *f; - int err =3D 0; - - ksyms =3D load_kallsyms_custom_local(load_kallsyms_compare); - if (!ASSERT_OK_PTR(ksyms, "load_kallsyms_custom_local")) - return -EINVAL; - - /* - * The available_filter_functions contains many duplicates, - * but other than that all symbols are usable in kprobe multi - * interface. - * Filtering out duplicates by using hashmap__add, which won't - * add existing entry. - */ - - if (access("/sys/kernel/tracing/trace", F_OK) =3D=3D 0) - f =3D fopen("/sys/kernel/tracing/available_filter_functions", "r"); - else - f =3D fopen("/sys/kernel/debug/tracing/available_filter_functions", "r"); - - if (!f) - return -EINVAL; - - map =3D hashmap__new(symbol_hash, symbol_equal, NULL); - if (IS_ERR(map)) { - err =3D libbpf_get_error(map); - goto error; - } - - while (fgets(buf, sizeof(buf), f)) { - if (is_invalid_entry(buf, kernel)) - continue; - - free(name); - if (sscanf(buf, "%ms$*[^\n]\n", &name) !=3D 1) - continue; - if (skip_entry(name)) - continue; - - ks =3D search_kallsyms_custom_local(ksyms, name, search_kallsyms_compare= ); - if (!ks) { - err =3D -EINVAL; - goto error; - } - - ksym_name =3D ks->name; - err =3D hashmap__add(map, ksym_name, 0); - if (err =3D=3D -EEXIST) { - err =3D 0; - continue; - } - if (err) - goto error; - - err =3D libbpf_ensure_mem((void **) &syms, &cap, - sizeof(*syms), cnt + 1); - if (err) - goto error; - - syms[cnt++] =3D ksym_name; - } - - *symsp =3D syms; - *cntp =3D cnt; - -error: - free(name); - fclose(f); - hashmap__free(map); - if (err) - free(syms); - return err; -} - -static int get_addrs(unsigned long **addrsp, size_t *cntp, bool kernel) -{ - unsigned long *addr, *addrs, *tmp_addrs; - int err =3D 0, max_cnt, inc_cnt; - char *name =3D NULL; - size_t cnt =3D 0; - char buf[256]; - FILE *f; - - if (access("/sys/kernel/tracing/trace", F_OK) =3D=3D 0) - f =3D fopen("/sys/kernel/tracing/available_filter_functions_addrs", "r"); - else - f =3D fopen("/sys/kernel/debug/tracing/available_filter_functions_addrs"= , "r"); - - if (!f) - return -ENOENT; - - /* In my local setup, the number of entries is 50k+ so Let us initially - * allocate space to hold 64k entries. If 64k is not enough, incrementally - * increase 1k each time. - */ - max_cnt =3D 65536; - inc_cnt =3D 1024; - addrs =3D malloc(max_cnt * sizeof(long)); - if (addrs =3D=3D NULL) { - err =3D -ENOMEM; - goto error; - } - - while (fgets(buf, sizeof(buf), f)) { - if (is_invalid_entry(buf, kernel)) - continue; - - free(name); - if (sscanf(buf, "%p %ms$*[^\n]\n", &addr, &name) !=3D 2) - continue; - if (skip_entry(name)) - continue; - - if (cnt =3D=3D max_cnt) { - max_cnt +=3D inc_cnt; - tmp_addrs =3D realloc(addrs, max_cnt); - if (!tmp_addrs) { - err =3D -ENOMEM; - goto error; - } - addrs =3D tmp_addrs; - } - - addrs[cnt++] =3D (unsigned long)addr; - } - - *addrsp =3D addrs; - *cntp =3D cnt; - -error: - free(name); - fclose(f); - if (err) - free(addrs); - return err; -} - static void do_bench_test(struct kprobe_multi_empty *skel, struct bpf_kpro= be_multi_opts *opts) { long attach_start_ns, attach_end_ns; @@ -670,7 +456,7 @@ static void test_kprobe_multi_bench_attach(bool kernel) char **syms =3D NULL; size_t cnt =3D 0; =20 - if (!ASSERT_OK(get_syms(&syms, &cnt, kernel), "get_syms")) + if (!ASSERT_OK(bpf_get_ksyms(&syms, &cnt, kernel), "bpf_get_ksyms")) return; =20 skel =3D kprobe_multi_empty__open_and_load(); @@ -696,13 +482,13 @@ static void test_kprobe_multi_bench_attach_addr(bool = kernel) size_t cnt =3D 0; int err; =20 - err =3D get_addrs(&addrs, &cnt, kernel); + err =3D bpf_get_addrs(&addrs, &cnt, kernel); if (err =3D=3D -ENOENT) { test__skip(); return; } =20 - if (!ASSERT_OK(err, "get_addrs")) + if (!ASSERT_OK(err, "bpf_get_addrs")) return; =20 skel =3D kprobe_multi_empty__open_and_load(); diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/se= lftests/bpf/trace_helpers.c index 81943c6254e6..d24baf244d1f 100644 --- a/tools/testing/selftests/bpf/trace_helpers.c +++ b/tools/testing/selftests/bpf/trace_helpers.c @@ -17,6 +17,7 @@ #include #include #include +#include "bpf/hashmap.h" #include "bpf/libbpf_internal.h" =20 #define TRACEFS_PIPE "/sys/kernel/tracing/trace_pipe" @@ -519,3 +520,216 @@ void read_trace_pipe(void) { read_trace_pipe_iter(trace_pipe_cb, NULL, 0); } + +static size_t symbol_hash(long key, void *ctx __maybe_unused) +{ + return str_hash((const char *) key); +} + +static bool symbol_equal(long key1, long key2, void *ctx __maybe_unused) +{ + return strcmp((const char *) key1, (const char *) key2) =3D=3D 0; +} + +static bool is_invalid_entry(char *buf, bool kernel) +{ + if (kernel && strchr(buf, '[')) + return true; + if (!kernel && !strchr(buf, '[')) + return true; + return false; +} + +static bool skip_entry(char *name) +{ + /* + * We attach to almost all kernel functions and some of them + * will cause 'suspicious RCU usage' when fprobe is attached + * to them. Filter out the current culprits - arch_cpu_idle + * default_idle and rcu_* functions. + */ + if (!strcmp(name, "arch_cpu_idle")) + return true; + if (!strcmp(name, "default_idle")) + return true; + if (!strncmp(name, "rcu_", 4)) + return true; + if (!strcmp(name, "bpf_dispatcher_xdp_func")) + return true; + if (!strncmp(name, "__ftrace_invalid_address__", + sizeof("__ftrace_invalid_address__") - 1)) + return true; + return false; +} + +/* Do comparison by ignoring '.llvm.' suffixes. */ +static int compare_name(const char *name1, const char *name2) +{ + const char *res1, *res2; + int len1, len2; + + res1 =3D strstr(name1, ".llvm."); + res2 =3D strstr(name2, ".llvm."); + len1 =3D res1 ? res1 - name1 : strlen(name1); + len2 =3D res2 ? res2 - name2 : strlen(name2); + + if (len1 =3D=3D len2) + return strncmp(name1, name2, len1); + if (len1 < len2) + return strncmp(name1, name2, len1) <=3D 0 ? -1 : 1; + return strncmp(name1, name2, len2) >=3D 0 ? 1 : -1; +} + +static int load_kallsyms_compare(const void *p1, const void *p2) +{ + return compare_name(((const struct ksym *)p1)->name, ((const struct ksym = *)p2)->name); +} + +static int search_kallsyms_compare(const void *p1, const struct ksym *p2) +{ + return compare_name(p1, p2->name); +} + +int bpf_get_ksyms(char ***symsp, size_t *cntp, bool kernel) +{ + size_t cap =3D 0, cnt =3D 0; + char *name =3D NULL, *ksym_name, **syms =3D NULL; + struct hashmap *map; + struct ksyms *ksyms; + struct ksym *ks; + char buf[256]; + FILE *f; + int err =3D 0; + + ksyms =3D load_kallsyms_custom_local(load_kallsyms_compare); + if (!ksyms) + return -EINVAL; + + /* + * The available_filter_functions contains many duplicates, + * but other than that all symbols are usable to trace. + * Filtering out duplicates by using hashmap__add, which won't + * add existing entry. + */ + + if (access("/sys/kernel/tracing/trace", F_OK) =3D=3D 0) + f =3D fopen("/sys/kernel/tracing/available_filter_functions", "r"); + else + f =3D fopen("/sys/kernel/debug/tracing/available_filter_functions", "r"); + + if (!f) + return -EINVAL; + + map =3D hashmap__new(symbol_hash, symbol_equal, NULL); + if (IS_ERR(map)) { + err =3D libbpf_get_error(map); + goto error; + } + + while (fgets(buf, sizeof(buf), f)) { + if (is_invalid_entry(buf, kernel)) + continue; + + free(name); + if (sscanf(buf, "%ms$*[^\n]\n", &name) !=3D 1) + continue; + if (skip_entry(name)) + continue; + + ks =3D search_kallsyms_custom_local(ksyms, name, search_kallsyms_compare= ); + if (!ks) { + err =3D -EINVAL; + goto error; + } + + ksym_name =3D ks->name; + err =3D hashmap__add(map, ksym_name, 0); + if (err =3D=3D -EEXIST) { + err =3D 0; + continue; + } + if (err) + goto error; + + err =3D libbpf_ensure_mem((void **) &syms, &cap, + sizeof(*syms), cnt + 1); + if (err) + goto error; + + syms[cnt++] =3D ksym_name; + } + + *symsp =3D syms; + *cntp =3D cnt; + +error: + free(name); + fclose(f); + hashmap__free(map); + if (err) + free(syms); + return err; +} + +int bpf_get_addrs(unsigned long **addrsp, size_t *cntp, bool kernel) +{ + unsigned long *addr, *addrs, *tmp_addrs; + int err =3D 0, max_cnt, inc_cnt; + char *name =3D NULL; + size_t cnt =3D 0; + char buf[256]; + FILE *f; + + if (access("/sys/kernel/tracing/trace", F_OK) =3D=3D 0) + f =3D fopen("/sys/kernel/tracing/available_filter_functions_addrs", "r"); + else + f =3D fopen("/sys/kernel/debug/tracing/available_filter_functions_addrs"= , "r"); + + if (!f) + return -ENOENT; + + /* In my local setup, the number of entries is 50k+ so Let us initially + * allocate space to hold 64k entries. If 64k is not enough, incrementally + * increase 1k each time. + */ + max_cnt =3D 65536; + inc_cnt =3D 1024; + addrs =3D malloc(max_cnt * sizeof(long)); + if (addrs =3D=3D NULL) { + err =3D -ENOMEM; + goto error; + } + + while (fgets(buf, sizeof(buf), f)) { + if (is_invalid_entry(buf, kernel)) + continue; + + free(name); + if (sscanf(buf, "%p %ms$*[^\n]\n", &addr, &name) !=3D 2) + continue; + if (skip_entry(name)) + continue; + + if (cnt =3D=3D max_cnt) { + max_cnt +=3D inc_cnt; + tmp_addrs =3D realloc(addrs, max_cnt); + if (!tmp_addrs) { + err =3D -ENOMEM; + goto error; + } + addrs =3D tmp_addrs; + } + + addrs[cnt++] =3D (unsigned long)addr; + } + + *addrsp =3D addrs; + *cntp =3D cnt; + +error: + free(name); + fclose(f); + if (err) + free(addrs); + return err; +} diff --git a/tools/testing/selftests/bpf/trace_helpers.h b/tools/testing/se= lftests/bpf/trace_helpers.h index 2ce873c9f9aa..9437bdd4afa5 100644 --- a/tools/testing/selftests/bpf/trace_helpers.h +++ b/tools/testing/selftests/bpf/trace_helpers.h @@ -41,4 +41,7 @@ ssize_t get_rel_offset(uintptr_t addr); =20 int read_build_id(const char *path, char *build_id, size_t size); =20 +int bpf_get_ksyms(char ***symsp, size_t *cntp, bool kernel); +int bpf_get_addrs(unsigned long **addrsp, size_t *cntp, bool kernel); + #endif --=20 2.50.1 From nobody Sun Oct 5 23:57:03 2025 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) (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 CCBE421CC74; Mon, 28 Jul 2025 04:13:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753675992; cv=none; b=spZGfoflpBT9h3DtQC83psxLEdBJl0RnurdtdSUvr4NIknl78tPYz+siwKQPa2VMpLsyhKm6ePFmYcLv1MIfDBCFT+eo/J0U0QZnZCOIPxqxzncCneD/2CgnPpaw7YsFyyrd1zUfaN2bIOpgo6JPFzdcUA8qJLPx6qLUq+lAUTw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753675992; c=relaxed/simple; bh=TGw2ul2ZAldEcVHaU0fnT+T9Zm5AaMY7QcEq1fLdVSA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TrKsWbJPN8E/BEaHK6LhdyANcjgxOaIGZucM5LKlqI2s/ys5eIWYLZlCy+YnrXU3Cz++/0/fmvWCQeAV6I5UBTXh1afOmZ+xFrV5ZbwwpT+6f2mQCfh1D90/bSnKunI0c3xFyd1IaWz/7JZg3S8pq0fQViUKkrjm8uXDdFpd1kA= 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=HByaA437; arc=none smtp.client-ip=209.85.214.194 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="HByaA437" Received: by mail-pl1-f194.google.com with SMTP id d9443c01a7336-234f17910d8so33814795ad.3; Sun, 27 Jul 2025 21:13:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753675990; x=1754280790; 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=DGBbLIiLGqrmFvSwaYDbAojdCre78exL+6ZjHnBuXvE=; b=HByaA437BoA9M86BoqGIPDAMLeB975vjxV6EXiGTXszhkMGWlPtN3HGXOAB5BkhfZX KD5mepIRUK43RYo4U+11BexLkK2+jZcM01LUqcxI8ETG8EwIzKLSBHoalDTL5ru0lsTF SZczRc/rUmeC25twD4yziI1n7WViZtIfoL2+92fnlfCaKGZr6VMXQ7TrObtg9Bo2PxeB HLsYD8yMuYLHvDBiC+iz7lnd7cHZHJabSQmHCvalCGN7tMG910fwTOhzNiTln31hBcq3 DAb7ZUXeuIOOyVkVEqwSncX9AyaMkKasH5rKKcdvH+zO8qZZxJCamzRrihZHqoogbc3u kwIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753675990; x=1754280790; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DGBbLIiLGqrmFvSwaYDbAojdCre78exL+6ZjHnBuXvE=; b=b/0bLSZuqVZMKLbyi7R+714vnV46fHYSKXTig36QK1+GANpCqmb8uq0hm6pKBp6Wzv AVzZCgNgitSBEBR2pzqmCzYCHZ7f6vkTIi0c45KirpZsBq5zme7j24S3L7hGqBmznyrd 3VrYJRovDZBmGsla1qQENdTYzCV9L77u+PE+Yj3DbGpOiTHAXsZgckZ/9sOPaW3SCPYL iBl3w/VOggU3/tNxilvy62fUXWQWpUXcvUM57StWjirxAfzNaDPoNQdCn0GZ7aVhGmSG ORxiYkpxTQQbgtBH4Vj0+hmPTdByMTTzgJdnL4oa54OjPBg05o3G1ECFa9XaGJC50KRT vT7g== X-Forwarded-Encrypted: i=1; AJvYcCUM+JGpsIw4OZ6NlZH+/+QBS8KCptLt5JobmaSgU/f8LfvrqT8f4tNuiCHP8GDZqaO2EmSyQNPfkEryVANUAVmWVDPP@vger.kernel.org, AJvYcCXhXgeg8lXq+gn3Dp04owI6woUpBKMKypzk+uMxHNEMKYsxNcS+S6VeiEd2V+4S36O0c+s=@vger.kernel.org, AJvYcCXxWgU+mq0KlGatDsMefnD0aBZTYRDKGaWbTZvh3B80/ljOYelgh1n2bn74H3C3KrbbPMNx4WklRFn0n/da@vger.kernel.org X-Gm-Message-State: AOJu0YxppwLGvNmB4/FHxZLL5Zr1V+TbuYwmeVVsELCeTUMGpIxejuF1 xmgYTUMBLU1ueAeubExSK05CTFCP19lkDI9TaYIdbsmP26180HpZpsKGuDzVGfnNcd0= X-Gm-Gg: ASbGncs2VapEI4tR3DuYFho8wvvtLp9jZMFi8AA/3FXnwMCxGXvqacZ2LqU7zVPUE0f qZyynVnOAQWF2qyPCTUHsNLQo9ccXW3SCnPw9bMWxiD2Yq2BX6D/g8Vrg4Ni7q7RKRQLwjTUcd7 hBRqZDherF5DKY5bjG4AqpNJAhPpVCOc1klr04aWfbWZq+cl92Jjz3aCfTtTURy8LZB8wVT1xa7 0vSGuRFKCn3y6oDwgF7Vd0trOLmc7JVbErsGQEWUWLL6C+Cez1Y9pUNVa8dYV8ludpZxORhy0vT XCuJWQrJVf6GgvDRK9B8ER8ED840xRJRCvfsmeXPG8AJL7qFW1XSCP9oa8UK2PeyspGSZgg8UrO OyDgYrZeApBgNRkduYjQ= X-Google-Smtp-Source: AGHT+IGB2pjt0vkcDq6lWjAxS++yOy8gk7moI81oq6LOT4h67+7I5MBC0hse5/AG1yjymEbtYkgE5A== X-Received: by 2002:a17:902:d506:b0:235:f45f:ed2b with SMTP id d9443c01a7336-23fb2fe1271mr144452705ad.1.1753675989958; Sun, 27 Jul 2025 21:13:09 -0700 (PDT) Received: from 7950hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-24008efc073sm20599175ad.58.2025.07.27.21.13.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Jul 2025 21:13:09 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: alexei.starovoitov@gmail.com, mhiramat@kernel.org Cc: rostedt@goodmis.org, mathieu.desnoyers@efficios.com, hca@linux.ibm.com, revest@chromium.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH bpf-next 3/4] selftests/bpf: skip recursive functions for kprobe_multi Date: Mon, 28 Jul 2025 12:12:50 +0800 Message-ID: <20250728041252.441040-4-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728041252.441040-1-dongml2@chinatelecom.cn> References: <20250728041252.441040-1-dongml2@chinatelecom.cn> 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" Some functions is recursive for the kprobe_multi and impact the benchmark results. So just skip them. Signed-off-by: Menglong Dong --- tools/testing/selftests/bpf/trace_helpers.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/se= lftests/bpf/trace_helpers.c index d24baf244d1f..9da9da51b132 100644 --- a/tools/testing/selftests/bpf/trace_helpers.c +++ b/tools/testing/selftests/bpf/trace_helpers.c @@ -559,6 +559,22 @@ static bool skip_entry(char *name) if (!strncmp(name, "__ftrace_invalid_address__", sizeof("__ftrace_invalid_address__") - 1)) return true; + + if (!strcmp(name, "migrate_disable")) + return true; + if (!strcmp(name, "migrate_enable")) + return true; + if (!strcmp(name, "rcu_read_unlock_strict")) + return true; + if (!strcmp(name, "preempt_count_add")) + return true; + if (!strcmp(name, "preempt_count_sub")) + return true; + if (!strcmp(name, "__rcu_read_lock")) + return true; + if (!strcmp(name, "__rcu_read_unlock")) + return true; + return false; } =20 --=20 2.50.1 From nobody Sun Oct 5 23:57:03 2025 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) (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 2ACAB220F34; Mon, 28 Jul 2025 04:13:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753675995; cv=none; b=HAd7NNUhFNVz6Pp2u83LSseVNXSkFDX/UHFlhznP5A8U4jrNDC1DINbNhhrMNiTdk7jUX2xCa1Y1yxyUWSRYlws39M0b2+USvCmuHvDUzUl5g3pIsr2b1P+byRQbFCmlvKYuPjkXUoc5fd7aCcpgR2EnSdv8jn/n03fpe2H6WnA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753675995; c=relaxed/simple; bh=bRExeoONmR0WhrsbqFNroJ9+Vz1rBjIUMt3FwoFHMyQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XGyPmxDWkaqHwdw0+nvm7ptYnnKBHSTU/IF+FDPzNFWQaA5FW+Kx5dAS+G5kS/GPqgaqRhOGnzD+V7AFUCyEU84nLDUPtg52p3sFqk0onzYQkLvORODR9mVMgTZVe7s2/b4Iz2RGgfzNEOxGIihN4onY680G4Te/X5/YAIkf5GY= 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=fK+gBeSX; arc=none smtp.client-ip=209.85.214.196 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="fK+gBeSX" Received: by mail-pl1-f196.google.com with SMTP id d9443c01a7336-23602481460so39620015ad.0; Sun, 27 Jul 2025 21:13:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753675993; x=1754280793; 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=AjeNP1ojEwSXm7x5F0g4swwiLUfc7kqWz38lpPc+Rx8=; b=fK+gBeSX/zLgzQIWjLg5MsFYTWm+ernGTfh48OcfErjnfZT+paMLVH5PAxb4tw5CaM U84qSUotMtrYmmsIe5uKaMSxD5CLY37o8kTvVVxyyaroiApv92PTwAwPyPq7JmCVZ0d3 Op2bZSeBRFRW/UiQ6E7vV9afNzaZnE6afh0GFo50W2c2LM4ig3iHhGStKQbAvn4HgtU1 7Bzs4d+qJ/OU5imjb7mpUD5/YAUxXY7uo1pcpV3CeWaHwuoffUB7n3auWtZDSU5py9jb btZ1M1ZkINpni2arWmYoXV/Ly9SjYdj15ctqB+125bde17awZoXmZNwO7ztXycnP19qd uzBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753675993; x=1754280793; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AjeNP1ojEwSXm7x5F0g4swwiLUfc7kqWz38lpPc+Rx8=; b=M3aA8Yc26ZA9mXS1iLMgQ8VIgugQysmX91hAYxjV7beJBPXlpiNl0HnkKPvjk6QLkc /bSobfX0u4I9M1AusMG5ieQhh7jVrkH7LoyV5vtLPbNvW4Zr+AM9zzLCTkaVvNS4q0sr fBrix7M1oaQbZTyqJC09hwq7KbKHGjOK8Ll2bN65aWoYtZ2vJGWqlyabDSY+JitHDPTw StLGoVP/R7WqTVcn8abz9Y0IJSGYkeUBm6JBiYV7M+v5zPjuq3phN7IBhnNSk1+2INPp 41OtayBqVhqP5qdkuaZEMHlvLy6BO2yz+b+WGCEt77RiGxGERQZ7neDk68T3MLFAS/VG dvbw== X-Forwarded-Encrypted: i=1; AJvYcCUWoFKvckbHYbdnRybrr1uWdf+7cTD9TF70t+y9RRIQk1YoLFbpN4KBP1QFRnYQ+weJlnNr9Q7n5r+WrqLPfolkFxS4@vger.kernel.org, AJvYcCXCWj97iTtKxhgwhR9xEkygSUAH3CL72fJfgR0EVCqC3KyGTUvUUR/rQOIn2FSiWKhv72mzzsh97YBVCnOt@vger.kernel.org, AJvYcCXXsjNMRbyx1pTj1uVRdqZTmYU6hmV5LZGpzNVaEurYad7IIzQygj6cXMOBVS0GmFXb+VA=@vger.kernel.org X-Gm-Message-State: AOJu0YytkzG/C1Uxvmj/xkfPzskngoIdZj365ZPnpysVFDtTmUZM4vjR tdf9Y3KBGNqIv5cVkdqqZOt/dRppzXntBB4x6JsEJPO9K3p5NRKBNJ1O X-Gm-Gg: ASbGncv0ZetoHcaykpEpNnrbGb75ix1ebpwUJqxpW9y7dPSqIjCN5AQb3SQUC4MNO4N YTIWCJl0HHTxZf2+9K2jubq7Apic+QE/rox+4npjLiJzr7XGysl6Mh7u+zh9ABVq92cZ0h8Yso7 wgd720ZV3BD7kTT7zVSz7W31zxGyPivHwwWF20xcvuhozILzcIq+9QEkOZWxDoWNrLDUbuf2/y5 fvJ1d+YKAVgNo5fQ/knSm8cwzP/sXmzRds0oXgXYElznKcw8ahFuXq8M3fcr17z80ILNTHgJ6w/ zA99LBMgun5TZd9dF5+z1nQdNeNpLVp98roQo6EU1jztk4e5NMb29hJYPeFJuWMRXC4keVxr2cO NkubBBK6r/Dksfk40Zco= X-Google-Smtp-Source: AGHT+IF9kh81K3dC0j67xBO5/cmUYFztZWzS9P4O92aNSAOnGEzvIs2s4ZaQScwsDq0lt6VC2wP0aw== X-Received: by 2002:a17:903:4b50:b0:236:9726:7264 with SMTP id d9443c01a7336-23fb305083dmr171963755ad.5.1753675993352; Sun, 27 Jul 2025 21:13:13 -0700 (PDT) Received: from 7950hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-24008efc073sm20599175ad.58.2025.07.27.21.13.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Jul 2025 21:13:13 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: alexei.starovoitov@gmail.com, mhiramat@kernel.org Cc: rostedt@goodmis.org, mathieu.desnoyers@efficios.com, hca@linux.ibm.com, revest@chromium.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH bpf-next 4/4] selftests/bpf: add benchmark testing for kprobe-multi-all Date: Mon, 28 Jul 2025 12:12:51 +0800 Message-ID: <20250728041252.441040-5-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728041252.441040-1-dongml2@chinatelecom.cn> References: <20250728041252.441040-1-dongml2@chinatelecom.cn> 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" For now, the benchmark for kprobe-multi is single, which means there is only 1 function is hooked during testing. Add the testing "kprobe-multi-all", which will hook all the kernel functions during the benchmark. Signed-off-by: Menglong Dong --- tools/testing/selftests/bpf/bench.c | 2 ++ .../selftests/bpf/benchs/bench_trigger.c | 30 +++++++++++++++++++ .../selftests/bpf/benchs/run_bench_trigger.sh | 2 +- 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/bench.c b/tools/testing/selftests/= bpf/bench.c index ddd73d06a1eb..da971d8c5ae5 100644 --- a/tools/testing/selftests/bpf/bench.c +++ b/tools/testing/selftests/bpf/bench.c @@ -510,6 +510,7 @@ extern const struct bench bench_trig_kretprobe; extern const struct bench bench_trig_kprobe_multi; extern const struct bench bench_trig_kretprobe_multi; extern const struct bench bench_trig_fentry; +extern const struct bench bench_trig_kprobe_multi_all; extern const struct bench bench_trig_fexit; extern const struct bench bench_trig_fmodret; extern const struct bench bench_trig_tp; @@ -578,6 +579,7 @@ static const struct bench *benchs[] =3D { &bench_trig_kprobe_multi, &bench_trig_kretprobe_multi, &bench_trig_fentry, + &bench_trig_kprobe_multi_all, &bench_trig_fexit, &bench_trig_fmodret, &bench_trig_tp, diff --git a/tools/testing/selftests/bpf/benchs/bench_trigger.c b/tools/tes= ting/selftests/bpf/benchs/bench_trigger.c index 82327657846e..be5fe88862a4 100644 --- a/tools/testing/selftests/bpf/benchs/bench_trigger.c +++ b/tools/testing/selftests/bpf/benchs/bench_trigger.c @@ -226,6 +226,35 @@ static void trigger_fentry_setup(void) attach_bpf(ctx.skel->progs.bench_trigger_fentry); } =20 +static void trigger_kprobe_multi_all_setup(void) +{ + LIBBPF_OPTS(bpf_kprobe_multi_opts, opts); + struct bpf_program *prog; + struct bpf_link *link; + char **syms =3D NULL; + size_t cnt =3D 0; + + setup_ctx(); + prog =3D ctx.skel->progs.bench_trigger_kprobe_multi; + bpf_program__set_autoload(prog, true); + load_ctx(); + + if (bpf_get_ksyms(&syms, &cnt, true)) { + printf("failed to get ksyms\n"); + exit(1); + } + + printf("found %zu ksyms\n", cnt); + opts.syms =3D (const char **) syms; + opts.cnt =3D cnt; + link =3D bpf_program__attach_kprobe_multi_opts(prog, NULL, &opts); + if (!link) { + printf("failed to attach bpf_program__attach_kprobe_multi_opts to all\n"= ); + exit(1); + } + ctx.skel->links.bench_trigger_kprobe_multi =3D link; +} + static void trigger_fexit_setup(void) { setup_ctx(); @@ -512,6 +541,7 @@ BENCH_TRIG_KERNEL(kretprobe, "kretprobe"); BENCH_TRIG_KERNEL(kprobe_multi, "kprobe-multi"); BENCH_TRIG_KERNEL(kretprobe_multi, "kretprobe-multi"); BENCH_TRIG_KERNEL(fentry, "fentry"); +BENCH_TRIG_KERNEL(kprobe_multi_all, "kprobe-multi-all"); BENCH_TRIG_KERNEL(fexit, "fexit"); BENCH_TRIG_KERNEL(fmodret, "fmodret"); BENCH_TRIG_KERNEL(tp, "tp"); diff --git a/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh b/tool= s/testing/selftests/bpf/benchs/run_bench_trigger.sh index a690f5a68b6b..886b6ffc9742 100755 --- a/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh +++ b/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh @@ -6,7 +6,7 @@ def_tests=3D( \ usermode-count kernel-count syscall-count \ fentry fexit fmodret \ rawtp tp \ - kprobe kprobe-multi \ + kprobe kprobe-multi kprobe-multi-all \ kretprobe kretprobe-multi \ ) =20 --=20 2.50.1