From nobody Wed Dec 17 16:10:12 2025 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 DE54F32B9AE; Mon, 15 Dec 2025 21:15:39 +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=1765833340; cv=none; b=OiGfFGSDoL6T32EnufxOWFsGQa4YR+u3jAawWgspCrxI43PQn68v1fB6a1UkN2bxNrbvhMYvBkVmJ2bJqfRqyw5tiUJyvY425YDRMP9FdijDlGkPLWi++yZX7vcue6M81Yuq8wjoJQ2PGhjVIs13LaoePVesvONlHP14/JTxeYE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765833340; c=relaxed/simple; bh=MWeM2npA+/r+WLkyhdWGmPCCvwaBhWn30P369wb3/B4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VJu6AMSQCz6dBFTyMbnahxBeiK9OdZHUc0ZJfDBzo07mJONgDtfqhFG6KgBhTlK3KdWYW3j4ZlZRE5LHQxjP1gnOjAAPO8VcfHfnYUhbJODGllzaBA3+w8qEsMFFSOEs7CgGVpiOVu1W2JxxcIIM7NBbydUETUGlfbY5Lm68eDg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XmL66eN+; 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="XmL66eN+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6B1AC4CEF5; Mon, 15 Dec 2025 21:15:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765833339; bh=MWeM2npA+/r+WLkyhdWGmPCCvwaBhWn30P369wb3/B4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XmL66eN+wNT9TwZQmb05x8uT6n6SDuLDFBYjPbR+N73FSgSMWfbEe9yCevPAqWAhR DYy1UpQCLwUNVbPx+XlINuN5fZzssxJQ5dsozqvSIzOH2MhLpSQq9Sc9o4Kyetmetk w08fY423x96CJWfksor4zzaBYiYXOG2e3mPZ04NGE0NUMKHJwPJIuiTgcGjZf/ODvo 65SCJzRdFfjeZucEFSSwFtY7y+R67AYkESLNxq3VzPVZhQcaoOZaS92hS7JU3hgx/K GYWeURCvmnMhGAkgY8PsJrJ/CxQdX3EBFhtpJ8xLCFgj9OG/yFBl8UEYdnMUFBq+5H uVQFifqLov94Q== From: Jiri Olsa To: Steven Rostedt , Florent Revest , Mark Rutland Cc: 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: [PATCHv5 bpf-next 8/9] ftrace: Factor ftrace_ops ops_func interface Date: Mon, 15 Dec 2025 22:14:01 +0100 Message-ID: <20251215211402.353056-9-jolsa@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251215211402.353056-1-jolsa@kernel.org> References: <20251215211402.353056-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. 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 c3bf9cede1fe..6f94bad34492 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 f298bafab76e..17af2aad8382 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 95a38fb18ed7..c2054fe80de7 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2049,7 +2049,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) { @@ -8983,7 +8983,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; } @@ -9030,7 +9030,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