From patchwork Fri Dec 8 10:30:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 175766 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5367491vqy; Fri, 8 Dec 2023 02:39:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IHnAcyMuxaIAi8X1dEAUJtLuUBy1rfeuqweumERyGlcjEie8EfEkl8LtzyjKIhxHpyFIYV3 X-Received: by 2002:a17:902:ea03:b0:1d0:6ffd:9df4 with SMTP id s3-20020a170902ea0300b001d06ffd9df4mr5067890plg.70.1702031946313; Fri, 08 Dec 2023 02:39:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702031946; cv=none; d=google.com; s=arc-20160816; b=uHu5ZP0kqDZdHIe9YOSYfYZkxGZFiQ6TevFeURpBtQpghATymV1LfLGcW2la8ky6xX nbSIoEk4fdHvVXqPzxvJxIaDZIgnZ/Kxk/oDuoVuorsSOCPEH/dA4MqBNDdGzvLdmo/w iCcTBo/Uih8sGvAsaJ2ZJjAjGLPiNoT8w/dFVitw63OoxamqX/x+UNUjsPNylMZ5Xrif xHEUaw4csEtCUkkqU/QeXZKYnz2+CcFs/oOZGTqGDBTihdWvmY8Iaa870qeW92+Spvhh RH2KMWrWlxHzOjag9OAL/n5hzaAqEOW3ziVtLvVh6BabQxKi1fI6/E5AU3bpp/pW8RY8 zORA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=B+IimFdLV6G8hCJEMsVcQeurP5etXlmAnEIlOhkzF3g=; fh=SIgps5XdV0XNwjZfT2uAI7g3mrspDldK9Qs8qQAfoa4=; b=UMR0zwzbsm1vjcmFh93hZCYi4ReaGq4Q/BzQ9qdYiq8u/Od1IfI1eSucoyFGYpGgTm 80qjSV4+PN31sqaTjGkQgxO4Sm1ttvX4Q3pt2dbG12KXqHOnUl9D/hmBLgwSAyxcgLdB DZDpSqas0JefuRI2lszNM72SsZYOObZu/Rs9PHbTHyF3AW9hQeZh9Liu2r/O0sC9ycbG xv48w0+nIlxHIpJsIODIIN6DJwDYDvMk4g2KpEyNi/Fa2P/6v4Duhi/UqgmEvvalsYTM jWLJ3PHQrPq6T1W52j+71qoplGxV5SUq9dZN6DzTMvymZJ/flOIQa2dwiBhl2mg5NOr1 jgdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gogPUb0m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id d20-20020a170902729400b001cc282684c6si1348840pll.278.2023.12.08.02.39.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 02:39:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gogPUb0m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id BB6FF80F7E66; Fri, 8 Dec 2023 02:39:02 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1573670AbjLHKiv (ORCPT + 99 others); Fri, 8 Dec 2023 05:38:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1573792AbjLHKid (ORCPT ); Fri, 8 Dec 2023 05:38:33 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B46A61FFE for ; Fri, 8 Dec 2023 02:30:39 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27A66C433C8; Fri, 8 Dec 2023 10:30:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702031439; bh=uaiQ0NlnGDpVimzHf7hc4bouD6LM9m4Fjq8sHDW6itc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gogPUb0mk7pCFhGy1iFlvqkZhP+m5OexrJM8E4/R2bkrr4FQvpNE+5GJoEQjM5DVt AouFvrTgRvLuqrH0FxpB6UGnYRkg/YpJHpSnwqNZgHhc0+WFBTRXRwPu6O1FGSUFws LKONy3N9DzVlj8tFyO04HP/KRu+JCVmSmnt0WpXOj+dIytAB/Yq0d/EQn13rXIATKO haVg9jgwE2EyEmUIXkPRD81Dtg76Rf/1FGXlwUgaBwyoQCVTNaQaPRivgYbIoppE0c px97dCdf9ajDlb06XQCD2NWJenwJlSoIsB4HdOKAQ39taEr4C0o3pjwFZ/tWJpwGJt rYWfnft5RdjVw== From: "Masami Hiramatsu (Google)" To: Alexei Starovoitov , Steven Rostedt , Florent Revest Cc: linux-trace-kernel@vger.kernel.org, LKML , Martin KaFai Lau , bpf , Sven Schnelle , Alexei Starovoitov , Jiri Olsa , Arnaldo Carvalho de Melo , Daniel Borkmann , Alan Maguire , Mark Rutland , Peter Zijlstra , Thomas Gleixner , Guo Ren Subject: [PATCH v4 31/33] bpf: Enable kprobe_multi feature if CONFIG_FPROBE is enabled Date: Fri, 8 Dec 2023 19:30:32 +0900 Message-Id: <170203143209.579004.15628231153884760718.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <170203105427.579004.8033550792660734570.stgit@devnote2> References: <170203105427.579004.8033550792660734570.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 08 Dec 2023 02:39:02 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784709850509568837 X-GMAIL-MSGID: 1784709850509568837 From: Masami Hiramatsu (Google) Enable kprobe_multi feature if CONFIG_FPROBE is enabled. The pt_regs is converted from ftrace_regs by ftrace_partial_regs(), thus some registers may always returns 0. But it should be enough for function entry (access arguments) and exit (access return value). Signed-off-by: Masami Hiramatsu (Google) Acked-by: Florent Revest --- Changes from previous series: NOTHING, Update against the new series. --- kernel/trace/bpf_trace.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index efb792f8f2ea..24ee4e960f1d 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2503,7 +2503,7 @@ static int __init bpf_event_init(void) fs_initcall(bpf_event_init); #endif /* CONFIG_MODULES */ -#if defined(CONFIG_FPROBE) && defined(CONFIG_DYNAMIC_FTRACE_WITH_REGS) +#ifdef CONFIG_FPROBE struct bpf_kprobe_multi_link { struct bpf_link link; struct fprobe fp; @@ -2526,6 +2526,8 @@ struct user_syms { char *buf; }; +static DEFINE_PER_CPU(struct pt_regs, bpf_kprobe_multi_pt_regs); + static int copy_user_syms(struct user_syms *us, unsigned long __user *usyms, u32 cnt) { unsigned long __user usymbol; @@ -2703,13 +2705,14 @@ static u64 bpf_kprobe_multi_entry_ip(struct bpf_run_ctx *ctx) static int kprobe_multi_link_prog_run(struct bpf_kprobe_multi_link *link, - unsigned long entry_ip, struct pt_regs *regs) + unsigned long entry_ip, struct ftrace_regs *fregs) { struct bpf_kprobe_multi_run_ctx run_ctx = { .link = link, .entry_ip = entry_ip, }; struct bpf_run_ctx *old_run_ctx; + struct pt_regs *regs; int err; if (unlikely(__this_cpu_inc_return(bpf_prog_active) != 1)) { @@ -2720,6 +2723,7 @@ kprobe_multi_link_prog_run(struct bpf_kprobe_multi_link *link, migrate_disable(); rcu_read_lock(); + regs = ftrace_partial_regs(fregs, this_cpu_ptr(&bpf_kprobe_multi_pt_regs)); old_run_ctx = bpf_set_run_ctx(&run_ctx.run_ctx); err = bpf_prog_run(link->link.prog, regs); bpf_reset_run_ctx(old_run_ctx); @@ -2737,13 +2741,9 @@ kprobe_multi_link_handler(struct fprobe *fp, unsigned long fentry_ip, void *data) { struct bpf_kprobe_multi_link *link; - struct pt_regs *regs = ftrace_get_regs(fregs); - - if (!regs) - return 0; link = container_of(fp, struct bpf_kprobe_multi_link, fp); - kprobe_multi_link_prog_run(link, get_entry_ip(fentry_ip), regs); + kprobe_multi_link_prog_run(link, get_entry_ip(fentry_ip), fregs); return 0; } @@ -2753,13 +2753,9 @@ kprobe_multi_link_exit_handler(struct fprobe *fp, unsigned long fentry_ip, void *data) { struct bpf_kprobe_multi_link *link; - struct pt_regs *regs = ftrace_get_regs(fregs); - - if (!regs) - return; link = container_of(fp, struct bpf_kprobe_multi_link, fp); - kprobe_multi_link_prog_run(link, get_entry_ip(fentry_ip), regs); + kprobe_multi_link_prog_run(link, get_entry_ip(fentry_ip), fregs); } static int symbols_cmp_r(const void *a, const void *b, const void *priv) @@ -3016,7 +3012,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr kvfree(cookies); return err; } -#else /* !CONFIG_FPROBE || !CONFIG_DYNAMIC_FTRACE_WITH_REGS */ +#else /* !CONFIG_FPROBE */ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *prog) { return -EOPNOTSUPP;