From nobody Sun Feb 8 08:22:18 2026 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 16440322B76; Tue, 30 Dec 2025 14:51:43 +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=1767106304; cv=none; b=JJUgSFPZ1SrxeXa0NRp+FGfz3kRaybPtl/8HzwY7oTR4Zwl56BtumEMrmWPlhWkMMuZKq46lZklJh8RvTJey/0+82Mj4tMK/CqpIYmaNMaww2hr/aPPArtzIsbq11/qWog0ZlWN7/8JuWPEjGjWPxbTpKt/Mwbvfg6y8Z+QJIDE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767106304; c=relaxed/simple; bh=FyY2kAvHD96tBjCFBg4Ht7xxs3v9QHdIjTezYjBYBnQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CQND/aZyKS9WyAprTXoO36wF/1QS5Jp42CN8E+r5vtFL6gpdzNGs5cWml455uDze/DkMBe55dHsbdUeP3s7RZtRFvTkbR/dLJW2g7SVUZXj5TQv5r4t1CcyPolQSJipS/uTAXxzpaSkIuR/jNHr2Cevei5/5VFK9WXMD6lDsSQ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qXQ+xfw+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qXQ+xfw+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A299BC116D0; Tue, 30 Dec 2025 14:51:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767106303; bh=FyY2kAvHD96tBjCFBg4Ht7xxs3v9QHdIjTezYjBYBnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qXQ+xfw+iG3gNTqCrj4ori7WaiJx/+cOHrU5nx29ca6OkslyqblnCXCySARyrJ+iV RkJ2viIqIJRly6nMWM7HtFqS6F3w1vTN6hJK7q1Q9Cnm01/ImZMeY99ZVf4/JCS3qN +EcF7A+WkzkjfQyRfmTm1RSocIw3v/Co7GFRgW7G0jTdhLtLmnnzDOmis8TCXb3j8S 2akWpVKX8UEBgU1A0+IB4SwleULp78XFrIBfMF9ubKt0uuJma/Q/LfjLx6lpwxYl16 lER55ffctuJVrp74aPmIUumn9F4w1SiHdo3KkqthDsHrwfLqX7GhIn8vm2Nsuc7UoX A1fVgGWrX6/hQ== From: Jiri Olsa To: Steven Rostedt , Florent Revest , Mark Rutland Cc: "Steven Rostedt (Google)" , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Menglong Dong , Song Liu Subject: [PATCHv6 bpf-next 8/9] ftrace: Factor ftrace_ops ops_func interface Date: Tue, 30 Dec 2025 15:50:09 +0100 Message-ID: <20251230145010.103439-9-jolsa@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251230145010.103439-1-jolsa@kernel.org> References: <20251230145010.103439-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We are going to remove "ftrace_ops->private =3D=3D bpf_trampoline" setup in following changes. Adding ip argument to ftrace_ops_func_t callback function, so we can use it to look up the trampoline. Acked-by: Steven Rostedt (Google) Signed-off-by: Jiri Olsa --- include/linux/ftrace.h | 2 +- kernel/bpf/trampoline.c | 3 ++- kernel/trace/ftrace.c | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 6c1680ab8bf9..781b613781a6 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -403,7 +403,7 @@ enum ftrace_ops_cmd { * Negative on failure. The return value is dependent on the * callback. */ -typedef int (*ftrace_ops_func_t)(struct ftrace_ops *op, enum ftrace_ops_cm= d cmd); +typedef int (*ftrace_ops_func_t)(struct ftrace_ops *op, unsigned long ip, = enum ftrace_ops_cmd cmd); =20 #ifdef CONFIG_DYNAMIC_FTRACE =20 diff --git a/kernel/bpf/trampoline.c b/kernel/bpf/trampoline.c index bdac9d673776..e5a0d58ed6dc 100644 --- a/kernel/bpf/trampoline.c +++ b/kernel/bpf/trampoline.c @@ -33,7 +33,8 @@ static DEFINE_MUTEX(trampoline_mutex); #ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS static int bpf_trampoline_update(struct bpf_trampoline *tr, bool lock_dire= ct_mutex); =20 -static int bpf_tramp_ftrace_ops_func(struct ftrace_ops *ops, enum ftrace_o= ps_cmd cmd) +static int bpf_tramp_ftrace_ops_func(struct ftrace_ops *ops, unsigned long= ip, + enum ftrace_ops_cmd cmd) { struct bpf_trampoline *tr =3D ops->private; int ret =3D 0; diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index d24f28677007..02030f62d737 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2075,7 +2075,7 @@ static int __ftrace_hash_update_ipmodify(struct ftrac= e_ops *ops, */ if (!ops->ops_func) return -EBUSY; - ret =3D ops->ops_func(ops, FTRACE_OPS_CMD_ENABLE_SHARE_IPMODIFY_SELF); + ret =3D ops->ops_func(ops, rec->ip, FTRACE_OPS_CMD_ENABLE_SHARE_IPMODI= FY_SELF); if (ret) return ret; } else if (is_ipmodify) { @@ -9058,7 +9058,7 @@ static int prepare_direct_functions_for_ipmodify(stru= ct ftrace_ops *ops) if (!op->ops_func) return -EBUSY; =20 - ret =3D op->ops_func(op, FTRACE_OPS_CMD_ENABLE_SHARE_IPMODIFY_PEER); + ret =3D op->ops_func(op, ip, FTRACE_OPS_CMD_ENABLE_SHARE_IPMODIFY_PEER= ); if (ret) return ret; } @@ -9105,7 +9105,7 @@ static void cleanup_direct_functions_after_ipmodify(s= truct ftrace_ops *ops) =20 /* The cleanup is optional, ignore any errors */ if (found_op && op->ops_func) - op->ops_func(op, FTRACE_OPS_CMD_DISABLE_SHARE_IPMODIFY_PEER); + op->ops_func(op, ip, FTRACE_OPS_CMD_DISABLE_SHARE_IPMODIFY_PEER); } } mutex_unlock(&direct_mutex); --=20 2.52.0