Skip to content

Commit a1342c8

Browse files
dmatlackMarc Zyngier
authored andcommitted
KVM: Rename kvm_arch_flush_remote_tlb() to kvm_arch_flush_remote_tlbs()
Rename kvm_arch_flush_remote_tlb() and the associated macro __KVM_HAVE_ARCH_FLUSH_REMOTE_TLB to kvm_arch_flush_remote_tlbs() and __KVM_HAVE_ARCH_FLUSH_REMOTE_TLBS respectively. Making the name plural matches kvm_flush_remote_tlbs() and makes it more clear that this function can affect more than one remote TLB. No functional change intended. Signed-off-by: David Matlack <[email protected]> Signed-off-by: Raghavendra Rao Ananta <[email protected]> Reviewed-by: Gavin Shan <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Shaoqin Huang <[email protected]> Acked-by: Sean Christopherson <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 6eaae19 commit a1342c8

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

arch/mips/include/asm/kvm_host.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}
896896
static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {}
897897
static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu) {}
898898

899-
#define __KVM_HAVE_ARCH_FLUSH_REMOTE_TLB
900-
int kvm_arch_flush_remote_tlb(struct kvm *kvm);
899+
#define __KVM_HAVE_ARCH_FLUSH_REMOTE_TLBS
900+
int kvm_arch_flush_remote_tlbs(struct kvm *kvm);
901901

902902
#endif /* __MIPS_KVM_HOST_H__ */

arch/mips/kvm/mips.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot)
981981

982982
}
983983

984-
int kvm_arch_flush_remote_tlb(struct kvm *kvm)
984+
int kvm_arch_flush_remote_tlbs(struct kvm *kvm)
985985
{
986986
kvm_mips_callbacks->prepare_flush_shadow(kvm);
987987
return 1;

arch/x86/include/asm/kvm_host.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1794,8 +1794,8 @@ static inline struct kvm *kvm_arch_alloc_vm(void)
17941794
#define __KVM_HAVE_ARCH_VM_FREE
17951795
void kvm_arch_free_vm(struct kvm *kvm);
17961796

1797-
#define __KVM_HAVE_ARCH_FLUSH_REMOTE_TLB
1798-
static inline int kvm_arch_flush_remote_tlb(struct kvm *kvm)
1797+
#define __KVM_HAVE_ARCH_FLUSH_REMOTE_TLBS
1798+
static inline int kvm_arch_flush_remote_tlbs(struct kvm *kvm)
17991799
{
18001800
if (kvm_x86_ops.flush_remote_tlbs &&
18011801
!static_call(kvm_x86_flush_remote_tlbs)(kvm))

include/linux/kvm_host.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,8 +1479,8 @@ static inline void kvm_arch_free_vm(struct kvm *kvm)
14791479
}
14801480
#endif
14811481

1482-
#ifndef __KVM_HAVE_ARCH_FLUSH_REMOTE_TLB
1483-
static inline int kvm_arch_flush_remote_tlb(struct kvm *kvm)
1482+
#ifndef __KVM_HAVE_ARCH_FLUSH_REMOTE_TLBS
1483+
static inline int kvm_arch_flush_remote_tlbs(struct kvm *kvm)
14841484
{
14851485
return -ENOTSUPP;
14861486
}

virt/kvm/kvm_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ void kvm_flush_remote_tlbs(struct kvm *kvm)
361361
* kvm_make_all_cpus_request() reads vcpu->mode. We reuse that
362362
* barrier here.
363363
*/
364-
if (!kvm_arch_flush_remote_tlb(kvm)
364+
if (!kvm_arch_flush_remote_tlbs(kvm)
365365
|| kvm_make_all_cpus_request(kvm, KVM_REQ_TLB_FLUSH))
366366
++kvm->stat.generic.remote_tlb_flush;
367367
}

0 commit comments

Comments
 (0)