RISC-V: KVM: Replace KVM_REQ_HFENCE_GVMA_VMID_ALL with KVM_REQ_TLB_FLUSH

The KVM_REQ_HFENCE_GVMA_VMID_ALL is same as KVM_REQ_TLB_FLUSH so
to avoid confusion let's replace KVM_REQ_HFENCE_GVMA_VMID_ALL with
KVM_REQ_TLB_FLUSH. Also, rename kvm_riscv_hfence_gvma_vmid_all_process()
to kvm_riscv_tlb_flush_process().

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
Tested-by: Atish Patra <atishp@rivosinc.com>
Reviewed-by: Nutty Liu <liujingqi@lanxincomputing.com>
Link: https://lore.kernel.org/r/20250618113532.471448-5-apatel@ventanamicro.com
Signed-off-by: Anup Patel <anup@brainfault.org>

diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h
index 66195d7cbb1792a00a6d36a4876552f3234d5dc6..1ca477b2adb2ac8a47138f596dd139676bb0ba3c 100644 (file)
--- a/arch/riscv/include/asm/kvm_host.h
+++ b/arch/riscv/include/asm/kvm_host.h
@@ -36,7 +36,6 @@
 #define KVM_REQ_UPDATE_HGATP           KVM_ARCH_REQ(2)
 #define KVM_REQ_FENCE_I                        \
        KVM_ARCH_REQ_FLAGS(3, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
-#define KVM_REQ_HFENCE_GVMA_VMID_ALL   KVM_REQ_TLB_FLUSH
 #define KVM_REQ_HFENCE_VVMA_ALL                \
        KVM_ARCH_REQ_FLAGS(4, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
 #define KVM_REQ_HFENCE                 \
@@ -330,8 +329,9 @@ void kvm_riscv_local_hfence_vvma_gva(unsigned long vmid,
                                     unsigned long order);
 void kvm_riscv_local_hfence_vvma_all(unsigned long vmid);
 
+void kvm_riscv_tlb_flush_process(struct kvm_vcpu *vcpu);
+
 void kvm_riscv_fence_i_process(struct kvm_vcpu *vcpu);
-void kvm_riscv_hfence_gvma_vmid_all_process(struct kvm_vcpu *vcpu);
 void kvm_riscv_hfence_vvma_all_process(struct kvm_vcpu *vcpu);
 void kvm_riscv_hfence_process(struct kvm_vcpu *vcpu);
 

diff --git a/arch/riscv/kvm/tlb.c b/arch/riscv/kvm/tlb.c
index b3461bfd9756fbcaa735b7fac1e6e80e5e8ed1f1..da98ca801d319446e853677e1344dd770e1830e3 100644 (file)
--- a/arch/riscv/kvm/tlb.c
+++ b/arch/riscv/kvm/tlb.c
@@ -162,7 +162,7 @@ void kvm_riscv_fence_i_process(struct kvm_vcpu *vcpu)
        local_flush_icache_all();
 }
 
-void kvm_riscv_hfence_gvma_vmid_all_process(struct kvm_vcpu *vcpu)
+void kvm_riscv_tlb_flush_process(struct kvm_vcpu *vcpu)
 {
        struct kvm_vmid *v = &vcpu->kvm->arch.vmid;
        unsigned long vmid = READ_ONCE(v->vmid);
@@ -342,14 +342,14 @@ void kvm_riscv_hfence_gvma_vmid_gpa(struct kvm *kvm,
        data.size = gpsz;
        data.order = order;
        make_xfence_request(kvm, hbase, hmask, KVM_REQ_HFENCE,
-                           KVM_REQ_HFENCE_GVMA_VMID_ALL, &data);
+                           KVM_REQ_TLB_FLUSH, &data);
 }
 
 void kvm_riscv_hfence_gvma_vmid_all(struct kvm *kvm,
                                    unsigned long hbase, unsigned long hmask)
 {
-       make_xfence_request(kvm, hbase, hmask, KVM_REQ_HFENCE_GVMA_VMID_ALL,
-                           KVM_REQ_HFENCE_GVMA_VMID_ALL, NULL);
+       make_xfence_request(kvm, hbase, hmask, KVM_REQ_TLB_FLUSH,
+                           KVM_REQ_TLB_FLUSH, NULL);
 }
 
 void kvm_riscv_hfence_vvma_asid_gva(struct kvm *kvm,

diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c
index 6ba62c62cd7e6c737671732aea0d011ed4238080..3ccc6bec3a3ad94c0b1fe994f61a7033e888eee0 100644 (file)
--- a/arch/riscv/kvm/vcpu.c
+++ b/arch/riscv/kvm/vcpu.c
@@ -711,12 +711,8 @@ static void kvm_riscv_check_vcpu_requests(struct kvm_vcpu *vcpu)
                if (kvm_check_request(KVM_REQ_FENCE_I, vcpu))
                        kvm_riscv_fence_i_process(vcpu);
 
-               /*
-                * The generic KVM_REQ_TLB_FLUSH is same as
-                * KVM_REQ_HFENCE_GVMA_VMID_ALL
-                */
-               if (kvm_check_request(KVM_REQ_HFENCE_GVMA_VMID_ALL, vcpu))
-                       kvm_riscv_hfence_gvma_vmid_all_process(vcpu);
+               if (kvm_check_request(KVM_REQ_TLB_FLUSH, vcpu))
+                       kvm_riscv_tlb_flush_process(vcpu);
 
                if (kvm_check_request(KVM_REQ_HFENCE_VVMA_ALL, vcpu))
                        kvm_riscv_hfence_vvma_all_process(vcpu);