Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1020937iob; Thu, 28 Apr 2022 16:50:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyV8beWlOOTJikqjvHakyD8RuC0W6OQemAUIHyx6j4/CdVv4iStbJCBbF/Z4jwc9PE92kgK X-Received: by 2002:a17:902:70c1:b0:154:667f:e361 with SMTP id l1-20020a17090270c100b00154667fe361mr36266700plt.148.1651189825684; Thu, 28 Apr 2022 16:50:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651189825; cv=none; d=google.com; s=arc-20160816; b=SnhefgQms1rqrybP4KzMx9l3suNZ4x+wXB+3WAzRypb8SbXho7SFX4RIfhZ3g/RyKn 19CX4XitJb6PCSLGWeBghkoEaTpbm1WYbnWGf+cxjN2q1Ebxjw9Yktm75qmG4j94cPIt kVhOsuQK8hwmbgsS6of+HzLSbpjU9rwQ7WCRsP6VRzLXWtoYegPuhtS7g/wsCWVfgRHi 3XyfvLrqD7q1jX4J7NDsfqGdel8h7c2DwBquEvr2wBgSpZ19yD5cstIyNzoVjPilXeT8 EZeZk9MDDeDUjdQ66olHbyHY1U39L47a2VJWoXr8/ASUcjgDz57/q92TH55bgZ4ZFjC+ C/GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KQlVJ/7DO+gDaiWlP8sfD0DK3oC7UhNBG5YdrvOy2/o=; b=QsjMBobPy8IFNmxrFuLSD6grlhSAm6Y3U3JONSej4NPCPrNV2V+pbWhEZ7W5O+X9uv 7sA5rNWO7MvLHZ/s9XCgEJ3l7MazGP08omeWYXPP/wdDRQN8Lo+SgvDldj3o6wc5RS6P ipRPi06S31hGPLT1Urrc1PW1Oi5Ar5zMGxvhxJHAq4FTJHYVspJ+e14CJjyUAW+lvQTr bAcDN/nOxH812lZglDKUd+17TnaVJQbiNxI7oTY586aaf2nLnVUQ6vNaGhA1DJg4dC3E EHuEq58vaPnPRU8c1i1J82dDluA1WmPo1mwvXD4Cm0QVGjOP8yk04nqk8xWUtcaXTpJg /AYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qU25aXDe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y19-20020a1709027c9300b0015862deeb9dsi5409547pll.117.2022.04.28.16.50.09; Thu, 28 Apr 2022 16:50:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qU25aXDe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351754AbiD1UQA (ORCPT + 99 others); Thu, 28 Apr 2022 16:16:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351701AbiD1UPu (ORCPT ); Thu, 28 Apr 2022 16:15:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5D8DBF958; Thu, 28 Apr 2022 13:12:34 -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 5B35961E71; Thu, 28 Apr 2022 20:12:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF03CC385AE; Thu, 28 Apr 2022 20:12:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651176753; bh=T76x8sAnMa9QYAi+4HM2HG5atz742DfkdDvuDq9jtVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qU25aXDefjDTCiJXG9eTlO5Gsw75CqRnqnB80Tqrxl2XfAp6dM2AnlwHwrG+QifUA 7Rn4nmot81H9XBPz/zf7uzTiouKG4wfeOGvy8H5gHJ8OlFauYTmQzT8341Qs8QdoJw Gu9wLih0fQVFQkxu31TPbXwFw58hevGzPHlK2BLVFyzctI8kfbX9D7O3LWNNVbWVbb NMDxO5O7eGyGpAcyKPD18RKFW8n9q21cfJ41SkVEd+lqRsOO9++pW2AXZJ6DTx3oXN T7UVuYm7V7WT+KYzam1JwCU+PXMu9SSklJygBbMAkNLPUZwbJmNFVI1gwy2ovkvaPo Qsd1uzuwfv9Bw== 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: [PATCHv4 bpf-next 2/5] ftrace: Add ftrace_lookup_symbols function Date: Thu, 28 Apr 2022 22:12:04 +0200 Message-Id: <20220428201207.954552-3-jolsa@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428201207.954552-1-jolsa@kernel.org> References: <20220428201207.954552-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 kallsyms 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 Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- 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); + +int ftrace_lookup_symbols(const char **sorted_syms, size_t cnt, unsigned long *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 long 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 cnt, unsigned long *addrs) +{ + return -EOPNOTSUPP; +} #endif /* CONFIG_FUNCTION_TRACER */ 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 /* * 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 write, mutex_unlock(&ftrace_lock); return ret; } + +static int symbols_cmp(const void *a, const void *b) +{ + const char **str_a = (const char **) a; + const char **str_b = (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 = data; + + if (!bsearch(&name, args->syms, args->cnt, sizeof(*args->syms), symbols_cmp)) + return 0; + + addr = ftrace_location(addr); + if (!addr) + return 0; + + args->addrs[args->found++] = addr; + return args->found == 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 long *addrs) +{ + struct kallsyms_data args; + int err; + + args.addrs = addrs; + args.syms = sorted_syms; + args.cnt = cnt; + args.found = 0; + err = kallsyms_on_each_symbol(kallsyms_callback, &args); + if (err < 0) + return err; + return args.found == args.cnt ? 0 : -ESRCH; +} -- 2.35.1