mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	kfence: skip all GFP_ZONEMASK allocations
Allocation requests outside ZONE_NORMAL (MOVABLE, HIGHMEM or DMA) cannot
be fulfilled by KFENCE, because KFENCE memory pool is located in a zone
different from the requested one.
Because callers of kmem_cache_alloc() may actually rely on the
allocation to reside in the requested zone (e.g.  memory allocations
done with __GFP_DMA must be DMAable), skip all allocations done with
GFP_ZONEMASK and/or respective SLAB flags (SLAB_CACHE_DMA and
SLAB_CACHE_DMA32).
Link: https://lkml.kernel.org/r/20210714092222.1890268-2-glider@google.com
Fixes: 0ce20dd840 ("mm: add Kernel Electric-Fence infrastructure")
Signed-off-by: Alexander Potapenko <glider@google.com>
Reviewed-by: Marco Elver <elver@google.com>
Acked-by: Souptick Joarder <jrdr.linux@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Souptick Joarder <jrdr.linux@gmail.com>
Cc: <stable@vger.kernel.org>	[5.12+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
			
			
This commit is contained in:
		
							parent
							
								
									235a85cb32
								
							
						
					
					
						commit
						236e9f1538
					
				
					 1 changed files with 9 additions and 0 deletions
				
			
		| 
						 | 
					@ -740,6 +740,15 @@ void *__kfence_alloc(struct kmem_cache *s, size_t size, gfp_t flags)
 | 
				
			||||||
	if (size > PAGE_SIZE)
 | 
						if (size > PAGE_SIZE)
 | 
				
			||||||
		return NULL;
 | 
							return NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						/*
 | 
				
			||||||
 | 
						 * Skip allocations from non-default zones, including DMA. We cannot
 | 
				
			||||||
 | 
						 * guarantee that pages in the KFENCE pool will have the requested
 | 
				
			||||||
 | 
						 * properties (e.g. reside in DMAable memory).
 | 
				
			||||||
 | 
						 */
 | 
				
			||||||
 | 
						if ((flags & GFP_ZONEMASK) ||
 | 
				
			||||||
 | 
						    (s->flags & (SLAB_CACHE_DMA | SLAB_CACHE_DMA32)))
 | 
				
			||||||
 | 
							return NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/*
 | 
						/*
 | 
				
			||||||
	 * allocation_gate only needs to become non-zero, so it doesn't make
 | 
						 * allocation_gate only needs to become non-zero, so it doesn't make
 | 
				
			||||||
	 * sense to continue writing to it and pay the associated contention
 | 
						 * sense to continue writing to it and pay the associated contention
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue