Commit bb4ce2c6 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:
 "The main and larger change here is a workaround for AMD's lack of
  cache coherency for encrypted-memory guests.

  I have another patch pending, but it's waiting for review from the
  architecture maintainers.

  RISC-V:

   - Remove 's' & 'u' as valid ISA extension

   - Do not allow disabling the base extensions 'i'/'m'/'a'/'c'

  x86:

   - Fix NMI watchdog in guests on AMD

   - Fix for SEV cache incoherency issues

   - Don't re-acquire SRCU lock in complete_emulated_io()

   - Avoid NULL pointer deref if VM creation fails

   - Fix race conditions between APICv disabling and vCPU creation

   - Bugfixes for disabling of APICv

   - Preserve BSP MSR_KVM_POLL_CONTROL across suspend/resume

  selftests:

   - Do not use bitfields larger than 32-bits, they differ between GCC
     and clang"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: selftests: introduce and use more page size-related constants
  kvm: selftests: do not use bitfields larger than 32-bits for PTEs
  KVM: SEV: add cache flush to solve SEV cache incoherency issues
  KVM: SVM: Flush when freeing encrypted pages even on SME_COHERENT CPUs
  KVM: SVM: Simplify and harden helper to flush SEV guest page(s)
  KVM: selftests: Silence compiler warning in the kvm_page_table_test
  KVM: x86/pmu: Update AMD PMC sample period to fix guest NMI-watchdog
  x86/kvm: Preserve BSP MSR_KVM_POLL_CONTROL across suspend/resume
  KVM: SPDX style and spelling fixes
  KVM: x86: Skip KVM_GUESTDBG_BLOCKIRQ APICv update if APICv is disabled
  KVM: x86: Pend KVM_REQ_APICV_UPDATE during vCPU creation to fix a race
  KVM: nVMX: Defer APICv updates while L2 is active until L1 is active
  KVM: x86: Tag APICv DISABLE inhibit, not ABSENT, if APICv is disabled
  KVM: Initialize debugfs_dentry when a VM is created to avoid NULL deref
  KVM: Add helpers to wrap vcpu->srcu_idx and yell if it's abused
  KVM: RISC-V: Use kvm_vcpu.srcu_idx, drop RISC-V's unnecessary copy
  KVM: x86: Don't re-acquire SRCU lock in complete_emulated_io()
  RISC-V: KVM: Restrict the extensions that can be disabled
  RISC-V: KVM: Remove 's' & 'u' as valid ISA extension
parents 06fb4ecf e852be8b

arch/powerpc/kvm/book3s_64_mmu_radix.c

+5 −4
Original line number Diff line number Diff line
@@ -168,9 +168,10 @@ int kvmppc_mmu_walk_radix_tree(struct kvm_vcpu *vcpu, gva_t eaddr, 
			return -EINVAL;

		/* Read the entry from guest memory */

		addr = base + (index * sizeof(rpte));

		vcpu->srcu_idx = srcu_read_lock(&kvm->srcu);



		kvm_vcpu_srcu_read_lock(vcpu);

		ret = kvm_read_guest(kvm, addr, &rpte, sizeof(rpte));

		srcu_read_unlock(&kvm->srcu, vcpu->srcu_idx);

		kvm_vcpu_srcu_read_unlock(vcpu);

		if (ret) {

			if (pte_ret_p)

				*pte_ret_p = addr;
@@ -246,9 +247,9 @@ int kvmppc_mmu_radix_translate_table(struct kvm_vcpu *vcpu, gva_t eaddr, 


	/* Read the table to find the root of the radix tree */

	ptbl = (table & PRTB_MASK) + (table_index * sizeof(entry));

	vcpu->srcu_idx = srcu_read_lock(&kvm->srcu);

	kvm_vcpu_srcu_read_lock(vcpu);

	ret = kvm_read_guest(kvm, ptbl, &entry, sizeof(entry));

	srcu_read_unlock(&kvm->srcu, vcpu->srcu_idx);

	kvm_vcpu_srcu_read_unlock(vcpu);

	if (ret)

		return ret;

arch/powerpc/kvm/book3s_hv_nested.c

+8 −8
Original line number Diff line number Diff line
@@ -306,10 +306,10 @@ long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu) 
	/* copy parameters in */

	hv_ptr = kvmppc_get_gpr(vcpu, 4);

	regs_ptr = kvmppc_get_gpr(vcpu, 5);

	vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);

	kvm_vcpu_srcu_read_lock(vcpu);

	err = kvmhv_read_guest_state_and_regs(vcpu, &l2_hv, &l2_regs,

					      hv_ptr, regs_ptr);

	srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx);

	kvm_vcpu_srcu_read_unlock(vcpu);

	if (err)

		return H_PARAMETER;
@@ -410,10 +410,10 @@ long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu) 
		byteswap_hv_regs(&l2_hv);

		byteswap_pt_regs(&l2_regs);

	}

	vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);

	kvm_vcpu_srcu_read_lock(vcpu);

	err = kvmhv_write_guest_state_and_regs(vcpu, &l2_hv, &l2_regs,

					       hv_ptr, regs_ptr);

	srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx);

	kvm_vcpu_srcu_read_unlock(vcpu);

	if (err)

		return H_AUTHORITY;
@@ -600,16 +600,16 @@ long kvmhv_copy_tofrom_guest_nested(struct kvm_vcpu *vcpu) 
			goto not_found;



		/* Write what was loaded into our buffer back to the L1 guest */

		vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);

		kvm_vcpu_srcu_read_lock(vcpu);

		rc = kvm_vcpu_write_guest(vcpu, gp_to, buf, n);

		srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx);

		kvm_vcpu_srcu_read_unlock(vcpu);

		if (rc)

			goto not_found;

	} else {

		/* Load the data to be stored from the L1 guest into our buf */

		vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);

		kvm_vcpu_srcu_read_lock(vcpu);

		rc = kvm_vcpu_read_guest(vcpu, gp_from, buf, n);

		srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx);

		kvm_vcpu_srcu_read_unlock(vcpu);

		if (rc)

			goto not_found;

arch/powerpc/kvm/book3s_rtas.c

+2 −2
Original line number Diff line number Diff line
@@ -229,9 +229,9 @@ int kvmppc_rtas_hcall(struct kvm_vcpu *vcpu) 
	 */

	args_phys = kvmppc_get_gpr(vcpu, 4) & KVM_PAM;



	vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);

	kvm_vcpu_srcu_read_lock(vcpu);

	rc = kvm_read_guest(vcpu->kvm, args_phys, &args, sizeof(args));

	srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx);

	kvm_vcpu_srcu_read_unlock(vcpu);

	if (rc)

		goto fail;

arch/powerpc/kvm/powerpc.c

+2 −2
Original line number Diff line number Diff line
@@ -425,9 +425,9 @@ int kvmppc_ld(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr, 
		return EMULATE_DONE;

	}



	vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);

	kvm_vcpu_srcu_read_lock(vcpu);

	rc = kvm_read_guest(vcpu->kvm, pte.raddr, ptr, size);

	srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx);

	kvm_vcpu_srcu_read_unlock(vcpu);

	if (rc)

		return EMULATE_DO_MMIO;

arch/riscv/include/asm/kvm_host.h

+0 −3
Original line number Diff line number Diff line
@@ -193,9 +193,6 @@ struct kvm_vcpu_arch { 


	/* Don't run the VCPU (blocked) */

	bool pause;



	/* SRCU lock index for in-kernel run loop */

	int srcu_idx;

};



static inline void kvm_arch_hardware_unsetup(void) {}