Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp6036051iob; Tue, 10 May 2022 08:58:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2R/DCppZ38cEYqnHJOVdlwOhqg2DNOony1sOkKbvlXpXOSy/j0YZiFpUr4ik5U3NejpG8 X-Received: by 2002:a17:902:b094:b0:15c:dee8:74c8 with SMTP id p20-20020a170902b09400b0015cdee874c8mr20948591plr.6.1652198299233; Tue, 10 May 2022 08:58:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652198299; cv=none; d=google.com; s=arc-20160816; b=m4pK6rtnBkHY5Yp6xhaBJia8TYulA7xbK5NDl4skrv5O+mRoAQMeUW3br8tCf7OjNs D3zwzUxYDPhhdGDJF+c6qDbY9qD8yZPRads+CLBE9j4ouqVKv3wU5+EBpPrHc1sX3yKA H9LvTiQF2nEVN3O5A2hpgBDivpall932lMY8pDjv5yk/aHfbjCupXot4ddWc+okDv6Pt bVaeDYOeMb7xaRNu/YQjzkBQCEB3H9uig3MiAmPiBvMvi5VzSwl9IZKDq7JRE3g2/bSJ trUo3/DKBOXOUm5nXAS8CnA9xwel49lIb39bUY7Hd7jipRS2LmzbA1evY7lzEmnQqnZA jcdg== 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=Fcst80bZcpWX2r0t9HZuNo1euk+V4Ngzenis9iDo2KY=; b=ijuv62M1UaUS4K0Eqdp8FISKGbUtTAqiAddz2MKwlbH0/gy1bL3Eq5C2JzAwiOgLpf C39L42BOeRoiQ4PqzEatyMUwqzcGkhksw8UbI1PcuqLh5BqTNew97HYIYt4qqRkAQGIV u9oToIH3Mj4pcrFdC1zrKeMJaE0+e1u7rynrYdLTjJivjC31i/vlcRL9f9umqyx5ooBk gbwfPveGrjip39K3NAEedhTLEsSAOveGhrJ+NrRJiHFc9i46uyXbrg1KBKVJSianBTGB eGcIIkjC0lStirvVOVHGeRodansSbM6cDSnROsaxdYM8ck9Jcs4CzpZYsEidt5yLfRQc mtjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GBTDNT2e; 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 j34-20020a635962000000b003a0ab4ec87fsi18716161pgm.740.2022.05.10.08.58.03; Tue, 10 May 2022 08:58:19 -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=GBTDNT2e; 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 S241860AbiEJMcB (ORCPT + 99 others); Tue, 10 May 2022 08:32:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241889AbiEJMbJ (ORCPT ); Tue, 10 May 2022 08:31:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 826FE2B52CB; Tue, 10 May 2022 05:27:01 -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 1B29A60C52; Tue, 10 May 2022 12:27:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17923C385C2; Tue, 10 May 2022 12:26:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652185620; bh=pSjwjxMQ0Xqxg/DyGW31H8wuzBaHCcrF1uhKi6HzOQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GBTDNT2eENPnjoiPrBKgL7K+DJzPVKFFVBUaSWivU7jsvEz3DwIQKy+ZfiaJUuJ8J 9w04UXPhvw1eaGfQue85hU08Wmou4fDRsK/BQsiE+gTu0nv9RwDPI6tnCKULdugoWK KVVK83/rrdq93zxaZ5uuV9Pn48c/8nzy9+BI6N0XiEABe2tVrJGFKbS23SofSwHb7t haXzFui5SrxK1Rzlx+FCspRPf9oNovhxpg0tOAhPw9lLQM5qKHyJKzO6jCY8WAIzwd gkVhLTE+/sf8VCr93SVNjioDE9+rka9tuuBrxJIbDl4ZiBmhKdleeXDkhgQT1G8Ggj PKyIdx/QDmuuQ== 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 , Christoph Hellwig Subject: [PATCHv6 bpf-next 3/5] fprobe: Resolve symbols with ftrace_lookup_symbols Date: Tue, 10 May 2022 14:26:14 +0200 Message-Id: <20220510122616.2652285-4-jolsa@kernel.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220510122616.2652285-1-jolsa@kernel.org> References: <20220510122616.2652285-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,T_SCC_BODY_TEXT_LINE 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 Using ftrace_lookup_symbols to speed up symbols lookup in register_fprobe_syms API. Acked-by: Masami Hiramatsu 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); +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); +} + /* 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; /* Convert symbols to symbol address */ addrs = kcalloc(num, sizeof(*addrs), GFP_KERNEL); if (!addrs) return ERR_PTR(-ENOMEM); - for (i = 0; i < num; i++) { - addr = 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); - addr = ftrace_location_range(addr, addr + size - 1); - if (!addr) /* No dynamic ftrace there. */ - goto error; + if (!ftrace_lookup_symbols(syms, num, addrs)) + return addrs; - addrs[i] = addr; - } - - return addrs; - -error: kfree(addrs); - return ERR_PTR(-ENOENT); } -- 2.35.3