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 77727CD4F2B for ; Fri, 22 Sep 2023 07:33:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 111D96B026F; Fri, 22 Sep 2023 03:33:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C4086B0279; Fri, 22 Sep 2023 03:33:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ECE126B0294; Fri, 22 Sep 2023 03:33:36 -0400 (EDT) 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 DEFE86B026F for ; Fri, 22 Sep 2023 03:33:36 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A8CB8C0F49 for ; Fri, 22 Sep 2023 07:33:36 +0000 (UTC) X-FDA: 81263418432.14.737460D Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf20.hostedemail.com (Postfix) with ESMTP id 7CFFE1C0018 for ; Fri, 22 Sep 2023 07:33:34 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf20.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695368014; 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=RMYg+WT7PiAfmkDgnckyBG/HbHNAQ98fYUgi0msp9Sc=; b=GycMcO7dmRmCFdadsfkt5tw6sRrIt4BMdJzowflx7fCpUb8M1hBy1k2lhW+U4Uo333PHfV rnmoHI/sJ7JVE31rnQMl4WYehKsaKD+x2l6RBrOrv9wHT1JZSNNb361Zl8kI5Na9TIWFsm pRrSMsP6zFjnHBbcjjQ9XwXmJtiRgo8= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf20.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695368014; a=rsa-sha256; cv=none; b=MOdQIFAvwpDZC4eEZo8RVrRkuixml875TRY2cBR4t0LaQ/rEqmtoRTKkuYHynTKz64bZDv /G3zTolKsRo1PSjvgqZv/sXlu9clOusRkMCSn6nEUWE59ffqCCeGxdLsoQAMmGG0b01+cZ okinvtegOiwAWBXcJD1hSE9tabVOKKQ= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B091CDA7; Fri, 22 Sep 2023 00:34:09 -0700 (PDT) Received: from [10.57.65.11] (unknown [10.57.65.11]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 412E53F5A1; Fri, 22 Sep 2023 00:33:09 -0700 (PDT) Message-ID: <597e7496-ef99-4505-88ee-91701af02835@arm.com> Date: Fri, 22 Sep 2023 08:33:03 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 2/8] powerpc: hugetlb: Convert set_huge_pte_at() to take vma Content-Language: en-GB To: Christophe Leroy , Catalin Marinas , Will Deacon , "James E.J. Bottomley" , Helge Deller , Nicholas Piggin , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , "David S. Miller" , Arnd Bergmann , Mike Kravetz , Muchun Song , SeongJae Park , Andrew Morton , Uladzislau Rezki , Christoph Hellwig , Lorenzo Stoakes , Anshuman Khandual , Peter Xu , Axel Rasmussen , Qi Zheng Cc: "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "linux-parisc@vger.kernel.org" , "linuxppc-dev@lists.ozlabs.org" , "linux-riscv@lists.infradead.org" , "linux-s390@vger.kernel.org" , "sparclinux@vger.kernel.org" , "linux-mm@kvack.org" , "stable@vger.kernel.org" References: <20230921162007.1630149-1-ryan.roberts@arm.com> <20230921162007.1630149-3-ryan.roberts@arm.com> <0f2dd31a-a361-24ba-154d-4e614c0eff73@csgroup.eu> From: Ryan Roberts In-Reply-To: <0f2dd31a-a361-24ba-154d-4e614c0eff73@csgroup.eu> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 7CFFE1C0018 X-Stat-Signature: i9xs4ihrt897whonyb5z18mpas38w6p1 X-HE-Tag: 1695368014-402734 X-HE-Meta: U2FsdGVkX19R3bn2dwFQAISKoOLW7qdDphADQr7awX3G+8sXxy3FJuXtivvgh4yIIsA0QC48cWVdeiWgH/iWqJC8/sMpK4peK4g4pEpSij04ywMSHf1ZfoRSqPRJvgZDotOyVdwGOuA7AO3eAxsCriBCa9CPSIx7RR/ex8mgXsLcbbOMzIV5gcC1LAQQFJZF/pKExS6wsrDhd9XdGKMoutm8YcLbFRArpt7ALEyXYcViUkYudJChiyUcJAuuc+WxhFSTUBmtu6brd0pzZcwC8BC6cbIe7xXB4wutRL4Xan6u0vtZRChU9AgI938DObgb764RzT6nkczJjxQ/l2NfaerrIso9U3d8hYtn7PULZsupzbdm2xMiXqIs4RnBiIkKHT/9r9nkqh7d6Sz0l1TuyMGkvksWzUjvYt7JXqqgT/3zxsFLEWcgjmnIcYj5PmgM0W7QOB+KIjpNn7sYgiKa+y4wTvSwDTSIFi3dwt9D2K8rpFgYMmK1s++cTsneni8yjaHps5sklp1kyM4B6xymshmaBbuX84B2eSS7ANzx6PysXycoMm484ERKWNfGSsxYXyB1YucEPWV79BECKk4wiA0q1Eu6fHvBqtR50I2XbLoYanUqOxbHWf7uRTS/m4kU6G5wnYAtSFu0vJJqarA7+O4cOwNAgFhJzy1ADRROpKXb/6KNVde61TjIRLqpTABj8xaqjTszNjVlqQCYk9In8ahu4QNkj2VViv5OyfB+4vpdDDN4vdJRNbAnK03G/JK9t5Xe6DhwKLxTigop5jiaMatvEf9p57ghYPB55rQzyq+DyGNEdY488atr5lPkGXdIHINcepgz5y+BFWIdN1cV/6VUFPkC0TuF8yow12nx4eJVuBB3Y1Uo9QDvTzTSuX3iB25KewcBDSXQZhDbHAK1gKcFzk9AICxznPeOtRuNHI9ttE446wNcimUqkzAOa25Vvw95E354Ryx+CqRdmQs UDnsedjo hwoLXhh49lwg1kKaN0615/K4BXGDuYt6ZAYjGpiJHAfGQpHVVw8aFITa1sBrfuWl+uJdyQKagdKrVPXvDgvE0jweq106arw+svz+tlHkuSfMEM2z++fek5ljlSgTItESVizZuW5NJhmotKqj/X2j0ZHma9rmWRjIxQ8CsZ+X4Y0Z/0LsIFlbn3cB/3J897uQruOy51r8rode8eNq3hruuRXo+wmKpMlX9h2mdpGhvvV638A/4NAg00EGy6VyDdQv4S2dQjEQHLeyvSdlYpWzTfOFRC7AKwefkaTEHyHqBWA67v1o= 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: On 22/09/2023 07:56, Christophe Leroy wrote: > > > Le 21/09/2023 à 18:20, Ryan Roberts a écrit : >> In order to fix a bug, arm64 needs access to the vma inside it's >> implementation of set_huge_pte_at(). Provide for this by converting the >> mm parameter to be a vma. Any implementations that require the mm can >> access it via vma->vm_mm. >> >> This commit makes the required powerpc modifications. Separate commits >> update the other arches and core code, before the actual bug is fixed in >> arm64. >> >> No behavioral changes intended. >> >> Signed-off-by: Ryan Roberts >> --- >> arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 3 ++- >> arch/powerpc/mm/book3s64/hugetlbpage.c | 2 +- >> arch/powerpc/mm/book3s64/radix_hugetlbpage.c | 2 +- >> arch/powerpc/mm/nohash/8xx.c | 2 +- >> arch/powerpc/mm/pgtable.c | 7 ++++++- >> 5 files changed, 11 insertions(+), 5 deletions(-) >> >> diff --git a/arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h b/arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h >> index de092b04ee1a..fff8cd726bc7 100644 >> --- a/arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h >> +++ b/arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h >> @@ -46,7 +46,8 @@ static inline int check_and_get_huge_psize(int shift) >> } >> >> #define __HAVE_ARCH_HUGE_SET_HUGE_PTE_AT >> -void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte); >> +void set_huge_pte_at(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t pte); >> +void __set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte); > > Don't add the burden of an additional function, see below > >> >> #define __HAVE_ARCH_HUGE_PTE_CLEAR >> static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr, >> diff --git a/arch/powerpc/mm/book3s64/hugetlbpage.c b/arch/powerpc/mm/book3s64/hugetlbpage.c >> index 3bc0eb21b2a0..ae7fd7c90eb8 100644 >> --- a/arch/powerpc/mm/book3s64/hugetlbpage.c >> +++ b/arch/powerpc/mm/book3s64/hugetlbpage.c >> @@ -147,7 +147,7 @@ void huge_ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr >> if (radix_enabled()) >> return radix__huge_ptep_modify_prot_commit(vma, addr, ptep, >> old_pte, pte); >> - set_huge_pte_at(vma->vm_mm, addr, ptep, pte); >> + set_huge_pte_at(vma, addr, ptep, pte); >> } >> >> void __init hugetlbpage_init_defaultsize(void) >> diff --git a/arch/powerpc/mm/book3s64/radix_hugetlbpage.c b/arch/powerpc/mm/book3s64/radix_hugetlbpage.c >> index 17075c78d4bc..7cd40a334c3a 100644 >> --- a/arch/powerpc/mm/book3s64/radix_hugetlbpage.c >> +++ b/arch/powerpc/mm/book3s64/radix_hugetlbpage.c >> @@ -58,5 +58,5 @@ void radix__huge_ptep_modify_prot_commit(struct vm_area_struct *vma, >> atomic_read(&mm->context.copros) > 0) >> radix__flush_hugetlb_page(vma, addr); >> >> - set_huge_pte_at(vma->vm_mm, addr, ptep, pte); >> + set_huge_pte_at(vma, addr, ptep, pte); >> } >> diff --git a/arch/powerpc/mm/nohash/8xx.c b/arch/powerpc/mm/nohash/8xx.c >> index dbbfe897455d..650a7a8496b6 100644 >> --- a/arch/powerpc/mm/nohash/8xx.c >> +++ b/arch/powerpc/mm/nohash/8xx.c >> @@ -91,7 +91,7 @@ static int __ref __early_map_kernel_hugepage(unsigned long va, phys_addr_t pa, >> if (new && WARN_ON(pte_present(*ptep) && pgprot_val(prot))) >> return -EINVAL; >> >> - set_huge_pte_at(&init_mm, va, ptep, pte_mkhuge(pfn_pte(pa >> PAGE_SHIFT, prot))); >> + __set_huge_pte_at(&init_mm, va, ptep, pte_mkhuge(pfn_pte(pa >> PAGE_SHIFT, prot))); > > Call set_huge_pte_at() with a NULL vma instead. I'm happy to take your proposed approach if that's your preference. Another option is to use a dummy VMA, as I have done in the core code, for the one call site that calls set_huge_pte_at() with init_mm: struct vm_area_struct vma = TLB_FLUSH_VMA(&init_mm, 0); This is an existing macro that creates a dummy vma with vma->vm_mm filled in. Then I pass &vma to the function. Or yet another option would be to keep the mm param as is in set_huge_pte_at(), and add a size param to the function. But then all call sites have the burden of figuring out the size of the huge pte (although I think most know already). Thanks, Ryan > >> >> return 0; >> } >> diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c >> index 3f86fd217690..9cbcb561a4d8 100644 >> --- a/arch/powerpc/mm/pgtable.c >> +++ b/arch/powerpc/mm/pgtable.c >> @@ -288,7 +288,7 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, >> } >> >> #if defined(CONFIG_PPC_8xx) >> -void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte) >> +void __set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte) > > Keep it as set_huge_pte_at() with vma argument. > >> { >> pmd_t *pmd = pmd_off(mm, addr); > > Change to: > > pmd_t *pmd = vma ? pmd_off(vma->vm_mm, addr) : pmd_off_k(addr); > >> pte_basic_t val; >> @@ -310,6 +310,11 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_ >> for (i = 0; i < num; i++, entry++, val += SZ_4K) >> *entry = val; >> } >> + >> +void set_huge_pte_at(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t pte) >> +{ >> + __set_huge_pte_at(vma->vm_mm, addr, ptep, pte); >> +} > > Remove this burden. > >> #endif >> #endif /* CONFIG_HUGETLB_PAGE */ >> > > > Christophe