mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	mm/gup: fix gup_pmd_range() for dax
For dax pmd, pmd_trans_huge() returns false but pmd_huge() returns true on x86. So the function works as long as hugetlb is configured. However, dax doesn't depend on hugetlb. Link: http://lkml.kernel.org/r/20190111034033.601-1-yuzhao@google.com Signed-off-by: Yu Zhao <yuzhao@google.com> Reviewed-by: Jan Kara <jack@suse.cz> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Huang Ying <ying.huang@intel.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Keith Busch <keith.busch@intel.com> Cc: "Michael S . Tsirkin" <mst@redhat.com> Cc: John Hubbard <jhubbard@nvidia.com> Cc: Wei Yang <richard.weiyang@gmail.com> Cc: Mike Rapoport <rppt@linux.ibm.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
		
							parent
							
								
									a9a238e83f
								
							
						
					
					
						commit
						414fd080d1
					
				
					 1 changed files with 2 additions and 1 deletions
				
			
		
							
								
								
									
										3
									
								
								mm/gup.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								mm/gup.c
									
									
									
									
									
								
							| 
						 | 
				
			
			@ -1674,7 +1674,8 @@ static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end,
 | 
			
		|||
		if (!pmd_present(pmd))
 | 
			
		||||
			return 0;
 | 
			
		||||
 | 
			
		||||
		if (unlikely(pmd_trans_huge(pmd) || pmd_huge(pmd))) {
 | 
			
		||||
		if (unlikely(pmd_trans_huge(pmd) || pmd_huge(pmd) ||
 | 
			
		||||
			     pmd_devmap(pmd))) {
 | 
			
		||||
			/*
 | 
			
		||||
			 * NUMA hinting faults need to be handled in the GUP
 | 
			
		||||
			 * slowpath for accounting purposes and so that they
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue