Commit 2f3fc29a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

KVM/riscv fixes for 6.16, take #1

- Fix the size parameter check in SBI SFENCE calls
- Don't treat SBI HFENCE calls as NOPs
parents a09e359d 2e7be162

arch/riscv/kvm/vcpu_sbi_replace.c

+4 −4
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static int kvm_sbi_ext_rfence_handler(struct kvm_vcpu *vcpu, struct kvm_run *run 
		kvm_riscv_vcpu_pmu_incr_fw(vcpu, SBI_PMU_FW_FENCE_I_SENT);

		break;

	case SBI_EXT_RFENCE_REMOTE_SFENCE_VMA:

		if (cp->a2 == 0 && cp->a3 == 0)

		if ((cp->a2 == 0 && cp->a3 == 0) || cp->a3 == -1UL)

			kvm_riscv_hfence_vvma_all(vcpu->kvm, hbase, hmask);

		else

			kvm_riscv_hfence_vvma_gva(vcpu->kvm, hbase, hmask,
@@ -111,7 +111,7 @@ static int kvm_sbi_ext_rfence_handler(struct kvm_vcpu *vcpu, struct kvm_run *run 
		kvm_riscv_vcpu_pmu_incr_fw(vcpu, SBI_PMU_FW_HFENCE_VVMA_SENT);

		break;

	case SBI_EXT_RFENCE_REMOTE_SFENCE_VMA_ASID:

		if (cp->a2 == 0 && cp->a3 == 0)

		if ((cp->a2 == 0 && cp->a3 == 0) || cp->a3 == -1UL)

			kvm_riscv_hfence_vvma_asid_all(vcpu->kvm,

						       hbase, hmask, cp->a4);

		else
@@ -127,9 +127,9 @@ static int kvm_sbi_ext_rfence_handler(struct kvm_vcpu *vcpu, struct kvm_run *run 
	case SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID:

		/*

		 * Until nested virtualization is implemented, the

		 * SBI HFENCE calls should be treated as NOPs

		 * SBI HFENCE calls should return not supported

		 * hence fallthrough.

		 */

		break;

	default:

		retdata->err_val = SBI_ERR_NOT_SUPPORTED;

	}