Commit cd22fb38 authored by David Hildenbrand's avatar David Hildenbrand Committed by Kefeng Wang
Browse files

mm/memory: pass PTE to copy_present_pte() 

mainline inclusion
from mainline-v6.9-rc1
commit 53723298ba436830fdf0744c19b57b2a18f44041
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9CHB4
CVE: NA

-------------------------------------------------

We already read it, let's just forward it.

This patch is based on work by Ryan Roberts.

[david@redhat.com: fix the hmm "exclusive_cow" selftest]
  Link: https://lkml.kernel.org/r/13f296b8-e882-47fd-b939-c2141dc28717@redhat.com
Link: https://lkml.kernel.org/r/20240129124649.189745-13-david@redhat.com


Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarRyan Roberts <ryan.roberts@arm.com>
Reviewed-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alexandre Ghiti <alexghiti@rivosinc.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: David S. Miller <davem@davemloft.net>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Naveen N. Rao <naveen.n.rao@linux.ibm.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Russell King (Oracle) <linux@armlinux.org.uk>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
(cherry picked from commit 53723298ba436830fdf0744c19b57b2a18f44041)
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
parent 5e014966

mm/memory.c

+5 −4
Original line number Diff line number Diff line
@@ -964,10 +964,9 @@ static inline void __copy_present_pte(struct vm_area_struct *dst_vma, 
 */

static inline int

copy_present_pte(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma,

		 pte_t *dst_pte, pte_t *src_pte, unsigned long addr, int *rss,

		 struct folio **prealloc)

		 pte_t *dst_pte, pte_t *src_pte, pte_t pte, unsigned long addr,

		 int *rss, struct folio **prealloc)

{

	pte_t pte = ptep_get(src_pte);

	struct page *page;

	struct folio *folio;
@@ -1095,6 +1094,8 @@ copy_pte_range(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma, 
				progress += 8;

				continue;

			}

			ptent = ptep_get(src_pte);

			VM_WARN_ON_ONCE(!pte_present(ptent));



			/*

			 * Device exclusive entry restored, continue by copying
@@ -1104,7 +1105,7 @@ copy_pte_range(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma, 
		}

		/* copy_present_pte() will clear `*prealloc' if consumed */

		ret = copy_present_pte(dst_vma, src_vma, dst_pte, src_pte,

				       addr, rss, &prealloc);

				       ptent, addr, rss, &prealloc);

		/*

		 * If we need a pre-allocated page for this pte, drop the

		 * locks, allocate, and try again.