From nobody Sun Oct 5 23:54:47 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 A6A80289837; Tue, 29 Jul 2025 10:29:44 +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=1753784985; cv=none; b=XNxCtvLgNFZn4IZE3eveRhgD6T0LpBU28PIqi7bKKaCC+ADOx4ogO9vrf4pAd8Q3BZlvitOcmhwLT0s49kd1X6GUcv3CMIqoi5xmQhKqf0DzQkCIzZjr6NYxsfL/icabtohg+3qC5Y8YCugY+pHOpAgbjfMdisUCC8/tc7ENeF0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753784985; c=relaxed/simple; bh=gkMMkcsvhGCheI1Y4239jYBPUdUxOQ7UslqUuwaf+NY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O24B3RbEZmr4Rrj8Y8mXlA72TibKr+Sb6KGdM61UIkuk7LWmlCEKffZDGyg/4rVBE6d1WK9YyjhkAN0dB8yell9AtVLu6pYH4EUbY+rb+KWmjsbUjUmZbbVq489j2Ksm1p4ZrFgzChVawaL+sLUZgJSnZ+1SoP1wK2maXY281dM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T1lpVrWs; 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="T1lpVrWs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7055BC4CEEF; Tue, 29 Jul 2025 10:29:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753784984; bh=gkMMkcsvhGCheI1Y4239jYBPUdUxOQ7UslqUuwaf+NY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T1lpVrWsiXKASxyTeBu3hnP8GrAosrNWPwwnx8nqmGQ/OYdrOweMpZfcPJDM+xl/N F4XD0bEzsQhoeUhI1IHdDkNny0ntOU3R1ORBxaQKAcCSho40rLU0TZIsP/caOl2j6b eUlT9Uk4O4stCse23RQeKCo1mb0Ci0/GK4CSfYkh3xGtgDuubYvBZ7csbKtFs8vc6h NpQj1c+ZyyuLgC2IMKhfCxvkk5aJPNLOPJkD7xbB8QB/tfxtMsifUOhIdprlmn3mwt yVfgNANCpMlJmOR9VgQh7NBbTPXT9aTogVoczcShubaCjQA195m5rR5a8Jdnuv0HmG Vhk5fbNUqOm4Q== 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 Subject: [RFC 08/10] ftrace: Factor ftrace_ops ops_func interface Date: Tue, 29 Jul 2025 12:28:11 +0200 Message-ID: <20250729102813.1531457-9-jolsa@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250729102813.1531457-1-jolsa@kernel.org> References: <20250729102813.1531457-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 | 26 ++++++++++++++++++++++++-- kernel/trace/ftrace.c | 6 +++--- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 85f4ab1a1e72..1a61f969550d 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -394,7 +394,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 84bcd9f6bd74..398c1a722d83 100644 --- a/kernel/bpf/trampoline.c +++ b/kernel/bpf/trampoline.c @@ -33,11 +33,33 @@ 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 struct bpf_trampoline *bpf_trampoline_ip_lookup(unsigned long ip) { - struct bpf_trampoline *tr =3D ops->private; + struct hlist_head *head_ip; + struct bpf_trampoline *tr; + + mutex_lock(&trampoline_mutex); + head_ip =3D &trampoline_ip_table[hash_64(ip, TRAMPOLINE_HASH_BITS)]; + hlist_for_each_entry(tr, head_ip, hlist_ip) { + if (tr->func.addr =3D=3D (void *) ip) + goto out; + } + tr =3D NULL; +out: + mutex_unlock(&trampoline_mutex); + return tr; +} + +static int bpf_tramp_ftrace_ops_func(struct ftrace_ops *ops, unsigned long= ip, + enum ftrace_ops_cmd cmd) +{ + struct bpf_trampoline *tr; int ret =3D 0; =20 + tr =3D bpf_trampoline_ip_lookup(ip); + if (!tr) + return -EINVAL; + if (cmd =3D=3D FTRACE_OPS_CMD_ENABLE_SHARE_IPMODIFY_SELF) { /* This is called inside register_ftrace_direct_multi(), so * tr->mutex is already locked. diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 151ca94f496a..943feabdd5e6 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2040,7 +2040,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) { @@ -8746,7 +8746,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; } @@ -8793,7 +8793,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.50.1