Commit 8c123380 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fixes from Paolo Bonzini:
 "Bugfixes for ARM, PPC and x86, plus selftest improvements"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: nVMX: Don't leak L1 MMIO regions to L2
  KVM: SVM: Fix potential wrong physical id in avic_handle_ldr_update
  kvm: clear kvmclock MSR on reset
  KVM: x86: fix bugon.cocci warnings
  KVM: VMX: Remove specialized handling of unexpected exit-reasons
  selftests: kvm: fix sync_regs_test with newer gccs
  selftests: kvm: vmx_dirty_log_test: skip the test when VMX is not supported
  selftests: kvm: consolidate VMX support checks
  selftests: kvm: vmx_set_nested_state_test: don't check for VMX support twice
  KVM: Don't shrink/grow vCPU halt_poll_ns if host side polling is disabled
  selftests: kvm: synchronize .gitignore to Makefile
  kvm: x86: Expose RDPID in KVM_GET_SUPPORTED_CPUID
  KVM: arm64: pmu: Reset sample period on overflow handling
  KVM: arm64: pmu: Set the CHAINED attribute before creating the in-kernel event
  arm64: KVM: Handle PMCR_EL0.LC as RES1 on pure AArch64 systems
  KVM: arm64: pmu: Fix cycle counter truncation
  KVM: PPC: Book3S HV: XIVE: Ensure VP isn't already in use
parents 8caacaad 671ddc70

arch/arm64/kvm/sys_regs.c

+4 −0
Original line number Diff line number Diff line
@@ -632,6 +632,8 @@ static void reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r) 
	 */

	val = ((pmcr & ~ARMV8_PMU_PMCR_MASK)

	       | (ARMV8_PMU_PMCR_MASK & 0xdecafbad)) & (~ARMV8_PMU_PMCR_E);

	if (!system_supports_32bit_el0())

		val |= ARMV8_PMU_PMCR_LC;

	__vcpu_sys_reg(vcpu, r->reg) = val;

}
@@ -682,6 +684,8 @@ static bool access_pmcr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, 
		val = __vcpu_sys_reg(vcpu, PMCR_EL0);

		val &= ~ARMV8_PMU_PMCR_MASK;

		val |= p->regval & ARMV8_PMU_PMCR_MASK;

		if (!system_supports_32bit_el0())

			val |= ARMV8_PMU_PMCR_LC;

		__vcpu_sys_reg(vcpu, PMCR_EL0) = val;

		kvm_pmu_handle_pmcr(vcpu, val);

		kvm_vcpu_pmu_restore_guest(vcpu);

arch/powerpc/kvm/book3s_xive.c

+16 −8
Original line number Diff line number Diff line
@@ -1217,6 +1217,7 @@ int kvmppc_xive_connect_vcpu(struct kvm_device *dev, 
	struct kvmppc_xive *xive = dev->private;

	struct kvmppc_xive_vcpu *xc;

	int i, r = -EBUSY;

	u32 vp_id;



	pr_devel("connect_vcpu(cpu=%d)\n", cpu);
@@ -1228,25 +1229,32 @@ int kvmppc_xive_connect_vcpu(struct kvm_device *dev, 
		return -EPERM;

	if (vcpu->arch.irq_type != KVMPPC_IRQ_DEFAULT)

		return -EBUSY;

	if (kvmppc_xive_find_server(vcpu->kvm, cpu)) {

		pr_devel("Duplicate !\n");

		return -EEXIST;

	}

	if (cpu >= (KVM_MAX_VCPUS * vcpu->kvm->arch.emul_smt_mode)) {

		pr_devel("Out of bounds !\n");

		return -EINVAL;

	}

	xc = kzalloc(sizeof(*xc), GFP_KERNEL);

	if (!xc)

		return -ENOMEM;



	/* We need to synchronize with queue provisioning */

	mutex_lock(&xive->lock);



	vp_id = kvmppc_xive_vp(xive, cpu);

	if (kvmppc_xive_vp_in_use(xive->kvm, vp_id)) {

		pr_devel("Duplicate !\n");

		r = -EEXIST;

		goto bail;

	}



	xc = kzalloc(sizeof(*xc), GFP_KERNEL);

	if (!xc) {

		r = -ENOMEM;

		goto bail;

	}



	vcpu->arch.xive_vcpu = xc;

	xc->xive = xive;

	xc->vcpu = vcpu;

	xc->server_num = cpu;

	xc->vp_id = kvmppc_xive_vp(xive, cpu);

	xc->vp_id = vp_id;

	xc->mfrr = 0xff;

	xc->valid = true;

arch/powerpc/kvm/book3s_xive.h

+12 −0
Original line number Diff line number Diff line
@@ -220,6 +220,18 @@ static inline u32 kvmppc_xive_vp(struct kvmppc_xive *xive, u32 server) 
	return xive->vp_base + kvmppc_pack_vcpu_id(xive->kvm, server);

}



static inline bool kvmppc_xive_vp_in_use(struct kvm *kvm, u32 vp_id)

{

	struct kvm_vcpu *vcpu = NULL;

	int i;



	kvm_for_each_vcpu(i, vcpu, kvm) {

		if (vcpu->arch.xive_vcpu && vp_id == vcpu->arch.xive_vcpu->vp_id)

			return true;

	}

	return false;

}



/*

 * Mapping between guest priorities and host priorities

 * is as follow.

arch/powerpc/kvm/book3s_xive_native.c

+4 −2
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ int kvmppc_xive_native_connect_vcpu(struct kvm_device *dev, 
	struct kvmppc_xive *xive = dev->private;

	struct kvmppc_xive_vcpu *xc = NULL;

	int rc;

	u32 vp_id;



	pr_devel("native_connect_vcpu(server=%d)\n", server_num);
@@ -124,7 +125,8 @@ int kvmppc_xive_native_connect_vcpu(struct kvm_device *dev, 


	mutex_lock(&xive->lock);



	if (kvmppc_xive_find_server(vcpu->kvm, server_num)) {

	vp_id = kvmppc_xive_vp(xive, server_num);

	if (kvmppc_xive_vp_in_use(xive->kvm, vp_id)) {

		pr_devel("Duplicate !\n");

		rc = -EEXIST;

		goto bail;
@@ -141,7 +143,7 @@ int kvmppc_xive_native_connect_vcpu(struct kvm_device *dev, 
	xc->vcpu = vcpu;

	xc->server_num = server_num;



	xc->vp_id = kvmppc_xive_vp(xive, server_num);

	xc->vp_id = vp_id;

	xc->valid = true;

	vcpu->arch.irq_type = KVMPPC_IRQ_XIVE;

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -1189,7 +1189,7 @@ struct kvm_x86_ops { 
	int (*set_nested_state)(struct kvm_vcpu *vcpu,

				struct kvm_nested_state __user *user_kvm_nested_state,

				struct kvm_nested_state *kvm_state);

	void (*get_vmcs12_pages)(struct kvm_vcpu *vcpu);

	bool (*get_vmcs12_pages)(struct kvm_vcpu *vcpu);



	int (*smi_allowed)(struct kvm_vcpu *vcpu);

	int (*pre_enter_smm)(struct kvm_vcpu *vcpu, char *smstate);

CRA Git | Maintained and supported by SUSTech CRA and CCSE