Commit 8734a162 authored Oct 16, 2018 by John Fastabend Committed by Daniel Borkmann Oct 17, 2018

bpf: skmsg, improve sk_msg_used_element to work in cork context



Currently sk_msg_used_element is only called in zerocopy context where
cork is not possible and if this case happens we fallback to copy
mode. However the helper is more useful if it works in all contexts.

This patch resolved the case where if end == head indicating a full
or empty ring the helper always reports an empty ring. To fix this
add a test for the full ring case to avoid reporting a full ring
has 0 elements. This additional functionality will be used in the
next patches from recvmsg context where end = head with a full ring
is a valid case.

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

parent 3f4c3127

include/linux/skmsg.h

+8 −5

Original line number	Diff line number	Diff line
		@@ -187,18 +187,21 @@ static inline void sk_msg_xfer_full(struct sk_msg dst, struct sk_msg src)
		sk_msg_init(src);
		}

		static inline bool sk_msg_full(const struct sk_msg *msg)
		{
		return (msg->sg.end == msg->sg.start) && msg->sg.size;
		}

		static inline u32 sk_msg_elem_used(const struct sk_msg *msg)
		{
		if (sk_msg_full(msg))
		return MAX_MSG_FRAGS;

		return msg->sg.end >= msg->sg.start ?
		msg->sg.end - msg->sg.start :
		msg->sg.end + (MAX_MSG_FRAGS - msg->sg.start);
		}

		static inline bool sk_msg_full(const struct sk_msg *msg)
		{
		return (msg->sg.end == msg->sg.start) && msg->sg.size;
		}

		static inline struct scatterlist sk_msg_elem(struct sk_msg msg, int which)
		{
		return &msg->sg.data[which];

Admin message