From patchwork Thu Jan 16 02:30:25 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: 13941161 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 DBEFBC02185 for ; Thu, 16 Jan 2025 02:32:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CBDC06B008A; Wed, 15 Jan 2025 21:32:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C4E84280001; Wed, 15 Jan 2025 21:32:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C4D7280003; Wed, 15 Jan 2025 21:32:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 1453E6B008A for ; Wed, 15 Jan 2025 21:32:48 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8A229120603 for ; Thu, 16 Jan 2025 02:32:47 +0000 (UTC) X-FDA: 83011741974.17.2B8E8CC Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf30.hostedemail.com (Postfix) with ESMTP id 0F1A480004 for ; Thu, 16 Jan 2025 02:32:45 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736994766; 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=dHsoEyJZ5XLC7JY7dTW5E1So6h81yzYLCyPTrStsqgs=; b=uKgCzJzdSqNpayRwntfTxNXhMPVtOrCRTti3vLFbsXshvmQId0lnaLMTs6bWFq1xTPUut7 sHpMWH8hNKiYFRziCFuhz+iGDZfy+Jc+BOkLhmFCJHIhowahfp45hooaz74U4PGAgiCMYQ vTjPnysRa7lnAlWCeTJxKB7FawS42fg= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736994766; a=rsa-sha256; cv=none; b=CaFsNxhjeSc4Pz4CM7hqf+E1gHAC8WgkfFJewc3pGT4koHJKpMEnCcQcaLLKh7HcUXS2ZS 2tgWT7Z53MKeD3RGO83ozPI+RkIajXocFXGrlb/iiREvYSeRF+tCXh3LB1BxlsgFCQSZoO /dKaqIx6Iiyp+kVJGx4MHq4/Gbw5Ovw= 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 1tYFfO-000000003nd-34ZK; Wed, 15 Jan 2025 21:31:30 -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, jannh@google.com, mhklinux@outlook.com, andrew.cooper3@citrix.com, Rik van Riel Subject: [PATCH v5 02/12] x86/mm: remove pv_ops.mmu.tlb_remove_table call Date: Wed, 15 Jan 2025 21:30:25 -0500 Message-ID: <20250116023127.1531583-3-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116023127.1531583-1-riel@surriel.com> References: <20250116023127.1531583-1-riel@surriel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 0F1A480004 X-Stat-Signature: fj87y9io5bz6yjxd59am6iu8j8srumib X-HE-Tag: 1736994765-953439 X-HE-Meta: U2FsdGVkX18YqgId+WqrNnwqCF4Gh6sdDv2lCCNCME47BssvuFfEr0bGQmPQYQ8nniNRZU/TlKpLjJjlJ/LC8G4wNdK4UvbmUkfQ6O5vl2HvAu7duchvDE65q4Gh8TrmlAzYWAuYdQi2qgH/w2xMc2KQA7/cGcOO+dqKo4g3lcvUAlUhMj9uGpIdri2cENpfB35U4Nq9I5IktZTqlEig4Iv1GiD/dhTXQ6iSO5n7zGT/9z1LLYgOyCUAMsrTP8Dg8Jta6IXY3Vb1v76oc5t6cKx3FP+YEcvzG7My6uZdhgT0zlSz3WRfnhxvWo4oK7+gi47s6e+zsHQY2uPj9Dwfa/Y13D8GDyvYpp9z0VUMUibUSPSxcGDqAegQyxT+f89ChS+hnSU6S7M58iGTGMKWtlOHu/v2E3XHWZ+ua4vC+SdSM3B/FfoHRSzckPsa7SlbvmiWV2iFxOHbRYDPpbqyLokASB7i4XcZcReWO36LFpnMkk4pR4Qo+RcirMKnJcBp4AXFj+5UDTJTnFvxyxOoZQ+DnVv1qYGqYZwvDqLy22jRLWeTMLmfzyX/LaBuyAog2inzd+j33TvWAgkVbPJf010lWPRMOKQBUVHdY15Uc2fSOlU29ixCiKCdpmjkX3xkB7ig64yud4+25OtCKXUhp+VhSY97Ae9qSYlq1Lx7qpWlmBQzms8LRJUYjiLVIfe3Hn6rlP/5vxCRPtWMbIlJ8W53C57oQfaG55JbzsK9l5bmTGe3wyJP0Hkk30xWVq686zT04t+i9Po8KInaymoJm/C1mVo8J3lJLMFzNlx7OFRYJ6BQ7g2U9pyNe62czmGNsAqrknOAHw90KYIQlDHShmdngWkyvjyboAeWSecMmY4ejNdYMeDkqWSXwEmGNH4WdkWOidspYXoPaausCHP6RQDl9eW+zt5nhH8O26ajnL4bS0ZcAslyxIACZCqr3V75lDgGXiAAkLsnwfb/zjg 3P5toftm v12nPWV+fadt0dn2eMMb837clonOy7JVWmx9QTQxYC/a8bzcqhRPgoj0Uj16Aclirv67B7cjV0OuyfLbAcBxQmoA8TR4dlGTlpevVtk1eim8Vofy2wrTxDeRhjMbJkB9XXs69LY9b4AcOTrOAYXfR7MZcb319NMgPYORCxzk2vCe9sWs4g0RDcWEFwyBSsE/M0XS4j2rhWTiw/JhYdzcQKTsskARZqQVAI86if2TYLm6vvWJU8jbGV5+TqGGqazAZJQ+pzQK2NNUNgrMooPN4T7bp8Mhi7iSMjpIxXzte2g9Ljej3jcRz1ysHAFFKX5ppH8+fiq0Q/DqucO9nl+EKrp7h/lJcZNgo5Z0bb5LkLLpJvJTRaueP6d1AG6mbH6ce8NazgTTbPWZ8eUxlIN5Tw4r/hW4WbjF2usc1MEJINmGZ7DEZBYWW6ormUVGIG3NKlKyXT9SwO6JiXVo= 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: Every pv_ops.mmu.tlb_remove_table call ends up calling tlb_remove_table. Get rid of the indirection by simply calling tlb_remove_table directly, and not going through the paravirt function pointers. Signed-off-by: Rik van Riel Suggested-by: Qi Zheng --- arch/x86/hyperv/mmu.c | 1 - arch/x86/include/asm/paravirt.h | 5 ----- arch/x86/include/asm/paravirt_types.h | 2 -- arch/x86/kernel/kvm.c | 1 - arch/x86/kernel/paravirt.c | 1 - arch/x86/mm/pgtable.c | 16 ++++------------ arch/x86/xen/mmu_pv.c | 1 - 7 files changed, 4 insertions(+), 23 deletions(-) diff --git a/arch/x86/hyperv/mmu.c b/arch/x86/hyperv/mmu.c index 1cc113200ff5..cbe6c71e17c1 100644 --- a/arch/x86/hyperv/mmu.c +++ b/arch/x86/hyperv/mmu.c @@ -240,5 +240,4 @@ void hyperv_setup_mmu_ops(void) pr_info("Using hypercall for remote TLB flush\n"); pv_ops.mmu.flush_tlb_multi = hyperv_flush_tlb_multi; - pv_ops.mmu.tlb_remove_table = tlb_remove_table; } diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index d4eb9e1d61b8..794ba3647c6c 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -91,11 +91,6 @@ static inline void __flush_tlb_multi(const struct cpumask *cpumask, PVOP_VCALL2(mmu.flush_tlb_multi, cpumask, info); } -static inline void paravirt_tlb_remove_table(struct mmu_gather *tlb, void *table) -{ - PVOP_VCALL2(mmu.tlb_remove_table, tlb, table); -} - static inline void paravirt_arch_exit_mmap(struct mm_struct *mm) { PVOP_VCALL1(mmu.exit_mmap, mm); diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h index 8d4fbe1be489..13405959e4db 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -136,8 +136,6 @@ struct pv_mmu_ops { void (*flush_tlb_multi)(const struct cpumask *cpus, const struct flush_tlb_info *info); - void (*tlb_remove_table)(struct mmu_gather *tlb, void *table); - /* Hook for intercepting the destruction of an mm_struct. */ void (*exit_mmap)(struct mm_struct *mm); void (*notify_page_enc_status_changed)(unsigned long pfn, int npages, bool enc); diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 7a422a6c5983..3be9b3342c67 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -838,7 +838,6 @@ static void __init kvm_guest_init(void) #ifdef CONFIG_SMP if (pv_tlb_flush_supported()) { pv_ops.mmu.flush_tlb_multi = kvm_flush_tlb_multi; - pv_ops.mmu.tlb_remove_table = tlb_remove_table; pr_info("KVM setup pv remote TLB flush\n"); } diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 2b78a6b466ed..c019771e0123 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -186,7 +186,6 @@ 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 = 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 5745a354a241..3dc4af1f7868 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -18,14 +18,6 @@ EXPORT_SYMBOL(physical_mask); #define PGTABLE_HIGHMEM 0 #endif -#ifndef CONFIG_PARAVIRT -static inline -void paravirt_tlb_remove_table(struct mmu_gather *tlb, void *table) -{ - tlb_remove_page(tlb, table); -} -#endif - gfp_t __userpte_alloc_gfp = GFP_PGTABLE_USER | PGTABLE_HIGHMEM; pgtable_t pte_alloc_one(struct mm_struct *mm) @@ -54,7 +46,7 @@ void ___pte_free_tlb(struct mmu_gather *tlb, struct page *pte) { pagetable_pte_dtor(page_ptdesc(pte)); paravirt_release_pte(page_to_pfn(pte)); - paravirt_tlb_remove_table(tlb, pte); + tlb_remove_table(tlb, pte); } #if CONFIG_PGTABLE_LEVELS > 2 @@ -70,7 +62,7 @@ void ___pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) tlb->need_flush_all = 1; #endif pagetable_pmd_dtor(ptdesc); - paravirt_tlb_remove_table(tlb, ptdesc_page(ptdesc)); + tlb_remove_table(tlb, ptdesc_page(ptdesc)); } #if CONFIG_PGTABLE_LEVELS > 3 @@ -80,14 +72,14 @@ void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud) pagetable_pud_dtor(ptdesc); paravirt_release_pud(__pa(pud) >> PAGE_SHIFT); - paravirt_tlb_remove_table(tlb, virt_to_page(pud)); + tlb_remove_table(tlb, virt_to_page(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_page(p4d)); + tlb_remove_table(tlb, virt_to_page(p4d)); } #endif /* CONFIG_PGTABLE_LEVELS > 4 */ #endif /* CONFIG_PGTABLE_LEVELS > 3 */ diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index 55a4996d0c04..041e17282af0 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -2137,7 +2137,6 @@ static const typeof(pv_ops) xen_mmu_ops __initconst = { .flush_tlb_kernel = xen_flush_tlb, .flush_tlb_one_user = xen_flush_tlb_one_user, .flush_tlb_multi = xen_flush_tlb_multi, - .tlb_remove_table = tlb_remove_table, .pgd_alloc = xen_pgd_alloc, .pgd_free = xen_pgd_free,