Skip to content

Commit d155df5

Browse files
Ma Wupengakpm00
Ma Wupeng
authored andcommitted
x86/mm/pat: clear VM_PAT if copy_p4d_range failed
Syzbot reports a warning in untrack_pfn(). Digging into the root we found that this is due to memory allocation failure in pmd_alloc_one. And this failure is produced due to failslab. In copy_page_range(), memory alloaction for pmd failed. During the error handling process in copy_page_range(), mmput() is called to remove all vmas. While untrack_pfn this empty pfn, warning happens. Here's a simplified flow: dup_mm dup_mmap copy_page_range copy_p4d_range copy_pud_range copy_pmd_range pmd_alloc __pmd_alloc pmd_alloc_one page = alloc_pages(gfp, 0); if (!page) return NULL; mmput exit_mmap unmap_vmas unmap_single_vma untrack_pfn follow_phys WARN_ON_ONCE(1); Since this vma is not generate successfully, we can clear flag VM_PAT. In this case, untrack_pfn() will not be called while cleaning this vma. Function untrack_pfn_moved() has also been renamed to fit the new logic. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Ma Wupeng <[email protected]> Reported-by: <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Suresh Siddha <[email protected]> Cc: Toshi Kani <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent a1b92a3 commit d155df5

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

arch/x86/mm/pat/memtype.c

+8-4
Original file line numberDiff line numberDiff line change
@@ -1073,11 +1073,15 @@ void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn,
10731073
}
10741074

10751075
/*
1076-
* untrack_pfn_moved is called, while mremapping a pfnmap for a new region,
1077-
* with the old vma after its pfnmap page table has been removed. The new
1078-
* vma has a new pfnmap to the same pfn & cache type with VM_PAT set.
1076+
* untrack_pfn_clear is called if the following situation fits:
1077+
*
1078+
* 1) while mremapping a pfnmap for a new region, with the old vma after
1079+
* its pfnmap page table has been removed. The new vma has a new pfnmap
1080+
* to the same pfn & cache type with VM_PAT set.
1081+
* 2) while duplicating vm area, the new vma fails to copy the pgtable from
1082+
* old vma.
10791083
*/
1080-
void untrack_pfn_moved(struct vm_area_struct *vma)
1084+
void untrack_pfn_clear(struct vm_area_struct *vma)
10811085
{
10821086
vm_flags_clear(vma, VM_PAT);
10831087
}

include/linux/pgtable.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -1191,9 +1191,10 @@ static inline void untrack_pfn(struct vm_area_struct *vma,
11911191
}
11921192

11931193
/*
1194-
* untrack_pfn_moved is called while mremapping a pfnmap for a new region.
1194+
* untrack_pfn_clear is called while mremapping a pfnmap for a new region
1195+
* or fails to copy pgtable during duplicate vm area.
11951196
*/
1196-
static inline void untrack_pfn_moved(struct vm_area_struct *vma)
1197+
static inline void untrack_pfn_clear(struct vm_area_struct *vma)
11971198
{
11981199
}
11991200
#else
@@ -1205,7 +1206,7 @@ extern void track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot,
12051206
extern int track_pfn_copy(struct vm_area_struct *vma);
12061207
extern void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn,
12071208
unsigned long size, bool mm_wr_locked);
1208-
extern void untrack_pfn_moved(struct vm_area_struct *vma);
1209+
extern void untrack_pfn_clear(struct vm_area_struct *vma);
12091210
#endif
12101211

12111212
#ifdef CONFIG_MMU

mm/memory.c

+1
Original file line numberDiff line numberDiff line change
@@ -1290,6 +1290,7 @@ copy_page_range(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma)
12901290
continue;
12911291
if (unlikely(copy_p4d_range(dst_vma, src_vma, dst_pgd, src_pgd,
12921292
addr, next))) {
1293+
untrack_pfn_clear(dst_vma);
12931294
ret = -ENOMEM;
12941295
break;
12951296
}

mm/mremap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ static unsigned long move_vma(struct vm_area_struct *vma,
683683

684684
/* Tell pfnmap has moved from this vma */
685685
if (unlikely(vma->vm_flags & VM_PFNMAP))
686-
untrack_pfn_moved(vma);
686+
untrack_pfn_clear(vma);
687687

688688
if (unlikely(!err && (flags & MREMAP_DONTUNMAP))) {
689689
/* We always clear VM_LOCKED[ONFAULT] on the old vma */

0 commit comments

Comments
 (0)