From patchwork Mon Aug 7 06:49:33 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: 131712 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1275996vqr; Mon, 7 Aug 2023 00:18:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEGruzWxbNQI5OQWINaDmYUXQlmLu2dT5d/JJhA/uc3HBTrtU/vCb9/lp7qRuJJw9OqjJ4A X-Received: by 2002:a05:6402:198:b0:523:1901:d19c with SMTP id r24-20020a056402019800b005231901d19cmr7050341edv.24.1691392694175; Mon, 07 Aug 2023 00:18:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691392694; cv=none; d=google.com; s=arc-20160816; b=Ddw6VF624Jv/4+5HAZrxRBoIx7xfqE+A2sxQlHt3vEhlNFkZNbL3Ieu8NX7LPDNioB FDztk3H+kwZtyX4PKg+Tj69ZCa4XqdWa1A2w6DPQ5VSu5mfpjjtu5OJ2n2I+57XS/68h sOhVaEI+b8NvbenXzLKNnyesyvNBmhtxPj5w46+2t7Vf5tgnOmbmWtLwenLtybhWSbaz flIA3Y/Ot6WZqZd+KCNeRWNR+H1Frho3I8npUdv+8l3rKRz7cmq1LmazSrumyLUkJQNC uBJBaUdDw7ze7IJTi6XzUy1Wg8jAoRzaHE+mQosseEqg2N84lbZilOntGv8dHZLTGvGY yFTQ== 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=wJAFM/KxDG3NWUGMYaBWFKu80BnXO+X0VTkUu90CSEY=; fh=nNLeqPmm07c4DrdDej5z+HdJpmx5SqFFnpeka2nrMVM=; b=vYWshaiyL30kbK0405vbTcXDOP8GXy7gdHXs5J8H5nFUmwum8aN37uwCqp701gc76r W0qSVrFQldbBiTDdMIvFhftLerFanLISyjthsbmpY//4GmK8791yQ57h4p/eq6c7w+XA lgL2Q2faCSSw031dvZBvB5xT8xWcy018FGZNhejVrJlwe304kyWm3T0UDmAdBcZoLSCf fRnvX4AYedn6CGmryeurrPhju0OgC+glIF0mh0xaH8yleJ8BIwdXjeOBLibokFjh1M+K papkuw9r8VxfJ746p3oJozHg2MbBz2uDHkNzchqoECDxpuff279aZGdhULPrHuUHNpfR 1oGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Q4INJuoa; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l22-20020aa7c3d6000000b005233755666bsi1168310edr.305.2023.08.07.00.17.50; Mon, 07 Aug 2023 00:18:14 -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=Q4INJuoa; 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 S231317AbjHGGuL (ORCPT + 99 others); Mon, 7 Aug 2023 02:50:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231375AbjHGGuA (ORCPT ); Mon, 7 Aug 2023 02:50:00 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38D6E1BF5; Sun, 6 Aug 2023 23:49:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7A51361588; Mon, 7 Aug 2023 06:49:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 560CAC433C8; Mon, 7 Aug 2023 06:49:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691390979; bh=zlG4XdXdEpC54rcZoPhBS/p5nrcyfvD1Z3WKRvALoqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q4INJuoaj4RDLwYhiq+qDhUwK96mCQ5IDS6Lape7RZ73ZgbZUhVYtx3unt/mCRClf k7np5U2H4wvBHj0c7fFzVxbxWYDbsJEcpNV5uB4ibxp66MJ0yb28iDCJhEWF7KWg1b 3s4P2ZyV7ovH/Svx20xalERpCY59ryGgBrT7K0dWKF2U54ZvJ9c5LpPiL7tjzeAEsq 39jYUPsTlSyvg+m3PI/8RMmyHDy0ATihAq9yAxE07QYZiiy5Q4KEZ2KzCrCLLKIs5Q oFlMtbn4UG1+rDU5v0LBZVw4AHPsKUd4sSyxLfMYHpbFh5sPK1H9zt/9ZldWPTfa+T S+RnhQ+eLI78g== 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 Subject: [RFC PATCH v2 6/6] bpf: Enable kprobe_multi feature if CONFIG_FPROBE is enabled Date: Mon, 7 Aug 2023 15:49:33 +0900 Message-Id: <169139097360.324433.2521527070503682979.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <169139090386.324433.6412259486776991296.stgit@devnote2> References: <169139090386.324433.6412259486776991296.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773553785395075840 X-GMAIL-MSGID: 1773553785395075840 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) --- 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 99c5f95360f9..0725272a3de2 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2460,7 +2460,7 @@ static int __init bpf_event_init(void) fs_initcall(bpf_event_init); #endif /* CONFIG_MODULES */ -#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS +#ifdef CONFIG_FPROBE struct bpf_kprobe_multi_link { struct bpf_link link; struct fprobe fp; @@ -2482,6 +2482,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; @@ -2623,13 +2625,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)) { @@ -2639,6 +2642,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); @@ -2656,13 +2660,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; } @@ -2672,13 +2672,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) @@ -2918,7 +2914,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr kvfree(cookies); return err; } -#else /* !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;