Commit 0dfd9ea7 authored by Song Gao's avatar Song Gao Committed by Huacai Chen
Browse files

LoongArch: KVM: Use kvm_get_vcpu_by_id() instead of kvm_get_vcpu() 



Since using kvm_get_vcpu() may fail to retrieve the vCPU context,
kvm_get_vcpu_by_id() should be used instead.

Fixes: 8e305426 ("LoongArch: KVM: Add IPI user mode read and write function")
Fixes: 3956a52b ("LoongArch: KVM: Add EIOINTC read and write functions")
Reviewed-by: default avatarYanteng Si <siyanteng@cqsoftware.com.cm>
Signed-off-by: default avatarSong Gao <gaosong@loongson.cn>
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
parent 5c68549c

arch/loongarch/kvm/intc/eiointc.c

+6 −1
Original line number Diff line number Diff line
@@ -45,7 +45,12 @@ static void eiointc_update_irq(struct loongarch_eiointc *s, int irq, int level) 
	}



	cpu = s->sw_coremap[irq];

	vcpu = kvm_get_vcpu(s->kvm, cpu);

	vcpu = kvm_get_vcpu_by_id(s->kvm, cpu);

	if (unlikely(vcpu == NULL)) {

		kvm_err("%s: invalid target cpu: %d\n", __func__, cpu);

		return;

	}



	if (level) {

		/* if not enable return false */

		if (!test_bit(irq, (unsigned long *)s->enable.reg_u32))

arch/loongarch/kvm/intc/ipi.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static int kvm_ipi_regs_access(struct kvm_device *dev, 
	cpu = (attr->attr >> 16) & 0x3ff;

	addr = attr->attr & 0xff;



	vcpu = kvm_get_vcpu(dev->kvm, cpu);

	vcpu = kvm_get_vcpu_by_id(dev->kvm, cpu);

	if (unlikely(vcpu == NULL)) {

		kvm_err("%s: invalid target cpu: %d\n", __func__, cpu);

		return -EINVAL;