From nobody Sat Oct 4 14:14:57 2025 Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.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 131102C0F95; Fri, 15 Aug 2025 06:47:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755240446; cv=none; b=UdnhOSlpX5Fgm0waXopt/4T0AN5Cja7Qu6vd3sm7002q3Pirchc3LRG8TEomnHbWiWIEQLKLXNzlBO8TrbR2Mwkn0YoXchz7GaXWeF1rm/b9pXs0ekCix5OnBqA3F2FMO/76UrIyH6Xg/OhpgPrSap/Ne/mhztvUfyBeDDwqGzs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755240446; c=relaxed/simple; bh=8c6XiGSsLg4WivlAdddTMBCijsqkBnwNMDeJWgspdAA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nzMYiGBH4bRtDmwpHiG1kNhkoAvnbq5yfXn8qLQVsCYpceOtoh9//Mxa1JD0zep3Rs44bKM4HwHl+2jRyuT4vKJZdUu2W0tDxjlzbcgMHQSTIEdg+4Cvv2nuT0mqX5K+7GcVdloZrLXZqqXzw3/+hFgsKaMdJDV9sYFzz54U86g= 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=Z2PBTJWW; arc=none smtp.client-ip=209.85.215.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="Z2PBTJWW" Received: by mail-pg1-f196.google.com with SMTP id 41be03b00d2f7-b4717ba0d5dso1083648a12.1; Thu, 14 Aug 2025 23:47:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755240444; x=1755845244; 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=71t4n68hjAPevB6NpQf/YHIqzsx0jKOTw/PsbXVomRY=; b=Z2PBTJWWCK6wheiTAgdGwSEACTnEWG4g9DDiDZS4/iMp/Xo8BWH98qU6uZumf+Wz8W O8GOH+qDY9/eoj+mZkFhPoFbiEd132Sv8+FncO2pNulYvo9y/UZqmzIvA/sU3G1PJNQ/ qW2urY1AHNkZIghGHLmDojpM+YR8tRUox0Q9Swfk3xOolQC0D7GUcocYQ2O2Gxi1vUNZ KSVvxENeSgfFOsuhRUO9bf3/QQBrxuHlJMfk9aglmljuvQpZEGbomoSgWqNByHYpTjfd 0oleztCwiDt0jHjIlVM+ghU86a5/PpwJQ9qWZjJOK7oT5S1iPKGigyIAMJqutHziS2CG CD9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755240444; x=1755845244; 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=71t4n68hjAPevB6NpQf/YHIqzsx0jKOTw/PsbXVomRY=; b=E67vmsdImct5aFdR++hpfGJi4OlPI8sMk45eunApbMlmHqpL78Y5MGQspHciN6dNAS bH4tHIDRrIUyFKLhDXPOZBLYMvhltNQELyJYc1KczJFLDDTlMCes506lWR902WYDQDsW aCdFp+HD3lVPCd3YN/QmSD3z6fZhtd2hvlw6XoBaYuYvBF+pFO+KkAUYmZcXcEK/RZad VsV6u3GQWNeFSfIHSI2aJJrf+3o/0fySj5YKLR0U9IpeGJu1wVZG2JqB8WM5Hjnjm9I2 GXgehqvwFVOMYEkGIczoxT6ccdFhQf7B8QySQ+0YEsyu1qYJXRi5HJJiT31MaAfyi3ZQ mTdg== X-Forwarded-Encrypted: i=1; AJvYcCUUXOit5g/Bkd78BVvWcnXXwCNTbKc9rEEF+EE14zQcjECKhJ4/1SopwcRMSTkww+darR+otfMhYlyHbWdp@vger.kernel.org, AJvYcCWOGlu279V46hj3MO9aVb2g+JJiiwkR/iox1gjyJt47+4aqaQXYde5+ab34cYdgn2/VQjA=@vger.kernel.org, AJvYcCXnW5FxbM9n7Yw/fqECDoWqMxTA1yCLIiu49ol4PgEg1lJLaTwJraRrARtRGNt2z0DbvQx9WJv5XEUDr90XB0uJm3wb@vger.kernel.org X-Gm-Message-State: AOJu0YyYwvCGQ4gUakAzbXqyUnH3EDNG4O120BljO9GFvfreW0C2Lgnb /0qiW2cxxbxUPNk6z6M2x3PE6m3/p+vSXslbrP2/59Hm4NOv02u2tIxs X-Gm-Gg: ASbGnctyWtO+0Cc3smYBqak65I11cJtTdKvBbu3qV9kFyDMEEJi+MPfs9Zjl61NX06e zTVsMYwlTliNBX8yTDh5Cmlh7Gp0XjQIQCj8YX61rIi/4LKm6wldSZE/jJRcyuTYSej3IHXaikP L1vP8goR5x8m0O8jh3Dol9v9t1oYwgtWd9aNylCnXEp9Eh5J6bu3bUdtW3BB3umGJePZJk+mSaz OX15V/3W22MawX6J5pYUALo9O84cE5h4xg8Y5adseOljOdNzkXgN2OPVM06K+ICbcqhrWc+dFtQ aK7if2tWC2FV0E6Kp1m+2ORC+WlmStQLGI/D+fwhIFohWhR2l/+G7pdXLsaCIk9AdZOWTx6Aerx L2hY0yliIrk3TM6m9vMI= X-Google-Smtp-Source: AGHT+IHSCHmXharrfpd9fnWcPFEmd1GfpgTTPbaS9txeExQv8HIlsXQ7gYoHdF8axfKonJ/0REeGGA== X-Received: by 2002:a17:903:2d2:b0:23f:75d1:3691 with SMTP id d9443c01a7336-2446bdafa24mr20190085ad.15.1755240444214; Thu, 14 Aug 2025 23:47:24 -0700 (PDT) Received: from 7940hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2446d539032sm7161665ad.109.2025.08.14.23.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 23:47:23 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: mhiramat@kernel.org, olsajiri@gmail.com 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 v4 1/4] fprobe: use rhltable for fprobe_ip_table Date: Fri, 15 Aug 2025 14:47:07 +0800 Message-ID: <20250815064712.771089-2-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250815064712.771089-1-dongml2@chinatelecom.cn> References: <20250815064712.771089-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 rhltable to reduce the overhead. Signed-off-by: Menglong Dong --- v4: - replace rhashtable_walk_enter with rhltable_walk_enter v3: - some format optimization - handle the error that returned from rhltable_insert in insert_fprobe_node --- include/linux/fprobe.h | 3 +- kernel/trace/fprobe.c | 155 +++++++++++++++++++++++------------------ 2 files changed, 91 insertions(+), 67 deletions(-) diff --git a/include/linux/fprobe.h b/include/linux/fprobe.h index 7964db96e41a..0a3bcd1718f3 100644 --- a/include/linux/fprobe.h +++ b/include/linux/fprobe.h @@ -7,6 +7,7 @@ #include #include #include +#include #include =20 struct fprobe; @@ -26,7 +27,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 rhlist_head hlist; unsigned long addr; struct fprobe *fp; }; diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c index c8034dfc1070..7aa21361227e 100644 --- a/kernel/trace/fprobe.c +++ b/kernel/trace/fprobe.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include =20 @@ -41,47 +42,46 @@ * - 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 rhltable 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; } -NOKPROBE_SYMBOL(find_first_fprobe_node); =20 -/* Node insertion and deletion requires the fprobe_mutex */ -static void insert_fprobe_node(struct fprobe_hlist_node *node) +static u32 fprobe_node_obj_hashfn(const void *data, u32 len, u32 seed) { - unsigned long ip =3D node->addr; - struct fprobe_hlist_node *next; - struct hlist_head *head; + const struct fprobe_hlist_node *n =3D data; + + return hash_ptr((void *)n->addr, 32); +} + +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 int insert_fprobe_node(struct fprobe_hlist_node *node) +{ 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); + return rhltable_insert(&fprobe_ip_table, &node->hlist, fprobe_rht_params); } =20 /* Return true if there are synonims */ @@ -92,9 +92,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); + rhltable_remove(&fprobe_ip_table, &node->hlist, + fprobe_rht_params); } - return !!find_first_fprobe_node(node->addr); + return !!rhltable_lookup(&fprobe_ip_table, &node->addr, + fprobe_rht_params); } =20 /* Check existence of the fprobe */ @@ -249,9 +251,10 @@ static inline int __fprobe_kprobe_handler(unsigned lon= g 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; unsigned long *fgraph_data =3D NULL; unsigned long func =3D trace->func; + struct fprobe_hlist_node *node; + struct rhlist_head *head, *pos; unsigned long ret_ip; int reserved_words; struct fprobe *fp; @@ -260,14 +263,12 @@ static int fprobe_entry(struct ftrace_graph_ent *trac= e, struct fgraph_ops *gops, if (WARN_ON_ONCE(!fregs)) return 0; =20 - first =3D node =3D find_first_fprobe_node(func); - if (unlikely(!first)) - return 0; - + rcu_read_lock(); + head =3D rhltable_lookup(&fprobe_ip_table, &func, fprobe_rht_params); reserved_words =3D 0; - hlist_for_each_entry_from_rcu(node, hlist) { + rhl_for_each_entry_rcu(node, pos, head, hlist) { if (node->addr !=3D func) - break; + continue; fp =3D READ_ONCE(node->fp); if (!fp || !fp->exit_handler) continue; @@ -278,17 +279,19 @@ 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; + rcu_read_unlock(); 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) { + rcu_read_lock(); + rhl_for_each_entry_rcu(node, pos, head, hlist) { if (node->addr !=3D func) - break; + continue; fp =3D READ_ONCE(node->fp); if (fp && !fprobe_disabled(fp)) fp->nmissed++; } + rcu_read_unlock(); return 0; } } @@ -299,12 +302,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) { + rhl_for_each_entry_rcu(node, pos, head, 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 +451,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 +473,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 +486,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); + rhltable_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, @@ -727,8 +735,16 @@ int register_fprobe_ips(struct fprobe *fp, unsigned lo= ng *addrs, int num) ret =3D fprobe_graph_add_ips(addrs, num); if (!ret) { add_fprobe_hash(fp); - for (i =3D 0; i < hlist_array->size; i++) - insert_fprobe_node(&hlist_array->array[i]); + for (i =3D 0; i < hlist_array->size; i++) { + ret =3D insert_fprobe_node(&hlist_array->array[i]); + if (ret) + break; + } + /* fallback on insert error */ + if (ret) { + for (i--; i >=3D 0; i--) + delete_fprobe_node(&hlist_array->array[i]); + } } mutex_unlock(&fprobe_mutex); =20 @@ -824,3 +840,10 @@ int unregister_fprobe(struct fprobe *fp) return ret; } EXPORT_SYMBOL_GPL(unregister_fprobe); + +static int __init fprobe_initcall(void) +{ + rhltable_init(&fprobe_ip_table, &fprobe_rht_params); + return 0; +} +late_initcall(fprobe_initcall); --=20 2.50.1 From nobody Sat Oct 4 14:14:57 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 AFB442D060F; Fri, 15 Aug 2025 06:47:28 +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=1755240450; cv=none; b=hiSJsSMkG5n2Dgxr98DDwHT6piB/54Oz7twTNZpZS21NUoTyOHWZyTI063pRFSEvJ0Xs414SD/hvRU/2kXMbhjh8i1itqWXO14FFmP4+JvjfNNEiQLhwD9sOTp6MARemPT159ayMXzXAPxF8k+Pn8rH+K6/mTRyglhFvbNVnUjY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755240450; c=relaxed/simple; bh=zudiWkkAlg6yySZkWMGW/IXw6hzgirR0YopZ0oI3JAs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nOFXSPvcqjNIpBu3K+3e2Ou4cSwX6r/pPvxSm8S0e9MtlQHDBGyHuVUZWgAREuFaIE/FUAzEyxQdegdL10v3rzOqtNFa4t0EB7f54NcrXbzqd6Kv1F5wNCYmnjziQmXMmPag/W7cCMth/za//aoL7P8sGjbWWGNctpK1AWt1d+g= 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=j7Qe9MoP; 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="j7Qe9MoP" Received: by mail-pl1-f194.google.com with SMTP id d9443c01a7336-24458272c00so21107215ad.3; Thu, 14 Aug 2025 23:47:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755240448; x=1755845248; 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=j7Qe9MoPn4YCpmgJmuMxKQQqHCFW/C7BKGBPbi8ghu0buM3/MjBFb/mGJWG/bKalb4 Mkh9G/3+LL+1KELC36ySD7jMngT3ylCMFREFaIgxTXMgbtvfwLl5SEbyypjxn1uqUCDL j863qQb0U4v2bLhqg2p9WT511HFn9sLVywLpGOyAIJZVtP/U3lvuqCc5KysvM8MhhA9t gHiAteYM4+vGosCVh7vlLpGGSMs4LDQUSMFS+SVO3oK+EMIbBbE+Bu6CrPe5R9peFxQV /REixS6tS8LRAec5mKnpseaXbNkyutKFZLMnDUXCvGMcGLXqB6s+q2k/DLuPhrTRFYa/ qufA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755240448; x=1755845248; 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=Tqm/sDIZtwkejNh7rsDfiFUZhOasiwbda7U/6AyqVoGSij0MuKjtFNl5UAeLi1zg9C d/jktgJoHgg4CSX9bPQX5AQW3LVoS+a8G44tuYX2EE7eDywaC6i+v8mHsQUv/CVAe5Cq uRS+NE4r7zYxpVKISrpVaOubb5Tl+3E97JsFVHYdyUmIK0M5u36DVnL0T/PBMPna585w YdzMtiYZjVQmNniCiNC6FQZw3MoTiJ9zLNXVkcTzvyZV1IdLaNz0LC53UcRYzstEX87d Sy4ms5VzsSSK4HrVz7D/EJqz4rJmQvwmfxoT/hpE8trMFCWEeAxFOL43c2SK7ALwsUVX hKgQ== X-Forwarded-Encrypted: i=1; AJvYcCWKBuLnvIy/+uSNFAZ1S2Fs5khECTRUBvsUegJG6Y9ZSS/e7t+AM76uC0E5nx0Fj3LNrdUszJcDAzNGY7y4+QztWxLb@vger.kernel.org, AJvYcCXdD7volbCZnRBrt8T8Bbh13CE6KWRmb3qVNBq8ggV+ywpX9g12ICJqgH4rd728rMgehWg=@vger.kernel.org, AJvYcCXw26i3nVKmFozmiub4zv9MIoARUcGP6R0V2I8JOxzsp7fDm90+NWo0B46Nkb2zhDcxD9QJfdBckSm2JkCo@vger.kernel.org X-Gm-Message-State: AOJu0Yyc6wqdhGjk9tOE9vL5vPhZa+U4+OJfrHBGmmPh33X8M3as7Cwr LIMZXdXbgzymPcNHxTLnNwOrf8rpcHcuBE+wqQq3Yo78vp7tsIWUhgXD X-Gm-Gg: ASbGncsy9e40BhkAbOdXsq/y9AfFdQLPZDNcjCDMdNOXyM0b27x248qn0bgpx5SFowb tZVwJDjnihpyAEAZTuYBB2fYYkhUuyOHNdc/JEYaNjZ95g6wO9pDpMmCt/tjt6r5dlqr75jF3hE gBz5wbEafn4KgWWLSmeDlNpyHETnkiVM3bKwkX3IeBJGK9YyyMxYXk/KuMV8uGaoXb9zRaMSbbs AZ1hy9u787+j6GXnLGfYsaUfb8ObKEkpKTgiJ8SM2x1BG7C+hf3cNSAyWQn2ATFIjPR0Rh0C41H AqtjsVQ3FCT1RBJJPxXTtMQveIn7dhNj0gp8Rz1QJhCb4dpiGNqIBanBzaBM3TShalq+oOJKdp1 zwhRvRFZNdJOaz5/D/Jw= X-Google-Smtp-Source: AGHT+IErw/6CnbAAK7clC7TivS3k4DX5ckRC6LysKE2YCvXB+cp9czBffZZE4iYoHldNtDB496mgNw== X-Received: by 2002:a17:903:2446:b0:240:70d4:85c3 with SMTP id d9443c01a7336-2446d71ab3fmr13477225ad.9.1755240447808; Thu, 14 Aug 2025 23:47:27 -0700 (PDT) Received: from 7940hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2446d539032sm7161665ad.109.2025.08.14.23.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 23:47:27 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: mhiramat@kernel.org, olsajiri@gmail.com 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 v4 2/4] selftests/bpf: move get_ksyms and get_addrs to trace_helpers.c Date: Fri, 15 Aug 2025 14:47:08 +0800 Message-ID: <20250815064712.771089-3-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250815064712.771089-1-dongml2@chinatelecom.cn> References: <20250815064712.771089-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 Sat Oct 4 14:14:57 2025 Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.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 DB7C42D0C70; Fri, 15 Aug 2025 06:47:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755240453; cv=none; b=aKRFmvBlkbL/Qa8TSiX/ie9i7+Xou38PmJIZS/RGQRDzS7X4ky8jw3YZX6uui5k0FmyFQHEEAJgJrySNZX2W6bseNdlIjuvKLzJWeKwCEZA1iU1NSzmO2bQ28g8S9kgpHwy3G9JS5ICLQe2ecKRuMybaN2/x3Am1C4M3KR772R0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755240453; c=relaxed/simple; bh=TGw2ul2ZAldEcVHaU0fnT+T9Zm5AaMY7QcEq1fLdVSA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WR3Q1C274PAGDvcQQvLdVVx8ONEndwm5MzLEW/VKbQ7MoYoYFewpKbBOmONrtt7ahLo7er6XkSlMqfbXjSjFPYMWZjGlsdA1pqtoz1BiCIAFbfdTbeDad33U5GgHpi6v0QreQgrOV6oF7G+ldLTXwk1JmuY/wa5/fItZebgg4wg= 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=GeyLRzlH; arc=none smtp.client-ip=209.85.215.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="GeyLRzlH" Received: by mail-pg1-f194.google.com with SMTP id 41be03b00d2f7-b4716f92a0aso1124757a12.0; Thu, 14 Aug 2025 23:47:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755240451; x=1755845251; 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=GeyLRzlHmXyJFYAjjz5pjNjZgNECS1BUYyIoUH2XvG7YUWWXU5tGM75l2Tsx2xR3Y9 cR70ON0AP1HczkR31oqMWSMul2k+/qg7y6FzibY5UGbVRXCR5qz6gfUbi9Zf/GkLsgIr M/kWFbFObu0EAkB+bUZk9lrS5UysMM0KW+69pAg+91cC9vHVw4LEW/z9F1/jV2CvFWq2 Lg64zAV3lglttEDMw2bpBBF1xSBAYT88Z+S/wixhYaNf5SxwE0TjEqTmIHq1uso5d1rf UlTnWjAurjrFyy3UJ7xnFhqSb1dtM+TVPbMKE05njXLaD9S42ILM6rLSq3twzSgusS1P dqOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755240451; x=1755845251; 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=eYHCanO+ID/RCqK2gfwGOvI0r2FpaM5LfPjI164p/YjPRGYziLS9pdiUJTUtlb549L 6UO1bECGPFakIJo5HngMBGSx4c7mlhJUsIDf7zazBd2/dKxQ989F6TBFnFz1bzmaWBf0 9cy7rnkR31HgpN9wOs/Kd7+c/loH4DICosStGr1IiwHhjpMWCPf6z4mhwddTX1TYm73v p9Pn9HIvOi62N0d7vuytRavnocnlpiELyedfogGHbIkMwtgoEBkLteMaaoPPwmtDrNd1 MsJ/+bpPr3EEG8rzMpwsxikgpQMssPkqufwpHsB35YHPB6wqHfg8AlImkaG0to3YKZs0 hgIQ== X-Forwarded-Encrypted: i=1; AJvYcCUkdFvOsTs8At5aI5Ll5VcJxY6ffSTBuVP65BVE0g4LZcdDXLSLWc3DjhJ+hcJa/ehVOACUQHzpIBtSaDW5@vger.kernel.org, AJvYcCVgd1UKekr0NQ4VLQgKEp5HpGJgA08ZUgVqqjjplxFlo8c2nxM9a3tOvyt3N0YKElro+a4=@vger.kernel.org, AJvYcCXNR5SQCxpXzxLiO9HcUJiHdsCD2rgVb79ZFus3U75pi1SkV9m+5VymVdo8+kEBEdMqPb/nnY/3hEbH6NT/kMcaIywK@vger.kernel.org X-Gm-Message-State: AOJu0YxhB9SZlJYsIjX3iFVWWLZL46GfZDL3lE5wGxjkip84dMpe0EXS 2zH1Vv1XkZWVUC0YuV3P08Yui386DSOpYVFWShQXZ62yATJCZhWdhaYU X-Gm-Gg: ASbGnct0QrQz0GWJXofirwEFVhPrR4KtrxkmtN4DMhj2Innia1x/DebPH19wOCH60Vz 8lPOY/bTT5t4DGI/4k2h2nvTKf6SLyTOHRSBtZn9bsXkvUVZm4QGsOxSyFAF/qFfkpnF/8zo0DP tZy18EPR1Q6O8YaWWWs6cSpd8NC+rCmQCL2vdwXAxusSqDKPJZXW9AYjqEAS1a3w4NCd/cRTlCW /Abeji8CcUrySlReTRviQQi5MlWGRNd+uOKzSwaKPaD8Af/5+K4i5TSCa17/KqCTGcyd8sJzpHe ylbJETknj8Jlqpkt1bDH7rbjWNFxpLbfhR2qbPJ5mRc+9Y2vy6fLsUioL+FZ2LcvP9uaVLLa7hN s+dLtMFIwNPI97uobNh0= X-Google-Smtp-Source: AGHT+IFAyNLSVXS6d3exkk6mi7mr/5YG0du4DL/Gkc9c4bnLuRQBKOR+eJMRYMJroan5QUUTtsK9rA== X-Received: by 2002:a17:903:228a:b0:242:ff89:d724 with SMTP id d9443c01a7336-2446d9053f8mr16908975ad.47.1755240451083; Thu, 14 Aug 2025 23:47:31 -0700 (PDT) Received: from 7940hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2446d539032sm7161665ad.109.2025.08.14.23.47.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 23:47:30 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: mhiramat@kernel.org, olsajiri@gmail.com 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 v4 3/4] selftests/bpf: skip recursive functions for kprobe_multi Date: Fri, 15 Aug 2025 14:47:09 +0800 Message-ID: <20250815064712.771089-4-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250815064712.771089-1-dongml2@chinatelecom.cn> References: <20250815064712.771089-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 Sat Oct 4 14:14:57 2025 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.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 00D892D1913; Fri, 15 Aug 2025 06:47:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755240456; cv=none; b=Q4f+R+VDkDIGQvsX4S7n+cKYq54JiQJhtjTeY6JOnwm7t7CWRepcZl4neAN8gUsatD8oZiUZpIg6fU+t8n4OkTQQhtTIWVSqaKPCdPajJWTiOw7qjB7F7TLeMI6xeCjCNK/DE6Ash+4FWAqAkWcdxQDdUBMKItXpB04zIylpgT8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755240456; c=relaxed/simple; bh=Y0sVgiMIvCN1tEPgiAVLe8svWdYQEvpuSTM/2lhhTGQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ATy4GV8hsxTElt1NAbUyyyzEKiCwfBubp2QKCL0Sf6V1aLmouARr/hdpV9SLAVBZ0/uwsuIsCs+1+K1jXhRWBxZ4gUu1/847F+xQGWKRtgLFSlN0Gn8av+QXotqbXjnHizSto4NOBtqdZDc3+Dpb86184HjPKGTGRb2dw66Gnnk= 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=JlsWtg54; arc=none smtp.client-ip=209.85.210.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="JlsWtg54" Received: by mail-pf1-f196.google.com with SMTP id d2e1a72fcca58-76e2eb9ae80so1511571b3a.3; Thu, 14 Aug 2025 23:47:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755240454; x=1755845254; 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=I4PDMe7SP8CZO+JhWjjdFtQ1vR89wVuSvH9ObtDEfac=; b=JlsWtg54GWru5oqIW9XQlViJn+k3rXg8VxFLIW9p7tqoXpTvKgki8RnIt7fUq/8+v9 wRBZdLznlvKCamxBqs9UoYKpvga6C4HaN2DWOeK0nEuKbqwqpkNOaMlyDSvCv+BUm43/ uHdOL35fxg1FHWBksEERtxMpUoXDVVN+1Wk6UzdcgjRWHZAr0SnOTO4XfonxFLB2SLA6 nAxqS6LJ6K9yUkuX28U78TPWYA1Pe8SP8DefxZ9Cm7zx3KoMBdBSY2bWdR6ly3uOxzg8 wmChigHI4TJpAvRM+csU+42IuZzSbCB2ntUcsbBiJRYoyiUdH42IXQ6As6Sau0MA/84G WquQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755240454; x=1755845254; 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=I4PDMe7SP8CZO+JhWjjdFtQ1vR89wVuSvH9ObtDEfac=; b=N2lLAzy3bEmbJjPVVysQrU4Ftc/mJBRccLoVlu0uqlrPywWtOXNoiZIBnOSj20X+Gp ySHtPKXuo3Eg7B1+gKclTQtpjUMO3fW94FmgShDhopNfDf4/H59h1HZ+EPrk0eym3RrC htVh9ZXQcxN/gTxDQlUGybukWNE4mtOmsRiUtjxlnnPsS7a20xJMr/V38WgJaLgo8kip 6y3OI1h7EHmsneaxIurUqLPZFg/dewbneqaPoVZKiB2BluDj8msH8H7A9SrHITDRi1v3 RiwFp2hoTgl8DQaXtyqzytBjW/P1OMAMuuM8rrRXBjOzEENlY+ufCHtq8JeHL8KeHV0C nKmA== X-Forwarded-Encrypted: i=1; AJvYcCUmbxLRVFkpJis4epm0PAmPwqihrxMF3zFoMMNbrF/iPtEwjg5kZD1sxcebQWNK7h07Lhc=@vger.kernel.org, AJvYcCW+LFjCKq8SXMDN7YD7WR/egjVqzjp7EFCuXu/wNGmILB+6LtOFAb1Hmg8Us98LKvplmCnMOn4qknb3nLU96DCHc3ff@vger.kernel.org, AJvYcCWvxUmL6ur/kDXjTEXcA3izvt4hEAFwJKerUy1chKFG48Vv7CwR1SHF7M7xYtfNzazteIRhbnRlyLTeFn2S@vger.kernel.org X-Gm-Message-State: AOJu0Yy6uUoOvRudNyt45pg1iSERZ/eJcWjljOOnsXNz48DIEGDcFvvZ OQ4SD1sBxGE7ltkj0ViNdkmXgc/ExqUyDGOq+gK5d1Bhr47tcMsFUzFj X-Gm-Gg: ASbGncvKB84JhoJEeJSALCiHbCGQ3NUMTSikYZdy/wT6t7ig5w0fCWwZk4gOtnVELMv 6I6ezyRjcQCDwm26c99GfJeqQrhdj5z5sIN4o5qVeOMnQewlUL+SGNOliwM3/48EoLKl5qew474 ESUkWlsqy5mH0lVN/JaHRFq6WCAnpkvyHB1/sgzRC3R0APanrgwjsesSUHLOKK2qtOmSXR71nWt nRcweKLJWDyPIChthYpgUohJcTN9+kgcqAykE3LLznV/r+7ytzF6LpWEr9bD/yHJkKL0mUUq9nL QHoBaekYwyvIwycpIdburkSnELlu8ut5duqAJjVNXvvw2UGf22f12wjZjfhL9pVmHiRVvvdj96P SbSotG0znY4r1uVw6WROzb5Wkz/MKLA== X-Google-Smtp-Source: AGHT+IEpPQf+JHKjFjSgWqtn4rPpLWyc9VY7M5Q7JPqhR1Pw9ZB8mkZhnx1HbtDpf1FcmJxxiv/Cjg== X-Received: by 2002:a17:902:f68e:b0:240:6aad:1c43 with SMTP id d9443c01a7336-2446d905497mr14307425ad.48.1755240454201; Thu, 14 Aug 2025 23:47:34 -0700 (PDT) Received: from 7940hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2446d539032sm7161665ad.109.2025.08.14.23.47.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 23:47:33 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: mhiramat@kernel.org, olsajiri@gmail.com 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 v4 4/4] selftests/bpf: add benchmark testing for kprobe-multi-all Date: Fri, 15 Aug 2025 14:47:10 +0800 Message-ID: <20250815064712.771089-5-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250815064712.771089-1-dongml2@chinatelecom.cn> References: <20250815064712.771089-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. And the "kretprobe-multi-all" is added too. Signed-off-by: Menglong Dong --- v3: - add testcase kretprobe-multi-all - attach a empty kprobe-multi/kretprobe-multi prog to all the kernel functions except bpf_get_numa_node_id to make the bench result more accurate --- tools/testing/selftests/bpf/bench.c | 4 ++ .../selftests/bpf/benchs/bench_trigger.c | 54 +++++++++++++++++++ .../selftests/bpf/benchs/run_bench_trigger.sh | 4 +- .../selftests/bpf/progs/trigger_bench.c | 12 +++++ tools/testing/selftests/bpf/trace_helpers.c | 3 ++ 5 files changed, 75 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/bench.c b/tools/testing/selftests/= bpf/bench.c index ddd73d06a1eb..29dbf937818a 100644 --- a/tools/testing/selftests/bpf/bench.c +++ b/tools/testing/selftests/bpf/bench.c @@ -510,6 +510,8 @@ 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_kretprobe_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 +580,8 @@ static const struct bench *benchs[] =3D { &bench_trig_kprobe_multi, &bench_trig_kretprobe_multi, &bench_trig_fentry, + &bench_trig_kprobe_multi_all, + &bench_trig_kretprobe_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..c6634a64a7c0 100644 --- a/tools/testing/selftests/bpf/benchs/bench_trigger.c +++ b/tools/testing/selftests/bpf/benchs/bench_trigger.c @@ -226,6 +226,58 @@ static void trigger_fentry_setup(void) attach_bpf(ctx.skel->progs.bench_trigger_fentry); } =20 +static void attach_ksyms_all(struct bpf_program *empty, bool kretprobe) +{ + LIBBPF_OPTS(bpf_kprobe_multi_opts, opts); + char **syms =3D NULL; + size_t cnt =3D 0; + + 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; + opts.retprobe =3D kretprobe; + /* attach empty to all the kernel functions except bpf_get_numa_node_id. = */ + if (!bpf_program__attach_kprobe_multi_opts(empty, NULL, &opts)) { + printf("failed to attach bpf_program__attach_kprobe_multi_opts to all\n"= ); + exit(1); + } +} + +static void trigger_kprobe_multi_all_setup(void) +{ + struct bpf_program *prog, *empty; + + setup_ctx(); + empty =3D ctx.skel->progs.bench_kprobe_multi_empty; + prog =3D ctx.skel->progs.bench_trigger_kprobe_multi; + bpf_program__set_autoload(empty, true); + bpf_program__set_autoload(prog, true); + load_ctx(); + + attach_ksyms_all(empty, false); + attach_bpf(prog); +} + +static void trigger_kretprobe_multi_all_setup(void) +{ + struct bpf_program *prog, *empty; + + setup_ctx(); + empty =3D ctx.skel->progs.bench_kretprobe_multi_empty; + prog =3D ctx.skel->progs.bench_trigger_kretprobe_multi; + bpf_program__set_autoload(empty, true); + bpf_program__set_autoload(prog, true); + load_ctx(); + + attach_ksyms_all(empty, true); + attach_bpf(prog); +} + static void trigger_fexit_setup(void) { setup_ctx(); @@ -512,6 +564,8 @@ 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(kretprobe_multi_all, "kretprobe-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..f7573708a0c3 100755 --- a/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh +++ b/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh @@ -6,8 +6,8 @@ def_tests=3D( \ usermode-count kernel-count syscall-count \ fentry fexit fmodret \ rawtp tp \ - kprobe kprobe-multi \ - kretprobe kretprobe-multi \ + kprobe kprobe-multi kprobe-multi-all \ + kretprobe kretprobe-multi kretprobe-multi-all \ ) =20 tests=3D("$@") diff --git a/tools/testing/selftests/bpf/progs/trigger_bench.c b/tools/test= ing/selftests/bpf/progs/trigger_bench.c index 044a6d78923e..3d5f30c29ae3 100644 --- a/tools/testing/selftests/bpf/progs/trigger_bench.c +++ b/tools/testing/selftests/bpf/progs/trigger_bench.c @@ -97,6 +97,12 @@ int bench_trigger_kprobe_multi(void *ctx) return 0; } =20 +SEC("?kprobe.multi/bpf_get_numa_node_id") +int bench_kprobe_multi_empty(void *ctx) +{ + return 0; +} + SEC("?kretprobe.multi/bpf_get_numa_node_id") int bench_trigger_kretprobe_multi(void *ctx) { @@ -104,6 +110,12 @@ int bench_trigger_kretprobe_multi(void *ctx) return 0; } =20 +SEC("?kretprobe.multi/bpf_get_numa_node_id") +int bench_kretprobe_multi_empty(void *ctx) +{ + return 0; +} + SEC("?fentry/bpf_get_numa_node_id") int bench_trigger_fentry(void *ctx) { diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/se= lftests/bpf/trace_helpers.c index 9da9da51b132..78cf1aab09d8 100644 --- a/tools/testing/selftests/bpf/trace_helpers.c +++ b/tools/testing/selftests/bpf/trace_helpers.c @@ -575,6 +575,9 @@ static bool skip_entry(char *name) if (!strcmp(name, "__rcu_read_unlock")) return true; =20 + if (!strcmp(name, "bpf_get_numa_node_id")) + return true; + return false; } =20 --=20 2.50.1