Skip to content

Commit 04c35ab

Browse files
davidhildenbrandakpm00
authored andcommitted
x86/mm/pat: fix VM_PAT handling in COW mappings
PAT handling won't do the right thing in COW mappings: the first PTE (or, in fact, all PTEs) can be replaced during write faults to point at anon folios. Reliably recovering the correct PFN and cachemode using follow_phys() from PTEs will not work in COW mappings. Using follow_phys(), we might just get the address+protection of the anon folio (which is very wrong), or fail on swap/nonswap entries, failing follow_phys() and triggering a WARN_ON_ONCE() in untrack_pfn() and track_pfn_copy(), not properly calling free_pfn_range(). In free_pfn_range(), we either wouldn't call memtype_free() or would call it with the wrong range, possibly leaking memory. To fix that, let's update follow_phys() to refuse returning anon folios, and fallback to using the stored PFN inside vma->vm_pgoff for COW mappings if we run into that. We will now properly handle untrack_pfn() with COW mappings, where we don't need the cachemode. We'll have to fail fork()->track_pfn_copy() if the first page was replaced by an anon folio, though: we'd have to store the cachemode in the VMA to make this work, likely growing the VMA size. For now, lets keep it simple and let track_pfn_copy() just fail in that case: it would have failed in the past with swap/nonswap entries already, and it would have done the wrong thing with anon folios. Simple reproducer to trigger the WARN_ON_ONCE() in untrack_pfn(): <--- C reproducer ---> #include <stdio.h> #include <sys/mman.h> #include <unistd.h> #include <liburing.h> int main(void) { struct io_uring_params p = {}; int ring_fd; size_t size; char *map; ring_fd = io_uring_setup(1, &p); if (ring_fd < 0) { perror("io_uring_setup"); return 1; } size = p.sq_off.array + p.sq_entries * sizeof(unsigned); /* Map the submission queue ring MAP_PRIVATE */ map = mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, ring_fd, IORING_OFF_SQ_RING); if (map == MAP_FAILED) { perror("mmap"); return 1; } /* We have at least one page. Let's COW it. */ *map = 0; pause(); return 0; } <--- C reproducer ---> On a system with 16 GiB RAM and swap configured: # ./iouring & # memhog 16G # killall iouring [ 301.552930] ------------[ cut here ]------------ [ 301.553285] WARNING: CPU: 7 PID: 1402 at arch/x86/mm/pat/memtype.c:1060 untrack_pfn+0xf4/0x100 [ 301.553989] Modules linked in: binfmt_misc nft_fib_inet nft_fib_ipv4 nft_fib_ipv6 nft_fib nft_reject_g [ 301.558232] CPU: 7 PID: 1402 Comm: iouring Not tainted 6.7.5-100.fc38.x86_64 #1 [ 301.558772] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.16.3-0-ga6ed6b701f0a-prebu4 [ 301.559569] RIP: 0010:untrack_pfn+0xf4/0x100 [ 301.559893] Code: 75 c4 eb cf 48 8b 43 10 8b a8 e8 00 00 00 3b 6b 28 74 b8 48 8b 7b 30 e8 ea 1a f7 000 [ 301.561189] RSP: 0018:ffffba2c0377fab8 EFLAGS: 00010282 [ 301.561590] RAX: 00000000ffffffea RBX: ffff9208c8ce9cc0 RCX: 000000010455e047 [ 301.562105] RDX: 07fffffff0eb1e0a RSI: 0000000000000000 RDI: ffff9208c391d200 [ 301.562628] RBP: 0000000000000000 R08: ffffba2c0377fab8 R09: 0000000000000000 [ 301.563145] R10: ffff9208d2292d50 R11: 0000000000000002 R12: 00007fea890e0000 [ 301.563669] R13: 0000000000000000 R14: ffffba2c0377fc08 R15: 0000000000000000 [ 301.564186] FS: 0000000000000000(0000) GS:ffff920c2fbc0000(0000) knlGS:0000000000000000 [ 301.564773] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 301.565197] CR2: 00007fea88ee8a20 CR3: 00000001033a8000 CR4: 0000000000750ef0 [ 301.565725] PKRU: 55555554 [ 301.565944] Call Trace: [ 301.566148] <TASK> [ 301.566325] ? untrack_pfn+0xf4/0x100 [ 301.566618] ? __warn+0x81/0x130 [ 301.566876] ? untrack_pfn+0xf4/0x100 [ 301.567163] ? report_bug+0x171/0x1a0 [ 301.567466] ? handle_bug+0x3c/0x80 [ 301.567743] ? exc_invalid_op+0x17/0x70 [ 301.568038] ? asm_exc_invalid_op+0x1a/0x20 [ 301.568363] ? untrack_pfn+0xf4/0x100 [ 301.568660] ? untrack_pfn+0x65/0x100 [ 301.568947] unmap_single_vma+0xa6/0xe0 [ 301.569247] unmap_vmas+0xb5/0x190 [ 301.569532] exit_mmap+0xec/0x340 [ 301.569801] __mmput+0x3e/0x130 [ 301.570051] do_exit+0x305/0xaf0 ... Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: David Hildenbrand <[email protected]> Reported-by: Wupeng Ma <[email protected]> Closes: https://lkml.kernel.org/r/[email protected] Fixes: b1a86e1 ("x86, pat: remove the dependency on 'vm_pgoff' in track/untrack pfn vma routines") Fixes: 5899329 ("x86: PAT: implement track/untrack of pfnmap regions for x86 - v3") Acked-by: Ingo Molnar <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 87f0e65 commit 04c35ab

File tree

2 files changed

+39
-14
lines changed

2 files changed

+39
-14
lines changed

arch/x86/mm/pat/memtype.c

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,38 @@ static void free_pfn_range(u64 paddr, unsigned long size)
947947
memtype_free(paddr, paddr + size);
948948
}
949949

950+
static int get_pat_info(struct vm_area_struct *vma, resource_size_t *paddr,
951+
pgprot_t *pgprot)
952+
{
953+
unsigned long prot;
954+
955+
VM_WARN_ON_ONCE(!(vma->vm_flags & VM_PAT));
956+
957+
/*
958+
* We need the starting PFN and cachemode used for track_pfn_remap()
959+
* that covered the whole VMA. For most mappings, we can obtain that
960+
* information from the page tables. For COW mappings, we might now
961+
* suddenly have anon folios mapped and follow_phys() will fail.
962+
*
963+
* Fallback to using vma->vm_pgoff, see remap_pfn_range_notrack(), to
964+
* detect the PFN. If we need the cachemode as well, we're out of luck
965+
* for now and have to fail fork().
966+
*/
967+
if (!follow_phys(vma, vma->vm_start, 0, &prot, paddr)) {
968+
if (pgprot)
969+
*pgprot = __pgprot(prot);
970+
return 0;
971+
}
972+
if (is_cow_mapping(vma->vm_flags)) {
973+
if (pgprot)
974+
return -EINVAL;
975+
*paddr = (resource_size_t)vma->vm_pgoff << PAGE_SHIFT;
976+
return 0;
977+
}
978+
WARN_ON_ONCE(1);
979+
return -EINVAL;
980+
}
981+
950982
/*
951983
* track_pfn_copy is called when vma that is covering the pfnmap gets
952984
* copied through copy_page_range().
@@ -957,20 +989,13 @@ static void free_pfn_range(u64 paddr, unsigned long size)
957989
int track_pfn_copy(struct vm_area_struct *vma)
958990
{
959991
resource_size_t paddr;
960-
unsigned long prot;
961992
unsigned long vma_size = vma->vm_end - vma->vm_start;
962993
pgprot_t pgprot;
963994

964995
if (vma->vm_flags & VM_PAT) {
965-
/*
966-
* reserve the whole chunk covered by vma. We need the
967-
* starting address and protection from pte.
968-
*/
969-
if (follow_phys(vma, vma->vm_start, 0, &prot, &paddr)) {
970-
WARN_ON_ONCE(1);
996+
if (get_pat_info(vma, &paddr, &pgprot))
971997
return -EINVAL;
972-
}
973-
pgprot = __pgprot(prot);
998+
/* reserve the whole chunk covered by vma. */
974999
return reserve_pfn_range(paddr, vma_size, &pgprot, 1);
9751000
}
9761001

@@ -1045,19 +1070,15 @@ void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn,
10451070
unsigned long size, bool mm_wr_locked)
10461071
{
10471072
resource_size_t paddr;
1048-
unsigned long prot;
10491073

10501074
if (vma && !(vma->vm_flags & VM_PAT))
10511075
return;
10521076

10531077
/* free the chunk starting from pfn or the whole chunk */
10541078
paddr = (resource_size_t)pfn << PAGE_SHIFT;
10551079
if (!paddr && !size) {
1056-
if (follow_phys(vma, vma->vm_start, 0, &prot, &paddr)) {
1057-
WARN_ON_ONCE(1);
1080+
if (get_pat_info(vma, &paddr, NULL))
10581081
return;
1059-
}
1060-
10611082
size = vma->vm_end - vma->vm_start;
10621083
}
10631084
free_pfn_range(paddr, size);

mm/memory.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5973,6 +5973,10 @@ int follow_phys(struct vm_area_struct *vma,
59735973
goto out;
59745974
pte = ptep_get(ptep);
59755975

5976+
/* Never return PFNs of anon folios in COW mappings. */
5977+
if (vm_normal_folio(vma, address, pte))
5978+
goto unlock;
5979+
59765980
if ((flags & FOLL_WRITE) && !pte_write(pte))
59775981
goto unlock;
59785982

0 commit comments

Comments
 (0)