Commit 63623fd4 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:
 "Bugfixes, including the fix for CVE-2020-2732 and a few issues found
  by 'make W=1'"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: s390: rstify new ioctls in api.rst
  KVM: nVMX: Check IO instruction VM-exit conditions
  KVM: nVMX: Refactor IO bitmap checks into helper function
  KVM: nVMX: Don't emulate instructions in guest mode
  KVM: nVMX: Emulate MTF when performing instruction emulation
  KVM: fix error handling in svm_hardware_setup
  KVM: SVM: Fix potential memory leak in svm_cpu_init()
  KVM: apic: avoid calculating pending eoi from an uninitialized val
  KVM: nVMX: clear PIN_BASED_POSTED_INTR from nested pinbased_ctls only when apicv is globally disabled
  KVM: nVMX: handle nested posted interrupts when apicv is disabled for L1
  kvm: x86: svm: Fix NULL pointer dereference when AVIC not enabled
  KVM: VMX: Add VMX_FEATURE_USR_WAIT_PAUSE
  KVM: nVMX: Hold KVM's srcu lock when syncing vmcs12->shadow
  KVM: x86: don't notify userspace IOAPIC on edge-triggered interrupt EOI
  kvm/emulate: fix a -Werror=cast-function-type
  KVM: x86: fix incorrect comparison in trace event
  KVM: nVMX: Fix some obsolete comments and grammar error
  KVM: x86: fix missing prototypes
  KVM: x86: enable -Werror
parents 7031ecff a93236fc

Documentation/virt/kvm/api.rst

+18 −15
Original line number Diff line number Diff line
@@ -4611,35 +4611,38 @@ unpins the VPA pages and releases all the device pages that are used to 
track the secure pages by hypervisor.



4.122 KVM_S390_NORMAL_RESET

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



Capability: KVM_CAP_S390_VCPU_RESETS

Architectures: s390

Type: vcpu ioctl

Parameters: none

Returns: 0

:Capability: KVM_CAP_S390_VCPU_RESETS

:Architectures: s390

:Type: vcpu ioctl

:Parameters: none

:Returns: 0



This ioctl resets VCPU registers and control structures according to

the cpu reset definition in the POP (Principles Of Operation).



4.123 KVM_S390_INITIAL_RESET

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



Capability: none

Architectures: s390

Type: vcpu ioctl

Parameters: none

Returns: 0

:Capability: none

:Architectures: s390

:Type: vcpu ioctl

:Parameters: none

:Returns: 0



This ioctl resets VCPU registers and control structures according to

the initial cpu reset definition in the POP. However, the cpu is not

put into ESA mode. This reset is a superset of the normal reset.



4.124 KVM_S390_CLEAR_RESET

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



Capability: KVM_CAP_S390_VCPU_RESETS

Architectures: s390

Type: vcpu ioctl

Parameters: none

Returns: 0

:Capability: KVM_CAP_S390_VCPU_RESETS

:Architectures: s390

:Type: vcpu ioctl

:Parameters: none

:Returns: 0



This ioctl resets VCPU registers and control structures according to

the clear cpu reset definition in the POP. However, the cpu is not put

arch/x86/include/asm/kvm_emulate.h

+12 −1
Original line number Diff line number Diff line
@@ -292,6 +292,14 @@ enum x86emul_mode { 
#define X86EMUL_SMM_MASK             (1 << 6)

#define X86EMUL_SMM_INSIDE_NMI_MASK  (1 << 7)



/*

 * fastop functions are declared as taking a never-defined fastop parameter,

 * so they can't be called from C directly.

 */

struct fastop;



typedef void (*fastop_t)(struct fastop *);



struct x86_emulate_ctxt {

	const struct x86_emulate_ops *ops;
@@ -324,7 +332,10 @@ struct x86_emulate_ctxt { 
	struct operand src;

	struct operand src2;

	struct operand dst;

	union {

		int (*execute)(struct x86_emulate_ctxt *ctxt);

		fastop_t fop;

	};

	int (*check_perm)(struct x86_emulate_ctxt *ctxt);

	/*

	 * The following six fields are cleared together,

arch/x86/include/asm/kvm_host.h

+2 −1
Original line number Diff line number Diff line
@@ -1122,6 +1122,7 @@ struct kvm_x86_ops { 
	int (*handle_exit)(struct kvm_vcpu *vcpu,

		enum exit_fastpath_completion exit_fastpath);

	int (*skip_emulated_instruction)(struct kvm_vcpu *vcpu);

	void (*update_emulated_instruction)(struct kvm_vcpu *vcpu);

	void (*set_interrupt_shadow)(struct kvm_vcpu *vcpu, int mask);

	u32 (*get_interrupt_shadow)(struct kvm_vcpu *vcpu);

	void (*patch_hypercall)(struct kvm_vcpu *vcpu,
@@ -1146,7 +1147,7 @@ struct kvm_x86_ops { 
	void (*load_eoi_exitmap)(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap);

	void (*set_virtual_apic_mode)(struct kvm_vcpu *vcpu);

	void (*set_apic_access_page_addr)(struct kvm_vcpu *vcpu, hpa_t hpa);

	void (*deliver_posted_interrupt)(struct kvm_vcpu *vcpu, int vector);

	int (*deliver_posted_interrupt)(struct kvm_vcpu *vcpu, int vector);

	int (*sync_pir_to_irr)(struct kvm_vcpu *vcpu);

	int (*set_tss_addr)(struct kvm *kvm, unsigned int addr);

	int (*set_identity_map_addr)(struct kvm *kvm, u64 ident_addr);

arch/x86/include/asm/vmx.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
#define SECONDARY_EXEC_MODE_BASED_EPT_EXEC	VMCS_CONTROL_BIT(MODE_BASED_EPT_EXEC)

#define SECONDARY_EXEC_PT_USE_GPA		VMCS_CONTROL_BIT(PT_USE_GPA)

#define SECONDARY_EXEC_TSC_SCALING              VMCS_CONTROL_BIT(TSC_SCALING)

#define SECONDARY_EXEC_ENABLE_USR_WAIT_PAUSE	0x04000000

#define SECONDARY_EXEC_ENABLE_USR_WAIT_PAUSE	VMCS_CONTROL_BIT(USR_WAIT_PAUSE)



#define PIN_BASED_EXT_INTR_MASK                 VMCS_CONTROL_BIT(INTR_EXITING)

#define PIN_BASED_NMI_EXITING                   VMCS_CONTROL_BIT(NMI_EXITING)

arch/x86/include/asm/vmxfeatures.h

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
#define VMX_FEATURE_MODE_BASED_EPT_EXEC	( 2*32+ 22) /* "ept_mode_based_exec" Enable separate EPT EXEC bits for supervisor vs. user */

#define VMX_FEATURE_PT_USE_GPA		( 2*32+ 24) /* "" Processor Trace logs GPAs */

#define VMX_FEATURE_TSC_SCALING		( 2*32+ 25) /* Scale hardware TSC when read in guest */

#define VMX_FEATURE_USR_WAIT_PAUSE	( 2*32+ 26) /* Enable TPAUSE, UMONITOR, UMWAIT in guest */

#define VMX_FEATURE_ENCLV_EXITING	( 2*32+ 28) /* "" VM-Exit on ENCLV (leaf dependent) */



#endif /* _ASM_X86_VMXFEATURES_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE