From patchwork Fri Feb 21 00:53:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rik van Riel X-Patchwork-Id: 13984687 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 4ACEAC021B3 for ; Fri, 21 Feb 2025 00:55:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B699F280012; Thu, 20 Feb 2025 19:55:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 95DD4280014; Thu, 20 Feb 2025 19:55:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6EC81280013; Thu, 20 Feb 2025 19:55:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 340E4280012 for ; Thu, 20 Feb 2025 19:55:27 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id DFD681A01D2 for ; Fri, 21 Feb 2025 00:55:26 +0000 (UTC) X-FDA: 83142133452.09.078262C Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf20.hostedemail.com (Postfix) with ESMTP id 611AD1C0013 for ; Fri, 21 Feb 2025 00:55:25 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf20.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740099325; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zQVkWtQvWh/JQlkH3zRjmdk+4uvC0ZngJuxM1UBby2g=; b=4uO7LMBBEaJsW/7kTdVrgKVPNLDqcHE4Jp7h6MkFhS8XoAmZlf3KyQzq9pMnj03E9GLR3J sJ6uHfsZ4HSVxM8FwC3DORsxeauhoGuH1zrUuJZFoWUXwVdXQA9hGgUpHhDxZ1OE+iz8pi 5nwC+56awYXwRajmKsZqQKcTgIzb4hA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740099325; a=rsa-sha256; cv=none; b=Q972Twyl16MUohntfk/vk6AHckrZsaUNJ8kFsc9vhWF9WmEgrxJswPW7d2o9gXmxLjZqWj /sodoy26N91Sac8CKXrGKjBc0L5arb6YiUHG2e3OBnBKQEluYcTl6qyekR8ZZIjlbzBq5E VXBPwDoKFyuzHtjOBRfmUlsfoCyQteU= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf20.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com Received: from fangorn.home.surriel.com ([10.0.13.7]) by shelob.surriel.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1tlHIZ-000000003Qf-0b2u; Thu, 20 Feb 2025 19:53:47 -0500 From: Rik van Riel To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, bp@alien8.de, peterz@infradead.org, dave.hansen@linux.intel.com, zhengqi.arch@bytedance.com, nadav.amit@gmail.com, thomas.lendacky@amd.com, kernel-team@meta.com, linux-mm@kvack.org, akpm@linux-foundation.org, jackmanb@google.com, jannh@google.com, mhklinux@outlook.com, andrew.cooper3@citrix.com, Manali.Shukla@amd.com, Rik van Riel Subject: [PATCH v12 01/16] x86/mm: make MMU_GATHER_RCU_TABLE_FREE unconditional Date: Thu, 20 Feb 2025 19:53:00 -0500 Message-ID: <20250221005345.2156760-2-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250221005345.2156760-1-riel@surriel.com> References: <20250221005345.2156760-1-riel@surriel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 611AD1C0013 X-Rspamd-Server: rspam07 X-Stat-Signature: z9chbcyey33wdjc6fc1u8coefe1515fx X-HE-Tag: 1740099325-181618 X-HE-Meta: U2FsdGVkX18n+35Ryi5tScs4EiToCgOangN5MP20gd41nlo/ITijCXuc/Nkreolzv0S50ryI/859QG2177sTTFcMLQECTeC2ypY6hWsZxiIgH7YFVendDPndjhGlw03aO56MSmPUxbGw2/74gqF0/KNqnXp8SBCR3oM4S/N0iTWmu31PbAVx7IfhLjUtpxyJqn+4N3VhEWJZL47FJ/1Ns2zRAKCUjO1zXV97v8BRjqdtUfDw2EFUIFv1eKPaNO/60x2UmS1qO5TDuEL80+4AIUuQLY9ATvEoB7VuAhKq6/2hLggAkcZUZvs04ixlkN3DGHNUgHX90AVsJuDOlvRuzonft9v8LJ9sh/Bh5x/yISU49Q3gwq6x0WK9H7SPZZRYEhnf2eLK7nDY7uEoL0ZJ3jVrDmQW0JZYUAS5/lnXjQSmewhx2DdbXLUnuHGZjFZmq4p9FPi3kXLh3wOAmMkfyLTqGcfcO8aS9xLbZ3fjMdFqpNL3NUbybSgSnNQwobVqW3T4bb8asUI2cceIOv5tOJSCl2LexAezgAzLn1Kx794yH8V2VYdKYEvRqO/RjjAGJHgUqyC0wHvuQ9ex5sCAc56aqdzhn9dG901vvhjuD9hvoHb/ncR/q6B5wwqpPiKp/TBXsqaT13bB693ddSEN7REAqlt5o4uf6BYBESJ7mwvkpTqilt/9mTwq1Ib9igTC6BOd+vUttS75+i4xDsdLvDUIIBKK6ghPyQWWKYisSsuY2MGCmfVzVqfOTTm7ZxDh54lu5cOw6y7a+aDiUMW5ctgOzQRZlVq6FKkMb754rQkPctdLak7rZ90ViWeO0PmDNkvu4e4MhF+5amehrw5ciB2Pt4BEpfAmjLBCyUycRyl5DfXl2gaYkvQoaM8T0Pr1ScJCr+iNGtW1ZK+EsW0Q70L+X2zsK/Puibh+fbNFUCir/qUfcYtsoOnvFsABI+L7gUEyb39nOWYExwEFsnk UE2uVnOd 7+lYpMcSIjzw1HIHe/k1baALk+OOHXwpkTvyh4+jQQ4cBZUDgr9I0FW9mS6/0qRQ3L8t7r5ldW9FLzo3CTChs8jF6qH+ecwuAHS4T5yu4PdD/57fQqil2gSVxPFIJBO5ylLL6YaOM0uWI2jC2wSBROtRTTDvFLqID0G+qEaH2ryqJA8YTeVE5sVocBczVgThO5YxlTHbNjdW4ikmeGAHMs4pkV+HVE3SjZX8jAecBlEX/7fXBKyqHNpYAmDoHDeEG74OadgOt4tPyM8cq5DOUzO47pop8CjDMiUhBsnWtXM8ecHDyR1nalWipeJ/35yEox7D1Q4OZhX21vodDYsNecTWu+P4PR0dgeOOGCsOWuriCTDhD5F/mlgh3LHsGsPHs9xo5/JyJQWrMRBGn86yZ6XVslnxrnGeI01hOlKrDSJxS7YLhJodmyfVOSe3DpSvwGVA7v1P2/dEPAAY0/bb1ozFXUVtlT8TgeVXJj9KSJlm4moI3SY66MUojRlYFaVNTkKkkj2fPmrOo8Z7DB9RgCx+CkkY8F9VRTxtnRRQ7lF9H5WZboyqjaIYgVA== 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: List-Subscribe: List-Unsubscribe: Currently x86 uses CONFIG_MMU_GATHER_TABLE_FREE when using paravirt, and not when running on bare metal. There is no real good reason to do things differently for each setup. Make them all the same. Currently get_user_pages_fast synchronizes against page table freeing in two different ways: - on bare metal, by blocking IRQs, which block TLB flush IPIs - on paravirt, with MMU_GATHER_RCU_TABLE_FREE This is done because some paravirt TLB flush implementations handle the TLB flush in the hypervisor, and will do the flush even when the target CPU has interrupts disabled. Always handle page table freeing with MMU_GATHER_RCU_TABLE_FREE. Using RCU synchronization between page table freeing and get_user_pages_fast() allows bare metal to also do TLB flushing while interrupts are disabled. Various places in the mm do still block IRQs or disable preemption as an implicit way to block RCU frees. That makes it safe to use INVLPGB on AMD CPUs. Signed-off-by: Rik van Riel Suggested-by: Peter Zijlstra Tested-by: Manali Shukla Tested-by: Brendan Jackman Tested-by: Michael Kelley --- arch/x86/Kconfig | 2 +- arch/x86/kernel/paravirt.c | 17 +---------------- arch/x86/mm/pgtable.c | 27 ++++----------------------- 3 files changed, 6 insertions(+), 40 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 6df7779ed6da..aeb07da762fc 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -278,7 +278,7 @@ config X86 select HAVE_PCI select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP - select MMU_GATHER_RCU_TABLE_FREE if PARAVIRT + select MMU_GATHER_RCU_TABLE_FREE select MMU_GATHER_MERGE_VMAS select HAVE_POSIX_CPU_TIMERS_TASK_WORK select HAVE_REGS_AND_STACK_ACCESS_API diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 1ccaa3397a67..527f5605aa3e 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -59,21 +59,6 @@ void __init native_pv_lock_init(void) static_branch_enable(&virt_spin_lock_key); } -#ifndef CONFIG_PT_RECLAIM -static void native_tlb_remove_table(struct mmu_gather *tlb, void *table) -{ - struct ptdesc *ptdesc = (struct ptdesc *)table; - - pagetable_dtor(ptdesc); - tlb_remove_page(tlb, ptdesc_page(ptdesc)); -} -#else -static void native_tlb_remove_table(struct mmu_gather *tlb, void *table) -{ - tlb_remove_table(tlb, table); -} -#endif - struct static_key paravirt_steal_enabled; struct static_key paravirt_steal_rq_enabled; @@ -195,7 +180,7 @@ struct paravirt_patch_template pv_ops = { .mmu.flush_tlb_kernel = native_flush_tlb_global, .mmu.flush_tlb_one_user = native_flush_tlb_one_user, .mmu.flush_tlb_multi = native_flush_tlb_multi, - .mmu.tlb_remove_table = native_tlb_remove_table, + .mmu.tlb_remove_table = tlb_remove_table, .mmu.exit_mmap = paravirt_nop, .mmu.notify_page_enc_status_changed = paravirt_nop, diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 1fef5ad32d5a..b1c1f72c1fd1 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -18,25 +18,6 @@ EXPORT_SYMBOL(physical_mask); #define PGTABLE_HIGHMEM 0 #endif -#ifndef CONFIG_PARAVIRT -#ifndef CONFIG_PT_RECLAIM -static inline -void paravirt_tlb_remove_table(struct mmu_gather *tlb, void *table) -{ - struct ptdesc *ptdesc = (struct ptdesc *)table; - - pagetable_dtor(ptdesc); - tlb_remove_page(tlb, ptdesc_page(ptdesc)); -} -#else -static inline -void paravirt_tlb_remove_table(struct mmu_gather *tlb, void *table) -{ - tlb_remove_table(tlb, table); -} -#endif /* !CONFIG_PT_RECLAIM */ -#endif /* !CONFIG_PARAVIRT */ - gfp_t __userpte_alloc_gfp = GFP_PGTABLE_USER | PGTABLE_HIGHMEM; pgtable_t pte_alloc_one(struct mm_struct *mm) @@ -64,7 +45,7 @@ early_param("userpte", setup_userpte); void ___pte_free_tlb(struct mmu_gather *tlb, struct page *pte) { paravirt_release_pte(page_to_pfn(pte)); - paravirt_tlb_remove_table(tlb, page_ptdesc(pte)); + tlb_remove_table(tlb, page_ptdesc(pte)); } #if CONFIG_PGTABLE_LEVELS > 2 @@ -78,21 +59,21 @@ void ___pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) #ifdef CONFIG_X86_PAE tlb->need_flush_all = 1; #endif - paravirt_tlb_remove_table(tlb, virt_to_ptdesc(pmd)); + tlb_remove_table(tlb, virt_to_ptdesc(pmd)); } #if CONFIG_PGTABLE_LEVELS > 3 void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud) { paravirt_release_pud(__pa(pud) >> PAGE_SHIFT); - paravirt_tlb_remove_table(tlb, virt_to_ptdesc(pud)); + tlb_remove_table(tlb, virt_to_ptdesc(pud)); } #if CONFIG_PGTABLE_LEVELS > 4 void ___p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d) { paravirt_release_p4d(__pa(p4d) >> PAGE_SHIFT); - paravirt_tlb_remove_table(tlb, virt_to_ptdesc(p4d)); + tlb_remove_table(tlb, virt_to_ptdesc(p4d)); } #endif /* CONFIG_PGTABLE_LEVELS > 4 */ #endif /* CONFIG_PGTABLE_LEVELS > 3 */