From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A5CBB2F99BE for ; Thu, 14 Aug 2025 10:00:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755165602; cv=none; b=b+FfqGUM3nd4gZCbVv3k1c1gzC2MuDrlJmij19MJz0cxo5kwgv6zj5AmknnB5ztxBkiHT25c0TIF2CVxjUPSNkfajXQxpPo7nCrVT04a+mlve0+bbL0QVl1rBedfSiC/LbjaqvfZ52FKr2++pwY3sCilfiBHCH/Szv3zJ+Ta8p4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755165602; c=relaxed/simple; bh=k8pg6zKaAn4KxxOrzXs3mn5BY3v3RGul0MX3FzG6CSw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=ndWNk1fQQC+nIJuCe62BdyUM2vFDbc5Stw0IU9wIFQusc11ReeaNX69AoLRJ7CnLzBARsfPzFZfR8J0KuNP0xxnlU4QqXZtPPL+Q7SqkXju+iCwUd4phb5cn2PehpjSsf15SD48N+S4r/K4QqKdUJ8MfRsc0LO/cSPPit3ZxIEE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ghiti.fr; spf=pass smtp.mailfrom=ghiti.fr; arc=none smtp.client-ip=217.70.183.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ghiti.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ghiti.fr Received: by mail.gandi.net (Postfix) with ESMTPSA id A12FF43379; Thu, 14 Aug 2025 09:59:57 +0000 (UTC) Message-ID: Date: Thu, 14 Aug 2025 11:59:57 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v16 07/13] mm/page_table_check: Reinstate address parameter in [__]page_table_check_pmd_clear() To: Andrew Donnellan , linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, x86@kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, pasha.tatashin@soleen.com, sweettea-kernel@dorminy.me, nicholas@linux.ibm.com, christophe.leroy@csgroup.eu, Rohan McLure , Ingo Molnar References: <20250813062614.51759-1-ajd@linux.ibm.com> <20250813062614.51759-8-ajd@linux.ibm.com> Content-Language: en-US From: Alexandre Ghiti In-Reply-To: <20250813062614.51759-8-ajd@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-GND-State: clean X-GND-Score: -100 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddugedtjeekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefkffggfgfuvfevfhfhjggtgfesthejredttddvjeenucfhrhhomheptehlvgigrghnughrvgcuifhhihhtihcuoegrlhgvgiesghhhihhtihdrfhhrqeenucggtffrrghtthgvrhhnpedthfelfeejgeehveegleejleelgfevhfekieffkeeujeetfedvvefhledvgeegieenucfkphepudelfedrfeefrdehjedrudelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduleefrdeffedrheejrdduleelpdhhvghloheplgduledvrdduieekrddvvddruddtudgnpdhmrghilhhfrhhomheprghlvgigsehghhhithhirdhfrhdpnhgspghrtghpthhtohepudegpdhrtghpthhtoheprghjugeslhhinhhugidrihgsmhdrtghomhdprhgtphhtthhopehlihhnuhigphhptgdquggvvheslhhishhtshdrohiilhgrsghsrdhorhhgpdhrtghpthhtoheplhhinhhugidqmhhmsehkvhgrtghkrdhorhhgpdhrtghpthhtoheprghkphhmsehlihhnuhigqdhfohhunhgurghtihhonhdrohhrghdprhgtphhtthhopeigkeeisehkvghrnhgvlhdrohhrghdprhgtphhtthhopehlihhnuhigqdhrihhstghvsehli hhsthhsrdhinhhfrhgruggvrggurdhorhhgpdhrtghpthhtoheplhhinhhugidqrghrmhdqkhgvrhhnvghlsehlihhsthhsrdhinhhfrhgruggvrggurdhorhhgpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgvrhhnvghlrdhorhhg X-GND-Sasl: alex@ghiti.fr On 8/13/25 08:26, Andrew Donnellan wrote: > From: Rohan McLure > > This reverts commit 1831414cd729 ("mm/page_table_check: remove unused > parameter in [__]page_table_check_pmd_clear"). > > Reinstate previously unused parameters for the purpose of supporting > powerpc platforms, as many do not encode user/kernel ownership of the > page in the pte, but instead in the address of the access. > > [ajd@linux.ibm.com: rebase on arm64 changes] > Signed-off-by: Rohan McLure > Reviewed-by: Pasha Tatashin > Acked-by: Ingo Molnar # x86 > Signed-off-by: Andrew Donnellan > --- > v15: rebase > --- > arch/arm64/include/asm/pgtable.h | 2 +- > arch/riscv/include/asm/pgtable.h | 2 +- > arch/x86/include/asm/pgtable.h | 2 +- > include/linux/page_table_check.h | 11 +++++++---- > include/linux/pgtable.h | 2 +- > mm/page_table_check.c | 5 +++-- > 6 files changed, 14 insertions(+), 10 deletions(-) > > diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h > index 81f06e5e32b2..dfcdf051b114 100644 > --- a/arch/arm64/include/asm/pgtable.h > +++ b/arch/arm64/include/asm/pgtable.h > @@ -1370,7 +1370,7 @@ static inline pte_t __ptep_get_and_clear_anysz(struct mm_struct *mm, > page_table_check_pte_clear(mm, pte); > break; > case PMD_SIZE: > - page_table_check_pmd_clear(mm, pte_pmd(pte)); > + page_table_check_pmd_clear(mm, address, pte_pmd(pte)); > break; > #ifndef __PAGETABLE_PMD_FOLDED > case PUD_SIZE: > diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h > index 2484c0788012..d11fc6333606 100644 > --- a/arch/riscv/include/asm/pgtable.h > +++ b/arch/riscv/include/asm/pgtable.h > @@ -860,7 +860,7 @@ static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, > { > pmd_t pmd = __pmd(atomic_long_xchg((atomic_long_t *)pmdp, 0)); > > - page_table_check_pmd_clear(mm, pmd); > + page_table_check_pmd_clear(mm, address, pmd); > > return pmd; > } > diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h > index 8b45e0c41923..b68bea15f32d 100644 > --- a/arch/x86/include/asm/pgtable.h > +++ b/arch/x86/include/asm/pgtable.h > @@ -1318,7 +1318,7 @@ static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, unsigned long > { > pmd_t pmd = native_pmdp_get_and_clear(pmdp); > > - page_table_check_pmd_clear(mm, pmd); > + page_table_check_pmd_clear(mm, addr, pmd); > > return pmd; > } > diff --git a/include/linux/page_table_check.h b/include/linux/page_table_check.h > index 808cc3a48c28..3973b69ae294 100644 > --- a/include/linux/page_table_check.h > +++ b/include/linux/page_table_check.h > @@ -15,7 +15,8 @@ extern struct page_ext_operations page_table_check_ops; > > void __page_table_check_zero(struct page *page, unsigned int order); > void __page_table_check_pte_clear(struct mm_struct *mm, pte_t pte); > -void __page_table_check_pmd_clear(struct mm_struct *mm, pmd_t pmd); > +void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr, > + pmd_t pmd); > void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr, > pud_t pud); > void __page_table_check_ptes_set(struct mm_struct *mm, unsigned long addr, > @@ -52,12 +53,13 @@ static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte) > __page_table_check_pte_clear(mm, pte); > } > > -static inline void page_table_check_pmd_clear(struct mm_struct *mm, pmd_t pmd) > +static inline void page_table_check_pmd_clear(struct mm_struct *mm, > + unsigned long addr, pmd_t pmd) > { > if (static_branch_likely(&page_table_check_disabled)) > return; > > - __page_table_check_pmd_clear(mm, pmd); > + __page_table_check_pmd_clear(mm, addr, pmd); > } > > static inline void page_table_check_pud_clear(struct mm_struct *mm, > @@ -121,7 +123,8 @@ static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte) > { > } > > -static inline void page_table_check_pmd_clear(struct mm_struct *mm, pmd_t pmd) > +static inline void page_table_check_pmd_clear(struct mm_struct *mm, > + unsigned long addr, pmd_t pmd) > { > } > > diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h > index 28fcff844b63..d97f40f1365d 100644 > --- a/include/linux/pgtable.h > +++ b/include/linux/pgtable.h > @@ -648,7 +648,7 @@ static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, > pmd_t pmd = *pmdp; > > pmd_clear(pmdp); > - page_table_check_pmd_clear(mm, pmd); > + page_table_check_pmd_clear(mm, address, pmd); > > return pmd; > } > diff --git a/mm/page_table_check.c b/mm/page_table_check.c > index bd1242087a35..e8c26b616aed 100644 > --- a/mm/page_table_check.c > +++ b/mm/page_table_check.c > @@ -156,7 +156,8 @@ void __page_table_check_pte_clear(struct mm_struct *mm, pte_t pte) > } > EXPORT_SYMBOL(__page_table_check_pte_clear); > > -void __page_table_check_pmd_clear(struct mm_struct *mm, pmd_t pmd) > +void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr, > + pmd_t pmd) > { > if (&init_mm == mm) > return; > @@ -231,7 +232,7 @@ void __page_table_check_pmds_set(struct mm_struct *mm, unsigned long addr, > page_table_check_pmd_flags(pmd); > > for (i = 0; i < nr; i++) > - __page_table_check_pmd_clear(mm, *(pmdp + i)); > + __page_table_check_pmd_clear(mm, addr + PMD_SIZE * i, *(pmdp + i)); > if (pmd_user_accessible_page(pmd)) > page_table_check_set(pmd_pfn(pmd), stride * nr, pmd_write(pmd)); > } Acked-by: Alexandre Ghiti # riscv Thanks, Alex