Commit 3bdbd022 authored Dec 16, 2018 by John Fastabend Committed by Daniel Borkmann Dec 19, 2018

bpf: sockmap, metadata support for reporting size of msg



This adds metadata to sk_msg_md for BPF programs to read the sk_msg
size.

When the SK_MSG program is running under an application that is using
sendfile the data is not copied into sk_msg buffers by default. Rather
the BPF program uses sk_msg_pull_data to read the bytes in. This
avoids doing the costly memcopy instructions when they are not in
fact needed. However, if we don't know the size of the sk_msg we
have to guess if needed bytes are available by doing a pull request
which may fail. By including the size of the sk_msg BPF programs can
check the size before issuing sk_msg_pull_data requests.

Additionally, the same applies for sendmsg calls when the application
provides multiple iovs. Here the BPF program needs to pull in data
to update data pointers but its not clear where the data ends without
a size parameter. In many cases "guessing" is not easy to do
and results in multiple calls to pull and without bounded loops
everything gets fairly tricky.

Clean this up by including a u32 size field. Note, all writes into
sk_msg_md are rejected already from sk_msg_is_valid_access so nothing
additional is needed there.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

parent 0bae2d4d

include/linux/skmsg.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,9 @@ struct sk_msg_sg {
		struct scatterlist data[MAX_MSG_FRAGS + 1];
		};

		/* UAPI in filter.c depends on struct sk_msg_sg being first element. If
		* this is moved filter.c also must be updated.
		*/
		struct sk_msg {
		struct sk_msg_sg sg;
		void *data;

include/uapi/linux/bpf.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -2665,6 +2665,7 @@ struct sk_msg_md {
		__u32 local_ip6[4]; /* Stored in network byte order */
		__u32 remote_port; /* Stored in network byte order */
		__u32 local_port; /* stored in host byte order */
		__u32 size; /* Total size of sk_msg */
		};

		struct sk_reuseport_md {

net/core/filter.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -7530,6 +7530,12 @@ static u32 sk_msg_convert_ctx_access(enum bpf_access_type type,
		*insn++ = BPF_LDX_MEM(BPF_H, si->dst_reg, si->dst_reg,
		offsetof(struct sock_common, skc_num));
		break;

		case offsetof(struct sk_msg_md, size):
		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_msg_sg, size),
		si->dst_reg, si->src_reg,
		offsetof(struct sk_msg_sg, size));
		break;
		}

		return insn - insn_buf;

Admin message