From patchwork Fri Jan 12 10:16:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 187689 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp79102dyc; Fri, 12 Jan 2024 02:21:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IGCBNaeYMk4DwGt2v8f+MzdqeVqOJuAutIf0xvanzqDoIb2ITVrYK49qwvVI/GnyIX+mCvd X-Received: by 2002:a0c:e292:0:b0:67f:c133:3922 with SMTP id r18-20020a0ce292000000b0067fc1333922mr652254qvl.129.1705054897092; Fri, 12 Jan 2024 02:21:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705054897; cv=none; d=google.com; s=arc-20160816; b=BcSt2qqCoVHXQpMicPp7fqJ5SyvZyc/5XaBMKGfLyckwI7EiIUfIYEwcAVSzEtE9J+ FaIR5twdYK3FQiIrsT7KL7ixBebgO6AeoV7ZDR80XP0CjI4MbN1wgMvoc0e5C28/m+IY Pqv0msgFD5SYbehK8rSRg8PQOtshW2Zm8vXAt8U6qXGIZo+zYBTpJQntWnjR/4n5S8n4 jITew5PHz4Iy36+2LiA/U+h4Ls0GghG1vXZAWXwTujIhRns2mG/dBXO8mqcqdWSgVBQD +poc2lyXeQqC/+uljBp9gttOzzqE+wkxC6tP7miFHSA8Q8WlV0yJ/JADi41icl/tg/RB Qd9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:user-agent:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=B+IimFdLV6G8hCJEMsVcQeurP5etXlmAnEIlOhkzF3g=; fh=SIgps5XdV0XNwjZfT2uAI7g3mrspDldK9Qs8qQAfoa4=; b=eBhps0XuAU9yjPjzRtY/vXcHZC3zBN3ALtsHgXesI7ZfoYDchsEQwAk7fEHvJ2a5Q4 0T+MynehI6wHI+tpBeDFvSp0quYHsinicBaCYJonK3IEfybswaroUSy4gC2i/Q8sZKRH ARDdZzVIl/HMT4j++M9dBXGfl7+G7Mq+dJSX4VAsX/af+epsrr+LCUzShFZuZAdlBkYJ PCo6nfwcMLeac5sdrwY9+OFH8VspLb7r+QVcTyk86G1HS5UQ2VnvePf7Y0hpPjGQ24vm ADeD9Piw6WrqXE84zw4Gt/R0di+Taud7PXJ8P5Va+dBVvtNjzI/lpVB6NOQ2anOyFpc1 SxYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pO5KVae6; spf=pass (google.com: domain of linux-kernel+bounces-24580-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-24580-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id e23-20020a0caa57000000b0067f38efba40si2512695qvb.144.2024.01.12.02.21.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jan 2024 02:21:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-24580-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pO5KVae6; spf=pass (google.com: domain of linux-kernel+bounces-24580-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-24580-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id DD3A91C252D0 for ; Fri, 12 Jan 2024 10:21:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C25B7651A0; Fri, 12 Jan 2024 10:17:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pO5KVae6" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25C7565197; Fri, 12 Jan 2024 10:17:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED3ACC433F1; Fri, 12 Jan 2024 10:16:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705054620; bh=uaiQ0NlnGDpVimzHf7hc4bouD6LM9m4Fjq8sHDW6itc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pO5KVae6AmOuqr6kVlJNH4be4B4TxbaMaLYsDVdubgNkwu7Yt5xOUbIg1Ei6Py3/F DE7LEQSb+gJYMhB6aLgrhmfCbqhrh2WizYlJEsjbkb4UCw8pLZNIhRWxRQ4vlLndn5 H1PPtiznmiVcRK/ldP8naIsSVMXvNk7FcKIo5CdGx6tnFPb22Xntqri4NCZar7pqEN VIG42/WGYGdZqNBwuDHocupYL5vZzXIkkr+K/sPudQC7jsJYR0ncr2EBdcqZb9y2qw EHf05ahEti5GRx6GZ0snNTq9v7GpVBQ8EA8MVznLLn6Kod2EPfR+LMWC0bcTTIQ6vK 0dP2h5Ucn802A== 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 v6 31/36] bpf: Enable kprobe_multi feature if CONFIG_FPROBE is enabled Date: Fri, 12 Jan 2024 19:16:54 +0900 Message-Id: <170505461435.459169.1646224653234049177.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <170505424954.459169.10630626365737237288.stgit@devnote2> References: <170505424954.459169.10630626365737237288.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787879643701164475 X-GMAIL-MSGID: 1787879643701164475 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;