Commit 22447828 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:
 "ARM fixes:

   - Another state update on exit to userspace fix

   - Prevent the creation of mixed 32/64 VMs

   - Fix regression with irqbypass not restarting the guest on failed
     connect

   - Fix regression with debug register decoding resulting in
     overlapping access

   - Commit exception state on exit to usrspace

   - Fix the MMU notifier return values

   - Add missing 'static' qualifiers in the new host stage-2 code

  x86 fixes:

   - fix guest missed wakeup with assigned devices

   - fix WARN reported by syzkaller

   - do not use BIT() in UAPI headers

   - make the kvm_amd.avic parameter bool

  PPC fixes:

   - make halt polling heuristics consistent with other architectures

  selftests:

   - various fixes

   - new performance selftest memslot_perf_test

   - test UFFD minor faults in demand_paging_test"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (44 commits)
  selftests: kvm: fix overlapping addresses in memslot_perf_test
  KVM: X86: Kill off ctxt->ud
  KVM: X86: Fix warning caused by stale emulation context
  KVM: X86: Use kvm_get_linear_rip() in single-step and #DB/#BP interception
  KVM: x86/mmu: Fix comment mentioning skip_4k
  KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
  KVM: rename KVM_REQ_PENDING_TIMER to KVM_REQ_UNBLOCK
  KVM: x86: add start_assignment hook to kvm_x86_ops
  KVM: LAPIC: Narrow the timer latency between wait_lapic_expire and world switch
  selftests: kvm: do only 1 memslot_perf_test run by default
  KVM: X86: Use _BITUL() macro in UAPI headers
  KVM: selftests: add shared hugetlbfs backing source type
  KVM: selftests: allow using UFFD minor faults for demand paging
  KVM: selftests: create alias mappings when using shared memory
  KVM: selftests: add shmem backing source type
  KVM: selftests: refactor vm_mem_backing_src_type flags
  KVM: selftests: allow different backing source types
  KVM: selftests: compute correct demand paging size
  KVM: selftests: simplify setup_demand_paging error handling
  KVM: selftests: Print a message if /dev/kvm is missing
  ...
parents 866c4b8a 000ac429

Documentation/virt/kvm/vcpu-requests.rst

+5 −3
Original line number Diff line number Diff line
@@ -118,10 +118,12 @@ KVM_REQ_MMU_RELOAD 
  necessary to inform each VCPU to completely refresh the tables.  This

  request is used for that.



KVM_REQ_PENDING_TIMER

KVM_REQ_UNBLOCK



  This request may be made from a timer handler run on the host on behalf

  of a VCPU.  It informs the VCPU thread to inject a timer interrupt.

  This request informs the vCPU to exit kvm_vcpu_block.  It is used for

  example from timer handlers that run on the host on behalf of a vCPU,

  or in order to update the interrupt routing and ensure that assigned

  devices will wake up the vCPU.



KVM_REQ_UNHALT

arch/arm64/include/asm/kvm_asm.h

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#define __KVM_HOST_SMCCC_FUNC___pkvm_cpu_set_vector		18

#define __KVM_HOST_SMCCC_FUNC___pkvm_prot_finalize		19

#define __KVM_HOST_SMCCC_FUNC___pkvm_mark_hyp			20

#define __KVM_HOST_SMCCC_FUNC___kvm_adjust_pc			21



#ifndef __ASSEMBLY__
@@ -201,6 +202,8 @@ extern void __kvm_timer_set_cntvoff(u64 cntvoff); 


extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu);



extern void __kvm_adjust_pc(struct kvm_vcpu *vcpu);



extern u64 __vgic_v3_get_gic_config(void);

extern u64 __vgic_v3_read_vmcr(void);

extern void __vgic_v3_write_vmcr(u32 vmcr);

arch/arm64/include/asm/kvm_emulate.h

+5 −0
Original line number Diff line number Diff line
@@ -463,4 +463,9 @@ static __always_inline void kvm_incr_pc(struct kvm_vcpu *vcpu) 
	vcpu->arch.flags |= KVM_ARM64_INCREMENT_PC;

}



static inline bool vcpu_has_feature(struct kvm_vcpu *vcpu, int feature)

{

	return test_bit(feature, vcpu->arch.features);

}



#endif /* __ARM64_KVM_EMULATE_H__ */

arch/arm64/kvm/arm.c

+17 −3
Original line number Diff line number Diff line
@@ -720,11 +720,13 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 
			return ret;

	}



	if (run->immediate_exit)

		return -EINTR;



	vcpu_load(vcpu);



	if (run->immediate_exit) {

		ret = -EINTR;

		goto out;

	}



	kvm_sigset_activate(vcpu);



	ret = 1;
@@ -897,6 +899,18 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 


	kvm_sigset_deactivate(vcpu);



out:

	/*

	 * In the unlikely event that we are returning to userspace

	 * with pending exceptions or PC adjustment, commit these

	 * adjustments in order to give userspace a consistent view of

	 * the vcpu state. Note that this relies on __kvm_adjust_pc()

	 * being preempt-safe on VHE.

	 */

	if (unlikely(vcpu->arch.flags & (KVM_ARM64_PENDING_EXCEPTION |

					 KVM_ARM64_INCREMENT_PC)))

		kvm_call_hyp(__kvm_adjust_pc, vcpu);



	vcpu_put(vcpu);

	return ret;

}

arch/arm64/kvm/hyp/exception.c

+17 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static void enter_exception32(struct kvm_vcpu *vcpu, u32 mode, u32 vect_offset) 
	*vcpu_pc(vcpu) = vect_offset;

}



void kvm_inject_exception(struct kvm_vcpu *vcpu)

static void kvm_inject_exception(struct kvm_vcpu *vcpu)

{

	if (vcpu_el1_is_32bit(vcpu)) {

		switch (vcpu->arch.flags & KVM_ARM64_EXCEPT_MASK) {
@@ -329,3 +329,19 @@ void kvm_inject_exception(struct kvm_vcpu *vcpu) 
		}

	}

}



/*

 * Adjust the guest PC (and potentially exception state) depending on

 * flags provided by the emulation code.

 */

void __kvm_adjust_pc(struct kvm_vcpu *vcpu)

{

	if (vcpu->arch.flags & KVM_ARM64_PENDING_EXCEPTION) {

		kvm_inject_exception(vcpu);

		vcpu->arch.flags &= ~(KVM_ARM64_PENDING_EXCEPTION |

				      KVM_ARM64_EXCEPT_MASK);

	} else 	if (vcpu->arch.flags & KVM_ARM64_INCREMENT_PC) {

		kvm_skip_instr(vcpu);

		vcpu->arch.flags &= ~KVM_ARM64_INCREMENT_PC;

	}

}