Commit 0bdf7101 authored Aug 09, 2017 by David S. Miller

Merge branch 'net-zerocopy-fixes'



Willem de Bruijn says:

====================
net: zerocopy fixes

Fix two issues introduced in the msg_zerocopy patchset.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents d5e7f827 0a4a060b

include/linux/skbuff.h

+7 −2

Original line number	Diff line number	Diff line
		@@ -1273,8 +1273,13 @@ static inline void skb_zcopy_clear(struct sk_buff *skb, bool zerocopy)
		struct ubuf_info *uarg = skb_zcopy(skb);

		if (uarg) {
		if (uarg->callback == sock_zerocopy_callback) {
		uarg->zerocopy = uarg->zerocopy && zerocopy;
		sock_zerocopy_put(uarg);
		} else {
		uarg->callback(uarg, zerocopy);
		}

		skb_shinfo(skb)->tx_flags &= ~SKBTX_ZEROCOPY_FRAG;
		}
		}

net/core/skbuff.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1044,6 +1044,8 @@ void sock_zerocopy_callback(struct ubuf_info *uarg, bool success)
		u32 lo, hi;
		u16 len;

		mm_unaccount_pinned_pages(&uarg->mmp);

		/* if !len, there was only 1 call, and it was aborted
		* so do not queue a completion notification
		*/
		@@ -1084,8 +1086,6 @@ EXPORT_SYMBOL_GPL(sock_zerocopy_callback);
		void sock_zerocopy_put(struct ubuf_info *uarg)
		{
		if (uarg && atomic_dec_and_test(&uarg->refcnt)) {
		mm_unaccount_pinned_pages(&uarg->mmp);

		if (uarg->callback)
		uarg->callback(uarg, uarg->zerocopy);
		else