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 E66F3C433EF for ; Wed, 2 Feb 2022 06:18:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3AE1E8D00EF; Wed, 2 Feb 2022 01:18:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 35D788D00C9; Wed, 2 Feb 2022 01:18:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 24C4A8D00EF; Wed, 2 Feb 2022 01:18:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0122.hostedemail.com [216.40.44.122]) by kanga.kvack.org (Postfix) with ESMTP id 1663E8D00C9 for ; Wed, 2 Feb 2022 01:18:33 -0500 (EST) Received: from smtpin31.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id B78DD96F31 for ; Wed, 2 Feb 2022 06:18:32 +0000 (UTC) X-FDA: 79096835664.31.707917C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf09.hostedemail.com (Postfix) with ESMTP id 3B76A140004 for ; Wed, 2 Feb 2022 06:18:32 +0000 (UTC) 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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1643780286-18798-1-git-send-email-anshuman.khandual@arm.com> X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 3B76A140004 X-Stat-Signature: j4ie645sicwtoeu64uwmd4159cqf31fk X-Rspam-User: nil Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ss+pnyK4; spf=pass (imf09.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-HE-Tag: 1643782712-362639 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 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.