Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06dc75ab authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

net: Revert "net: add function to allocate sk_buff head without data area" 



It was added for netlink mmap tx, there are no callers in the tree.
The commit also added a check for skb->head != NULL in kfree_skb path,
remove that too -- all skbs ought to have skb->head set.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c3c6081

include/linux/skbuff.h

+0 −6
Original line number Diff line number Diff line
@@ -944,12 +944,6 @@ static inline struct sk_buff *alloc_skb_fclone(unsigned int size, 
	return __alloc_skb(size, priority, SKB_ALLOC_FCLONE, NUMA_NO_NODE);

}



struct sk_buff *__alloc_skb_head(gfp_t priority, int node);

static inline struct sk_buff *alloc_skb_head(gfp_t priority)

{

	return __alloc_skb_head(priority, -1);

}



struct sk_buff *skb_morph(struct sk_buff *dst, struct sk_buff *src);

int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask);

struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t priority);

net/core/skbuff.c

+2 −29
Original line number Diff line number Diff line
@@ -158,31 +158,6 @@ static void *__kmalloc_reserve(size_t size, gfp_t flags, int node, 
 *

 */



struct sk_buff *__alloc_skb_head(gfp_t gfp_mask, int node)

{

	struct sk_buff *skb;



	/* Get the HEAD */

	skb = kmem_cache_alloc_node(skbuff_head_cache,

				    gfp_mask & ~__GFP_DMA, node);

	if (!skb)

		goto out;



	/*

	 * Only clear those fields we need to clear, not those that we will

	 * actually initialise below. Hence, don't put any more fields after

	 * the tail pointer in struct sk_buff!

	 */

	memset(skb, 0, offsetof(struct sk_buff, tail));

	skb->head = NULL;

	skb->truesize = sizeof(struct sk_buff);

	refcount_set(&skb->users, 1);



	skb->mac_header = (typeof(skb->mac_header))~0U;

out:

	return skb;

}



/**

 *	__alloc_skb	-	allocate a network buffer

 *	@size: size to allocate
@@ -663,7 +638,6 @@ void skb_release_head_state(struct sk_buff *skb) 
static void skb_release_all(struct sk_buff *skb)

{

	skb_release_head_state(skb);

	if (likely(skb->head))

	skb_release_data(skb);

}
@@ -762,7 +736,6 @@ void consume_stateless_skb(struct sk_buff *skb) 
		return;



	trace_consume_skb(skb);

	if (likely(skb->head))

	skb_release_data(skb);

	kfree_skbmem(skb);

}