From nobody Sat Oct 4 11:13:54 2025 Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) (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 B02721F30A9; Sun, 17 Aug 2025 02:46:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755398778; cv=none; b=tX/NtiEM8gnLvb1uN+/AIIrf42iLMxlHlQ74w2yhJHUusHt6y/XJng954kpVt0Xi/3l/PYNZu4G/deUUAifzPDBef8ZsDaYd47rWLoPIm1MgwOX317JeXzJRSNCWA9eMx9X1O4gGNUt/2f+nTWSQoL5hbRqxvgh4RiykJ2AfXkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755398778; c=relaxed/simple; bh=6g9LFPG0T+2M/2d7VqVE8XCa9YnZ8bVA8q66opMq9NA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BMfVNnORhG29dqZeUxOX19YoutfJ3C3FnwbBHS2u5UwupgVeBXjXES0QQV6+Lv/GQSojC97m+Df37tzdkdIDYNnSDjVaBaiSTZpJoTXLThLsARX1Ps1G4Z4NzOuRXG7EjKygNyk2FYtinjdg6eEt45KjBfG9SygEsx7ik42R62M= 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=V/jJdrjm; arc=none smtp.client-ip=209.85.214.195 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="V/jJdrjm" Received: by mail-pl1-f195.google.com with SMTP id d9443c01a7336-244581caca6so22951345ad.2; Sat, 16 Aug 2025 19:46:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755398776; x=1756003576; 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=UvCCSuj2jpL8ZxmmwPT7njDNi0pO19k28p12mFCypBU=; b=V/jJdrjmKwZ0na58DLxiaYglind5C47cZLwlG70f/MsNQMu3/I9ao0T++YuepbHaFb zQ9rBK8JXlIzRHhdj4x6TTXcxDPiDtwM9L+TRIojUOMyvi5BrA1SL+vRNSD4N08W6roR 7pdHWLae18bOF6cWe3LQRe4Iw+N1BiA9O3WTovCx8cEHpKihAZvas+vqS7YdtO0K+xVU gphR6XacoHiUlfdBL9Pld6BRsf54Hu8F9/8/88bHDCSd8kmST7EoXrhVESHgPUSpG8p0 4W9ibyhpaX/++VFLm2ZudwJzB62Ytp4sY2d5m6f1/EDNtJlxH/DPiGLHHOPPuivHTmEl w7YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755398776; x=1756003576; 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=UvCCSuj2jpL8ZxmmwPT7njDNi0pO19k28p12mFCypBU=; b=HWEHHMZ+LfyGBtq+rs8Yl545JgzGdRaRYk4ty+Bs6HB1xY5iKer0IYLYaHU1QRFbNj 1cJ+YqIDnrOx/9mtum3QW0NPzAaosUvJwLwl13v/VunWmd1mVMtrvxGSnj4vgKsf2Fwx UGIFz6OH4b6KOxeqade3moeE55dcD8PEpHukPaKa2jAC6LP9WruZTj4J7F5AI/6BnPOp p9I2yS0Sv7RzSCE9snrdlBgg9lspGbFu4i2Ymj/PPkWa3/yQ66JT9cIIGah8+qfV1HtQ v+0VT9W2usQPPeSQR4SZKlzQLvhU4Nk9soseBKSkcmdqfk5OK93Zqa9pdQTsgwd/qk8m iYZg== X-Forwarded-Encrypted: i=1; AJvYcCWCDv0y7vwnZtmKyWS/m4zV8v03TrR39naVQ8G96SABqwuTymKGrE2hY5p/a+rn/uCUU3Y=@vger.kernel.org, AJvYcCWEdTyVzIFvCqNy/54VgThjAYTSZ0gNiUOx5+DwnpIEVF+EmwneUmnfxTkbz4CZ1ywwQR03PM+K11u22xCJ@vger.kernel.org, AJvYcCWe2wtBQBIzonYQUZK8L+9AUbTrXkhoFq+8y7SHJtcAnwZHZNzuXHMKSZ2ENz6G2eJQKFoAmC5HdYnCjOhwzP9xP2Nz@vger.kernel.org X-Gm-Message-State: AOJu0YzAxJwI/qjU1WGpfLkoCKQS8g9OEluy8EFoXAvITxUCTFWajPdF plGFw9cdGdR7cjgLH8i9Qcy19LarEcU9Sa83rPUaUC02I5DKAkqq4hwi X-Gm-Gg: ASbGncvqophMPhiv17CKP/3nJVh48BtQnLnDn7+K+uS79gRjqx1DlUFtIjKvlQSck/o xD7/z9Agl9w8O5EkKH1SxPnmBOy1lzt+O3M1hv4z8kFBbXLpOBtpjupNBJwwyS5ixQYFuI7nEDM 7jHmwS6wpheD66+ChI2hpIfPNbG/ev3oCWuox1jL6IMPd+D0w/msmQvJUP9LWd07CnNyuCkzR39 /oeDRn5ra3Tr7IwG9xLCYAioyDuMiaEREDR1O7q0sTNMU8gJXbzPmpbzfBUmNVfKklbziXFjflk vBmf1R64K38jnAQIgEyl/zcgFZKgaa7GnmR9tv3CBu4KA4ThpSHiRA43R1FV4Q/egA57TchiLh4 Alr2xEgAGYC7bA9jaJm91lT5r7jwacg== X-Google-Smtp-Source: AGHT+IHDrKI17xNC7saiM6dHxqXmCxP7CQQJCENVnv4kiNqaTGCEjZeh3H7kvXfWxj9dzCC4M0WgaA== X-Received: by 2002:a17:903:1aae:b0:240:3909:5359 with SMTP id d9443c01a7336-2446d8dcccamr103792425ad.40.1755398775761; Sat, 16 Aug 2025 19:46:15 -0700 (PDT) Received: from 7950hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2446d50f382sm45009845ad.79.2025.08.16.19.46.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Aug 2025 19:46:15 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: 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 v5 1/4] fprobe: use rhltable for fprobe_ip_table Date: Sun, 17 Aug 2025 10:46:02 +0800 Message-ID: <20250817024607.296117-2-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250817024607.296117-1-dongml2@chinatelecom.cn> References: <20250817024607.296117-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 --- v5: - remove unnecessary rcu_read_lock in fprobe_entry 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 | 151 +++++++++++++++++++++++------------------ 2 files changed, 87 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..e09b034b3cf8 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,11 @@ 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; - + 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,13 +278,12 @@ 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) { + 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++; @@ -299,12 +298,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 +447,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 +469,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 +482,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 +731,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 +836,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 11:13:54 2025 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) (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 375CB200BBC; Sun, 17 Aug 2025 02:46:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755398782; cv=none; b=C29aCsIZD6D9YGY1BtjihvwoO5jGQnSIFKo/xa9uRdRP253hNzXYHBYekMiW4hsYEnrFKgwSCyYW2gLHpGSrlgz4Dpz+RJ3vldwzgkSYmxNkfHAx8q9FYWIu38HLgoIL3JyjcrYlgTF3zB413qNzSfXm+YKp9efUBJ/6CYgysYk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755398782; c=relaxed/simple; bh=zudiWkkAlg6yySZkWMGW/IXw6hzgirR0YopZ0oI3JAs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kEC8gnaxV4uHaQZj8eElfqMj2+d2rHx6fV72LTVwLZGDTKyfrpzSFUHuexEODdLGNPTKXq2jPhcEuQ9O8CtyOhOiANJ5Rg7LHwL0ijaNfoRbo5iCFxXRmFx2tj8Sx8Q4tv8eDDytwlWbf2Uz1tAf6gTWe4uv+qLsDpA/ezgQhx8= 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=hG2Hlbo3; arc=none smtp.client-ip=209.85.214.193 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="hG2Hlbo3" Received: by mail-pl1-f193.google.com with SMTP id d9443c01a7336-24457f3edd4so21549125ad.0; Sat, 16 Aug 2025 19:46:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755398778; x=1756003578; 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=hG2Hlbo3JJuH+ma/DUBcGOdETP1xRggmdckcSxGW06aBzB+d4h+Ro0CbFv9kC1gxxY 9siXhuCLKl1NeP2cNXBCPnOYYOpj3eP/DayX4Y6EL5o64UNVedBvxMMrPoOha/j+wxdG okql/GNPo3hTAehSpz67romofDoL+FUJd/hMz4j05BhiJDW413E2xwdclsZxo/f3VenT ajHakSa5rJ3qyd9klr1OeT+RBuhiYWzswiEcb5wy9Zps+eCfNUSTU3WhdbH1ZlyZt1JL y3q7TuPchBr/j3m08ohV12YPKP4kQ6pEjscei50zUHcjft8SIP56IpyaXpNaar+EVhRE kA7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755398778; x=1756003578; 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=q8WBOC8s1jZ0nE4gBHGfvyXZ0kkNAzZR0OpDI3/D6yxQGz3wDHqdWG2pEoqalJjc0h SkQUFmkUkl3ggYk9BIuX2tT7m9/XLWf/fcwKHTOE5Fq8rwJQUsgjCK/ky9Q8Nz3p+ujo Y//wesK27OYWT/xkUuU93jGEKGPDJVJ8Ca4O1/iy68u9liP/y0s6b9pfCtmODawOjAZo gNZhkGa7sm9YpNpZnr+N9kmhqGMrQpUIzNzxULKgZe9vLT/oZ6o2RaO90OhvNmY7IFoP kbD6wfDxtpIKSdosx62tXtnTrXjUd8MrU/b5JL/RFTPmbiM3EskGO8nLbWTUzJDL/+eY sevw== X-Forwarded-Encrypted: i=1; AJvYcCU128P4EOYYSPGxXfeIRQCefieSfzdT3W6tQZZ8JxgCLd1gbIia9LgQgHA2YFJCcbLmFn602RJE4HJVuxw5@vger.kernel.org, AJvYcCUVTaGMzMQW8C4dQDTS5fhshAtY6IaNTI5W0fEw4KV9AtP2SxO4uZ5JeRAeS+DxiCzU1es=@vger.kernel.org, AJvYcCUxh7E5L0MxtZypUxsEIFO7pnpl743brsPwGaX3TmTczws0FkZdaUwD/4NcXMvXCq4D8JlsWFygQoG9bhRxpI7Z3evb@vger.kernel.org X-Gm-Message-State: AOJu0YwTyVrALMfkiNVHOOFBhXFvD10UEPC/jsl/fTCh7S1GwYn4rImn CRl1BuxOKLiXHUqhv6SRSo57iD/3Mig6mKkJx+UYLEJOgw4PBMfSpdAI5VeSBlb/yos= X-Gm-Gg: ASbGncsuxLwn4jBwN8rVU0ezpGFopPV+fLID8ntIXYfLcG/w67O65FKs6ZxpXvCvrmw JHYD+OPXQS9/qsTjlJeJZA+YM60k3PpIfRuIiDCcCw7hBdFZcG4NqepIoggd+XjdQLh5dSpzzVK OozfE/GMs7D6kDqXl9wXFw4V+tSiyunleKLPg7UfHPmtmWlN/N3eIknLYBUvUsMaLXOfAikQ8eU D2E4HtJ6x2B8wW5RaUmY1gdF8MY+xbAOesgsCFqElzTj5ZMQl5wS6oWaePdY2Wk34z7D5Y2XLuo +kMdjeQVWnH/7IA+CHvEDsC67yDWzq/+8lZPTb0/fmmPym83vhrjYje+BSyvfVN54Qgh4C3HFz2 LvuJNHWfS5idnzk25IYQYk0P071J0Xw== X-Google-Smtp-Source: AGHT+IEwTL5859P99QqEPsVnvDnRrjg40sNB7JCKIsECWYA46hWwXOyTSgRRNDG5RQybnzvuWsPZVw== X-Received: by 2002:a17:902:d2cc:b0:243:11e3:a764 with SMTP id d9443c01a7336-2446d6eef7bmr123435035ad.12.1755398778295; Sat, 16 Aug 2025 19:46:18 -0700 (PDT) Received: from 7950hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2446d50f382sm45009845ad.79.2025.08.16.19.46.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Aug 2025 19:46:17 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: 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 v5 2/4] selftests/bpf: move get_ksyms and get_addrs to trace_helpers.c Date: Sun, 17 Aug 2025 10:46:03 +0800 Message-ID: <20250817024607.296117-3-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250817024607.296117-1-dongml2@chinatelecom.cn> References: <20250817024607.296117-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 11:13:54 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 8D5CF137932; Sun, 17 Aug 2025 02:46:21 +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=1755398783; cv=none; b=lwsQeyiZpo+7ccUAvhiTxXTYlM1QUojJnLLZujSHVSwZijmRCWsq3vL6ZjNnZiPVKuOY09cyyl9GyLGRLYDoNLZk7pmexTqPZNi5d+wc0CjoTnx+ry/cYAGAAmpiNVoCrBDZXDApkvMBxnuthEeoL/bnvjY5v21iVpasRWiSB+Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755398783; c=relaxed/simple; bh=TGw2ul2ZAldEcVHaU0fnT+T9Zm5AaMY7QcEq1fLdVSA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V3MYn0daMUmVLkLkI0b3L2JSZYPXgqFojTqXhk44KXk1rtTd/3jKd8+PGYfef22q+K4zPmJJVvrWFmeq7eCsANC62I1kkJrq21vJvONqaHnmuQR54zyzQqijkxB1kZW+IIhBMVcnRldnUISQTxnO4HrsdskD1aGUtG4kkpasRb8= 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=auBy6Zr4; 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="auBy6Zr4" Received: by mail-pg1-f194.google.com with SMTP id 41be03b00d2f7-b47052620a6so3304525a12.1; Sat, 16 Aug 2025 19:46:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755398781; x=1756003581; 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=auBy6Zr4OGvfPTpO4iLfVVsY4MZTRTSMyHPULQMp6Yh4MikBS0Pp4bxaAa9uw2idkW 4uHKE9DRYmWHGhKmozMLGhHzjFk6LXLSabz50IJku/x5W8i+pnx/ZNYSCFupKjTqcTCi Ill1D8pa53V1zDUGJkYnRwo5AoyGD3n+jMNrE0oHiJuM6vqei/u3pALP/Z1NqGlfYCw7 lj14LO+YrG+3wELJNqatLLHw1em32SaWySLG+zMCRgREy6sJNZm7ViDmGm87i3dNeSQT 11unpvPDqF6XH2OUvyjCGMPLEipLRiM+i1Avk2c16sLoFidtIahT8Y2grACDS8qtgLS5 Ih5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755398781; x=1756003581; 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=c+C8FpF/amtgFqYgKFoLMc7DAg1hFdB1CU6GVqRnK8A2VYz9SuTZt1Xjvwtql3yhUp hLZF5jNlLNowdzI4NNUdq7sAo1f6XvT8vyOD2S+NBQIHCh2+/DwCT+I4DR8R23tOqjCC ooZ1Jj9fbX4GRBlIFgSaAgxMjx6DLkIMCyskqetHcdXs9ECJuuqRKPn9d2c+XVTRDA4R wQoF/XvLrv62MgJVAOy5yp7TVbXHL3EuDUKGvvy78ybJmL56mTSuV5XnxwOmR1kVDDsr vQWYg4OVjkDh5FCH9uUBMUH28dWhjpc2NO5Lw2utbqy/vGuAJGK+mjBFNmj2Mbq01F/F H00Q== X-Forwarded-Encrypted: i=1; AJvYcCVQTMa6NBHacdQDFLtpj4jPcvWnBoMj/HDjMrKVpU4I+jyp4uLTmceo0tox2VLr/1cQnH0=@vger.kernel.org, AJvYcCWXXoX9c7Un74nYp/WEZJ52N0D2AKrtYitQVsdd1o/sBvvfB2tIWNG7f/vgTZyEoc3nX/48tHXeJMxw2fglh+zr2oWL@vger.kernel.org, AJvYcCWjXj76ByPKsgAIk1bB3dxhUPUb7A6AeaA3ubpPisVgGrVMWe44OAxXOhN79iwBtwAkcALlbGXmF4VauUjX@vger.kernel.org X-Gm-Message-State: AOJu0Yybye0vojqk0h5HqfIdpNRLtP4rmtYASjb3z/hEFN2lnfH6enXZ 7OO7r8beU7zYjUYmo9lbLeS/MQGu1JkLY3u2CRES6Ktlp78vDUVNQmoz X-Gm-Gg: ASbGncvWYikq+Tt+WP7+DBhU9HNRrLt1siHxna1NnB9Y8TVslQd/RDVAZ0n4j7eJpIY 9KGcDzzY9DQUy80i/1z/6SgA8M5ghS38wnpVzbXa90VIBCFUdbm4Ge27tjRrYtZjOuWO/07wnYw fiHGHacLHvjuZzeHHOlp0+6kOaBrhWjKjgU8Mq3vrI8bGiJKmcr+yqOZJtKuQBACFmZeoqDORZc 9lldX30RIklSs9kvaSQ+N6wd1FwBMA6we+yy7fbQXVG/+rts2WY6NA6U0uCXPlrJtV+GCfm1Eyq gRZxLMqQ1YCvoIhWbYcmIxbRNdusvBow+RIBO/48AOuLhaee9IODQ564fiu32H8lhPYiCrrUqa0 7ui5eIq6mGDYH5oe8nmU= X-Google-Smtp-Source: AGHT+IEeC2V9oqheQugCIcmUB2DfOBvQnyUmbMjdWI+i2rE3X4cT9blBWKi2otTV1GmY599BeVgUMQ== X-Received: by 2002:a17:902:f551:b0:240:b630:e600 with SMTP id d9443c01a7336-244594f1b07mr188841525ad.11.1755398780750; Sat, 16 Aug 2025 19:46:20 -0700 (PDT) Received: from 7950hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2446d50f382sm45009845ad.79.2025.08.16.19.46.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Aug 2025 19:46:20 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: 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 v5 3/4] selftests/bpf: skip recursive functions for kprobe_multi Date: Sun, 17 Aug 2025 10:46:04 +0800 Message-ID: <20250817024607.296117-4-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250817024607.296117-1-dongml2@chinatelecom.cn> References: <20250817024607.296117-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 11:13:54 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 2AF27215175; Sun, 17 Aug 2025 02:46:23 +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=1755398785; cv=none; b=vCpFboF34QgfBYn8r8R9ttO801I+7EVX3QoUD1RzAlehnOGoXogshHgZF7RDTs8np/w2To0DjpUUweyRUq4LD92kgZQMbnceho6tHIzvu+gB5pghvVlhF9PXUyfJU8ojEmB94mrZON4mWioqEo04b2c9vEJ6mACe/gkYfc7A+4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755398785; c=relaxed/simple; bh=Y0sVgiMIvCN1tEPgiAVLe8svWdYQEvpuSTM/2lhhTGQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OnQ614y3z4HxVKjatBWxTMDctBiy7Bi4angp6ydJI9vZUbrphZCtFBVaLUi7DbnGdtNvV+lvAtKM8h/ojdMAxmlw7C7jejwj/dcLyf6O2XgSvOBfUkxJ4gMplbDl3Hkfl3rsyGoOemc2DyU6oPxQv7Kk9Srzdp0WA+P5DhX0EEM= 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=Gdm3RNDQ; 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="Gdm3RNDQ" Received: by mail-pg1-f194.google.com with SMTP id 41be03b00d2f7-b471740e488so3113322a12.1; Sat, 16 Aug 2025 19:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755398783; x=1756003583; 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=Gdm3RNDQIHpNdn7HvbdrITSFlMIWFK6SZLzCeRrsG5EZ3Il60hMIisQRh6zqpJkU6r gQDPbaSz4niVS0xOmdq5bcJhyot4w9FwfIv9N2U5Pv5QeJyeZ1X//+VKqYOtp2neKeDo GvnhjX39oD2jTGs/nUlsVxnNGlcjnnHmVcxfQnEbhHCQXmCKGQnrRn3AbGx+86VQa8Nq 1c2gs8d43MVsvvC/sVW37AaCMNUdnX7jd/yER6wqw0uMqKVRXM9Tx9HJvxuDn/A859Qb kLqR3E//9GDATT7WcrAKDHnOHgL8Rpd3dXAxKu84xpIxjjX/grR/9LFZcpWaHDmwVQUD QM7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755398783; x=1756003583; 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=N0sSo06i3Ga3u0YgM/eDDN3jNY3q7POAuozX0mPYlAi/guNp1JLMN1YF5zGI1g/AdG 7OTf2FmDHeAkXanDrwTEK82rSuiXyECF69VStfhvafSvLgtA+n/OA8ZMhySZLNd7d40I dPB7nJYlZkJezh9rW78w7ET2jbwMJ8QodgTzjt1PWrQxELM3c6e9N1wHXsxKpmiJyBf0 cxLw4ICItpVRVJ/tHP7ny2DgNvkvDcE3c9bOhI22up0FDUxKjANymqOm1inOjEMBQoss pMOGxb1KHWhOiP6gRIaM8Pb4z2ydkVBcntRYmyYBC24t6b//kpw0SOfFWXnTZ0m1ny+o +ujA== X-Forwarded-Encrypted: i=1; AJvYcCV+T299XQxtOn2IjGB45NndnTXHRCd97zCiwI2BS27ufaQlHwa+Gg3JEqJFGZE60E1GGQg=@vger.kernel.org, AJvYcCVRjRKSFtphomQ0IHd7W7TlGT9OELlwOj2ZiBam3VCON+PIlqle3WPhAayOZ5SgIzqXZuFukEbjn6+zO7Sw@vger.kernel.org, AJvYcCXQdQQ+LtPavN0z1UzbfBoI0inMAFjWFXn+Qd8K4jaCK72rW19NlqV4Sn8LkUsV18qN7AnudRbX0v+4Zcvkyf6Khdh/@vger.kernel.org X-Gm-Message-State: AOJu0YyjVyhw55kcosowmOMxwOxYQvLxe3wIqfY0ibp854Dw22YY1sI+ X3kXei9+4tWYFXnJxkCln+Qduntz9rl9c9cKI08HTo8shQabDl5Mb8XC X-Gm-Gg: ASbGnctUBYn2kBoYJLTa5YkJ2H5lNEG24O9cwGEcrmpLkmjPT5wQn53QlRemk5do+We dcGXE4xigEf5UKwYfcK3CtpnZq/AAorH9EW//5/jQrVp8qii4glulm7WhPbCJUiufbfMtaYHD8H XB4qsqjnkq0GAqpOsouaxn24EvnaUEREWoOenDE/xlRXCOaHHplBEh86lIwkQfjcjoreVaJh7cc TXYdqg+9EJOVPxxAoHNbC3jHC+Xh2564mJvG9FPUhXDn9/bP/o6Wl4JUDYaPM+RlY/FYZMLNdKg 4BYO1v+itKGWuF46AJEq9H+Dej5eJuZ0oIQb9C5wUov2wFaBiCvC6BXnthTa1KPhEZO5ya7MRic JQ+UKME0L72CFiR7kvv/2y+qVmHgpyA== X-Google-Smtp-Source: AGHT+IEkRPYeSRtqbRyErbZ1r7ZynxxPHvXzI5eAhICn9Y7f2BvFMwBwIlBrZf6wG5Htf8n3RW09DA== X-Received: by 2002:a17:902:dac9:b0:240:1ed3:fc1f with SMTP id d9443c01a7336-2446d71a0afmr107827595ad.12.1755398783228; Sat, 16 Aug 2025 19:46:23 -0700 (PDT) Received: from 7950hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2446d50f382sm45009845ad.79.2025.08.16.19.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Aug 2025 19:46:22 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: 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 v5 4/4] selftests/bpf: add benchmark testing for kprobe-multi-all Date: Sun, 17 Aug 2025 10:46:05 +0800 Message-ID: <20250817024607.296117-5-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250817024607.296117-1-dongml2@chinatelecom.cn> References: <20250817024607.296117-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