Commit b79bf202 authored by Anup Patel's avatar Anup Patel Committed by Anup Patel
Browse files

RISC-V: KVM: Rename and move kvm_riscv_local_tlb_sanitize() 



The kvm_riscv_local_tlb_sanitize() deals with sanitizing current
VMID related TLB mappings when a VCPU is moved from one host CPU
to another.

Let's move kvm_riscv_local_tlb_sanitize() to VMID management
sources and rename it to kvm_riscv_gstage_vmid_sanitize().

Signed-off-by: default avatarAnup Patel <apatel@ventanamicro.com>
Reviewed-by: default avatarAtish Patra <atishp@rivosinc.com>
Tested-by: default avatarAtish Patra <atishp@rivosinc.com>
Reviewed-by: default avatarNutty Liu <liujingqi@lanxincomputing.com>
Link: https://lore.kernel.org/r/20250618113532.471448-4-apatel@ventanamicro.com


Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
parent 7c67de21

arch/riscv/include/asm/kvm_host.h

+1 −2
Original line number Diff line number Diff line
@@ -330,8 +330,6 @@ 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_local_tlb_sanitize(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);
@@ -379,6 +377,7 @@ unsigned long kvm_riscv_gstage_vmid_bits(void); 
int kvm_riscv_gstage_vmid_init(struct kvm *kvm);

bool kvm_riscv_gstage_vmid_ver_changed(struct kvm_vmid *vmid);

void kvm_riscv_gstage_vmid_update(struct kvm_vcpu *vcpu);

void kvm_riscv_gstage_vmid_sanitize(struct kvm_vcpu *vcpu);



int kvm_riscv_setup_default_irq_routing(struct kvm *kvm, u32 lines);

arch/riscv/kvm/tlb.c

+0 −23
Original line number Diff line number Diff line
@@ -156,29 +156,6 @@ void kvm_riscv_local_hfence_vvma_all(unsigned long vmid) 
	csr_write(CSR_HGATP, hgatp);

}



void kvm_riscv_local_tlb_sanitize(struct kvm_vcpu *vcpu)

{

	unsigned long vmid;



	if (!kvm_riscv_gstage_vmid_bits() ||

	    vcpu->arch.last_exit_cpu == vcpu->cpu)

		return;



	/*

	 * On RISC-V platforms with hardware VMID support, we share same

	 * VMID for all VCPUs of a particular Guest/VM. This means we might

	 * have stale G-stage TLB entries on the current Host CPU due to

	 * some other VCPU of the same Guest which ran previously on the

	 * current Host CPU.

	 *

	 * To cleanup stale TLB entries, we simply flush all G-stage TLB

	 * entries by VMID whenever underlying Host CPU changes for a VCPU.

	 */



	vmid = READ_ONCE(vcpu->kvm->arch.vmid.vmid);

	kvm_riscv_local_hfence_gvma_vmid_all(vmid);

}



void kvm_riscv_fence_i_process(struct kvm_vcpu *vcpu)

{

	kvm_riscv_vcpu_pmu_incr_fw(vcpu, SBI_PMU_FW_FENCE_I_RCVD);

arch/riscv/kvm/vcpu.c

+2 −2
Original line number Diff line number Diff line
@@ -952,12 +952,12 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 
		}



		/*

		 * Cleanup stale TLB enteries

		 * Sanitize VMID mappings cached (TLB) on current CPU

		 *

		 * Note: This should be done after G-stage VMID has been

		 * updated using kvm_riscv_gstage_vmid_ver_changed()

		 */

		kvm_riscv_local_tlb_sanitize(vcpu);

		kvm_riscv_gstage_vmid_sanitize(vcpu);



		trace_kvm_entry(vcpu);

arch/riscv/kvm/vmid.c

+23 −0
Original line number Diff line number Diff line
@@ -122,3 +122,26 @@ void kvm_riscv_gstage_vmid_update(struct kvm_vcpu *vcpu) 
	kvm_for_each_vcpu(i, v, vcpu->kvm)

		kvm_make_request(KVM_REQ_UPDATE_HGATP, v);

}



void kvm_riscv_gstage_vmid_sanitize(struct kvm_vcpu *vcpu)

{

	unsigned long vmid;



	if (!kvm_riscv_gstage_vmid_bits() ||

	    vcpu->arch.last_exit_cpu == vcpu->cpu)

		return;



	/*

	 * On RISC-V platforms with hardware VMID support, we share same

	 * VMID for all VCPUs of a particular Guest/VM. This means we might

	 * have stale G-stage TLB entries on the current Host CPU due to

	 * some other VCPU of the same Guest which ran previously on the

	 * current Host CPU.

	 *

	 * To cleanup stale TLB entries, we simply flush all G-stage TLB

	 * entries by VMID whenever underlying Host CPU changes for a VCPU.

	 */



	vmid = READ_ONCE(vcpu->kvm->arch.vmid.vmid);

	kvm_riscv_local_hfence_gvma_vmid_all(vmid);

}