Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 050fc52d 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:
 "All x86-specific, apart from some arch-independent syzkaller fixes"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: cleanup the page tracking SRCU instance
  KVM: nVMX: fix nested EPT detection
  KVM: pci-assign: do not map smm memory slot pages in vt-d page tables
  KVM: kvm_io_bus_unregister_dev() should never fail
  KVM: VMX: Fix enable VPID conditions
  KVM: nVMX: Fix nested VPID vmx exec control
  KVM: x86: correct async page present tracepoint
  kvm: vmx: Flush TLB when the APIC-access address changes
  KVM: x86: use pic/ioapic destructor when destroy vm
  KVM: x86: check existance before destroy
  KVM: x86: clear bus pointer when destroyed
  KVM: Documentation: document MCE ioctls
  KVM: nVMX: don't reset kvm mmu twice
  PTP: fix ptr_ret.cocci warnings
  kvm: fix usage of uninit spinlock in avic_vm_destroy()
  KVM: VMX: downgrade warning on unexpected exit code
parents ad0376eb 2beb6dad

Documentation/virtual/kvm/api.txt

+63 −0
Original line number Diff line number Diff line
@@ -3377,6 +3377,69 @@ struct kvm_ppc_resize_hpt { 
	__u32 pad;

};



4.104 KVM_X86_GET_MCE_CAP_SUPPORTED



Capability: KVM_CAP_MCE

Architectures: x86

Type: system ioctl

Parameters: u64 mce_cap (out)

Returns: 0 on success, -1 on error



Returns supported MCE capabilities. The u64 mce_cap parameter

has the same format as the MSR_IA32_MCG_CAP register. Supported

capabilities will have the corresponding bits set.



4.105 KVM_X86_SETUP_MCE



Capability: KVM_CAP_MCE

Architectures: x86

Type: vcpu ioctl

Parameters: u64 mcg_cap (in)

Returns: 0 on success,

         -EFAULT if u64 mcg_cap cannot be read,

         -EINVAL if the requested number of banks is invalid,

         -EINVAL if requested MCE capability is not supported.



Initializes MCE support for use. The u64 mcg_cap parameter

has the same format as the MSR_IA32_MCG_CAP register and

specifies which capabilities should be enabled. The maximum

supported number of error-reporting banks can be retrieved when

checking for KVM_CAP_MCE. The supported capabilities can be

retrieved with KVM_X86_GET_MCE_CAP_SUPPORTED.



4.106 KVM_X86_SET_MCE



Capability: KVM_CAP_MCE

Architectures: x86

Type: vcpu ioctl

Parameters: struct kvm_x86_mce (in)

Returns: 0 on success,

         -EFAULT if struct kvm_x86_mce cannot be read,

         -EINVAL if the bank number is invalid,

         -EINVAL if VAL bit is not set in status field.



Inject a machine check error (MCE) into the guest. The input

parameter is:



struct kvm_x86_mce {

	__u64 status;

	__u64 addr;

	__u64 misc;

	__u64 mcg_status;

	__u8 bank;

	__u8 pad1[7];

	__u64 pad2[3];

};



If the MCE being reported is an uncorrected error, KVM will

inject it as an MCE exception into the guest. If the guest

MCG_STATUS register reports that an MCE is in progress, KVM

causes an KVM_EXIT_SHUTDOWN vmexit.



Otherwise, if the MCE is a corrected error, KVM will just

store it in the corresponding bank (provided this bank is

not holding a previously reported uncorrected error).



5. The kvm_run structure

------------------------

arch/x86/include/asm/kvm_page_track.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ struct kvm_page_track_notifier_node { 
};



void kvm_page_track_init(struct kvm *kvm);

void kvm_page_track_cleanup(struct kvm *kvm);



void kvm_page_track_free_memslot(struct kvm_memory_slot *free,

				 struct kvm_memory_slot *dont);

arch/x86/kvm/i8259.c

+3 −0
Original line number Diff line number Diff line
@@ -657,6 +657,9 @@ void kvm_pic_destroy(struct kvm *kvm) 
{

	struct kvm_pic *vpic = kvm->arch.vpic;



	if (!vpic)

		return;



	kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_master);

	kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_slave);

	kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_eclr);

arch/x86/kvm/ioapic.c

+3 −0
Original line number Diff line number Diff line
@@ -635,6 +635,9 @@ void kvm_ioapic_destroy(struct kvm *kvm) 
{

	struct kvm_ioapic *ioapic = kvm->arch.vioapic;



	if (!ioapic)

		return;



	cancel_delayed_work_sync(&ioapic->eoi_inject);

	kvm_io_bus_unregister_dev(kvm, KVM_MMIO_BUS, &ioapic->dev);

	kvm->arch.vioapic = NULL;

arch/x86/kvm/page_track.c

+8 −0
Original line number Diff line number Diff line
@@ -160,6 +160,14 @@ bool kvm_page_track_is_active(struct kvm_vcpu *vcpu, gfn_t gfn, 
	return !!ACCESS_ONCE(slot->arch.gfn_track[mode][index]);

}



void kvm_page_track_cleanup(struct kvm *kvm)

{

	struct kvm_page_track_notifier_head *head;



	head = &kvm->arch.track_notifier_head;

	cleanup_srcu_struct(&head->track_srcu);

}



void kvm_page_track_init(struct kvm *kvm)

{

	struct kvm_page_track_notifier_head *head;