From nobody Sun May 10 17:52:28 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95767C433FE for ; Wed, 27 Apr 2022 21:04:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236906AbiD0VHS (ORCPT ); Wed, 27 Apr 2022 17:07:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233639AbiD0VHQ (ORCPT ); Wed, 27 Apr 2022 17:07:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD1ECBF43; Wed, 27 Apr 2022 14:04:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 468C461D94; Wed, 27 Apr 2022 21:04:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 867E6C385A9; Wed, 27 Apr 2022 21:03:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651093441; bh=syZvsfkXqWjSBvMqPMOPO0J8VKUuLeAVtPJLh94JYZo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ks5R5o4rby5MKu2lFnaXpPgnj3to+HEWAZHDiKBD4OIbHi7tKvaS7RVYc412pRSm8 /FXTBnXDCJbZMoxpSAsK2fxcqQR7HTlOVOELVHtJe/a7pzJRrLf8UEUHbClE9guWYf j5BbGjDfQ/ANf6QD0z8xkBdPmy4gc2MrWGlP82TOtqkbcCLmwriPy9dnwP8UuoJYPC kW5wQPl3a8nW8+YsP/ykndZU5PkFPgSjgZQVM69E+MFUedCTA0j9yEOeFmmidButBo 2IN6a+Ok+L0oMtLvGoJ14+BAq+LM5ry0XJLz35JaqK8x7N49JIP0AYAdtsZ3S4InoI DCmSbNfOcNSLQ== From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Masami Hiramatsu Cc: Christoph Hellwig , netdev@vger.kernel.org, bpf@vger.kernel.org, lkml , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Steven Rostedt Subject: [PATCHv3 bpf-next 1/5] kallsyms: Fully export kallsyms_on_each_symbol function Date: Wed, 27 Apr 2022 23:03:41 +0200 Message-Id: <20220427210345.455611-2-jolsa@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220427210345.455611-1-jolsa@kernel.org> References: <20220427210345.455611-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Fully exporting kallsyms_on_each_symbol function, so it can be used in following changes. Rather than adding another ifdef option let's export the function completely (when CONFIG_KALLSYMS option is defined). Cc: Christoph Hellwig Signed-off-by: Jiri Olsa --- include/linux/kallsyms.h | 5 +++++ kernel/kallsyms.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h index ce1bd2fbf23e..d423f3cffa6d 100644 --- a/include/linux/kallsyms.h +++ b/include/linux/kallsyms.h @@ -163,6 +163,11 @@ static inline bool kallsyms_show_value(const struct cr= ed *cred) return false; } =20 +static inline int kallsyms_on_each_symbol(int (*fn)(void *, const char *, = struct module *, unsigned long), + void *data) +{ + return -EOPNOTSUPP; +} #endif /*CONFIG_KALLSYMS*/ =20 static inline void print_ip_sym(const char *loglvl, unsigned long ip) diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c index 79f2eb617a62..fdfd308bebc4 100644 --- a/kernel/kallsyms.c +++ b/kernel/kallsyms.c @@ -228,7 +228,6 @@ unsigned long kallsyms_lookup_name(const char *name) return module_kallsyms_lookup_name(name); } =20 -#ifdef CONFIG_LIVEPATCH /* * Iterate over all symbols in vmlinux. For symbols from modules use * module_kallsyms_on_each_symbol instead. @@ -251,7 +250,6 @@ int kallsyms_on_each_symbol(int (*fn)(void *, const cha= r *, struct module *, } return 0; } -#endif /* CONFIG_LIVEPATCH */ =20 static unsigned long get_symbol_pos(unsigned long addr, unsigned long *symbolsize, --=20 2.35.1 From nobody Sun May 10 17:52:28 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E9BDC433F5 for ; Wed, 27 Apr 2022 21:04:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236965AbiD0VH1 (ORCPT ); Wed, 27 Apr 2022 17:07:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236944AbiD0VHZ (ORCPT ); Wed, 27 Apr 2022 17:07:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 111B73B55E; Wed, 27 Apr 2022 14:04:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A0E2E61D96; Wed, 27 Apr 2022 21:04:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2999CC385A7; Wed, 27 Apr 2022 21:04:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651093452; bh=NbaQaqK6bK4LYN0yFT8k61hz2Mc7Pqy8ccZi9IehvmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zjo0L2p9Y7strrXZIHom4dECd+ItvA7YpRMkD5upN/8TYaVa5jwn+XOOpMJp75nSS 9LSPxb+N6M7OAv3qbWjOO0Oc6yATFMCs2F8DSaDBlJmelRmo/CjDHjMgt0nwp7fsDo 3JSuBQxwWbLiX8UfEyVgzFCDjB3sdsqKQPQn+PA3+e5RT3WSddQ1WE3ib3tfaOHt+b QEEBCiC6EZ2vUxViZpoWaF62dv4bw0JthSf7yGNKvEKmeYttaOVS01V+yG62UthCsp YU0VSydr1amRF6uaB14VrLiFS6b6Z3uXf8XIoFephx0g0pVu1uevvTIJC09ngoUN5/ SMgma+JmjwcrA== From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Masami Hiramatsu Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, lkml , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Steven Rostedt Subject: [PATCHv3 bpf-next 2/5] ftrace: Add ftrace_lookup_symbols function Date: Wed, 27 Apr 2022 23:03:42 +0200 Message-Id: <20220427210345.455611-3-jolsa@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220427210345.455611-1-jolsa@kernel.org> References: <20220427210345.455611-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Adding ftrace_lookup_symbols function that resolves array of symbols with single pass over kallsyms. The user provides array of string pointers with count and pointer to allocated array for resolved values. int ftrace_lookup_symbols(const char **sorted_syms, size_t cnt, unsigned long *addrs) It iterates all kalsyms symbols and tries to loop up each in provided symbols array with bsearch. The symbols array needs to be sorted by name for this reason. We also check each symbol to pass ftrace_location, because this API will be used for fprobe symbols resolving. Suggested-by: Andrii Nakryiko Signed-off-by: Jiri Olsa Acked-by: Andrii Nakryiko --- include/linux/ftrace.h | 6 ++++ kernel/kallsyms.c | 1 + kernel/trace/ftrace.c | 62 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 4816b7e11047..820500430eae 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -303,6 +303,8 @@ int unregister_ftrace_function(struct ftrace_ops *ops); extern void ftrace_stub(unsigned long a0, unsigned long a1, struct ftrace_ops *op, struct ftrace_regs *fregs); =20 + +int ftrace_lookup_symbols(const char **sorted_syms, size_t cnt, unsigned l= ong *addrs); #else /* !CONFIG_FUNCTION_TRACER */ /* * (un)register_ftrace_function must be a macro since the ops parameter @@ -313,6 +315,10 @@ extern void ftrace_stub(unsigned long a0, unsigned lon= g a1, static inline void ftrace_kill(void) { } static inline void ftrace_free_init_mem(void) { } static inline void ftrace_free_mem(struct module *mod, void *start, void *= end) { } +static inline int ftrace_lookup_symbols(const char **sorted_syms, size_t c= nt, unsigned long *addrs) +{ + return -EOPNOTSUPP; +} #endif /* CONFIG_FUNCTION_TRACER */ =20 struct ftrace_func_entry { diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c index fdfd308bebc4..fbdf8d3279ac 100644 --- a/kernel/kallsyms.c +++ b/kernel/kallsyms.c @@ -29,6 +29,7 @@ #include #include #include +#include =20 /* * These will be re-linked against their real values diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 4f1d2f5e7263..07d87c7a525d 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -7964,3 +7964,65 @@ ftrace_enable_sysctl(struct ctl_table *table, int wr= ite, mutex_unlock(&ftrace_lock); return ret; } + +static int symbols_cmp(const void *a, const void *b) +{ + const char **str_a =3D (const char **) a; + const char **str_b =3D (const char **) b; + + return strcmp(*str_a, *str_b); +} + +struct kallsyms_data { + unsigned long *addrs; + const char **syms; + size_t cnt; + size_t found; +}; + +static int kallsyms_callback(void *data, const char *name, + struct module *mod, unsigned long addr) +{ + struct kallsyms_data *args =3D data; + + if (!bsearch(&name, args->syms, args->cnt, sizeof(*args->syms), symbols_c= mp)) + return 0; + + addr =3D ftrace_location(addr); + if (!addr) + return 0; + + args->addrs[args->found++] =3D addr; + return args->found =3D=3D args->cnt ? 1 : 0; +} + +/** + * ftrace_lookup_symbols - Lookup addresses for array of symbols + * + * @sorted_syms: array of symbols pointers symbols to resolve, + * must be alphabetically sorted + * @cnt: number of symbols/addresses in @syms/@addrs arrays + * @addrs: array for storing resulting addresses + * + * This function looks up addresses for array of symbols provided in + * @syms array (must be alphabetically sorted) and stores them in + * @addrs array, which needs to be big enough to store at least @cnt + * addresses. + * + * This function returns 0 if all provided symbols are found, + * -ESRCH otherwise. + */ +int ftrace_lookup_symbols(const char **sorted_syms, size_t cnt, unsigned l= ong *addrs) +{ + struct kallsyms_data args; + int err; + + args.addrs =3D addrs; + args.syms =3D sorted_syms; + args.cnt =3D cnt; + args.found =3D 0; + err =3D kallsyms_on_each_symbol(kallsyms_callback, &args); + if (err < 0) + return err; + return args.found =3D=3D args.cnt ? 0 : -ESRCH; +} --=20 2.35.1 From nobody Sun May 10 17:52:28 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 397F4C433EF for ; Wed, 27 Apr 2022 21:04:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237243AbiD0VH4 (ORCPT ); Wed, 27 Apr 2022 17:07:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237164AbiD0VHj (ORCPT ); Wed, 27 Apr 2022 17:07:39 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 012BE8878B; Wed, 27 Apr 2022 14:04:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A8992B82AD8; Wed, 27 Apr 2022 21:04:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A74BC385AA; Wed, 27 Apr 2022 21:04:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651093462; bh=5FwLa1xFrkFZPWtTKRF4rYoUZEPf40so8YMj+Ov7/5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hq2F+2bBa8XOBoycOV7ws1Kz8fuIrlUnfVnPJ5XyTMPpvpZ3OV4gIh52KcEjkTJjq NKZTQJ4T4GuoiNIe7sfAWXjuKfcvNcjY/X2RjoXXNt/nCJYY2HlZbIwLT0q8sbAZKc vQbdkNB+f2SLPZ5uYMNLXwF0ATM0oUCYAYREFwWfkMD0XcCw563Hi2XBwlXnKx0rXs 2HNOosDYu26baMD3BPnl0G1pQgQLEdyJ8e20G8ZKpvicexROTakFeRs+GpHnW3dMtK XkXNtsze1RU+jGPqaGFfx+YszePxZEHZXRlxS/SqmJQzZ+2mQLRR2CGqmWu+d8rjcC T1fSIOPtbv7aw== From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Masami Hiramatsu Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, lkml , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Steven Rostedt Subject: [PATCHv3 bpf-next 3/5] fprobe: Resolve symbols with ftrace_lookup_symbols Date: Wed, 27 Apr 2022 23:03:43 +0200 Message-Id: <20220427210345.455611-4-jolsa@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220427210345.455611-1-jolsa@kernel.org> References: <20220427210345.455611-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Using ftrace_lookup_symbols to speed up symbols lookup in register_fprobe_syms API. This requires syms array to be alphabetically sorted. Signed-off-by: Jiri Olsa --- kernel/trace/fprobe.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c index 89d9f994ebb0..aac63ca9c3d1 100644 --- a/kernel/trace/fprobe.c +++ b/kernel/trace/fprobe.c @@ -85,39 +85,31 @@ static void fprobe_exit_handler(struct rethook_node *rh= , void *data, } NOKPROBE_SYMBOL(fprobe_exit_handler); =20 +static int symbols_cmp(const void *a, const void *b) +{ + const char **str_a =3D (const char **) a; + const char **str_b =3D (const char **) b; + + return strcmp(*str_a, *str_b); +} + /* Convert ftrace location address from symbols */ static unsigned long *get_ftrace_locations(const char **syms, int num) { - unsigned long addr, size; unsigned long *addrs; - int i; =20 /* Convert symbols to symbol address */ addrs =3D kcalloc(num, sizeof(*addrs), GFP_KERNEL); if (!addrs) return ERR_PTR(-ENOMEM); =20 - for (i =3D 0; i < num; i++) { - addr =3D kallsyms_lookup_name(syms[i]); - if (!addr) /* Maybe wrong symbol */ - goto error; - - /* Convert symbol address to ftrace location. */ - if (!kallsyms_lookup_size_offset(addr, &size, NULL) || !size) - goto error; + /* ftrace_lookup_symbols expects sorted symbols */ + sort(syms, num, sizeof(*syms), symbols_cmp, NULL); =20 - addr =3D ftrace_location_range(addr, addr + size - 1); - if (!addr) /* No dynamic ftrace there. */ - goto error; + if (!ftrace_lookup_symbols(syms, num, addrs)) + return addrs; =20 - addrs[i] =3D addr; - } - - return addrs; - -error: kfree(addrs); - return ERR_PTR(-ENOENT); } =20 --=20 2.35.1 From nobody Sun May 10 17:52:28 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D55ABC433F5 for ; Wed, 27 Apr 2022 21:05:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232133AbiD0VIK (ORCPT ); Wed, 27 Apr 2022 17:08:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237034AbiD0VHs (ORCPT ); Wed, 27 Apr 2022 17:07:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F87B5469D; Wed, 27 Apr 2022 14:04:33 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 161F261D92; Wed, 27 Apr 2022 21:04:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 901FAC385A7; Wed, 27 Apr 2022 21:04:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651093472; bh=+LByHrrtf81CwdaFC5DHRS/xfMmBXs2eEoWjFB8FU1Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JJF32/fiY26jTfo/FK05J6ZxCPw/xMV2k3xlhlc95AAqdlM0rZXA6eiA4M8ogKOLD CX2fxqIn7+8BYP2aWtFVHxUiS5FbGmY7IAmbWTIfMV/YLcapUF0e0HwpzqTYPLcnX8 DDiNUj/TZ2nNyTWHLcugq9phMe70X13CJWa5wJmYMcN0FWN9lOTKLGK9cJxTvkVN8g l8pyUaqqJ+aNAriIG6LS+VCIaw9Q75CbLo5xmqGyQ8ku/Wb410yatGjeCS1pmI/bHh m6OHMOqJEEGtMjszTTxk1sTVj1UruPJD03bcXNkSA9VFQ4I1yK4PDEGcvhR7uY8l5I QL8kjQ3G4Gm/Q== From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Masami Hiramatsu Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, lkml , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Steven Rostedt Subject: [PATCHv3 bpf-next 4/5] bpf: Resolve symbols with ftrace_lookup_symbols for kprobe multi link Date: Wed, 27 Apr 2022 23:03:44 +0200 Message-Id: <20220427210345.455611-5-jolsa@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220427210345.455611-1-jolsa@kernel.org> References: <20220427210345.455611-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Using kallsyms_lookup_names function to speed up symbols lookup in kprobe multi link attachment and replacing with it the current kprobe_multi_resolve_syms function. This speeds up bpftrace kprobe attachment: # perf stat -r 5 -e cycles ./src/bpftrace -e 'kprobe:x* { } i:ms:1 { exi= t(); }' ... 6.5681 +- 0.0225 seconds time elapsed ( +- 0.34% ) After: # perf stat -r 5 -e cycles ./src/bpftrace -e 'kprobe:x* { } i:ms:1 { exi= t(); }' ... 0.5661 +- 0.0275 seconds time elapsed ( +- 4.85% ) Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- kernel/trace/bpf_trace.c | 112 +++++++++++++++++++++++---------------- 1 file changed, 66 insertions(+), 46 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index f15b826f9899..7fd11c17558d 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2229,6 +2229,59 @@ struct bpf_kprobe_multi_run_ctx { unsigned long entry_ip; }; =20 +struct user_syms { + const char **syms; + char *buf; +}; + +static int copy_user_syms(struct user_syms *us, unsigned long __user *usym= s, u32 cnt) +{ + unsigned long __user usymbol; + const char **syms =3D NULL; + char *buf =3D NULL, *p; + int err =3D -ENOMEM; + unsigned int i; + + syms =3D kvmalloc(cnt * sizeof(*syms), GFP_KERNEL); + if (!syms) + goto error; + + buf =3D kvmalloc(cnt * KSYM_NAME_LEN, GFP_KERNEL); + if (!buf) + goto error; + + for (p =3D buf, i =3D 0; i < cnt; i++) { + if (__get_user(usymbol, usyms + i)) { + err =3D -EFAULT; + goto error; + } + err =3D strncpy_from_user(p, (const char __user *) usymbol, KSYM_NAME_LE= N); + if (err =3D=3D KSYM_NAME_LEN) + err =3D -E2BIG; + if (err < 0) + goto error; + syms[i] =3D p; + p +=3D err + 1; + } + + us->syms =3D syms; + us->buf =3D buf; + return 0; + +error: + if (err) { + kvfree(syms); + kvfree(buf); + } + return err; +} + +static void free_user_syms(struct user_syms *us) +{ + kvfree(us->syms); + kvfree(us->buf); +} + static void bpf_kprobe_multi_link_release(struct bpf_link *link) { struct bpf_kprobe_multi_link *kmulti_link; @@ -2349,53 +2402,12 @@ kprobe_multi_link_handler(struct fprobe *fp, unsign= ed long entry_ip, kprobe_multi_link_prog_run(link, entry_ip, regs); } =20 -static int -kprobe_multi_resolve_syms(const void __user *usyms, u32 cnt, - unsigned long *addrs) +static int symbols_cmp(const void *a, const void *b) { - unsigned long addr, size; - const char __user **syms; - int err =3D -ENOMEM; - unsigned int i; - char *func; - - size =3D cnt * sizeof(*syms); - syms =3D kvzalloc(size, GFP_KERNEL); - if (!syms) - return -ENOMEM; + const char **str_a =3D (const char **) a; + const char **str_b =3D (const char **) b; =20 - func =3D kmalloc(KSYM_NAME_LEN, GFP_KERNEL); - if (!func) - goto error; - - if (copy_from_user(syms, usyms, size)) { - err =3D -EFAULT; - goto error; - } - - for (i =3D 0; i < cnt; i++) { - err =3D strncpy_from_user(func, syms[i], KSYM_NAME_LEN); - if (err =3D=3D KSYM_NAME_LEN) - err =3D -E2BIG; - if (err < 0) - goto error; - err =3D -EINVAL; - addr =3D kallsyms_lookup_name(func); - if (!addr) - goto error; - if (!kallsyms_lookup_size_offset(addr, &size, NULL)) - goto error; - addr =3D ftrace_location_range(addr, addr + size - 1); - if (!addr) - goto error; - addrs[i] =3D addr; - } - - err =3D 0; -error: - kvfree(syms); - kfree(func); - return err; + return strcmp(*str_a, *str_b); } =20 int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_pr= og *prog) @@ -2441,7 +2453,15 @@ int bpf_kprobe_multi_link_attach(const union bpf_att= r *attr, struct bpf_prog *pr goto error; } } else { - err =3D kprobe_multi_resolve_syms(usyms, cnt, addrs); + struct user_syms us; + + err =3D copy_user_syms(&us, usyms, cnt); + if (err) + goto error; + + sort(us.syms, cnt, sizeof(*us.syms), symbols_cmp, NULL); + err =3D ftrace_lookup_symbols(us.syms, cnt, addrs); + free_user_syms(&us); if (err) goto error; } --=20 2.35.1 From nobody Sun May 10 17:52:28 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 853CEC433F5 for ; Wed, 27 Apr 2022 21:05:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237288AbiD0VIU (ORCPT ); Wed, 27 Apr 2022 17:08:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236962AbiD0VH5 (ORCPT ); Wed, 27 Apr 2022 17:07:57 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BC8286AE4; Wed, 27 Apr 2022 14:04:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E3E58B8294B; Wed, 27 Apr 2022 21:04:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C46E3C385A9; Wed, 27 Apr 2022 21:04:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651093482; bh=Rw6s213h6pi9+XTI45xKSrEgbSgQPXH8mq2kkItUh2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D2K3rYNk33Dbcz1ZusuGdlo8aoPLyw1eIyzdempRehkOJXEeCdo5AcXUWYKyhunqP zhwR/ZmIgQl1r1oMMIPN5ieMObcRtRqx4gXdMScftdlGBrNN9bfhj+1Nc7+KHqbirG 9DIg37A2UYAI1GLccx16y+gm/hJen2L0D9McMcmYIeC7e8WiwRjtRdEk/fyFanG2P9 siFlq0OdwRx6iIHtdM9kxaI12ivajI09rgZHlj+a97oDAFw21M9BTMGs6r+UDxEau/ wsLu9T1O8/1YD2StJ+H1ALZT5Twh2rXyiHRISBCcywVczR6cYAxWSNhyDW5M9PCT6C Dywv32h3uvWgw== From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Masami Hiramatsu Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, lkml , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Steven Rostedt Subject: [PATCHv3 bpf-next 5/5] selftests/bpf: Add attach bench test Date: Wed, 27 Apr 2022 23:03:45 +0200 Message-Id: <20220427210345.455611-6-jolsa@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220427210345.455611-1-jolsa@kernel.org> References: <20220427210345.455611-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Adding test that reads all functions from ftrace available_filter_functions file and attach them all through kprobe_multi API. It also prints stats info with -v option, like on my setup: test_bench_attach: found 48712 functions test_bench_attach: attached in 1.069s test_bench_attach: detached in 0.373s Signed-off-by: Jiri Olsa Acked-by: Andrii Nakryiko --- .../bpf/prog_tests/kprobe_multi_test.c | 133 ++++++++++++++++++ .../selftests/bpf/progs/kprobe_multi_empty.c | 12 ++ 2 files changed, 145 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/kprobe_multi_empty.c 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 b9876b55fc0c..a0664c5c15ee 100644 --- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c @@ -2,6 +2,9 @@ #include #include "kprobe_multi.skel.h" #include "trace_helpers.h" +#include "kprobe_multi_empty.skel.h" +#include "bpf/libbpf_internal.h" +#include "bpf/hashmap.h" =20 static void kprobe_multi_test_run(struct kprobe_multi *skel, bool test_ret= urn) { @@ -301,6 +304,134 @@ static void test_attach_api_fails(void) kprobe_multi__destroy(skel); } =20 +static inline __u64 get_time_ns(void) +{ + struct timespec t; + + clock_gettime(CLOCK_MONOTONIC, &t); + return (__u64) t.tv_sec * 1000000000 + t.tv_nsec; +} + +static size_t symbol_hash(const void *key, void *ctx __maybe_unused) +{ + return str_hash((const char *) key); +} + +static bool symbol_equal(const void *key1, const void *key2, void *ctx __m= aybe_unused) +{ + return strcmp((const char *) key1, (const char *) key2) =3D=3D 0; +} + +static int get_syms(char ***symsp, size_t *cntp) +{ + size_t cap =3D 0, cnt =3D 0, i; + char *name, **syms =3D NULL; + struct hashmap *map; + char buf[256]; + FILE *f; + int err; + + /* + * 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. + */ + 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)) + goto error; + + while (fgets(buf, sizeof(buf), f)) { + /* skip modules */ + if (strchr(buf, '[')) + continue; + if (sscanf(buf, "%ms$*[^\n]\n", &name) !=3D 1) + continue; + err =3D hashmap__add(map, name, NULL); + if (err) { + free(name); + if (err =3D=3D -EEXIST) + continue; + goto error; + } + err =3D libbpf_ensure_mem((void **) &syms, &cap, + sizeof(*syms), cnt + 1); + if (err) { + free(name); + goto error; + } + syms[cnt] =3D name; + cnt++; + } + + *symsp =3D syms; + *cntp =3D cnt; + +error: + fclose(f); + hashmap__free(map); + if (err) { + for (i =3D 0; i < cnt; i++) + free(syms[cnt]); + free(syms); + } + return err; +} + +static void test_bench_attach(void) +{ + LIBBPF_OPTS(bpf_kprobe_multi_opts, opts); + struct kprobe_multi_empty *skel =3D NULL; + long attach_start_ns, attach_end_ns; + long detach_start_ns, detach_end_ns; + double attach_delta, detach_delta; + struct bpf_link *link =3D NULL; + char **syms =3D NULL; + size_t cnt, i; + + if (!ASSERT_OK(get_syms(&syms, &cnt), "get_syms")) + return; + + skel =3D kprobe_multi_empty__open_and_load(); + if (!ASSERT_OK_PTR(skel, "kprobe_multi_empty__open_and_load")) + goto cleanup; + + opts.syms =3D (const char **) syms; + opts.cnt =3D cnt; + + attach_start_ns =3D get_time_ns(); + link =3D bpf_program__attach_kprobe_multi_opts(skel->progs.test_kprobe_em= pty, + NULL, &opts); + attach_end_ns =3D get_time_ns(); + + if (!ASSERT_OK_PTR(link, "bpf_program__attach_kprobe_multi_opts")) + goto cleanup; + + detach_start_ns =3D get_time_ns(); + bpf_link__destroy(link); + detach_end_ns =3D get_time_ns(); + + attach_delta =3D (attach_end_ns - attach_start_ns) / 1000000000.0; + detach_delta =3D (detach_end_ns - detach_start_ns) / 1000000000.0; + + printf("%s: found %lu functions\n", __func__, cnt); + printf("%s: attached in %7.3lfs\n", __func__, attach_delta); + printf("%s: detached in %7.3lfs\n", __func__, detach_delta); + +cleanup: + kprobe_multi_empty__destroy(skel); + if (syms) { + for (i =3D 0; i < cnt; i++) + free(syms[i]); + free(syms); + } +} + void test_kprobe_multi_test(void) { if (!ASSERT_OK(load_kallsyms(), "load_kallsyms")) @@ -320,4 +451,6 @@ void test_kprobe_multi_test(void) test_attach_api_syms(); if (test__start_subtest("attach_api_fails")) test_attach_api_fails(); + if (test__start_subtest("bench_attach")) + test_bench_attach(); } diff --git a/tools/testing/selftests/bpf/progs/kprobe_multi_empty.c b/tools= /testing/selftests/bpf/progs/kprobe_multi_empty.c new file mode 100644 index 000000000000..e76e499aca39 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/kprobe_multi_empty.c @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include + +char _license[] SEC("license") =3D "GPL"; + +SEC("kprobe.multi/") +int test_kprobe_empty(struct pt_regs *ctx) +{ + return 0; +} --=20 2.35.1