From 131714e34be58fe3fa51e3fd79092da36d5747e9 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Thu, 18 May 2023 14:29:14 -0700 Subject: [PATCH] FROMLIST: mm: Call arch_swap_restore() from unuse_pte() We would like to move away from requiring architectures to restore metadata from swap in the set_pte_at() implementation, as this is not only error-prone but adds complexity to the arch-specific code. This requires us to call arch_swap_restore() before calling swap_free() whenever pages are restored from swap. We are currently doing so everywhere except in unuse_pte(); do so there as well. Signed-off-by: Peter Collingbourne Link: https://linux-review.googlesource.com/id/I68276653e612d64cde271ce1b5a99ae05d6bbc4f Suggested-by: David Hildenbrand Acked-by: David Hildenbrand Acked-by: "Huang, Ying" Reviewed-by: Steven Price Acked-by: Catalin Marinas Link: https://lore.kernel.org/all/20230523004312.1807357-3-pcc@google.com/ Change-Id: I68276653e612d64cde271ce1b5a99ae05d6bbc4f Bug: 274890466 --- mm/swapfile.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mm/swapfile.c b/mm/swapfile.c index 7854322e647c..b63e7fd3d6c6 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1790,6 +1790,13 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, goto out; } + /* + * Some architectures may have to restore extra metadata to the page + * when reading from swap. This metadata may be indexed by swap entry + * so this must be called before swap_free(). + */ + arch_swap_restore(entry, page_folio(page)); + /* See do_swap_page() */ BUG_ON(!PageAnon(page) && PageMappedToDisk(page)); BUG_ON(PageAnon(page) && PageAnonExclusive(page));