From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 592933A254B for ; Tue, 18 Aug 2026 15:53:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787068397; cv=none; b=GdtgOU+5DUjD99eJAF9+qlZIH3VV6JF/xibraeVwJUFGLm7N4pS0xLs8ZVdNZqt1LN2tWwNSaDuv+23KrBYXVF3DcdDQBknlaTPtiLD5+KO/qulddwI73tyMNN9nUfudO1EQug9NpWm4szdsYdbxiB551WjNYuUvE9gnOqjRR9E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787068397; c=relaxed/simple; bh=n5Pn/EgrqrIEFc5DK4mgxFWT/9EScWqa5GcuyDfAyeo=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Xq55FdT69wM3SWae9H73t927fmXPEnYJuoJEAzvb1xhF+mgJoriC0ouvMTrhXhsKEWDlqsF3CK6Bv4vQblZDdzWBjgbA8m93M1+ZGzw6Dw1KuCIRJPF0cP8KbkhUFSZ3HRw4PsCR1NKxjTQy4m3xemdWnId/42nrcsPB3CGfJLw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=KiMNDdqo; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="KiMNDdqo" 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 3316B1A00; Tue, 18 Aug 2026 08:53:10 -0700 (PDT) Received: from arm.com (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9AEF53F763; Tue, 18 Aug 2026 08:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1787068394; bh=n5Pn/EgrqrIEFc5DK4mgxFWT/9EScWqa5GcuyDfAyeo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=KiMNDdqo79AFXbKqbuzUTJzNZjfCcxsyG80l6DMNVWk3SK8nXkyidq4VEkkObM4lg 2k296O5lKEZVD5XqetWIn+E/GvtX7ic8xbAsx7MBDnbniwPndVR5pUbaKDi8vAr2ak /6nbyhSweQ+975pWMIkNhvlMelJpufEsIPDC/zOk= Date: Tue, 18 Aug 2026 16:53:08 +0100 From: Catalin Marinas To: James Houghton Cc: Will Deacon , Muchun Song , Oscar Salvador , Nikos Nikoleris , Linu Cherian , Mark Rutland , David Hildenbrand , Andrew Morton , Ryan Roberts , Nanyong Sun , Yu Zhao , Frank van der Linden , David Rientjes , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org Subject: Re: [PATCH 11/18] hugetlb_vmemmap: Use try_populate_vmemmap_pmd for replacing in-use PMDs Message-ID: References: <20260708031129.3503195-1-jthoughton@google.com> <20260708031129.3503195-12-jthoughton@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260708031129.3503195-12-jthoughton@google.com> On Wed, Jul 08, 2026 at 03:11:21AM +0000, James Houghton wrote: > diff --git a/arch/arm64/include/asm/pgalloc.h b/arch/arm64/include/asm/pgalloc.h > index 1b4509d3382c..c8946250d431 100644 > --- a/arch/arm64/include/asm/pgalloc.h > +++ b/arch/arm64/include/asm/pgalloc.h > @@ -121,4 +121,13 @@ pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep) > PMD_TYPE_TABLE | PMD_TABLE_AF | PMD_TABLE_PXN); > } > > +#define __HAVE_ARCH_TRY_POPULATE_VMEMMAP_PMD > +static inline int try_populate_vmemmap_pmd(pmd_t *pmdp, pte_t *pgtable, > + unsigned long addr) > +{ > + /* BBML2_NOABORT is required. Its presence has been checked. */ > + pmd_populate_kernel(&init_mm, pmdp, pgtable); > + return 0; > +} This patch adds the same function in 4 different arch files. Can we not have a single generic implementation in linux/pgalloc.h, bracketed by some ARCH_WANTS_* (macro or config)? I think the same goes for patch 4 with try_update_vmemmap_pte(), we can reduce the code duplication. > diff --git a/include/linux/pgalloc.h b/include/linux/pgalloc.h > index 9174fa59bbc5..ed446d95ca37 100644 > --- a/include/linux/pgalloc.h > +++ b/include/linux/pgalloc.h > @@ -26,4 +26,24 @@ > arch_sync_kernel_mappings(addr, addr); \ > } while (0) > > +#ifndef __HAVE_ARCH_TRY_POPULATE_VMEMMAP_PMD > +/* > + * try_populate_vmemmap_pmd - Populate a PMD that is in use by the vmemmap. > + * @addr: Base address of the remapped PMD. > + * @pmdp: Page table pointer to be overwritten. > + * @pgtable: Pointer to the page table that the new PMD will point to. > + * > + * This function is only to be used to update PMDs that map the vmemmap to > + * point to a page of already-populated PTEs that map the same pages. > + * > + * Implementations of this function must ensure that, while the update is taking > + * place, CPUs will not fault on the remapped virtual address range. > + */ > +static inline int try_populate_vmemmap_pmd(pmd_t *pmdp, pte_t *pgtable, > + unsigned long addr) Nit: if we follow try_update_vmemmap_pte(), we could place 'addr' first. It matches pgd_populate_kernel() as well in this file. > +{ > + return -EOPNOTSUPP; > +} > +#endif > + > #endif /* _LINUX_PGALLOC_H */ > diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c > index 977249e22ed0..b445febac0d2 100644 > --- a/mm/hugetlb_vmemmap.c > +++ b/mm/hugetlb_vmemmap.c > @@ -55,6 +55,7 @@ static int vmemmap_split_pmd(pmd_t *pmd, struct page *head, unsigned long start, > struct vmemmap_remap_walk *walk) > { > pmd_t __pmd; > + int ret; > int i; > unsigned long addr = start; > pte_t *pgtable; > @@ -74,8 +75,15 @@ static int vmemmap_split_pmd(pmd_t *pmd, struct page *head, unsigned long start, > set_pte_at(&init_mm, addr, pte, entry); > } > > + ret = 0; > spin_lock(&init_mm.page_table_lock); > if (likely(pmd_leaf(*pmd))) { > + /* Make pte visible before pmd. See comment in pmd_install(). */ > + smp_wmb(); > + ret = try_populate_vmemmap_pmd(pmd, pgtable, start); > + if (ret) > + goto free; > + > /* > * Higher order allocations from buddy allocator must be able to > * be treated as independent small pages (as they can be freed > @@ -84,21 +92,17 @@ static int vmemmap_split_pmd(pmd_t *pmd, struct page *head, unsigned long start, > if (!PageReserved(head)) > split_page(head, get_order(PMD_SIZE)); > > - /* Make pte visible before pmd. See comment in pmd_install(). */ > - smp_wmb(); > - /* > - * On arm64, this requires BBML2_NOABORT. Its support has > - * already been checked. > - */ > - pmd_populate_kernel(&init_mm, pmd, pgtable); > if (!(walk->flags & VMEMMAP_SPLIT_NO_TLB_FLUSH)) > flush_tlb_kernel_range(start, start + PMD_SIZE); > - } else { > - pte_free_kernel(&init_mm, pgtable); > - } > - spin_unlock(&init_mm.page_table_lock); > + } else > + goto free; > > - return 0; > +out: > + spin_unlock(&init_mm.page_table_lock); > + return ret; > +free: > + pte_free_kernel(&init_mm, pgtable); > + goto out; > } Would 'free' first with fall through 'out' read better? -- Catalin