From mboxrd@z Thu Jan 1 00:00:00 1970 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 57FB3C433F5 for ; Sun, 9 Oct 2022 22:00:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230212AbiJIWAC (ORCPT ); Sun, 9 Oct 2022 18:00:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230060AbiJIWAB (ORCPT ); Sun, 9 Oct 2022 18:00:01 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7B85F583 for ; Sun, 9 Oct 2022 14:59:59 -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 0C8CEB80D33 for ; Sun, 9 Oct 2022 21:59:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5842C433D6; Sun, 9 Oct 2022 21:59:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665352796; bh=BWvQeeb8M4lIAYd3zG0nSnErmIk4DfksyyqbUDmDQsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LTn3rkxrlc8dG/k40JAqQIOc1AmwI5+VhNZkCQqx/PuJgl5Su6lNBVGRvGuXL1dxI r4N/VDgSf8Ye6wQBkVqvzYhCBoK2iLgOabrV9/BoD2OAdyc8Q3B2eFIzhjzc5Yq6dK v/fmA5Vv4yMQzfO8azptaokoKlzPBIpa+DfYeNSWG2r+HVkk9uRkRdmpkyjsArxUx5 Xhm0fSBG8HUYbA75/G7byvBxJOoyNp1eKuDhYJGXK6sps7UoovBc74LlrBe1I88SW1 op+rEtzA+qkEP94erP0ta3aie+PWKzx0yhEpYF/vuhWv7qgjuErNErfRXs0jjNsMbV Ghsneqnd0uSpQ== From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: Martynas Pumputis , bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Christoph Hellwig , Masami Hiramatsu Subject: [PATCH bpf-next 2/8] ftrace: Add support to resolve module symbols in ftrace_lookup_symbols Date: Sun, 9 Oct 2022 23:59:20 +0200 Message-Id: <20221009215926.970164-3-jolsa@kernel.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221009215926.970164-1-jolsa@kernel.org> References: <20221009215926.970164-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Currently ftrace_lookup_symbols iterates only over core symbols, adding module_kallsyms_on_each_symbol call to check on modules symbols as well. Also removing 'args.found == args.cnt' condition, because it's already checked in kallsyms_callback function. Also removing 'err < 0' check, because both *kallsyms_on_each_symbol functions do not return error. Reported-by: Martynas Pumputis Signed-off-by: Jiri Olsa --- kernel/trace/ftrace.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 447d2e2a8549..6efdba4666f4 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -8292,17 +8292,18 @@ static int kallsyms_callback(void *data, const char *name, int ftrace_lookup_symbols(const char **sorted_syms, size_t cnt, unsigned long *addrs) { struct kallsyms_data args; - int err; + int found_all; memset(addrs, 0, sizeof(*addrs) * cnt); 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; + found_all = kallsyms_on_each_symbol(kallsyms_callback, &args); + if (found_all) + return 0; + found_all = module_kallsyms_on_each_symbol(kallsyms_callback, &args); + return found_all ? 0 : -ESRCH; } #ifdef CONFIG_SYSCTL -- 2.37.3