From patchwork Tue Feb 11 21:07:57 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: 13970697 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 EAF04C0219D for ; Tue, 11 Feb 2025 21:09:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2DC3E6B008C; Tue, 11 Feb 2025 16:09:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 15B7B280004; Tue, 11 Feb 2025 16:09:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E721B280002; Tue, 11 Feb 2025 16:09:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B58FF6B008C for ; Tue, 11 Feb 2025 16:09:06 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 5F73E120B9E for ; Tue, 11 Feb 2025 21:09:06 +0000 (UTC) X-FDA: 83108903892.30.D10FB54 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf23.hostedemail.com (Postfix) with ESMTP id C76CE140016 for ; Tue, 11 Feb 2025 21:09:04 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf23.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739308144; a=rsa-sha256; cv=none; b=vlQyoMPjnZG55SOB2ecDWoP30XNN/dKqpPPxlzCUF1wGvmJvV+OLeHzZUG6Nzm2VcGPMpG 5shf6hDVUQXd2+7BPxKJqKmpzNd0BajivQ8hA4lsBWjtRTmCSMO6gNmflLLjpTCiLrF+Dm tEoU+rFpg10pdmUV2w7mfQi2odGTvs4= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf23.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=1739308144; 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=a8Lc0/l5LZ9sGfCvyre++KeBAz2TLECIF2bnpXvR3D8=; b=IIUia6Q2XGCVkUzlDsmowJCaT7a0zGyKjrLqwhark74hp9AGmvRXKxQuQROICd+mueQhVd twO1E0Nc4hH0VrUyoET7cm2a05fePcT72nV+iiEvcGO0B4lJ5Mp77GmSPAzHvgKsA+42Bg mLRMWoKJEofS5Gy1UMhmHiNB0If9Q40= 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 1thxUX-000000008HU-2dg1; Tue, 11 Feb 2025 16:08:25 -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, Rik van Riel , Manali Shukla Subject: [PATCH v10 02/12] x86/mm: remove pv_ops.mmu.tlb_remove_table call Date: Tue, 11 Feb 2025 16:07:57 -0500 Message-ID: <20250211210823.242681-3-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250211210823.242681-1-riel@surriel.com> References: <20250211210823.242681-1-riel@surriel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: C76CE140016 X-Stat-Signature: z3kmcaa9w6xyqkmx1q5eaodbihszj4ct X-Rspam-User: X-HE-Tag: 1739308144-835886 X-HE-Meta: U2FsdGVkX18s6DyJkO6nHssjLx+IvCBDN+NpXZyV2tdV0htZO6IKIrsovJaJD8W3dbFeq6C2sL2CLUiQQAwbK1LbgwOib2sMRsQdecQo1JDhWVQLwYSlHGk0aKaBQo3k1MnnYPo23hkHYMU8JK2G/G+ehH0SnE1usge+WIMS8LZb0cyul+UbiCWGVlaJ2eFWHiC7EgL/Yyh3Ik/RkupMC1ZSnrpbeYLzzftLGihw6/kn3IW82QSJcjqnymQopefI2z/RlLPtl1ofuUViWtCIoXz9I8l1zVDXsuJ0Dil9DcZuAaWVMIwbzx+8SSdj9maxFEeIFyKg23EP9OhTrqMpmgNmiZMUPG/05EFOVJssqMzT/Ar/ut0veKD5VZ4//p2ExNnBLedfWDwA+jZjf0L6iuQDjgOcnWplj2w5iSFm1z52B66D/4Hu5lIKbMrvuWmMBJZccvWPDbQqN7rcL8R2s2IEHN1rPJFDJ9atoNTN1OKTVXFaLVdvJ3tzS0OJIl1LV1rYsLggVFLCQMjyly/hBmes6AdWsWRoZyHHJDU5MLqOXRg8MadJR5SHvFm11HuBpk2MhCkJGXFahNr6CQUwj2eg5/fH6PyP5X5OjssxRHbGkUVT1iuQcZfCDGPgAAVOvM7y4FPK61x9e3ggkulmrC+EDoogkhM+3a6+fa/IqGcmRckv8T7+X33cNB5INYLUQk86JvP4U9mAcEkfi3FkybhUtRATlUtt4iI6bfK1Y7U31h6bKGMwGu7b9xL1shIYsGPgMz7QZ11isApaVJPNunxmzPsrOH8h4Er1dT9IfZhqjzeBpq1O2tw9lLt+rYweciPqY1kYlZO4jOnV7JbuRiBLVGLKOsaWkLx9CzO7XaqjGE6xsEVbulr4RHxlmKi9usg6K+mmksdKySn1BU4fnWGNUKvl3cLuUk6+7uzACQKNU2maCIYXJPghA16uuyVFEbBLrqwmPdxoat36OBm k5P2ghYc /FI2neHKUlEvV3N9wzFaEEddVDb0x2EduLpMM9JM4LEKQI3oHuA7VhTNqjrwRsPNxbduKv4Z2ejtIvmvqgYx3TLahx/S5LSuTlKu4Z8msjn1U3Df4wA6SkgosbXuZVTG1L/N813qSokkbi3e4BArlLdum0XPo4BKjxtxbv6IQkFK73LptKheMfEBTXC60FPstLya4cjUVajYOBPEofQ2UboaQljD9e5ab8zAHaZvQzufycsaDP6yPg+m6b9TO7L89OnX/T5LhCEQMIwAPcJ741pSCduodcgrITIBV000kCmTNFnahfZyqhojpLuWA/hnO58xQOfHzH/XD+klpi9Ag2VJ/13+N+gjH+BsXs7pTybANIQeYkhau+T7Rlsr0wIFdCOUgKdeOj88fEBfgi45amwYG8fKemlHD9Z37ZEJlhnFNfQSQTqGsx+Xz7hcB1jtk1XEw9+JraX9XxHP0yz4VWnqDgtlu5h7P8D7bAlMw2nMOnvyveeh/h9rj//3cYDr7Du4F1QnFS8kL+7xXPDWY9/Y3yYrT6rm2Y/W29BOFbS+R3mTb2n7XJ0Czx1+8G74eT5I5g5C23nmavn5oIVemiQ9cIiBHt7T1aWZHyvU+o3CuQPkt9h3u0W8+7w== 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 Tested-by: Manali Shukla Tested-by: Brendan Jackman --- 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/xen/mmu_pv.c | 1 - 6 files changed, 11 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/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,