Commit 7fb05423 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Paolo Abeni
Browse files

net: split __zerocopy_sg_from_iter() 



Split a function out of __zerocopy_sg_from_iter() that only cares about
the traditional path with refcounted pages and doesn't need to know
about ->sg_from_iter. A preparation patch, we'll improve on the function
later.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Reviewed-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 9e2db9d3

net/core/datagram.c

+13 −9
Original line number Diff line number Diff line
@@ -610,16 +610,10 @@ int skb_copy_datagram_from_iter(struct sk_buff *skb, int offset, 
}

EXPORT_SYMBOL(skb_copy_datagram_from_iter);



int __zerocopy_sg_from_iter(struct msghdr *msg, struct sock *sk,

			    struct sk_buff *skb, struct iov_iter *from,

			    size_t length)

static int zerocopy_fill_skb_from_iter(struct sock *sk, struct sk_buff *skb,

					struct iov_iter *from, size_t length)

{

	int frag;



	if (msg && msg->msg_ubuf && msg->sg_from_iter)

		return msg->sg_from_iter(sk, skb, from, length);



	frag = skb_shinfo(skb)->nr_frags;

	int frag = skb_shinfo(skb)->nr_frags;



	while (length && iov_iter_count(from)) {

		struct page *head, *last_head = NULL;
@@ -692,6 +686,16 @@ int __zerocopy_sg_from_iter(struct msghdr *msg, struct sock *sk, 
	}

	return 0;

}



int __zerocopy_sg_from_iter(struct msghdr *msg, struct sock *sk,

			    struct sk_buff *skb, struct iov_iter *from,

			    size_t length)

{

	if (msg && msg->msg_ubuf && msg->sg_from_iter)

		return msg->sg_from_iter(sk, skb, from, length);

	else

		return zerocopy_fill_skb_from_iter(sk, skb, from, length);

}

EXPORT_SYMBOL(__zerocopy_sg_from_iter);



/**