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

Commit 5e2398a9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: support __netdev_alloc_frag to always use GFP_DMA"

parents 67d25a86 76a08528

mm/Kconfig

+11 −1
Original line number Diff line number Diff line
@@ -641,3 +641,13 @@ config KSWAPD_CPU_AFFINITY_MASK 
	  the resultant bitmask.

	  For example to limit kswapd to the first 4 cores use the following:

	  CONFIG_KSWAPD_CPU_AFFINITY_MASK="f"



config FORCE_ALLOC_FROM_DMA_ZONE

	bool "Force certain memory allocators to always return ZONE_DMA memory"

	depends on ZONE_DMA

	help

	  Ensure certain memory allocators always return memory from ZONE_DMA.

	  This option helps ensure that clients who require ZONE_DMA memory are

	  always using ZONE_DMA memory.



	  If unsure, say "n".

net/core/skbuff.c

+3 −0
Original line number Diff line number Diff line
@@ -361,6 +361,9 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask) 
	int order;

	unsigned long flags;



	if (IS_ENABLED(CONFIG_FORCE_ALLOC_FROM_DMA_ZONE))

		gfp_mask |= GFP_DMA;



	local_irq_save(flags);

	nc = this_cpu_ptr(&netdev_alloc_cache);

	if (unlikely(!nc->frag.page)) {