From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E33036DA14 for ; Wed, 8 Jul 2026 03:11:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783480300; cv=none; b=HpyzIiuXXd3of2pGFKFp9Fxqfvi6861rSGiKEB24dxz4iz4vvbMa4i2H+nrgSCuKacdrJCuTcrjdyha0k69X3qnY87+yQgTy3E1T0K8LtAH/NMO14NOLvZ1Z0m72YONvyjUvE+NDFPBAI4bMa4K/24zsds437PiXCKNoum0LFZ0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783480300; c=relaxed/simple; bh=Rba7EDsW2y2fRkreEnMhxYjRhzipY4mEwmoBUq8MJ78=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qwNQR66eWxl027i0zxZPJ6OzFWEUw8FpQ3LJoGEHsiNCgg2/gG3SfIOmm9ElQu2FNCSytlAWQ4zzau2bY/zYv2rwAr9bQ+dYIxsVBFSbEIEW1eKJ+gamaD+HrXOgJfVpHPFCQnsg0P0upC38IfeeY2Va4hRl7NS92HnoRBoFbxc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jthoughton.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=IbEOuRjR; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jthoughton.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="IbEOuRjR" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2cc640dfde3so3710445ad.1 for ; Tue, 07 Jul 2026 20:11:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1783480297; x=1784085097; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=iCCmK+o9wKQf5+3Ew8M4Jk3nTsjcUPa/yWersiCGiuk=; b=IbEOuRjRBs1Abt98ZdfW1i3YmGVbXRgi866QTOizxLKsjv1YT3drJoVTVNlgZWjcAJ guUKCa0yftiYN58+u9u+diXL3Sx9TIHAJCwORuRvzeTIyVTSjtx7MAxsNEBC963gQniI qden/M6J9yssTxR9WVEKA53XQW/juF/vsb6Xgk9rWqynuV8onPiLF3Ts4EN7YYTxpYco nNmOUzXIZs6K4m1gWxuV/Rqw3ht91/mtaOGHksqc7qRCZp356OHJxYu4pV7ZTLVS720r 6dhjMq1HcavbVCkDNTYMCNdSOo9ApgsZWE5Ga44N4U79jYPzrK07TKN3dJRT5WxCWdUJ CuWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783480297; x=1784085097; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=iCCmK+o9wKQf5+3Ew8M4Jk3nTsjcUPa/yWersiCGiuk=; b=Kpxprs/s0bQYug5Ad9+bRMN5HbrxX2aMJBh4EVHMpa5ELY3HBrEQc1vBF38Ep0C0mH 6Oh5pHSVczjDQDox5Jz8PNpJmBpZ3zrnxuRaqvQwKJfn0ivsQ7qx+h6O6cuRvqH/h2CQ CXCL2p4VPpCuA0hEMDpfpmAfQQ7VhQI1hH9saEVG/7bKt/izhCi/mijGWHI3YmAiOh8i 0RcKF8gkHmyXMm496OMgCJGMwBVzJwZOl/XC0/2U6qRa8Wa99Ylib6hWgdGAlxRpCiUq FNvGJcO/faZ0FpPLrgb4CKV5fx33PXfKb0GMCV8sZlTlxdpxo3S4X3B85TfiUckX30W5 NSxw== X-Forwarded-Encrypted: i=1; AHgh+RodigM06PZc1cyM66ut1zQIWriqohn0WzwwS0d7tGFkRGixK6ARX5Dlubf3baXcuPv+8lCbktaoxWi41fw=@vger.kernel.org X-Gm-Message-State: AOJu0YxhHIE8zVbeDMY12MTz6h7WkcKln8p7JMuvrpinUEGocwYrT+Lt 0OOAkiRabSke8XaJwEv80sYWwfvM6coKqTbZlQXXi6dG5FaLPdpJSv29AnaHi8BPgPHpAQB8kEP C7ldzwg3oqzcqxFFrZ9xxfA== X-Received: from plmp1.prod.google.com ([2002:a17:903:f01:b0:2ca:eea9:9845]) (user=jthoughton job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e943:b0:2c9:2ee6:693e with SMTP id d9443c01a7336-2ccea3c1987mr5977265ad.18.1783480297144; Tue, 07 Jul 2026 20:11:37 -0700 (PDT) Date: Wed, 8 Jul 2026 03:11:14 +0000 In-Reply-To: <20260708031129.3503195-1-jthoughton@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260708031129.3503195-1-jthoughton@google.com> X-Mailer: git-send-email 2.55.0.795.g602f6c329a-goog Message-ID: <20260708031129.3503195-5-jthoughton@google.com> Subject: [PATCH 04/18] hugetlb_vmemmap: Use try_update_vmemmap_pte to update in-use PTEs From: James Houghton To: Will Deacon , Catalin Marinas , Muchun Song , Oscar Salvador Cc: Nikos Nikoleris , Linu Cherian , Mark Rutland , David Hildenbrand , Andrew Morton , Ryan Roberts , Nanyong Sun , Yu Zhao , Frank van der Linden , David Rientjes , James Houghton , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" set_pte_at() cannot be used to replace in-use vmemmap PTEs on arm64, so replace it with a more specific routine, try_update_vmemmap_pte(). try_update_vmemmap_pte() is used for modifying page table entries such that there is a guarantee that no fault will be taken. For the x86, riscv, and loongarch implementations, please note one difference: set_pte() does not invoke page_table_check_ptes_set(), but set_pte_at(), the call we are about to replace, does. However, this is a functional no-op because page_table_check_ptes_set() does nothing for init_mm PTEs, which vmemmap PTEs are. Signed-off-by: James Houghton --- arch/loongarch/include/asm/pgtable.h | 8 ++++ arch/riscv/include/asm/pgtable.h | 8 ++++ arch/x86/include/asm/pgtable.h | 8 ++++ include/linux/pgtable.h | 21 +++++++++++ mm/hugetlb_vmemmap.c | 56 +++++++++++++++++++--------- 5 files changed, 84 insertions(+), 17 deletions(-) diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch/include/asm/pgtable.h index 223528c04d73..e7b65056ef73 100644 --- a/arch/loongarch/include/asm/pgtable.h +++ b/arch/loongarch/include/asm/pgtable.h @@ -638,6 +638,14 @@ static inline long pmd_protnone(pmd_t pmd) #define pmd_leaf(pmd) ((pmd_val(pmd) & _PAGE_HUGE) != 0) #define pud_leaf(pud) ((pud_val(pud) & _PAGE_HUGE) != 0) +#define __HAVE_ARCH_TRY_UPDATE_VMEMMAP_PTE +static inline int try_update_vmemmap_pte(unsigned long addr, pte_t *ptep, + pte_t pte) +{ + set_pte(ptep, pte); + return 0; +} + /* * We provide our own get_unmapped area to cope with the virtual aliasing * constraints placed on us by the cache architecture. diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 5d5756bda82e..a11c569ee2f0 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -1162,6 +1162,14 @@ static inline pud_t pud_modify(pud_t pud, pgprot_t newprot) #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ +#define __HAVE_ARCH_TRY_UPDATE_VMEMMAP_PTE +static inline int try_update_vmemmap_pte(unsigned long addr, pte_t *ptep, + pte_t pte) +{ + set_pte(ptep, pte); + return 0; +} + /* * Encode/decode swap entries and swap PTEs. Swap PTEs are all PTEs that * are !pte_none() && !pte_present(). diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index ac295ca6c92f..974151564071 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1372,6 +1372,14 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma, } #endif +#define __HAVE_ARCH_TRY_UPDATE_VMEMMAP_PTE +static inline int try_update_vmemmap_pte(unsigned long addr, pte_t *ptep, + pte_t pte) +{ + set_pte(ptep, pte); + return 0; +} + #ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD static inline pud_t pudp_establish(struct vm_area_struct *vma, unsigned long address, pud_t *pudp, pud_t pud) diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 2981e386da7b..e1abccf76bb4 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -457,6 +457,27 @@ static inline void set_ptes(struct mm_struct *mm, unsigned long addr, #endif #define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1) +#ifndef __HAVE_ARCH_TRY_UPDATE_VMEMMAP_PTE +/* + * try_update_vmemmap_pte - Remap PTEs used by the vmemmap. + * @addr: Base address of the remapped PTE. + * @ptep: Page table pointer to be overwritten. + * @pte: Page table entry to write. + * + * This function is only to be used to update PTEs that map the vmemmap. The + * only valid transitions supported by this function are: leaf-level + * (PAGE_SIZE), valid-to-valid. The pfn and prot bits may be changed. + * + * Implementations of this function must ensure that, while the update is taking + * place, CPUs will not fault on the remapped virtual address. + */ +static inline int try_update_vmemmap_pte(unsigned long addr, pte_t *ptep, + pte_t pte) +{ + return -EOPNOTSUPP; +} +#endif + #ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS extern int ptep_set_access_flags(struct vm_area_struct *vma, unsigned long address, pte_t *ptep, diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 5fee01bf5b34..3951c043164a 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -34,7 +34,7 @@ * operations. */ struct vmemmap_remap_walk { - void (*remap_pte)(pte_t *pte, unsigned long addr, + int (*remap_pte)(pte_t *pte, unsigned long addr, struct vmemmap_remap_walk *walk); unsigned long nr_walked; @@ -141,11 +141,13 @@ static int vmemmap_pte_entry(pte_t *pte, unsigned long addr, unsigned long next, struct mm_walk *walk) { struct vmemmap_remap_walk *vmemmap_walk = walk->private; + int ret = 0; - vmemmap_walk->remap_pte(pte, addr, vmemmap_walk); - vmemmap_walk->nr_walked++; + ret = vmemmap_walk->remap_pte(pte, addr, vmemmap_walk); + if (!ret) + vmemmap_walk->nr_walked++; - return 0; + return ret; } static const struct mm_walk_ops vmemmap_remap_ops = { @@ -197,18 +199,20 @@ static void free_vmemmap_page_list(struct list_head *list) free_vmemmap_page(page); } -static void vmemmap_remap_pte(pte_t *pte, unsigned long addr, - struct vmemmap_remap_walk *walk) +static int vmemmap_remap_pte(pte_t *pte, unsigned long addr, + struct vmemmap_remap_walk *walk) { struct page *page = pte_page(ptep_get(pte)); pte_t entry; + bool head; + int ret; + + head = walk->nr_walked == 0 && walk->vmemmap_head; /* Remapping the head page requires r/w */ - if (unlikely(walk->nr_walked == 0 && walk->vmemmap_head)) { + if (unlikely(head)) { VM_WARN_ON_ONCE(!PageHead((const struct page *)addr)); - list_del(&walk->vmemmap_head->lru); - /* * Makes sure that preceding stores to the page contents from * vmemmap_remap_free() become visible before the set_pte_at() @@ -227,17 +231,30 @@ static void vmemmap_remap_pte(pte_t *pte, unsigned long addr, entry = mk_pte(walk->vmemmap_tail, PAGE_KERNEL_RO); } + ret = try_update_vmemmap_pte(addr, pte, entry); + if (ret) + return ret; + + /* We successfully overwrote the vmemmap PTE, so we can free + * the vmemmap page that was just unmapped, and if we mapped + * the new head page, remove it from the list so that it + * doesn't get freed later. + */ list_add(&page->lru, walk->vmemmap_pages); - set_pte_at(&init_mm, addr, pte, entry); + if (head) + list_del(&walk->vmemmap_head->lru); + + return 0; } -static void vmemmap_restore_pte(pte_t *pte, unsigned long addr, - struct vmemmap_remap_walk *walk) +static int vmemmap_restore_pte(pte_t *pte, unsigned long addr, + struct vmemmap_remap_walk *walk) { struct page *src = pte_page(ptep_get(pte)), *dst; + int ret; if (WARN_ON_ONCE(!walk->vmemmap_tail)) - return; + return -EINVAL; /* * When restoring a partially-HVOed page, keep the copied head page @@ -245,20 +262,25 @@ static void vmemmap_restore_pte(pte_t *pte, unsigned long addr, * page. */ if (walk->vmemmap_tail != src) - return; + return 0; VM_WARN_ON_ONCE(PageHead((const struct page *)addr)); dst = list_first_entry(walk->vmemmap_pages, struct page, lru); - list_del(&dst->lru); copy_page(page_to_virt(dst), page_to_virt(src)); /* * Makes sure that preceding stores to the page contents become visible - * before the set_pte_at() write. + * before the try_update_vmemmap_pte() write. */ smp_wmb(); - set_pte_at(&init_mm, addr, pte, mk_pte(dst, PAGE_KERNEL)); + + ret = try_update_vmemmap_pte(addr, pte, mk_pte(dst, PAGE_KERNEL)); + if (ret) + return ret; + + list_del(&dst->lru); + return 0; } /** -- 2.55.0.795.g602f6c329a-goog