Commit 2e07a521 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jakub Kicinski
Browse files

skbuff: add SKBFL_DONT_ORPHAN flag 



We don't want to list every single ubuf_info callback in
skb_orphan_frags(), add a flag controlling the behaviour.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1b4b2b09

include/linux/skbuff.h

+5 −3
Original line number Diff line number Diff line
@@ -686,10 +686,13 @@ enum { 
	 * charged to the kernel memory.

	 */

	SKBFL_PURE_ZEROCOPY = BIT(2),



	SKBFL_DONT_ORPHAN = BIT(3),

};



#define SKBFL_ZEROCOPY_FRAG	(SKBFL_ZEROCOPY_ENABLE | SKBFL_SHARED_FRAG)

#define SKBFL_ALL_ZEROCOPY	(SKBFL_ZEROCOPY_FRAG | SKBFL_PURE_ZEROCOPY)

#define SKBFL_ALL_ZEROCOPY	(SKBFL_ZEROCOPY_FRAG | SKBFL_PURE_ZEROCOPY | \

				 SKBFL_DONT_ORPHAN)



/*

 * The callback notifies userspace to release buffers when skb DMA is done in
@@ -3182,8 +3185,7 @@ static inline int skb_orphan_frags(struct sk_buff *skb, gfp_t gfp_mask) 
{

	if (likely(!skb_zcopy(skb)))

		return 0;

	if (!skb_zcopy_is_nouarg(skb) &&

	    skb_uarg(skb)->callback == msg_zerocopy_callback)

	if (skb_shinfo(skb)->flags & SKBFL_DONT_ORPHAN)

		return 0;

	return skb_copy_ubufs(skb, gfp_mask);

}

net/core/skbuff.c

+1 −1
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ static struct ubuf_info *msg_zerocopy_alloc(struct sock *sk, size_t size) 
	uarg->len = 1;

	uarg->bytelen = size;

	uarg->zerocopy = 1;

	uarg->flags = SKBFL_ZEROCOPY_FRAG;

	uarg->flags = SKBFL_ZEROCOPY_FRAG | SKBFL_DONT_ORPHAN;

	refcount_set(&uarg->refcnt, 1);

	sock_hold(sk);