From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 486E9C04FFE for ; Wed, 8 May 2024 11:37:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CC48C6B0151; Wed, 8 May 2024 07:37:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C4D666B0153; Wed, 8 May 2024 07:37:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A9FDC6B0154; Wed, 8 May 2024 07:37:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8DFD36B0151 for ; Wed, 8 May 2024 07:37:31 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4DEADA23DF for ; Wed, 8 May 2024 11:37:31 +0000 (UTC) X-FDA: 82095028302.06.4F95B20 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by imf29.hostedemail.com (Postfix) with ESMTP id 60C18120016 for ; Wed, 8 May 2024 11:37:29 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="SeklHJb/"; spf=pass (imf29.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715168249; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=YO7yDIQr+QJFeAZFjf5GxhWsbGb5WjqA2EGZTufF1Fc=; b=Q24sGOP2fJYCpzW2JJsak84qmoWCDodu/cM5tfpVlzaol3PAROX3BIv8813BIDcEdA+wWz MIAdjy1sZVYArVpO/o+leu5Ozx5S16WFKgPhCw0HaGfSObEBgGdb4N7vv+8dSm0S/Bqax/ ZQ++fAg3YZw0OYtvVA//Ec6NWTK4rDg= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="SeklHJb/"; spf=pass (imf29.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715168249; a=rsa-sha256; cv=none; b=g6TbaYVca0OSuvEC+mzHHcD/sw1cxKyLjcQEBFXE8Gg8G0dt+rpkkLsuoYhcEngmxWYONc NGtFlNXVo1NiMidvI7HOUGiEsCFkZoH/gWNTrMX+tyBydcWFCn2fSlnL1VxbCoC7cZHVou +4Bm59QAS29R7j1LwB3/f4JYVcZCfYs= Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-41b79451145so31762675e9.3 for ; Wed, 08 May 2024 04:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1715168248; x=1715773048; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YO7yDIQr+QJFeAZFjf5GxhWsbGb5WjqA2EGZTufF1Fc=; b=SeklHJb/wqUbhtc3iYe8cnBbjaA3vsuSBKfBVyLRa4hMIoLRHigwXzA5FKILOI9q09 znTsfyZ7pHyPFikBtJ7KXHtUg/Bn/0rrg1S82DI3oS/BL780emlYaFgmHE42EHXbvY1V kkSZB/D6fqXBkRD0e2s8rKdxF+TUVqS94x84dlxIY7DNbj8fLltZ6agkPLT7o8fMMUP8 8l38RM9XV1omsQpPJBUpTkccM6/maQBBqv7PfWyWY+Q6eVglXg5BUAbcyMFfjT1vN3KI I/p8OqAxx7nqQF8BCny1aHNEbrFF+q+ZHUWrPPiC1baWL9ruToDBslxFROLnCP38+ZKV LArg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715168248; x=1715773048; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YO7yDIQr+QJFeAZFjf5GxhWsbGb5WjqA2EGZTufF1Fc=; b=Rwht8qZ9hJ+o2X2km4wY+XiCCiZOoQJNsqvMRUgBDejAi1v8GnjFGk7alR1qvUU6PQ DXvbnwBeOoAsoy77CUgoZDys6ZsAdlxTTq1X4aCHcwlVl2hNKhYl/tVHfK0/yRuqXnN3 FuTzlNDj46yJca2S0OOlGQmoyuBN/3hVQh+ODCfszFZEaH7nZwrwydkm4In4KkNeKRJd siCb1DHuBsWibXvItMVam/FbiqFScne7mnvj8AFoLA1YrcRDpDfVSFf6oWyjaCfrYf0K kCOKpzPTAh+nJFNpyNYn2FeG4A1rOAW5EDpkj3yLEceNKku6NzbJJ+j+sgrowri6m0uH Uv2Q== X-Forwarded-Encrypted: i=1; AJvYcCW1hIVI9Z35H9yADrVFqzcoArzrZOrTzSz064h0/0mbk/Ne4lkIL6H5rESf6KvpF5BjzL10ze7WcJyjM0ONGA5o/T4= X-Gm-Message-State: AOJu0YyMoCiMuUr+kBPr5d9nQsuYug5VYJ5cIwrFUqerm5vrSBqvne9B 6sAoGxbPGL9Xy0X05wMOx4BUloZTMtFlJ48DCx0tkMSt1ELiqWujWC/pEliLdvo= X-Google-Smtp-Source: AGHT+IEExaDEn0vN6E4Lxk1Zj77Ju6cFib9bZTV4G4rk0yK8V1Cj9z0Mbupc0fzpXub0lh02TBpHRw== X-Received: by 2002:a05:600c:4f0d:b0:41a:7bbe:c3bf with SMTP id 5b1f17b1804b1-41f714f717bmr19142655e9.22.1715168247871; Wed, 08 May 2024 04:37:27 -0700 (PDT) Received: from alex-rivos.ba.rivosinc.com (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id dd3-20020a0560001e8300b0034c9f060a14sm15085210wrb.11.2024.05.08.04.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 04:37:27 -0700 (PDT) From: Alexandre Ghiti To: Catalin Marinas , Will Deacon , Ryan Roberts , Mark Rutland , Paul Walmsley , Palmer Dabbelt , Albert Ou , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-mm@kvack.org Cc: Alexandre Ghiti Subject: [PATCH RESEND v2 3/9] mm: Use common huge_ptep_get() function for riscv/arm64 Date: Wed, 8 May 2024 13:34:13 +0200 Message-Id: <20240508113419.18620-4-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240508113419.18620-1-alexghiti@rivosinc.com> References: <20240508113419.18620-1-alexghiti@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: is3yfdcsfcdpkhb663wbhxhaqyj9ymnw X-Rspam-User: X-Rspamd-Queue-Id: 60C18120016 X-Rspamd-Server: rspam05 X-HE-Tag: 1715168249-662590 X-HE-Meta: U2FsdGVkX1+m2elhzN3CokjK7ZYyH/o+7Re0BnrxzbC9OKmMo3ZcWiMAF9F2rla/F+PV+mJeXeVJQ2+YPuG/UzuSvf5jWH+a7/eogzi+fEIxkjO43ZLBS0Qilqc2jOao68u6agpySe8o0OwjFDriLF8S/+8sCxs6iDI64x4EAxuAeUrcVLbXVYIufkiTnwbZcq/xYpY00xiFuEdzdpoCBfEvuN76MK+MNW+HPfohQh56AhnIUauz9bnhsvEquVoHtyLCx9BCOBnIEP9zH/LGzfkANCm3/7N6fDEF4JftYlnomun6JC2EKFMM93RMJAFPm3nuTBLfw7TlfjrK5L6WhyGbbCW7ZEBfkw5cv1gPL8vA5b6IWbXAUpzusjfhyhDvRPLh0FjC9SqUTG0kZuKd5Fv6tvrcFL9Sn+mZu2kARe/0h7Unn0gmMZDtU22mdBc1wGJO4AVbwKPzIwqViKVTu8z6TCL8+IxEqCFJFnuFZYYQeUZrZnjJR8uO/txDbHI+Guc/a9wm2ietx8+P8x4BpOOO8+4SDl/V9CshQWuBPA8/53F1s8gc/YlPo7C4Fv2vjjQFHnJ2qvaJArVR49Gl4TsfAjGryAE8hV6cNAUqw23XLWiAH8BJHcd7GqWmcDPMA2WpvPl1+EHKroC/fRBuuFGpBjh5XmZK/PsyU8hcoTAFJdAajaoly/0sAJlwnc+qcpaSuibhSslJBV1nPpmtqXqLAG3f3mzbiRM8GkPLIzu5D6jVDc3RHrAoIa7iaCC9PFGXyx7Eu83ougiTrjQsCqvn+luh4zsMF9jho6efmTD6GRtN/OeERmbBS19/0xeryCIQaXdAsYP1X2SwZHyA7YNWDCYbcowxy6H8Dh5BH+rRO97Hb52bTk7yIbnJOARw+idSZWiSaId9J5Oe9lG0OnpKb6kQ+QOXUK4PtBDUVrR+qhN6SDlfOXle2TIeFdQFBjWwDDnf+60DPuHbWcL w7e1Yarn O5mOUdPVqTZN0Dijsq39XXa/pJW8Zd2AiwN/LMZldYWU9qNeJhmoImAAtnT+Uj+X+6F7bLlCynPCqD0BJ6amnegBWd0jUNjphdwhBYPoD4Lw2RdW25GkGynRLA27OTZ6r/v4RH2aaoGvLgJLrbWeleehESsruIvt+HyrHIuz1rlZ0FLdk3jV8QtnD9IRm3yZYWtJcJPmfoMzif2J3Ji5wz5rohZEaG2rfwBSjHoxGgKmjSRJ4Q4wYAJCJ+XH+bjzEI3Khwjo8vA+yM6lvMAJQqXSHrtoR+hbUuCNYZXqGgBsA3DbHOz8kfp5GRCejuhVwnwSJRhPwzJqO1swQYu03Ue0+XSzA027PbFWUFLgS5AIPk/ced8hn8xqqkehqSNQkgdXUW2sldV2JnUZAkGKYbhRaphrHz5XjDr8pOO6zfhK+7HLEfbforj7763WMAL9ir0SzrmLWr+kynQz9OJKL8vWerrFNbYTfsCj+sw/ExmVofyrh+69d8152Gw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: For that, we need to introduce: - a new config: ARCH_HAS_CONTPTE, - a new arch specific function which returns the number of contiguous PTE in a mapping and its base page size, - a pte_cont() helper, only introduced for riscv since we keep the arm64 naming (contpte) which is more explicit than the riscv's (napot). Signed-off-by: Alexandre Ghiti --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/pgtable.h | 30 +++++++++++++++++ arch/arm64/mm/hugetlbpage.c | 55 ++------------------------------ arch/riscv/Kconfig | 1 + arch/riscv/include/asm/hugetlb.h | 2 +- arch/riscv/include/asm/pgtable.h | 6 ++-- arch/riscv/mm/hugetlbpage.c | 24 -------------- mm/Kconfig | 3 ++ mm/Makefile | 1 + mm/contpte.c | 45 ++++++++++++++++++++++++++ 10 files changed, 88 insertions(+), 80 deletions(-) create mode 100644 mm/contpte.c diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 7b11c98b3e84..ac2f6d906cc3 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -20,6 +20,7 @@ config ARM64 select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2 select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE select ARCH_HAS_CACHE_LINE_SIZE + select ARCH_HAS_CONTPTE select ARCH_HAS_CURRENT_STACK_POINTER select ARCH_HAS_DEBUG_VIRTUAL select ARCH_HAS_DEBUG_VM_PGTABLE diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index afdd56d26ad7..e30149a128f2 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1638,6 +1638,36 @@ static inline int ptep_set_access_flags(struct vm_area_struct *vma, #endif /* CONFIG_ARM64_CONTPTE */ +static inline int arch_contpte_get_num_contig(pte_t *ptep, unsigned long size, + size_t *pgsize) +{ + int contig_ptes = 0; + + *pgsize = size; + + switch (size) { +#ifndef __PAGETABLE_PMD_FOLDED + case PUD_SIZE: + if (pud_sect_supported()) + contig_ptes = 1; + break; +#endif + case PMD_SIZE: + contig_ptes = 1; + break; + case CONT_PMD_SIZE: + *pgsize = PMD_SIZE; + contig_ptes = CONT_PMDS; + break; + case CONT_PTE_SIZE: + *pgsize = PAGE_SIZE; + contig_ptes = CONT_PTES; + break; + } + + return contig_ptes; +} + #endif /* !__ASSEMBLY__ */ #endif /* __ASM_PGTABLE_H */ diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 0f0e10bb0a95..9e9c80ec6e74 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -112,57 +112,6 @@ static int find_num_contig(struct mm_struct *mm, unsigned long addr, return CONT_PTES; } -static inline int num_contig_ptes(unsigned long size, size_t *pgsize) -{ - int contig_ptes = 0; - - *pgsize = size; - - switch (size) { -#ifndef __PAGETABLE_PMD_FOLDED - case PUD_SIZE: - if (pud_sect_supported()) - contig_ptes = 1; - break; -#endif - case PMD_SIZE: - contig_ptes = 1; - break; - case CONT_PMD_SIZE: - *pgsize = PMD_SIZE; - contig_ptes = CONT_PMDS; - break; - case CONT_PTE_SIZE: - *pgsize = PAGE_SIZE; - contig_ptes = CONT_PTES; - break; - } - - return contig_ptes; -} - -pte_t huge_ptep_get(pte_t *ptep) -{ - int ncontig, i; - size_t pgsize; - pte_t orig_pte = __ptep_get(ptep); - - if (!pte_present(orig_pte) || !pte_cont(orig_pte)) - return orig_pte; - - ncontig = num_contig_ptes(page_size(pte_page(orig_pte)), &pgsize); - for (i = 0; i < ncontig; i++, ptep++) { - pte_t pte = __ptep_get(ptep); - - if (pte_dirty(pte)) - orig_pte = pte_mkdirty(orig_pte); - - if (pte_young(pte)) - orig_pte = pte_mkyoung(orig_pte); - } - return orig_pte; -} - /* * Changing some bits of contiguous entries requires us to follow a * Break-Before-Make approach, breaking the whole contiguous set @@ -243,7 +192,7 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, unsigned long pfn, dpfn; pgprot_t hugeprot; - ncontig = num_contig_ptes(sz, &pgsize); + ncontig = arch_contpte_get_num_contig(ptep, sz, &pgsize); if (!pte_present(pte)) { for (i = 0; i < ncontig; i++, ptep++, addr += pgsize) @@ -390,7 +339,7 @@ void huge_pte_clear(struct mm_struct *mm, unsigned long addr, int i, ncontig; size_t pgsize; - ncontig = num_contig_ptes(sz, &pgsize); + ncontig = arch_contpte_get_num_contig(ptep, sz, &pgsize); for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) __pte_clear(mm, addr, ptep); diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 8a0f403432e8..38d93cf44456 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -19,6 +19,7 @@ config RISCV select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2 select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE select ARCH_HAS_BINFMT_FLAT + select ARCH_HAS_CONTPTE if RISCV_ISA_SVNAPOT select ARCH_HAS_CURRENT_STACK_POINTER select ARCH_HAS_DEBUG_VIRTUAL if MMU select ARCH_HAS_DEBUG_VM_PGTABLE diff --git a/arch/riscv/include/asm/hugetlb.h b/arch/riscv/include/asm/hugetlb.h index 22deb7a2a6ec..f195f611722b 100644 --- a/arch/riscv/include/asm/hugetlb.h +++ b/arch/riscv/include/asm/hugetlb.h @@ -49,7 +49,7 @@ pte_t huge_ptep_get(pte_t *ptep); pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags); #define arch_make_huge_pte arch_make_huge_pte -#endif /*CONFIG_RISCV_ISA_SVNAPOT*/ +#endif /* CONFIG_RISCV_ISA_SVNAPOT */ #include diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 268c828f5152..66061002ff36 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -296,6 +296,7 @@ static inline unsigned long pte_napot(pte_t pte) { return pte_val(pte) & _PAGE_NAPOT; } +#define pte_cont pte_napot #define pte_valid_napot(pte) (pte_present(pte) && pte_napot(pte)) @@ -560,7 +561,7 @@ static inline int arch_contpte_get_num_contig(pte_t *ptep, unsigned long size, } #endif -static inline pte_t ptep_get(pte_t *ptep) +static inline pte_t __ptep_get(pte_t *ptep) { pte_t pte = READ_ONCE(*ptep); @@ -584,7 +585,6 @@ static inline pte_t ptep_get(pte_t *ptep) return pte; } -#define ptep_get ptep_get static inline void set_ptes(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pteval, unsigned int nr) @@ -686,6 +686,8 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma, return ptep_test_and_clear_young(vma, address, ptep); } +#define ptep_get __ptep_get + #define pgprot_nx pgprot_nx static inline pgprot_t pgprot_nx(pgprot_t _prot) { diff --git a/arch/riscv/mm/hugetlbpage.c b/arch/riscv/mm/hugetlbpage.c index f042f5c8bdb7..be129f4f1503 100644 --- a/arch/riscv/mm/hugetlbpage.c +++ b/arch/riscv/mm/hugetlbpage.c @@ -3,30 +3,6 @@ #include #ifdef CONFIG_RISCV_ISA_SVNAPOT -pte_t huge_ptep_get(pte_t *ptep) -{ - unsigned long pte_num; - int i; - pte_t orig_pte = ptep_get(ptep); - - if (!pte_present(orig_pte) || !pte_napot(orig_pte)) - return orig_pte; - - pte_num = napot_pte_num(napot_cont_order(orig_pte)); - - for (i = 0; i < pte_num; i++, ptep++) { - pte_t pte = ptep_get(ptep); - - if (pte_dirty(pte)) - orig_pte = pte_mkdirty(orig_pte); - - if (pte_young(pte)) - orig_pte = pte_mkyoung(orig_pte); - } - - return orig_pte; -} - pte_t *huge_pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, diff --git a/mm/Kconfig b/mm/Kconfig index b1448aa81e15..c325003d6552 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -981,6 +981,9 @@ config ARCH_HAS_CPU_CACHE_ALIASING config ARCH_HAS_CACHE_LINE_SIZE bool +config ARCH_HAS_CONTPTE + bool + config ARCH_HAS_CURRENT_STACK_POINTER bool help diff --git a/mm/Makefile b/mm/Makefile index 4abb40b911ec..605ead58403b 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -89,6 +89,7 @@ obj-$(CONFIG_MIGRATION) += migrate.o obj-$(CONFIG_NUMA) += memory-tiers.o obj-$(CONFIG_DEVICE_MIGRATION) += migrate_device.o obj-$(CONFIG_TRANSPARENT_HUGEPAGE) += huge_memory.o khugepaged.o +obj-$(CONFIG_ARCH_HAS_CONTPTE) += contpte.o obj-$(CONFIG_PAGE_COUNTER) += page_counter.o obj-$(CONFIG_MEMCG) += memcontrol.o vmpressure.o ifdef CONFIG_SWAP diff --git a/mm/contpte.c b/mm/contpte.c new file mode 100644 index 000000000000..e8574051d0b9 --- /dev/null +++ b/mm/contpte.c @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2024 Rivos Inc. + */ + +#include +#include +#include + +/* + * Any arch that wants to use that needs to define: + * - __ptep_get() + * - pte_cont() + * - arch_contpte_get_num_contig() + */ + +/* + * This file implements the following contpte aware API: + * - huge_ptep_get() + */ + +pte_t huge_ptep_get(pte_t *ptep) +{ + int ncontig, i; + size_t pgsize; + pte_t orig_pte = __ptep_get(ptep); + + if (!pte_present(orig_pte) || !pte_cont(orig_pte)) + return orig_pte; + + ncontig = arch_contpte_get_num_contig(ptep, + page_size(pte_page(orig_pte)), + &pgsize); + + for (i = 0; i < ncontig; i++, ptep++) { + pte_t pte = __ptep_get(ptep); + + if (pte_dirty(pte)) + orig_pte = pte_mkdirty(orig_pte); + + if (pte_young(pte)) + orig_pte = pte_mkyoung(orig_pte); + } + return orig_pte; +} -- 2.39.2