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 01956C47073 for ; Thu, 4 Jan 2024 10:55:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A6136B03B5; Thu, 4 Jan 2024 05:55:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 755F66B03B6; Thu, 4 Jan 2024 05:55:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 61CF46B03B7; Thu, 4 Jan 2024 05:55:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 4CCAD6B03B5 for ; Thu, 4 Jan 2024 05:55:47 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 11D6FA03C7 for ; Thu, 4 Jan 2024 10:55:47 +0000 (UTC) X-FDA: 81641323134.21.B5A532B Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by imf30.hostedemail.com (Postfix) with ESMTP id 4E4B18000C for ; Thu, 4 Jan 2024 10:55:45 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of alex@ghiti.fr designates 217.70.183.196 as permitted sender) smtp.mailfrom=alex@ghiti.fr; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704365745; a=rsa-sha256; cv=none; b=oVWtjC0u6n1NUMKNIvhtnPhpM8/j6Nfr5sN9WZ6n9i3kcFy0YAqSKWzY+zJqp9CAbjO/2v wsI9l4UzV6k4R1ON6lL71C9QVS/fR/ITcxqNhTseuV0EBhXpbMKYJgX/+CbO0jIFagNZCK /wUzAt68PXmVuP5e3SF1d/DeoX/5jEQ= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of alex@ghiti.fr designates 217.70.183.196 as permitted sender) smtp.mailfrom=alex@ghiti.fr; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704365745; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=diabq4qd4Kt1vJAgcVi3NYsIIq3v5mEq/My81edjZAk=; b=YKX473T5qmQiRC5TtMJsJqybqr5/Vxfm1WXtE9P5BH+PnTO+pJ5BHkxmVkEAsS4ky8z0B3 pIIwa2qYA6ogeZo6aMlOcAUwJLZajr8/tUTG3J1xyr2BZn2rPKrHnV4oUv7W+65VhH+i4c 4zkWg9UoZ8WFGUk3JAfD+RDLlGMVtMM= Received: by mail.gandi.net (Postfix) with ESMTPSA id 6766EE0005; Thu, 4 Jan 2024 10:55:40 +0000 (UTC) Message-ID: <36166acf-aa32-40b6-806a-ade59bc645ad@ghiti.fr> Date: Thu, 4 Jan 2024 11:55:40 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/4] riscv: tlb: fix __p*d_free_tlb() Content-Language: en-US To: Jisheng Zhang , Paul Walmsley , Palmer Dabbelt , Albert Ou , Will Deacon , "Aneesh Kumar K . V" , Andrew Morton , Nick Piggin , Peter Zijlstra , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org References: <20231219175046.2496-1-jszhang@kernel.org> <20231219175046.2496-2-jszhang@kernel.org> From: Alexandre Ghiti In-Reply-To: <20231219175046.2496-2-jszhang@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-GND-Sasl: alex@ghiti.fr X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 4E4B18000C X-Stat-Signature: n5bgg5fsac4s9naoqt5nyjrf4554nyi1 X-HE-Tag: 1704365745-240496 X-HE-Meta: U2FsdGVkX1+xSt94t40noy0mmRqIvOa6q2e0m9PrYrxQFnlxi9T1yX41uISO6r9nA+FTqcQ+poo/mFW3QJp4eiNI7LgDmqYhiJQpUYJtAeiXbJgHzTLCJ0TzPajDMq6vcK+cFGSqfDb4QLGcCXChD1i812FqiHpgMVBrn6ezEnxFleVsI/xOPaKB3Xzw60CdKbFDw33geO09svlmAeHg4cGZQwq4c7j42xb8rFvMO/zoxhtDYFDlE3Pbr8jR7xvAewNvD831FcIladYWSSMEdFXU/uyrtuRVbuokLsI5gvAWAPrT6B6klGHeSlxIkd+EVvGDTEIDYDqXaH1A9KMB+BT35jA+NIIc8EleZi6EdyVRyAHzZNlIg366uH3haKFwmB01QTy4o50qiqBEkuGhQayNPw9b0d0IYx3UMtRtFWYunNfgeBddugV4uvrK3hCJwhaG6jNAbBryX6d9N129E5lSRpFEY6zlw8HivoIkY+YNNXD7Ki+gWboCSppPfvhJ9QbRr8Wjjdq9hAj54+1P98lUINkwGe1zSY2WL2l+/3kRMydJInBDUjrRc8r6pZagjy9YzUamgls9N/XKpRXQiWTohXxOrJRqhSUcYzle0LF1j6R7aqKbSZmkblZFzB/x7mppbeP4xzr9qlSqAmKm42PCQIKitCkJthKeRH8g9yE8LyhM5QMzxRNFb8CG5hl7xHVjLGfJTrHHXyEq7Ycg1F8zLdiCyyJCP3VqxK08Il2tD7ETTAiloB6e1pv1RTZrcUs/RZg7pzHoga5nlD4FuK1X4U9xvSdJU/63eMrVv52FWiH/+iRzAfyGOPJQ9N5Uw0siaepgkJc/N/XQORETeBohpUyMm3xib96C+4eK4s2sBcS8QaTOIKmJM3I1BjFWxe33xWfksdPc5opKMjcNf9GsjZYnJFssfx6sL4d2PJns99EbPc5OPOEWjFNs/IKmzm/8hmjqonWe97atj8T h3ACkNeX qdK9sLMfW1tdpPFSTADtB01WHZd+7sHzfSpz57V5FeOj0ri9VerxkzyLWqa1qhVX+G0hnCcLCJqkvsk2rNSSJBoXuret65FQZyn8ib+VYZ3AhI0jKdWV1iUOqMqNh28pYCFpRr962c/35SA9pLToMDqvm7slc+ULZ+8ih5czpvLXocGodq6Me5kah6iyHKwC1qgan 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: On 19/12/2023 18:50, Jisheng Zhang wrote: > If non-leaf PTEs I.E pmd, pud or p4d is modified, a sfence.vma is > a must for safe, imagine if an implementation caches the non-leaf > translation in TLB, although I didn't meet this HW so far, but it's > possible in theory. And since this is a fix, it would be worth trying to add a Fixes tag here. Not easy I agree because it fixes several commits (I have 07037db5d479f,  e8a62cc26ddf5, d10efa21a9374 and c5e9b2c2ae822 if you implement tlb_flush() as I suggested). So I would add the latest commit as the Fixes commit (which would be c5e9b2c2ae822), and then I'd send a patch to stable for each commit with the right Fixes tag...@Conor: let me know if you have a simpler idea or if this is wrong. Thanks, Alex > Signed-off-by: Jisheng Zhang > --- > arch/riscv/include/asm/pgalloc.h | 20 +++++++++++++++++--- > 1 file changed, 17 insertions(+), 3 deletions(-) > > diff --git a/arch/riscv/include/asm/pgalloc.h b/arch/riscv/include/asm/pgalloc.h > index d169a4f41a2e..a12fb83fa1f5 100644 > --- a/arch/riscv/include/asm/pgalloc.h > +++ b/arch/riscv/include/asm/pgalloc.h > @@ -95,7 +95,13 @@ static inline void pud_free(struct mm_struct *mm, pud_t *pud) > __pud_free(mm, pud); > } > > -#define __pud_free_tlb(tlb, pud, addr) pud_free((tlb)->mm, pud) > +#define __pud_free_tlb(tlb, pud, addr) \ > +do { \ > + if (pgtable_l4_enabled) { \ > + pagetable_pud_dtor(virt_to_ptdesc(pud)); \ > + tlb_remove_page_ptdesc((tlb), virt_to_ptdesc(pud)); \ > + } \ > +} while (0) > > #define p4d_alloc_one p4d_alloc_one > static inline p4d_t *p4d_alloc_one(struct mm_struct *mm, unsigned long addr) > @@ -124,7 +130,11 @@ static inline void p4d_free(struct mm_struct *mm, p4d_t *p4d) > __p4d_free(mm, p4d); > } > > -#define __p4d_free_tlb(tlb, p4d, addr) p4d_free((tlb)->mm, p4d) > +#define __p4d_free_tlb(tlb, p4d, addr) \ > +do { \ > + if (pgtable_l5_enabled) \ > + tlb_remove_page_ptdesc((tlb), virt_to_ptdesc(p4d)); \ > +} while (0) > #endif /* __PAGETABLE_PMD_FOLDED */ > > static inline void sync_kernel_mappings(pgd_t *pgd) > @@ -149,7 +159,11 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) > > #ifndef __PAGETABLE_PMD_FOLDED > > -#define __pmd_free_tlb(tlb, pmd, addr) pmd_free((tlb)->mm, pmd) > +#define __pmd_free_tlb(tlb, pmd, addr) \ > +do { \ > + pagetable_pmd_dtor(virt_to_ptdesc(pmd)); \ > + tlb_remove_page_ptdesc((tlb), virt_to_ptdesc(pmd)); \ > +} while (0) > > #endif /* __PAGETABLE_PMD_FOLDED */ >