Commit 32e3573f authored by Yajun Deng's avatar Yajun Deng Committed by David S. Miller
Browse files

skbuff: inline page_frag_alloc_align() 



The __alloc_frag_align() is short, and only called by two functions,
so inline page_frag_alloc_align() for reduce the overhead of calls.

Reported-by: default avatarkernel test robot <oliver.sang@intel.com>
Signed-off-by: default avatarYajun Deng <yajun.deng@linux.dev>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b9bbc4c1

net/core/skbuff.c

+8 −11
Original line number Diff line number Diff line
@@ -134,34 +134,31 @@ struct napi_alloc_cache { 
static DEFINE_PER_CPU(struct page_frag_cache, netdev_alloc_cache);

static DEFINE_PER_CPU(struct napi_alloc_cache, napi_alloc_cache);



static void *__alloc_frag_align(unsigned int fragsz, gfp_t gfp_mask,

				unsigned int align_mask)

void *__napi_alloc_frag_align(unsigned int fragsz, unsigned int align_mask)

{

	struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);



	return page_frag_alloc_align(&nc->page, fragsz, gfp_mask, align_mask);

}



void *__napi_alloc_frag_align(unsigned int fragsz, unsigned int align_mask)

{

	fragsz = SKB_DATA_ALIGN(fragsz);



	return __alloc_frag_align(fragsz, GFP_ATOMIC, align_mask);

	return page_frag_alloc_align(&nc->page, fragsz, GFP_ATOMIC, align_mask);

}

EXPORT_SYMBOL(__napi_alloc_frag_align);



void *__netdev_alloc_frag_align(unsigned int fragsz, unsigned int align_mask)

{

	struct page_frag_cache *nc;

	void *data;



	fragsz = SKB_DATA_ALIGN(fragsz);

	if (in_hardirq() || irqs_disabled()) {

		nc = this_cpu_ptr(&netdev_alloc_cache);

		struct page_frag_cache *nc = this_cpu_ptr(&netdev_alloc_cache);



		data = page_frag_alloc_align(nc, fragsz, GFP_ATOMIC, align_mask);

	} else {

		struct napi_alloc_cache *nc;



		local_bh_disable();

		data = __alloc_frag_align(fragsz, GFP_ATOMIC, align_mask);

		nc = this_cpu_ptr(&napi_alloc_cache);

		data = page_frag_alloc_align(&nc->page, fragsz, GFP_ATOMIC, align_mask);

		local_bh_enable();

	}

	return data;