diff options
| author | Alistair Popple <alistair@popple.id.au> | 2020-09-04 16:35:58 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-09 19:14:33 +0200 |
| commit | 3fd08f78f47acffb92cc6b12037236f526b84f28 (patch) | |
| tree | 425d8475a7d21ca425a141ea1f769e6ae225b1af | |
| parent | 658e93f1c3181d805870b27803525b371166ff3b (diff) | |
| download | linux-3fd08f78f47acffb92cc6b12037236f526b84f28.tar.gz linux-3fd08f78f47acffb92cc6b12037236f526b84f28.tar.bz2 linux-3fd08f78f47acffb92cc6b12037236f526b84f28.zip | |
mm/migrate: fixup setting UFFD_WP flag
commit ebdf8321eeeb623aed60f7ed16f7445363230118 upstream.
Commit f45ec5ff16a75 ("userfaultfd: wp: support swap and page migration")
introduced support for tracking the uffd wp bit during page migration.
However the non-swap PTE variant was used to set the flag for zone device
private pages which are a type of swap page.
This leads to corruption of the swap offset if the original PTE has the
uffd_wp flag set.
Fixes: f45ec5ff16a75 ("userfaultfd: wp: support swap and page migration")
Signed-off-by: Alistair Popple <alistair@popple.id.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Cc: Jérôme Glisse <jglisse@redhat.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Ralph Campbell <rcampbell@nvidia.com>
Link: https://lkml.kernel.org/r/20200825064232.10023-1-alistair@popple.id.au
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | mm/migrate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 6a9ffe887e91..3511f9529ea6 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -251,7 +251,7 @@ static bool remove_migration_pte(struct page *page, struct vm_area_struct *vma, entry = make_device_private_entry(new, pte_write(pte)); pte = swp_entry_to_pte(entry); if (pte_swp_uffd_wp(*pvmw.pte)) - pte = pte_mkuffd_wp(pte); + pte = pte_swp_mkuffd_wp(pte); } } |