Commit 685ed983 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:
 "s390:

   - PCI interpretation compile fixes

  RISC-V:

   - fix unused variable warnings in vcpu_timer.c

   - move extern sbi_ext declarations to a header

  x86:

   - check validity of argument to KVM_SET_MP_STATE

   - use guest's global_ctrl to completely disable guest PEBS

   - fix a memory leak on memory allocation failure

   - mask off unsupported and unknown bits of IA32_ARCH_CAPABILITIES

   - fix build failure with Clang integrated assembler

   - fix MSR interception

   - always flush TLBs when enabling dirty logging"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: check validity of argument to KVM_SET_MP_STATE
  perf/x86/core: Completely disable guest PEBS via guest's global_ctrl
  KVM: x86: fix memoryleak in kvm_arch_vcpu_create()
  KVM: x86: Mask off unsupported and unknown bits of IA32_ARCH_CAPABILITIES
  KVM: s390: pci: Hook to access KVM lowlevel from VFIO
  riscv: kvm: move extern sbi_ext declarations to a header
  riscv: kvm: vcpu_timer: fix unused variable warnings
  KVM: selftests: Fix ambiguous mov in KVM_ASM_SAFE()
  KVM: selftests: Fix KVM_EXCEPTION_MAGIC build with Clang
  KVM: VMX: Heed the 'msr' argument in msr_write_intercepted()
  kvm: x86: mmu: Always flush TLBs when enabling dirty logging
  kvm: x86: mmu: Drop the need_remote_flush() function
parents b0839b28 29250ba5

arch/riscv/include/asm/kvm_vcpu_sbi.h

+12 −0
Original line number Diff line number Diff line
@@ -33,4 +33,16 @@ void kvm_riscv_vcpu_sbi_system_reset(struct kvm_vcpu *vcpu, 
				     u32 type, u64 flags);

const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext(unsigned long extid);



#ifdef CONFIG_RISCV_SBI_V01

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01;

#endif

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_base;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_time;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_ipi;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_rfence;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_srst;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_hsm;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor;



#endif /* __RISCV_KVM_VCPU_SBI_H__ */

arch/riscv/kvm/vcpu_sbi.c

+1 −11
Original line number Diff line number Diff line
@@ -32,23 +32,13 @@ static int kvm_linux_err_map_sbi(int err) 
	};

}



#ifdef CONFIG_RISCV_SBI_V01

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01;

#else

#ifndef CONFIG_RISCV_SBI_V01

static const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01 = {

	.extid_start = -1UL,

	.extid_end = -1UL,

	.handler = NULL,

};

#endif

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_base;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_time;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_ipi;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_rfence;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_srst;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_hsm;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor;



static const struct kvm_vcpu_sbi_extension *sbi_ext[] = {

	&vcpu_sbi_ext_v01,

arch/riscv/kvm/vcpu_timer.c

+0 −4
Original line number Diff line number Diff line
@@ -299,7 +299,6 @@ static void kvm_riscv_vcpu_update_timedelta(struct kvm_vcpu *vcpu) 


void kvm_riscv_vcpu_timer_restore(struct kvm_vcpu *vcpu)

{

	struct kvm_vcpu_csr *csr;

	struct kvm_vcpu_timer *t = &vcpu->arch.timer;



	kvm_riscv_vcpu_update_timedelta(vcpu);
@@ -307,7 +306,6 @@ void kvm_riscv_vcpu_timer_restore(struct kvm_vcpu *vcpu) 
	if (!t->sstc_enabled)

		return;



	csr = &vcpu->arch.guest_csr;

#if defined(CONFIG_32BIT)

	csr_write(CSR_VSTIMECMP, (u32)t->next_cycles);

	csr_write(CSR_VSTIMECMPH, (u32)(t->next_cycles >> 32));
@@ -324,13 +322,11 @@ void kvm_riscv_vcpu_timer_restore(struct kvm_vcpu *vcpu) 


void kvm_riscv_vcpu_timer_save(struct kvm_vcpu *vcpu)

{

	struct kvm_vcpu_csr *csr;

	struct kvm_vcpu_timer *t = &vcpu->arch.timer;



	if (!t->sstc_enabled)

		return;



	csr = &vcpu->arch.guest_csr;

	t = &vcpu->arch.timer;

#if defined(CONFIG_32BIT)

	t->next_cycles = csr_read(CSR_VSTIMECMP);

arch/s390/include/asm/kvm_host.h

+6 −11
Original line number Diff line number Diff line
@@ -1038,16 +1038,11 @@ static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu) {} 
#define __KVM_HAVE_ARCH_VM_FREE

void kvm_arch_free_vm(struct kvm *kvm);



#ifdef CONFIG_VFIO_PCI_ZDEV_KVM

int kvm_s390_pci_register_kvm(struct zpci_dev *zdev, struct kvm *kvm);

void kvm_s390_pci_unregister_kvm(struct zpci_dev *zdev);

#else

static inline int kvm_s390_pci_register_kvm(struct zpci_dev *dev,

					    struct kvm *kvm)

{

	return -EPERM;

}

static inline void kvm_s390_pci_unregister_kvm(struct zpci_dev *dev) {}

#endif

struct zpci_kvm_hook {

	int (*kvm_register)(void *opaque, struct kvm *kvm);

	void (*kvm_unregister)(void *opaque);

};



extern struct zpci_kvm_hook zpci_kvm_hook;



#endif

arch/s390/kvm/pci.c

+8 −4
Original line number Diff line number Diff line
@@ -431,8 +431,9 @@ static void kvm_s390_pci_dev_release(struct zpci_dev *zdev) 
 * available, enable them and let userspace indicate whether or not they will

 * be used (specify SHM bit to disable).

 */

int kvm_s390_pci_register_kvm(struct zpci_dev *zdev, struct kvm *kvm)

static int kvm_s390_pci_register_kvm(void *opaque, struct kvm *kvm)

{

	struct zpci_dev *zdev = opaque;

	int rc;



	if (!zdev)
@@ -510,10 +511,10 @@ int kvm_s390_pci_register_kvm(struct zpci_dev *zdev, struct kvm *kvm) 
	kvm_put_kvm(kvm);

	return rc;

}

EXPORT_SYMBOL_GPL(kvm_s390_pci_register_kvm);



void kvm_s390_pci_unregister_kvm(struct zpci_dev *zdev)

static void kvm_s390_pci_unregister_kvm(void *opaque)

{

	struct zpci_dev *zdev = opaque;

	struct kvm *kvm;



	if (!zdev)
@@ -566,7 +567,6 @@ void kvm_s390_pci_unregister_kvm(struct zpci_dev *zdev) 


	kvm_put_kvm(kvm);

}

EXPORT_SYMBOL_GPL(kvm_s390_pci_unregister_kvm);



void kvm_s390_pci_init_list(struct kvm *kvm)

{
@@ -678,6 +678,8 @@ int kvm_s390_pci_init(void) 


	spin_lock_init(&aift->gait_lock);

	mutex_init(&aift->aift_lock);

	zpci_kvm_hook.kvm_register = kvm_s390_pci_register_kvm;

	zpci_kvm_hook.kvm_unregister = kvm_s390_pci_unregister_kvm;



	return 0;

}
@@ -685,6 +687,8 @@ int kvm_s390_pci_init(void) 
void kvm_s390_pci_exit(void)

{

	mutex_destroy(&aift->aift_lock);

	zpci_kvm_hook.kvm_register = NULL;

	zpci_kvm_hook.kvm_unregister = NULL;



	kfree(aift);

}