86 lines
3.1 KiB
Diff
86 lines
3.1 KiB
Diff
From e8008cb69c5e4efbaedd70b0fb692343e4aa0e51 Mon Sep 17 00:00:00 2001
|
|
From: Rik van Riel <riel@surriel.com>
|
|
Date: Wed, 5 Feb 2025 23:43:21 -0500
|
|
Subject: x86/mm: remove pv_ops.mmu.tlb_remove_table call
|
|
|
|
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 <riel@surriel.com>
|
|
Suggested-by: Qi Zheng <zhengqi.arch@bytedance.com>
|
|
Tested-by: Manali Shukla <Manali.Shukla@amd.com>
|
|
---
|
|
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(-)
|
|
|
|
--- 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;
|
|
}
|
|
--- a/arch/x86/include/asm/paravirt.h
|
|
+++ b/arch/x86/include/asm/paravirt.h
|
|
@@ -91,11 +91,6 @@ static inline void __flush_tlb_multi(con
|
|
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);
|
|
--- 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);
|
|
--- 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");
|
|
}
|
|
|
|
--- 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,
|
|
--- 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
|
|
.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,
|