From nobody Tue Nov 26 11:48:25 2024 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 92F142071FD; Fri, 18 Oct 2024 20:42:07 +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=1729284127; cv=none; b=WuIRU4DhF0gwUdbKp3CX8j9mwplsMEFrL8Ix2MH8eYtfpH5FYFlRLBZG49zrABEMVeqg1sXJvSU8T8gSUwendqaRVUuNqmKM9M4FWd9x3XmIO7/CxhubAABGPTfZqvv1UA1Q27ozdTYb7qsqF8XbJpKUGzyr+JiXLcU5j1HAGUQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729284127; c=relaxed/simple; bh=EZ76JiF8nHrXB5Od2azxqfLxETX83Z2xeo/fMdQY5Ac=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ULJ+B6JjwGwpp8Qx3TkFG4hFbeSXlXlvF7MIJLvRD18TlsYTmCeKg2v542ai6MRWq56z5KaVkUEwhyyJwOF8hRQ1zumLmtLb7TksPogeyT8rO2HKbvghAEEGYTHIe/6dlta8a+GW4Rh3FesqoLbbOwYckJGeA0vgf+ePM8WhqJY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LelGUkOj; 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="LelGUkOj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 54D95C4CEC3; Fri, 18 Oct 2024 20:42:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729284127; bh=EZ76JiF8nHrXB5Od2azxqfLxETX83Z2xeo/fMdQY5Ac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LelGUkOjfY2tsxPqcPId8ML40Hd7u38ZT/JS+0f+w3wmXclrgNXwv7cv/dqCqWpqw 18ZxTzJ2FisKFUCEAtAAYuBp6TQJyqrs1oNIHc1rl9bkufG+X50CwNKgeRG6W2b0ma Pf2zgujf67qUJsmqSlzdzm8huHDKtqj1mM11PDFKpJiE5I4GWpMd9FXjeceJsxmOeh pn8c+TIsUnCUlcZX+BZfrTUTVSecFziGUiUTrBIdX7pr8R14Et2ALe1u17sLNGw3uI TawdhFZdIqYrUYOxbnOOr/93B7Kpg8EwTbagLIcBAAqJuRgzQFTEPOi4R3D7fWefbW wcXqiYKNX/qAw== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv8 bpf-next 04/13] bpf: Add support for uprobe multi session context Date: Fri, 18 Oct 2024 22:41:00 +0200 Message-ID: <20241018204109.713820-5-jolsa@kernel.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241018204109.713820-1-jolsa@kernel.org> References: <20241018204109.713820-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" Placing bpf_session_run_ctx layer in between bpf_run_ctx and bpf_uprobe_multi_run_ctx, so the session data can be retrieved from uprobe_multi link. Plus granting session kfuncs access to uprobe session programs. Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- kernel/trace/bpf_trace.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 5f10994376d0..01868039d7bc 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -3098,7 +3098,7 @@ struct bpf_uprobe_multi_link { }; =20 struct bpf_uprobe_multi_run_ctx { - struct bpf_run_ctx run_ctx; + struct bpf_session_run_ctx session_ctx; unsigned long entry_ip; struct bpf_uprobe *uprobe; }; @@ -3211,16 +3211,22 @@ static const struct bpf_link_ops bpf_uprobe_multi_l= ink_lops =3D { =20 static int uprobe_prog_run(struct bpf_uprobe *uprobe, unsigned long entry_ip, - struct pt_regs *regs) + struct pt_regs *regs, + bool is_return, void *data) { struct bpf_uprobe_multi_link *link =3D uprobe->link; struct bpf_uprobe_multi_run_ctx run_ctx =3D { + .session_ctx =3D { + .is_return =3D is_return, + .data =3D data, + }, .entry_ip =3D entry_ip, .uprobe =3D uprobe, }; struct bpf_prog *prog =3D link->link.prog; bool sleepable =3D prog->sleepable; struct bpf_run_ctx *old_run_ctx; + int err; =20 if (link->task && !same_thread_group(current, link->task)) return 0; @@ -3232,8 +3238,8 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe, =20 migrate_disable(); =20 - old_run_ctx =3D bpf_set_run_ctx(&run_ctx.run_ctx); - bpf_prog_run(link->link.prog, regs); + old_run_ctx =3D bpf_set_run_ctx(&run_ctx.session_ctx.run_ctx); + err =3D bpf_prog_run(link->link.prog, regs); bpf_reset_run_ctx(old_run_ctx); =20 migrate_enable(); @@ -3242,7 +3248,7 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe, rcu_read_unlock_trace(); else rcu_read_unlock(); - return 0; + return err; } =20 static bool @@ -3262,7 +3268,7 @@ uprobe_multi_link_handler(struct uprobe_consumer *con= , struct pt_regs *regs, int ret; =20 uprobe =3D container_of(con, struct bpf_uprobe, consumer); - ret =3D uprobe_prog_run(uprobe, instruction_pointer(regs), regs); + ret =3D uprobe_prog_run(uprobe, instruction_pointer(regs), regs, false, d= ata); if (uprobe->session) return ret ? UPROBE_HANDLER_IGNORE : 0; return 0; @@ -3275,7 +3281,7 @@ uprobe_multi_link_ret_handler(struct uprobe_consumer = *con, unsigned long func, s struct bpf_uprobe *uprobe; =20 uprobe =3D container_of(con, struct bpf_uprobe, consumer); - uprobe_prog_run(uprobe, func, regs); + uprobe_prog_run(uprobe, func, regs, true, data); return 0; } =20 @@ -3283,7 +3289,8 @@ static u64 bpf_uprobe_multi_entry_ip(struct bpf_run_c= tx *ctx) { struct bpf_uprobe_multi_run_ctx *run_ctx; =20 - run_ctx =3D container_of(current->bpf_ctx, struct bpf_uprobe_multi_run_ct= x, run_ctx); + run_ctx =3D container_of(current->bpf_ctx, struct bpf_uprobe_multi_run_ct= x, + session_ctx.run_ctx); return run_ctx->entry_ip; } =20 @@ -3291,7 +3298,8 @@ static u64 bpf_uprobe_multi_cookie(struct bpf_run_ctx= *ctx) { struct bpf_uprobe_multi_run_ctx *run_ctx; =20 - run_ctx =3D container_of(current->bpf_ctx, struct bpf_uprobe_multi_run_ct= x, run_ctx); + run_ctx =3D container_of(current->bpf_ctx, struct bpf_uprobe_multi_run_ct= x, + session_ctx.run_ctx); return run_ctx->uprobe->cookie; } =20 @@ -3485,7 +3493,7 @@ static int bpf_kprobe_multi_filter(const struct bpf_p= rog *prog, u32 kfunc_id) if (!btf_id_set8_contains(&kprobe_multi_kfunc_set_ids, kfunc_id)) return 0; =20 - if (!is_kprobe_session(prog)) + if (!is_kprobe_session(prog) && !is_uprobe_session(prog)) return -EACCES; =20 return 0; --=20 2.46.2