From: "Joel Fernandes (Google)" <joel@joelfernandes.org>
To: linux-kernel@vger.kernel.org
Cc: "Joel Fernandes (Google)" <joel@joelfernandes.org>,
Adrian Ratiu <adrian.ratiu@collabora.com>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii.nakryiko@gmail.com>,
bpf@vger.kernel.org, Brendan Gregg <brendan.d.gregg@gmail.com>,
Daniel Borkmann <daniel@iogearbox.net>,
duyuchao <yuchao.du@unisoc.com>, Ingo Molnar <mingo@redhat.com>,
Karim Yaghmour <karim.yaghmour@opersys.com>,
Kees Cook <keescook@chromium.org>,
kernel-team@android.com, Manjo Raja Rao <linux@manojrajarao.com>,
Martin KaFai Lau <kafai@fb.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Michal Gregorczyk <michalgr@live.com>,
Mohammad Husain <russoue@gmail.com>,
netdev@vger.kernel.org, Peter Ziljstra <peterz@infradead.org>,
Qais Yousef <qais.yousef@arm.com>,
Song Liu <songliubraving@fb.com>,
Srinivas Ramana <sramana@codeaurora.org>,
Steven Rostedt <rostedt@goodmis.org>,
Tamir Carmeli <carmeli.tamir@gmail.com>,
Yonghong Song <yhs@fb.com>
Subject: [PATCH v2 2/4] bpf: Add support for reading kernel pointers
Date: Mon, 6 May 2019 14:31:14 -0400 [thread overview]
Message-ID: <20190506183116.33014-2-joel@joelfernandes.org> (raw)
In-Reply-To: <20190506183116.33014-1-joel@joelfernandes.org>
The bpf_probe_read function is ambiguous in whether the pointer being
read is a kernel or user one. Add a specific function for kernel pointer
in this patch. Previous patches add it for userspace pointers.
Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
---
include/uapi/linux/bpf.h | 9 ++++++++-
kernel/trace/bpf_trace.c | 22 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 8146784b9fe3..05af4e1151d3 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -2437,6 +2437,12 @@ union bpf_attr {
* Read a userspace pointer safely.
* Return
* 0 on success or negative error
+ *
+ * int bpf_probe_read_kernel(void *dst, int size, void *src)
+ * Description
+ * Read a kernel pointer safely.
+ * Return
+ * 0 on success or negative error
*/
#define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \
@@ -2538,7 +2544,8 @@ union bpf_attr {
FN(tcp_sock), \
FN(skb_ecn_set_ce), \
FN(get_listener_sock), \
- FN(probe_read_user),
+ FN(probe_read_user), \
+ FN(probe_read_kernel),
/* integer value in 'imm' field of BPF_CALL instruction selects which helper
* function eBPF program intends to call
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index 7485deb0777f..99dc354fd62b 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -153,6 +153,26 @@ static const struct bpf_func_proto bpf_probe_read_proto = {
.arg3_type = ARG_ANYTHING,
};
+BPF_CALL_3(bpf_probe_read_kernel, void *, dst, u32, size, const void *, unsafe_ptr)
+{
+ int ret;
+
+ ret = probe_kernel_read(dst, unsafe_ptr, size);
+ if (unlikely(ret < 0))
+ memset(dst, 0, size);
+
+ return ret;
+}
+
+static const struct bpf_func_proto bpf_probe_read_kernel_proto = {
+ .func = bpf_probe_read_kernel,
+ .gpl_only = true,
+ .ret_type = RET_INTEGER,
+ .arg1_type = ARG_PTR_TO_UNINIT_MEM,
+ .arg2_type = ARG_CONST_SIZE_OR_ZERO,
+ .arg3_type = ARG_ANYTHING,
+};
+
BPF_CALL_3(bpf_probe_read_user, void *, dst, u32, size, const void *, unsafe_ptr)
{
int ret;
@@ -593,6 +613,8 @@ tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
return &bpf_probe_read_proto;
case BPF_FUNC_probe_read_user:
return &bpf_probe_read_user_proto;
+ case BPF_FUNC_probe_read_kernel:
+ return &bpf_probe_read_kernel_proto;
case BPF_FUNC_ktime_get_ns:
return &bpf_ktime_get_ns_proto;
case BPF_FUNC_tail_call:
--
2.21.0.1020.gf2820cf01a-goog
next prev parent reply other threads:[~2019-05-06 18:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-06 18:31 [PATCH v2 1/4] bpf: Add support for reading user pointers Joel Fernandes (Google)
2019-05-06 18:31 ` Joel Fernandes (Google) [this message]
2019-05-06 18:31 ` [PATCH v2 3/4] bpf: Add warning when program uses deprecated bpf_probe_read Joel Fernandes (Google)
2019-05-06 18:31 ` [PATCH v2 4/4] tools: Sync uapi headers with new bpf function calls Joel Fernandes (Google)
2019-05-06 19:11 ` [PATCH v2 1/4] bpf: Add support for reading user pointers Daniel Borkmann
2019-05-06 19:57 ` Joel Fernandes
2019-05-06 23:10 ` Daniel Borkmann
2019-05-07 9:47 ` Joel Fernandes
2019-05-08 12:39 ` Masami Hiramatsu
2019-05-06 22:24 ` Qais Yousef
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190506183116.33014-2-joel@joelfernandes.org \
--to=joel@joelfernandes.org \
--cc=adrian.ratiu@collabora.com \
--cc=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brendan.d.gregg@gmail.com \
--cc=carmeli.tamir@gmail.com \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=karim.yaghmour@opersys.com \
--cc=keescook@chromium.org \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@manojrajarao.com \
--cc=mhiramat@kernel.org \
--cc=michalgr@live.com \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=qais.yousef@arm.com \
--cc=rostedt@goodmis.org \
--cc=russoue@gmail.com \
--cc=songliubraving@fb.com \
--cc=sramana@codeaurora.org \
--cc=yhs@fb.com \
--cc=yuchao.du@unisoc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).