Commit 06c4f995 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

KVM/riscv fixes for 7.1, take #1

- Fix invalid HVA warning in steal-time recording
- Return SBI_ERR_FAILURE to guest upon OOM in pmu_event_info()
  and pmu_snapshot_set_shmem()
- Fix NULL pointer dereference in SBI v0.1 SEND_IPI handler
- Fix sign extension of value for MMIO loads
parents 37f32d5a c7832534

arch/riscv/kvm/vcpu_insn.c

+4 −5
Original line number Diff line number Diff line
@@ -415,7 +415,6 @@ int kvm_riscv_vcpu_mmio_load(struct kvm_vcpu *vcpu, struct kvm_run *run, 
		shift = 8 * (sizeof(ulong) - len);

	} else if ((insn & INSN_MASK_LBU) == INSN_MATCH_LBU) {

		len = 1;

		shift = 8 * (sizeof(ulong) - len);

#ifdef CONFIG_64BIT

	} else if ((insn & INSN_MASK_LD) == INSN_MATCH_LD) {

		len = 8;
@@ -649,22 +648,22 @@ int kvm_riscv_vcpu_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	case 1:

		data8 = *((u8 *)run->mmio.data);

		SET_RD(insn, &vcpu->arch.guest_context,

			(ulong)data8 << shift >> shift);

			(long)((ulong)data8 << shift) >> shift);

		break;

	case 2:

		data16 = *((u16 *)run->mmio.data);

		SET_RD(insn, &vcpu->arch.guest_context,

			(ulong)data16 << shift >> shift);

			(long)((ulong)data16 << shift) >> shift);

		break;

	case 4:

		data32 = *((u32 *)run->mmio.data);

		SET_RD(insn, &vcpu->arch.guest_context,

			(ulong)data32 << shift >> shift);

			(long)((ulong)data32 << shift) >> shift);

		break;

	case 8:

		data64 = *((u64 *)run->mmio.data);

		SET_RD(insn, &vcpu->arch.guest_context,

			(ulong)data64 << shift >> shift);

			(long)((ulong)data64 << shift) >> shift);

		break;

	default:

		return -EOPNOTSUPP;

arch/riscv/kvm/vcpu_pmu.c

+8 −4
Original line number Diff line number Diff line
@@ -453,8 +453,10 @@ int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned long s 
	}



	kvpmu->sdata = kzalloc(snapshot_area_size, GFP_ATOMIC);

	if (!kvpmu->sdata)

		return -ENOMEM;

	if (!kvpmu->sdata) {

		sbiret = SBI_ERR_FAILURE;

		goto out;

	}



	/* No need to check writable slot explicitly as kvm_vcpu_write_guest does it internally */

	if (kvm_vcpu_write_guest(vcpu, saddr, kvpmu->sdata, snapshot_area_size)) {
@@ -499,8 +501,10 @@ int kvm_riscv_vcpu_pmu_event_info(struct kvm_vcpu *vcpu, unsigned long saddr_low 
	}



	einfo = kzalloc(shmem_size, GFP_KERNEL);

	if (!einfo)

		return -ENOMEM;

	if (!einfo) {

		ret = SBI_ERR_FAILURE;

		goto out;

	}



	ret = kvm_vcpu_read_guest(vcpu, shmem, einfo, shmem_size);

	if (ret) {

arch/riscv/kvm/vcpu_sbi_sta.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ void kvm_riscv_vcpu_record_steal_time(struct kvm_vcpu *vcpu) 
	gfn = shmem >> PAGE_SHIFT;

	hva = kvm_vcpu_gfn_to_hva(vcpu, gfn);



	if (WARN_ON(kvm_is_error_hva(hva))) {

	if (kvm_is_error_hva(hva)) {

		vcpu->arch.sta.shmem = INVALID_GPA;

		return;

	}

arch/riscv/kvm/vcpu_sbi_v01.c

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ static int kvm_sbi_ext_v01_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, 


		for_each_set_bit(i, &hmask, BITS_PER_LONG) {

			rvcpu = kvm_get_vcpu_by_id(vcpu->kvm, i);

			if (!rvcpu)

				continue;

			ret = kvm_riscv_vcpu_set_interrupt(rvcpu, IRQ_VS_SOFT);

			if (ret < 0)

				break;