Commit 9cccec2b 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:
 "A bit late... I got sidetracked by back-from-vacation routines and
  conferences. But most of these patches are already a few weeks old and
  things look more calm on the mailing list than what this pull request
  would suggest.

  x86:

   - missing TLB flush

   - nested virtualization fixes for SMM (secure boot on nested
     hypervisor) and other nested SVM fixes

   - syscall fuzzing fixes

   - live migration fix for AMD SEV

   - mirror VMs now work for SEV-ES too

   - fixes for reset

   - possible out-of-bounds access in IOAPIC emulation

   - fix enlightened VMCS on Windows 2022

  ARM:

   - Add missing FORCE target when building the EL2 object

   - Fix a PMU probe regression on some platforms

  Generic:

   - KCSAN fixes

  selftests:

   - random fixes, mostly for clang compilation"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (43 commits)
  selftests: KVM: Explicitly use movq to read xmm registers
  selftests: KVM: Call ucall_init when setting up in rseq_test
  KVM: Remove tlbs_dirty
  KVM: X86: Synchronize the shadow pagetable before link it
  KVM: X86: Fix missed remote tlb flush in rmap_write_protect()
  KVM: x86: nSVM: don't copy virt_ext from vmcb12
  KVM: x86: nSVM: test eax for 4K alignment for GP errata workaround
  KVM: x86: selftests: test simultaneous uses of V_IRQ from L1 and L0
  KVM: x86: nSVM: restore int_vector in svm_clear_vintr
  kvm: x86: Add AMD PMU MSRs to msrs_to_save_all[]
  KVM: x86: nVMX: re-evaluate emulation_required on nested VM exit
  KVM: x86: nVMX: don't fail nested VM entry on invalid guest state if !from_vmentry
  KVM: x86: VMX: synthesize invalid VM exit when emulating invalid guest state
  KVM: x86: nSVM: refactor svm_leave_smm and smm_enter_smm
  KVM: x86: SVM: call KVM_REQ_GET_NESTED_STATE_PAGES on exit from SMM mode
  KVM: x86: reset pdptrs_from_userspace when exiting smm
  KVM: x86: nSVM: restore the L1 host state prior to resuming nested guest on SMM exit
  KVM: nVMX: Filter out all unsupported controls when eVMCS was activated
  KVM: KVM: Use cpumask_available() to check for NULL cpumask when kicking vCPUs
  KVM: Clean up benign vcpu->cpu data races when kicking vCPUs
  ...
parents e6609f2c 50b07818

arch/arm64/kvm/hyp/nvhe/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ $(obj)/kvm_nvhe.tmp.o: $(obj)/hyp.lds $(addprefix $(obj)/,$(hyp-obj)) FORCE 
#    runtime. Because the hypervisor is part of the kernel binary, relocations

#    produce a kernel VA. We enumerate relocations targeting hyp at build time

#    and convert the kernel VAs at those positions to hyp VAs.

$(obj)/hyp-reloc.S: $(obj)/kvm_nvhe.tmp.o $(obj)/gen-hyprel

$(obj)/hyp-reloc.S: $(obj)/kvm_nvhe.tmp.o $(obj)/gen-hyprel FORCE

	$(call if_changed,hyprel)



# 5) Compile hyp-reloc.S and link it into the existing partially linked object.

arch/arm64/kvm/perf.c

+0 −3
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ static struct perf_guest_info_callbacks kvm_guest_cbs = { 


int kvm_perf_init(void)

{

	if (kvm_pmu_probe_pmuver() != ID_AA64DFR0_PMUVER_IMP_DEF && !is_protected_kvm_enabled())

		static_branch_enable(&kvm_arm_pmu_available);



	return perf_register_guest_info_callbacks(&kvm_guest_cbs);

}

arch/arm64/kvm/pmu-emul.c

+8 −1
Original line number Diff line number Diff line
@@ -740,7 +740,14 @@ void kvm_pmu_set_counter_event_type(struct kvm_vcpu *vcpu, u64 data, 
	kvm_pmu_create_perf_event(vcpu, select_idx);

}



int kvm_pmu_probe_pmuver(void)

void kvm_host_pmu_init(struct arm_pmu *pmu)

{

	if (pmu->pmuver != 0 && pmu->pmuver != ID_AA64DFR0_PMUVER_IMP_DEF &&

	    !kvm_arm_support_pmu_v3() && !is_protected_kvm_enabled())

		static_branch_enable(&kvm_arm_pmu_available);

}



static int kvm_pmu_probe_pmuver(void)

{

	struct perf_event_attr attr = { };

	struct perf_event *event;

arch/s390/kvm/interrupt.c

+2 −2
Original line number Diff line number Diff line
@@ -419,13 +419,13 @@ static unsigned long deliverable_irqs(struct kvm_vcpu *vcpu) 
static void __set_cpu_idle(struct kvm_vcpu *vcpu)

{

	kvm_s390_set_cpuflags(vcpu, CPUSTAT_WAIT);

	set_bit(kvm_vcpu_get_idx(vcpu), vcpu->kvm->arch.idle_mask);

	set_bit(vcpu->vcpu_idx, vcpu->kvm->arch.idle_mask);

}



static void __unset_cpu_idle(struct kvm_vcpu *vcpu)

{

	kvm_s390_clear_cpuflags(vcpu, CPUSTAT_WAIT);

	clear_bit(kvm_vcpu_get_idx(vcpu), vcpu->kvm->arch.idle_mask);

	clear_bit(vcpu->vcpu_idx, vcpu->kvm->arch.idle_mask);

}



static void __reset_intercept_indicators(struct kvm_vcpu *vcpu)

arch/s390/kvm/kvm-s390.c

+1 −1
Original line number Diff line number Diff line
@@ -4066,7 +4066,7 @@ static int vcpu_pre_run(struct kvm_vcpu *vcpu) 
		kvm_s390_patch_guest_per_regs(vcpu);

	}



	clear_bit(kvm_vcpu_get_idx(vcpu), vcpu->kvm->arch.gisa_int.kicked_mask);

	clear_bit(vcpu->vcpu_idx, vcpu->kvm->arch.gisa_int.kicked_mask);



	vcpu->arch.sie_block->icptcode = 0;

	cpuflags = atomic_read(&vcpu->arch.sie_block->cpuflags);