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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F60DC433F5 for ; Wed, 2 Feb 2022 06:52:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244809AbiBBGwl (ORCPT ); Wed, 2 Feb 2022 01:52:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234589AbiBBGwh (ORCPT ); Wed, 2 Feb 2022 01:52:37 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 928A8C06175D; Tue, 1 Feb 2022 22:18:33 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2554AB820B3; Wed, 2 Feb 2022 06:18:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 469CBC004E1; Wed, 2 Feb 2022 06:18:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643782710; bh=fyAh/Tr2vBYttRq/UCJ3W5krrQh0GFSRmsyVq06/+GE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ss+pnyK4k44OeYCpVJ06NQqNBMvi2TOZjv3jly77ZFHvQ7ye5c4RvZ+8/1d3rLWPU 1x7reSL74jYawegH+02waosLcgTaYqBQEfTkL6Z3t4eVBlmzKukcJEPGENb0AmJEAK iHc6KJ9gXQlvUEWk3PzYesdmUMcEKg+BAnW1P8bv2nFOwHK4v0tjP6BvjZnV8Xd2je mvSxOkRksMS4NG7HS2NkAgy5rWZDgj6VQjERSUnKecTaumH9zQczBCeMsexit0CPo7 OCYetr9Iko+LAUJTMo5C/mHq6NPh+mCCAKd7EmqO0Q9A8fw5/9WLiP68SA4QuJFOiY gW4gQp3irsFgA== Date: Wed, 2 Feb 2022 08:18:21 +0200 From: Mike Rapoport To: Anshuman Khandual Cc: linux-mm@kvack.org, 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 Subject: Re: [PATCH] mm: Merge pte_mkhuge() call into arch_make_huge_pte() Message-ID: References: <1643780286-18798-1-git-send-email-anshuman.khandual@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1643780286-18798-1-git-send-email-anshuman.khandual@arm.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Feb 02, 2022 at 11:08:06AM +0530, Anshuman Khandual wrote: > 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. Won't it break architectures that don't define arch_make_huge_pte()? > 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 > Signed-off-by: Anshuman Khandual > --- > arch/arm64/mm/hugetlbpage.c | 1 + > arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 1 + > arch/sparc/mm/hugetlbpage.c | 1 + > include/linux/hugetlb.h | 2 +- > mm/hugetlb.c | 3 +-- > mm/vmalloc.c | 1 - > 6 files changed, 5 insertions(+), 4 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..e41e095158c7 100644 > --- a/arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h > +++ b/arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h > @@ -70,6 +70,7 @@ static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags > { > size_t size = 1UL << shift; > > + entry = pte_mkhuge(entry); > if (size == SZ_16K) > return __pte(pte_val(entry) & ~_PAGE_HUGE); > else > 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); > -- > 2.25.1 > > -- Sincerely yours, Mike. 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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CCE20C433F5 for ; Wed, 2 Feb 2022 06:19:13 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4JpWpm0kC2z3bcp for ; Wed, 2 Feb 2022 17:19:12 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=ss+pnyK4; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2604:1380:4641:c500::1; helo=dfw.source.kernel.org; envelope-from=rppt@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=ss+pnyK4; dkim-atps=neutral Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4JpWp22M90z2yJv for ; Wed, 2 Feb 2022 17:18:34 +1100 (AEDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6A70961731; Wed, 2 Feb 2022 06:18:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 469CBC004E1; Wed, 2 Feb 2022 06:18:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643782710; bh=fyAh/Tr2vBYttRq/UCJ3W5krrQh0GFSRmsyVq06/+GE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ss+pnyK4k44OeYCpVJ06NQqNBMvi2TOZjv3jly77ZFHvQ7ye5c4RvZ+8/1d3rLWPU 1x7reSL74jYawegH+02waosLcgTaYqBQEfTkL6Z3t4eVBlmzKukcJEPGENb0AmJEAK iHc6KJ9gXQlvUEWk3PzYesdmUMcEKg+BAnW1P8bv2nFOwHK4v0tjP6BvjZnV8Xd2je mvSxOkRksMS4NG7HS2NkAgy5rWZDgj6VQjERSUnKecTaumH9zQczBCeMsexit0CPo7 OCYetr9Iko+LAUJTMo5C/mHq6NPh+mCCAKd7EmqO0Q9A8fw5/9WLiP68SA4QuJFOiY gW4gQp3irsFgA== Date: Wed, 2 Feb 2022 08:18:21 +0200 From: Mike Rapoport To: Anshuman Khandual Subject: Re: [PATCH] mm: Merge pte_mkhuge() call into arch_make_huge_pte() Message-ID: References: <1643780286-18798-1-git-send-email-anshuman.khandual@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1643780286-18798-1-git-send-email-anshuman.khandual@arm.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Paul Mackerras , Catalin Marinas , sparclinux@vger.kernel.org, Andrew Morton , Will Deacon , "David S. Miller" , linux-arm-kernel@lists.infradead.org, Mike Kravetz Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Wed, Feb 02, 2022 at 11:08:06AM +0530, Anshuman Khandual wrote: > 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. Won't it break architectures that don't define arch_make_huge_pte()? > 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 > Signed-off-by: Anshuman Khandual > --- > arch/arm64/mm/hugetlbpage.c | 1 + > arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 1 + > arch/sparc/mm/hugetlbpage.c | 1 + > include/linux/hugetlb.h | 2 +- > mm/hugetlb.c | 3 +-- > mm/vmalloc.c | 1 - > 6 files changed, 5 insertions(+), 4 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..e41e095158c7 100644 > --- a/arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h > +++ b/arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h > @@ -70,6 +70,7 @@ static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags > { > size_t size = 1UL << shift; > > + entry = pte_mkhuge(entry); > if (size == SZ_16K) > return __pte(pte_val(entry) & ~_PAGE_HUGE); > else > 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); > -- > 2.25.1 > > -- Sincerely yours, Mike. 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 025DDC433EF for ; Wed, 2 Feb 2022 06:19:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EkPJF1Yd8lpIpqsSpye8bma/806IW6FL0zCfrXI5m/U=; b=KIVw6kHzGX43+i t1ToeqDxF8UNCkTzMWkesG0LCu2rCdeGyfD3b87WpIvIWXOdGiAJ+aSbITQzxKkerX6yiKYkS5SD8 0Mq1BZ78SRRZcH/u++3kl723zrN75pP5aKVPsaVFpS3tkgnmzEVM1Obz/Fes00vhmSRoWzVgRz1Dh 72QDVklxaX6dYZ47xIyzoTwAmbA9UJ8lWAKucltsP/kKQn/7ISnHmspUUO1/0byFS1hhc4g26wlO+ 4+CzrTmN6S6tkI+shuuNsrSPeJ4PRXSYs25xfkbAww8fRHXUl6uNI5zLrqzkd9BAlMZCC9Ro8gI+w InXyi7JzHpjYU3oyg8JQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nF8yT-00EHdN-2m; Wed, 02 Feb 2022 06:18:37 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nF8yN-00EHcb-Uy for linux-arm-kernel@lists.infradead.org; Wed, 02 Feb 2022 06:18:34 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6A70961731; Wed, 2 Feb 2022 06:18:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 469CBC004E1; Wed, 2 Feb 2022 06:18:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643782710; bh=fyAh/Tr2vBYttRq/UCJ3W5krrQh0GFSRmsyVq06/+GE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ss+pnyK4k44OeYCpVJ06NQqNBMvi2TOZjv3jly77ZFHvQ7ye5c4RvZ+8/1d3rLWPU 1x7reSL74jYawegH+02waosLcgTaYqBQEfTkL6Z3t4eVBlmzKukcJEPGENb0AmJEAK iHc6KJ9gXQlvUEWk3PzYesdmUMcEKg+BAnW1P8bv2nFOwHK4v0tjP6BvjZnV8Xd2je mvSxOkRksMS4NG7HS2NkAgy5rWZDgj6VQjERSUnKecTaumH9zQczBCeMsexit0CPo7 OCYetr9Iko+LAUJTMo5C/mHq6NPh+mCCAKd7EmqO0Q9A8fw5/9WLiP68SA4QuJFOiY gW4gQp3irsFgA== Date: Wed, 2 Feb 2022 08:18:21 +0200 From: Mike Rapoport To: Anshuman Khandual Cc: linux-mm@kvack.org, 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 Subject: Re: [PATCH] mm: Merge pte_mkhuge() call into arch_make_huge_pte() Message-ID: References: <1643780286-18798-1-git-send-email-anshuman.khandual@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1643780286-18798-1-git-send-email-anshuman.khandual@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220201_221832_129735_539F2968 X-CRM114-Status: GOOD ( 23.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Feb 02, 2022 at 11:08:06AM +0530, Anshuman Khandual wrote: > 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. Won't it break architectures that don't define arch_make_huge_pte()? > 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 > Signed-off-by: Anshuman Khandual > --- > arch/arm64/mm/hugetlbpage.c | 1 + > arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 1 + > arch/sparc/mm/hugetlbpage.c | 1 + > include/linux/hugetlb.h | 2 +- > mm/hugetlb.c | 3 +-- > mm/vmalloc.c | 1 - > 6 files changed, 5 insertions(+), 4 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..e41e095158c7 100644 > --- a/arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h > +++ b/arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h > @@ -70,6 +70,7 @@ static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags > { > size_t size = 1UL << shift; > > + entry = pte_mkhuge(entry); > if (size == SZ_16K) > return __pte(pte_val(entry) & ~_PAGE_HUGE); > else > 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); > -- > 2.25.1 > > -- Sincerely yours, Mike. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel