[01/24] mm: page_vma_mapped_walk(): use page for pvmw->page

Message ID	20210625013901.BV8rXpKTb%akpm@linux-foundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> Date: Thu, 24 Jun 2021 18:39:01 -0700 From: Andrew Morton <akpm@linux-foundation.org> To: akpm@linux-foundation.org, apopple@nvidia.com, hughd@google.com, kirill.shutemov@linux.intel.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, peterx@redhat.com, rcampbell@nvidia.com, shy828301@gmail.com, stable@vger.kernel.org, torvalds@linux-foundation.org, wangyugui@e16-tech.com, will@kernel.org, willy@infradead.org, ziy@nvidia.com Subject: [patch 01/24] mm: page_vma_mapped_walk(): use page for pvmw->page Message-ID: <20210625013901.BV8rXpKTb%akpm@linux-foundation.org> In-Reply-To: <20210624183838.ac3161ca4a43989665ac8b2f@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk
Series	[01/24] mm: page_vma_mapped_walk(): use page for pvmw->page \| expand [01/24] mm: page_vma_mapped_walk(): use page for pvmw->page [02/24] mm: page_vma_mapped_walk(): settle PageHuge on entry [03/24] mm: page_vma_mapped_walk(): use pmde for *pvmw->pmd [04/24] mm: page_vma_mapped_walk(): prettify PVMW_MIGRATION block [05/24] mm: page_vma_mapped_walk(): crossing page table boundary [06/24] mm: page_vma_mapped_walk(): add a level of indentation [07/24] mm: page_vma_mapped_walk(): use goto instead of while (1) [08/24] mm: page_vma_mapped_walk(): get vma_address_end() earlier [09/24] mm/thp: fix page_vma_mapped_walk() if THP mapped by ptes [10/24] mm/thp: another PVMW_SYNC fix in page_vma_mapped_walk() [15/24] kthread_worker: split code for canceling the delayed work timer [16/24] kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delay... [17/24] mm, futex: fix shared futex pgoff on shmem huge page [18/24] mm/memory-failure: use a mutex to avoid memory_failure() races [19/24] mm,hwpoison: return -EHWPOISON to denote that the page has already been poisoned [20/24] mm/hwpoison: do not lock page again when me_huge_page() successfully recovers

Message ID

20210625013901.BV8rXpKTb%akpm@linux-foundation.org

State

New

Headers

Date: Thu, 24 Jun 2021 18:39:01 -0700
From: Andrew Morton <akpm@linux-foundation.org>
To: akpm@linux-foundation.org, apopple@nvidia.com, hughd@google.com,
	kirill.shutemov@linux.intel.com, linux-mm@kvack.org,
	mm-commits@vger.kernel.org, peterx@redhat.com,
	rcampbell@nvidia.com, shy828301@gmail.com, stable@vger.kernel.org,
	torvalds@linux-foundation.org, wangyugui@e16-tech.com,
	will@kernel.org, willy@infradead.org, ziy@nvidia.com
Subject: [patch 01/24] mm: page_vma_mapped_walk(): use page for
 pvmw->page
Message-ID: <20210625013901.BV8rXpKTb%akpm@linux-foundation.org>
In-Reply-To: <20210624183838.ac3161ca4a43989665ac8b2f@linux-foundation.org>
User-Agent: s-nail v14.8.16
Precedence: bulk

Series

[01/24] mm: page_vma_mapped_walk(): use page for pvmw->page | expand

Commit Message

Andrew Morton June 25, 2021, 1:39 a.m. UTC

From: Hugh Dickins <hughd@google.com>
Subject: mm: page_vma_mapped_walk(): use page for pvmw->page

Patch series "mm: page_vma_mapped_walk() cleanup and THP fixes".

I've marked all of these for stable: many are merely cleanups,
but I think they are much better before the main fix than after.


This patch (of 11):

page_vma_mapped_walk() cleanup: sometimes the local copy of pvwm->page was
used, sometimes pvmw->page itself: use the local copy "page" throughout.

Link: https://lkml.kernel.org/r/589b358c-febc-c88e-d4c2-7834b37fa7bf@google.com
Link: https://lkml.kernel.org/r/88e67645-f467-c279-bf5e-af4b5c6b13eb@google.com
Signed-off-by: Hugh Dickins <hughd@google.com>
Reviewed-by: Alistair Popple <apopple@nvidia.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Cc: Yang Shi <shy828301@gmail.com>
Cc: Wang Yugui <wangyugui@e16-tech.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Ralph Campbell <rcampbell@nvidia.com>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Will Deacon <will@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/page_vma_mapped.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- a/mm/page_vma_mapped.c~mm-page_vma_mapped_walk-use-page-for-pvmw-page
+++ a/mm/page_vma_mapped.c
@@ -156,7 +156,7 @@  bool page_vma_mapped_walk(struct page_vm
 	if (pvmw->pte)
 		goto next_pte;
 
-	if (unlikely(PageHuge(pvmw->page))) {
+	if (unlikely(PageHuge(page))) {
 		/* when pud is not present, pte will be NULL */
 		pvmw->pte = huge_pte_offset(mm, pvmw->address, page_size(page));
 		if (!pvmw->pte)
@@ -217,8 +217,7 @@  restart:
 		 * cannot return prematurely, while zap_huge_pmd() has
 		 * cleared *pmd but not decremented compound_mapcount().
 		 */
-		if ((pvmw->flags & PVMW_SYNC) &&
-		    PageTransCompound(pvmw->page)) {
+		if ((pvmw->flags & PVMW_SYNC) && PageTransCompound(page)) {
 			spinlock_t *ptl = pmd_lock(mm, pvmw->pmd);
 
 			spin_unlock(ptl);
@@ -234,9 +233,9 @@  restart:
 			return true;
 next_pte:
 		/* Seek to next pte only makes sense for THP */
-		if (!PageTransHuge(pvmw->page) || PageHuge(pvmw->page))
+		if (!PageTransHuge(page) || PageHuge(page))
 			return not_found(pvmw);
-		end = vma_address_end(pvmw->page, pvmw->vma);
+		end = vma_address_end(page, pvmw->vma);
 		do {
 			pvmw->address += PAGE_SIZE;
 			if (pvmw->address >= end)