Commit e93d78e0 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-riscv-fixes-6.14-1' of https://github.com/kvm-riscv/linux into HEAD 

KVM/riscv fixes for 6.14, take #1

- Fix hart status check in SBI HSM extension
- Fix hart suspend_type usage in SBI HSM extension
- Fix error returned by SBI IPI and TIME extensions for
  unsupported function IDs
- Fix suspend_type usage in SBI SUSP extension
- Remove unnecessary vcpu kick after injecting interrupt
  via IMSIC guest file
parents 4647c822 d252435a

arch/riscv/kvm/aia_imsic.c

+0 −1
Original line number Diff line number Diff line
@@ -974,7 +974,6 @@ int kvm_riscv_vcpu_aia_imsic_inject(struct kvm_vcpu *vcpu, 


	if (imsic->vsfile_cpu >= 0) {

		writel(iid, imsic->vsfile_va + IMSIC_MMIO_SETIPNUM_LE);

		kvm_vcpu_kick(vcpu);

	} else {

		eix = &imsic->swfile->eix[iid / BITS_PER_TYPE(u64)];

		set_bit(iid & (BITS_PER_TYPE(u64) - 1), eix->eip);

arch/riscv/kvm/vcpu_sbi_hsm.c

+6 −5
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/errno.h>

#include <linux/err.h>

#include <linux/kvm_host.h>

#include <linux/wordpart.h>

#include <asm/sbi.h>

#include <asm/kvm_vcpu_sbi.h>
@@ -79,12 +80,12 @@ static int kvm_sbi_hsm_vcpu_get_status(struct kvm_vcpu *vcpu) 
	target_vcpu = kvm_get_vcpu_by_id(vcpu->kvm, target_vcpuid);

	if (!target_vcpu)

		return SBI_ERR_INVALID_PARAM;

	if (!kvm_riscv_vcpu_stopped(target_vcpu))

		return SBI_HSM_STATE_STARTED;

	else if (vcpu->stat.generic.blocking)

	if (kvm_riscv_vcpu_stopped(target_vcpu))

		return SBI_HSM_STATE_STOPPED;

	else if (target_vcpu->stat.generic.blocking)

		return SBI_HSM_STATE_SUSPENDED;

	else

		return SBI_HSM_STATE_STOPPED;

		return SBI_HSM_STATE_STARTED;

}



static int kvm_sbi_ext_hsm_handler(struct kvm_vcpu *vcpu, struct kvm_run *run,
@@ -109,7 +110,7 @@ static int kvm_sbi_ext_hsm_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, 
		}

		return 0;

	case SBI_EXT_HSM_HART_SUSPEND:

		switch (cp->a0) {

		switch (lower_32_bits(cp->a0)) {

		case SBI_HSM_SUSPEND_RET_DEFAULT:

			kvm_riscv_vcpu_wfi(vcpu);

			break;

arch/riscv/kvm/vcpu_sbi_replace.c

+12 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static int kvm_sbi_ext_time_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, 
	u64 next_cycle;



	if (cp->a6 != SBI_EXT_TIME_SET_TIMER) {

		retdata->err_val = SBI_ERR_INVALID_PARAM;

		retdata->err_val = SBI_ERR_NOT_SUPPORTED;

		return 0;

	}
@@ -51,9 +51,10 @@ static int kvm_sbi_ext_ipi_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, 
	struct kvm_cpu_context *cp = &vcpu->arch.guest_context;

	unsigned long hmask = cp->a0;

	unsigned long hbase = cp->a1;

	unsigned long hart_bit = 0, sentmask = 0;



	if (cp->a6 != SBI_EXT_IPI_SEND_IPI) {

		retdata->err_val = SBI_ERR_INVALID_PARAM;

		retdata->err_val = SBI_ERR_NOT_SUPPORTED;

		return 0;

	}
@@ -62,15 +63,23 @@ static int kvm_sbi_ext_ipi_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, 
		if (hbase != -1UL) {

			if (tmp->vcpu_id < hbase)

				continue;

			if (!(hmask & (1UL << (tmp->vcpu_id - hbase))))

			hart_bit = tmp->vcpu_id - hbase;

			if (hart_bit >= __riscv_xlen)

				goto done;

			if (!(hmask & (1UL << hart_bit)))

				continue;

		}

		ret = kvm_riscv_vcpu_set_interrupt(tmp, IRQ_VS_SOFT);

		if (ret < 0)

			break;

		sentmask |= 1UL << hart_bit;

		kvm_riscv_vcpu_pmu_incr_fw(tmp, SBI_PMU_FW_IPI_RCVD);

	}



done:

	if (hbase != -1UL && (hmask ^ sentmask))

		retdata->err_val = SBI_ERR_INVALID_PARAM;



	return ret;

}

arch/riscv/kvm/vcpu_sbi_system.c

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



#include <linux/kvm_host.h>

#include <linux/wordpart.h>



#include <asm/kvm_vcpu_sbi.h>

#include <asm/sbi.h>
@@ -19,7 +20,7 @@ static int kvm_sbi_ext_susp_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, 


	switch (funcid) {

	case SBI_EXT_SUSP_SYSTEM_SUSPEND:

		if (cp->a0 != SBI_SUSP_SLEEP_TYPE_SUSPEND_TO_RAM) {

		if (lower_32_bits(cp->a0) != SBI_SUSP_SLEEP_TYPE_SUSPEND_TO_RAM) {

			retdata->err_val = SBI_ERR_INVALID_PARAM;

			return 0;

		}