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 CFFBDC64ED6 for ; Wed, 1 Mar 2023 08:32:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 37FD66B0073; Wed, 1 Mar 2023 03:32:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 32E186B0074; Wed, 1 Mar 2023 03:32:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F5796B0075; Wed, 1 Mar 2023 03:32:56 -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 0F6946B0073 for ; Wed, 1 Mar 2023 03:32:56 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9C2D7ABD30 for ; Wed, 1 Mar 2023 08:32:55 +0000 (UTC) X-FDA: 80519663910.06.877C573 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf15.hostedemail.com (Postfix) with ESMTP id 63B6CA0002 for ; Wed, 1 Mar 2023 08:32:53 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf15.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677659573; 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=83iSo+/ApV/R7ztVFbfpP60njwbXCFycTtTdwj57jXU=; b=ZOgPPm4PLD6F5pEHgkb+JLrudofCdOa19K5NsVfcCe5G1Dj4rhNbAlYcFEmmUUHZbvI/Q8 g4yUeqx5HJrngMtQRxVFCPSEGsDz27DegNKXXkhpixhZXvaQZiz3z6Av26TzrcqrPmrNaD WiVatkMKZajfCzSUgagBjW5k5YrHR1o= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf15.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677659573; a=rsa-sha256; cv=none; b=EykImOZVQ3/XowAxIGlHFcgH5z6cKyZqQd/d1gz0P/E6IHt/LIw83JkNdpr5vUvln6Q2qJ BxsuaIga3WN5rn2GqslrXey0J/AkJkxHSTc5mfDet/PozzMnVll4uD0iNyutsdFi5NKh9B A21AdZNuJDJNF2Bm5FAN5wF8KF99BtA= 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 7A9F72F4; Wed, 1 Mar 2023 00:33:35 -0800 (PST) Received: from [10.162.41.9] (unknown [10.162.41.9]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 71C0F3F99C; Wed, 1 Mar 2023 00:32:48 -0800 (PST) Message-ID: <10b92874-222a-6f4d-2542-092c5a5e72db@arm.com> Date: Wed, 1 Mar 2023 14:02:45 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: Re: [PATCH V2] mm: Merge pte_mkhuge() call into arch_make_huge_pte() Content-Language: en-US To: Christophe Leroy , "linux-mm@kvack.org" Cc: Catalin Marinas , Will Deacon , Michael Ellerman , Paul Mackerras , "David S. Miller" , Mike Kravetz , Andrew Morton , "linux-arm-kernel@lists.infradead.org" , "linuxppc-dev@lists.ozlabs.org" , "sparclinux@vger.kernel.org" , "linux-kernel@vger.kernel.org" References: <1643860669-26307-1-git-send-email-anshuman.khandual@arm.com> <1ea45095-0926-a56a-a273-816709e9075e@csgroup.eu> From: Anshuman Khandual In-Reply-To: <1ea45095-0926-a56a-a273-816709e9075e@csgroup.eu> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 63B6CA0002 X-Stat-Signature: 3gc57q7qaci6kfn34ypja53ckuruxq7p X-HE-Tag: 1677659573-15423 X-HE-Meta: U2FsdGVkX18HzhTnXybiKFIyB8RPBB32mAzr79GAN8OX/kVsi0x/BXss5vn8YZgcycZ6CAwHH/cuW1Z6ZhZOY/qgNmusd6FRS7km730NkhboUd5Eg0Q6k7n3iFuwBFcAZ9oyq2E9JI8PIAdadPNSXpc/PTcpaGpIzGCp/ceFBIPxyo/uD/qoWfH/G73brckeIXmROTgEx83cBNpTi9wrg+xI8eoazUJqij6OA+3vLJ+s9W/1H9ssUq7XMB5CVFsi1jpPsV4hHug/vcaUjlTn4E3k+RpwDA+PuChgwaBX9/yjhYU4XWGoGtERUAzKRZyUAK59d0t07QXKgH2pxPbmVUUxcq5UsiLMR/2aYhIkb42b7P85DDiOl7CbaNb8jP78g3SWyk7uDICjm/j18t3h050lwT8XNqKuL2V8729hT2bj20iePNpDP2uean4qlIMSsXqZYSG2BtcGJyi4UrMX75MsNJd8g0zU7BTCAUNh+kgROTw2Ahik909kYB9icBEZd/8v2gOBIAwL9df3cBYOa12lTxgkiU7t9KbagaaBxumuqSk89M8QoArRxjGHyLA+9JWy0pwpPuZeNS0+Lur9a4TjZBhHv7uNbZZCoxHLgMSN3Skqq9GSKKii5gpZPOKvFYnRjokgeqdresWBAB/SiziEFvrdelOonGO5D2lJLpYJ3hWcM1iO+U3nKkItk0KhgKTZEzpgEeiOatVRWUYDfY54t6/O5lqLBL/vDnKM38fodSk4Mv03cbwwY9Lwv1P6/4SzRytpOuAQv6010Oquy27ohLKq310uh2lhAv72lu7g+nmyT9dHX2KCCn99QtUI0B1NO57zh7t1pfJrRGRQnkc8BTdwUsfmjODELFaJIQLABk8HtQdO0Bi+d1rtfsydwVorWMscYbO774Ty12Hbv88Lss4ZaPn6iTJh2O1/8D4aM56+Qvimb9AuRzuc5NgZBuyuzEKd+En1GfQHBmJ JuQcis5O pKVZ/IyYZaRtgpUfMxVU3L5vDhT8Lz+MqfygTEndxRoLzfWzt7uj3auSUzM7BHxGCJVpGPklgv9Y369uCFBjWqZLq+lRyiPNrV95OVI0OnfnDbQ5O75pEx5FTbX8TOkpA1hX0ZPGh7ascry+3xWX7O3ktt7nJyyrI/jOCHE0BaZwfTf7zTFH6nN8Kg4IjJL6QGLHRyZ23i2uVfZOzjuuZ4S30dj8fXfnyVxpaqH4RIjBTZr7A1pjnUGi72GN14y+JH0NwtbxChzj0j9u98qkMlNn6gbYVcjS3d2gY2EBLHue5/VrIvbOSAJVeCvpQgaiCYqc2NeqifMy0W89RJ8RYUG15ZKANmQ+rydXm8XvNalEycPqml9j3bPGxLnmizF+S9kFjwIbC3l/n7BzlOBKl3a43hGXgW/sXPCr1YxA6zWUMZxVlfeyilrxftjZPBaG9L5y2TB5SsSRpTVYOnv0ZRdHDA8j/+OI4abAZSsL2qRiE7XDO6QQdtNQIYe+S4hDXfEY0EtDfqhwQhd9bErZjKN4uex9S8UTvLCkgOeAYib+VhP7Kf4SrdnaIJKPeo6m998IBgOPrVF5737T0B/7VTpKEdfCFRQSGawdCMspJSatEVoY4vdjrxKZlE4mOrB1vv2kE6ABP/S6uMPzHTPORCUDJgKou0p5rZAkxPrOuLiyOlLHEVAlGMlxajIYG8UVRKC1FasWEIJBLuzugO7m+7EP9v/wR0KSHOaVN6yMCe8+gLg9HIdkAFCY/W/VzVUa4pWBlSe5oxeFkb3I= 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 3/1/23 12:26, Christophe Leroy wrote: > Hi, > > Le 03/02/2022 à 04:57, Anshuman Khandual a écrit : >> Each call into pte_mkhuge() is invariably followed by arch_make_huge_pte(). >> Instead arch_make_huge_pte() can accommodate pte_mkhuge() at the beginning. >> This updates generic fallback stub for arch_make_huge_pte() and available >> platforms definitions. This makes huge pte creation much cleaner and easier >> to follow. > > I can't remember, what was the reason for not doing it in > remove_migration_pte() as well ? > Looking at it, I have the feeling that we now have a redundant > pte_mkhuge() there. I guess it just got missed out, but you are right, there seems to be a redundant pte_mkhuge() in remove_migration_pte(), I will send out a patch dropping it off. > > Also, could we get rid of the one in mm/debug_vm_pgtable.c ? After this patch, arch_make_huge_pte() should be used instead in generic MM for all cases. So you are suggesting arch_make_huge_pte() should be tested instead ? diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c index c631ade3f1d2..15ee86034ddc 100644 --- a/mm/debug_vm_pgtable.c +++ b/mm/debug_vm_pgtable.c @@ -909,7 +909,7 @@ static void __init hugetlb_basic_tests(struct pgtable_debug_args *args) #ifdef CONFIG_ARCH_WANT_GENERAL_HUGETLB pte = pfn_pte(args->fixed_pmd_pfn, args->page_prot); - WARN_ON(!pte_huge(pte_mkhuge(pte))); + WARN_ON(!pte_huge(arch_make_huge_pte(pte))); #endif /* CONFIG_ARCH_WANT_GENERAL_HUGETLB */ } #else /* !CONFIG_HUGETLB_PAGE */ > > Also, shouldn't arch_make_huge_pte() be documented in > Documentation/vm/arch_pgtable_helpers.rst instead of pte_mkhuge() ? diff --git a/Documentation/mm/arch_pgtable_helpers.rst b/Documentation/mm/arch_pgtable_helpers.rst index fd2a19df884e..07a0618f84de 100644 --- a/Documentation/mm/arch_pgtable_helpers.rst +++ b/Documentation/mm/arch_pgtable_helpers.rst @@ -216,7 +216,7 @@ HugeTLB Page Table Helpers +---------------------------+--------------------------------------------------+ | pte_huge | Tests a HugeTLB | +---------------------------+--------------------------------------------------+ -| pte_mkhuge | Creates a HugeTLB | +| arch_make_huge_pte | Creates a HugeTLB | +---------------------------+--------------------------------------------------+ | huge_pte_dirty | Tests a dirty HugeTLB | +---------------------------+--------------------------------------------------+ I will send out a patch implementing the above changes. I guess pte_mkhuge() now will just be a platform helper, which can be folded into arch_make_huge_pte() if and when required. - Anshuman > > Christophe > >> >> Cc: Catalin Marinas >> Cc: Will Deacon >> Cc: Michael Ellerman >> Cc: Paul Mackerras >> Cc: "David S. Miller" >> Cc: Mike Kravetz >> Cc: Andrew Morton >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: linuxppc-dev@lists.ozlabs.org >> Cc: sparclinux@vger.kernel.org >> Cc: linux-mm@kvack.org >> Cc: linux-kernel@vger.kernel.org >> Reviewed-by: Christophe Leroy >> Acked-by: Mike Kravetz >> Signed-off-by: Anshuman Khandual >> --- >> This applies on v5.17-rc2 >> >> Changes in V2: >> >> - Direct PTE encode in arch_make_huge_pte() on powerpc platform per Christophe >> >> Changes in V1: >> >> https://lore.kernel.org/all/1643780286-18798-1-git-send-email-anshuman.khandual@arm.com/ >> >> arch/arm64/mm/hugetlbpage.c | 1 + >> arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 4 ++-- >> arch/sparc/mm/hugetlbpage.c | 1 + >> include/linux/hugetlb.h | 2 +- >> mm/hugetlb.c | 3 +-- >> mm/vmalloc.c | 1 - >> 6 files changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c >> index ffb9c229610a..228226c5fa80 100644 >> --- a/arch/arm64/mm/hugetlbpage.c >> +++ b/arch/arm64/mm/hugetlbpage.c >> @@ -347,6 +347,7 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags) >> { >> size_t pagesize = 1UL << shift; >> >> + entry = pte_mkhuge(entry); >> if (pagesize == CONT_PTE_SIZE) { >> entry = pte_mkcont(entry); >> } else if (pagesize == CONT_PMD_SIZE) { >> diff --git a/arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h b/arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h >> index 64b6c608eca4..de092b04ee1a 100644 >> --- a/arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h >> +++ b/arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h >> @@ -71,9 +71,9 @@ static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags >> size_t size = 1UL << shift; >> >> if (size == SZ_16K) >> - return __pte(pte_val(entry) & ~_PAGE_HUGE); >> + return __pte(pte_val(entry) | _PAGE_SPS); >> else >> - return entry; >> + return __pte(pte_val(entry) | _PAGE_SPS | _PAGE_HUGE); >> } >> #define arch_make_huge_pte arch_make_huge_pte >> #endif >> diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c >> index 0f49fada2093..d8e0e3c7038d 100644 >> --- a/arch/sparc/mm/hugetlbpage.c >> +++ b/arch/sparc/mm/hugetlbpage.c >> @@ -181,6 +181,7 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags) >> { >> pte_t pte; >> >> + entry = pte_mkhuge(entry); >> pte = hugepage_shift_to_tte(entry, shift); >> >> #ifdef CONFIG_SPARC64 >> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h >> index d1897a69c540..52c462390aee 100644 >> --- a/include/linux/hugetlb.h >> +++ b/include/linux/hugetlb.h >> @@ -754,7 +754,7 @@ static inline void arch_clear_hugepage_flags(struct page *page) { } >> static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, >> vm_flags_t flags) >> { >> - return entry; >> + return pte_mkhuge(entry); >> } >> #endif >> >> diff --git a/mm/hugetlb.c b/mm/hugetlb.c >> index 61895cc01d09..5ca253c1b4e4 100644 >> --- a/mm/hugetlb.c >> +++ b/mm/hugetlb.c >> @@ -4637,7 +4637,6 @@ static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page, >> vma->vm_page_prot)); >> } >> entry = pte_mkyoung(entry); >> - entry = pte_mkhuge(entry); >> entry = arch_make_huge_pte(entry, shift, vma->vm_flags); >> >> return entry; >> @@ -6172,7 +6171,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, >> unsigned int shift = huge_page_shift(hstate_vma(vma)); >> >> old_pte = huge_ptep_modify_prot_start(vma, address, ptep); >> - pte = pte_mkhuge(huge_pte_modify(old_pte, newprot)); >> + pte = huge_pte_modify(old_pte, newprot); >> pte = arch_make_huge_pte(pte, shift, vma->vm_flags); >> huge_ptep_modify_prot_commit(vma, address, ptep, old_pte, pte); >> pages++; >> diff --git a/mm/vmalloc.c b/mm/vmalloc.c >> index 4165304d3547..d0b14dd73adc 100644 >> --- a/mm/vmalloc.c >> +++ b/mm/vmalloc.c >> @@ -118,7 +118,6 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, >> if (size != PAGE_SIZE) { >> pte_t entry = pfn_pte(pfn, prot); >> >> - entry = pte_mkhuge(entry); >> entry = arch_make_huge_pte(entry, ilog2(size), 0); >> set_huge_pte_at(&init_mm, addr, pte, entry); >> pfn += PFN_DOWN(size);