Received: by 2002:a05:7208:9594:b0:7e:5202:c8b4 with SMTP id gs20csp862809rbb; Sun, 25 Feb 2024 07:21:39 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXgUdG/FPLc1FPwjSieJjfGYejwSNGUYSC7y+Ye7M5JVrBufrO7wt5TABJtmbmnlXxTM/B3JY5EEJ2LpLu/rF4/XIhc6h1+QZdo5tlF2w== X-Google-Smtp-Source: AGHT+IE5tyXu70f1WcKFoRuIfwvvDcRos6jCTzjtv+HOunx1wwwVwJdi4ZUfjkMqZGez0l9Z9xEt X-Received: by 2002:a05:6402:2045:b0:564:2518:adfd with SMTP id bc5-20020a056402204500b005642518adfdmr3554995edb.10.1708874498968; Sun, 25 Feb 2024 07:21:38 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708874498; cv=pass; d=google.com; s=arc-20160816; b=a5z+Mcq1vTwpVjOhZ4O2JyQLKRorHyu92A2PNMXnzDPSeuCIMpSKakGEUQJhCL9xyr EqEhhhFUJHRyo20pzkbKnIhFxMIg+bkJIBZ5DhLUmjwikvVbhcTtYrlrSOPMOvma/0JX 0BjZg5Lr869cIbXrIZiWqoz4QSuglF9tCv+DrCFXX2SjmV7n230voQu2NXeQHfVE859p WJk/u4alHogWCvjfHDXERT36+LldqG+H2wE9cow7wnydbQ7Xc7KY9FnvFIUpHqAW8e21 pFE0oysN9utNYmLpCWQvbStq8B1/RNjwLwvAmT5APUCu7GIrST6I/At38D1RTO1koTOY 5CZA== ARC-Message-Signature: i=2; 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=C2lN0ukvly+hP465MMOFi3Y24RCN0QORb7AtgAV8FsM=; fh=SIgps5XdV0XNwjZfT2uAI7g3mrspDldK9Qs8qQAfoa4=; b=Uh7jnqDcC3AJbba7pwq0bH/mc2NbA3rBNE+IN3lL4TT4o7ZYn2DMiBvuvpN3rziHIG ATWScC8IwOi5cWchA+MWn71tEToSxQLsuNPeRoDkG9cck5895TKh2jaaqt9c123lrC/+ Fldp4YyyWkR1+QFq4JaP+n5XrmgXR+EZDsLoO9TnXJQtG8CXcAtQNtsO2s+gfUceak/F YOnUugVhiZrZKcxW4P/lxvTjoOS2IUeFrRNJc30uflHrucdKrv1DXNX55cCYWhN/HFpW RmuaS/Q1TFoRLus1oAcSkQylIZLbtzn8x2OpRcuMvKUZNboKpPfE+enQemv6qqnJkUAv /W/Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EMfEWZkE; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80152-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80152-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id v14-20020a50954e000000b00563fbd1bb6bsi1246159eda.336.2024.02.25.07.21.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 07:21:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80152-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EMfEWZkE; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80152-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80152-linux.lists.archive=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 am.mirrors.kernel.org (Postfix) with ESMTPS id 82E391F218D1 for ; Sun, 25 Feb 2024 15:21:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 941BC18029; Sun, 25 Feb 2024 15:19:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EMfEWZkE" 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 920AF1BF33; Sun, 25 Feb 2024 15:19:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708874371; cv=none; b=jRQrkRZKhPBipK/nwMgbY0pEbQzeHyqgPinh1i5mD3CbWgRDXw+bdgtn9uX7HkFu30VMVX1ElQe8QY+yqGPjp/wbhxkBnoSsWZyZsLXjJ7jLyKsSZSrKNJ5ZEmIuyFomW4P4Z/hXq5uh2lQt8S3OmTa/KlLKBId2bjCwvgkqikk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708874371; c=relaxed/simple; bh=M0X72Js85fDNRAsVlUr4XVib9+liaQAL/Nu7Hq5AMS0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=roDhO+E+yCyyNMy/FG7vUGEdlWuRjs4etVp5VC4PkfwcrsEKKuvGnlUw7l17U/+k1XVUg1M4lkxjJ4ZGTRuVevUn4j5ZOs6EApBSAK5Zb26syCZcxtXeL1Z5TiReyQF5Q1EZmWP/K8MOPP92sFmps4W/aFZ65SOqv1be/8Q+uT0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EMfEWZkE; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76981C433F1; Sun, 25 Feb 2024 15:19:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708874370; bh=M0X72Js85fDNRAsVlUr4XVib9+liaQAL/Nu7Hq5AMS0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EMfEWZkE/Z9PBA62MrlS1MhfJDw+C/8DpDcahphBzfboRaSb3lXBtygLnrL+rWSdD iS3ADeOp0H/rYB0kJgGMNyeOS3XYEfv/VPlCfUL94LqSsU+MtFYbfcJs5mOvq/8NkN dBesKcjWBt/3QVKaXb9c5LTMXz6paQi3qyE9hDPNGrPhEaScCc8HilIN4OY5vy8owF 3ifEpBVeQwzm3GKGv8cx35N9kGQpFcA79Vr8+pITXYCWuHPOaPVVYJs5RwECrSNUVU QeZXyrsx6XeL4wcHkwWbOenRAHkHLT0NBuoSOM+ni/uF7wVLHtkXWy+YbDYU8oun+X rlnuMPRlhPtXw== 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 v8 24/35] fprobe: Use ftrace_regs in fprobe entry handler Date: Mon, 26 Feb 2024 00:19:25 +0900 Message-Id: <170887436501.564249.16912701941770488108.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <170887410337.564249.6360118840946697039.stgit@devnote2> References: <170887410337.564249.6360118840946697039.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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit From: Masami Hiramatsu (Google) This allows fprobes to be available with CONFIG_DYNAMIC_FTRACE_WITH_ARGS instead of CONFIG_DYNAMIC_FTRACE_WITH_REGS, then we can enable fprobe on arm64. Signed-off-by: Masami Hiramatsu (Google) Acked-by: Florent Revest --- Changes in v6: - Keep using SAVE_REGS flag to avoid breaking bpf kprobe-multi test. --- include/linux/fprobe.h | 2 +- kernel/trace/Kconfig | 3 ++- kernel/trace/bpf_trace.c | 10 +++++++--- kernel/trace/fprobe.c | 3 ++- kernel/trace/trace_fprobe.c | 6 +++++- lib/test_fprobe.c | 4 ++-- samples/fprobe/fprobe_example.c | 2 +- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/include/linux/fprobe.h b/include/linux/fprobe.h index 3e03758151f4..36c0595f7b93 100644 --- a/include/linux/fprobe.h +++ b/include/linux/fprobe.h @@ -35,7 +35,7 @@ struct fprobe { int nr_maxactive; int (*entry_handler)(struct fprobe *fp, unsigned long entry_ip, - unsigned long ret_ip, struct pt_regs *regs, + unsigned long ret_ip, struct ftrace_regs *regs, void *entry_data); void (*exit_handler)(struct fprobe *fp, unsigned long entry_ip, unsigned long ret_ip, struct pt_regs *regs, diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index cb9c48a4f5bc..0aba53b7b0be 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -287,7 +287,7 @@ config DYNAMIC_FTRACE_WITH_ARGS config FPROBE bool "Kernel Function Probe (fprobe)" depends on FUNCTION_TRACER - depends on DYNAMIC_FTRACE_WITH_REGS + depends on DYNAMIC_FTRACE_WITH_REGS || DYNAMIC_FTRACE_WITH_ARGS depends on HAVE_RETHOOK select RETHOOK default n @@ -672,6 +672,7 @@ config FPROBE_EVENTS select TRACING select PROBE_EVENTS select DYNAMIC_EVENTS + depends on DYNAMIC_FTRACE_WITH_REGS default y help This allows user to add tracing events on the function entry and diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 7ac6c52b25eb..2f04777330e0 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2577,7 +2577,7 @@ static int __init bpf_event_init(void) fs_initcall(bpf_event_init); #endif /* CONFIG_MODULES */ -#ifdef CONFIG_FPROBE +#if defined(CONFIG_FPROBE) && defined(CONFIG_DYNAMIC_FTRACE_WITH_REGS) struct bpf_kprobe_multi_link { struct bpf_link link; struct fprobe fp; @@ -2807,10 +2807,14 @@ kprobe_multi_link_prog_run(struct bpf_kprobe_multi_link *link, static int kprobe_multi_link_handler(struct fprobe *fp, unsigned long fentry_ip, - unsigned long ret_ip, struct pt_regs *regs, + unsigned long ret_ip, struct ftrace_regs *fregs, 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); @@ -3084,7 +3088,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr kvfree(cookies); return err; } -#else /* !CONFIG_FPROBE */ +#else /* !CONFIG_FPROBE || !CONFIG_DYNAMIC_FTRACE_WITH_REGS */ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *prog) { return -EOPNOTSUPP; diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c index 6cd2a4e3afb8..a932c3a79e8f 100644 --- a/kernel/trace/fprobe.c +++ b/kernel/trace/fprobe.c @@ -46,7 +46,7 @@ static inline void __fprobe_handler(unsigned long ip, unsigned long parent_ip, } if (fp->entry_handler) - ret = fp->entry_handler(fp, ip, parent_ip, ftrace_get_regs(fregs), entry_data); + ret = fp->entry_handler(fp, ip, parent_ip, fregs, entry_data); /* If entry_handler returns !0, nmissed is not counted. */ if (rh) { @@ -182,6 +182,7 @@ static void fprobe_init(struct fprobe *fp) fp->ops.func = fprobe_kprobe_handler; else fp->ops.func = fprobe_handler; + fp->ops.flags |= FTRACE_OPS_FL_SAVE_REGS; } diff --git a/kernel/trace/trace_fprobe.c b/kernel/trace/trace_fprobe.c index 7d2ddbcfa377..ef6b36fd05ae 100644 --- a/kernel/trace/trace_fprobe.c +++ b/kernel/trace/trace_fprobe.c @@ -320,12 +320,16 @@ NOKPROBE_SYMBOL(fexit_perf_func); #endif /* CONFIG_PERF_EVENTS */ static int fentry_dispatcher(struct fprobe *fp, unsigned long entry_ip, - unsigned long ret_ip, struct pt_regs *regs, + unsigned long ret_ip, struct ftrace_regs *fregs, void *entry_data) { struct trace_fprobe *tf = container_of(fp, struct trace_fprobe, fp); + struct pt_regs *regs = ftrace_get_regs(fregs); int ret = 0; + if (!regs) + return 0; + if (trace_probe_test_flag(&tf->tp, TP_FLAG_TRACE)) fentry_trace_func(tf, entry_ip, regs); #ifdef CONFIG_PERF_EVENTS diff --git a/lib/test_fprobe.c b/lib/test_fprobe.c index 24de0e5ff859..ff607babba18 100644 --- a/lib/test_fprobe.c +++ b/lib/test_fprobe.c @@ -40,7 +40,7 @@ static noinline u32 fprobe_selftest_nest_target(u32 value, u32 (*nest)(u32)) static notrace int fp_entry_handler(struct fprobe *fp, unsigned long ip, unsigned long ret_ip, - struct pt_regs *regs, void *data) + struct ftrace_regs *fregs, void *data) { KUNIT_EXPECT_FALSE(current_test, preemptible()); /* This can be called on the fprobe_selftest_target and the fprobe_selftest_target2 */ @@ -81,7 +81,7 @@ static notrace void fp_exit_handler(struct fprobe *fp, unsigned long ip, static notrace int nest_entry_handler(struct fprobe *fp, unsigned long ip, unsigned long ret_ip, - struct pt_regs *regs, void *data) + struct ftrace_regs *fregs, void *data) { KUNIT_EXPECT_FALSE(current_test, preemptible()); return 0; diff --git a/samples/fprobe/fprobe_example.c b/samples/fprobe/fprobe_example.c index 64e715e7ed11..1545a1aac616 100644 --- a/samples/fprobe/fprobe_example.c +++ b/samples/fprobe/fprobe_example.c @@ -50,7 +50,7 @@ static void show_backtrace(void) static int sample_entry_handler(struct fprobe *fp, unsigned long ip, unsigned long ret_ip, - struct pt_regs *regs, void *data) + struct ftrace_regs *fregs, void *data) { if (use_trace) /*