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

Commit f077825a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: API changes for SMM support 



This patch includes changes to the external API for SMM support.
Userspace can predicate the availability of the new fields and
ioctls on a new capability, KVM_CAP_X86_SMM, which is added at the end
of the patch series.

Reviewed-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a584539b

Documentation/virtual/kvm/api.txt

+34 −6
Original line number Diff line number Diff line
@@ -820,11 +820,21 @@ struct kvm_vcpu_events { 
	} nmi;

	__u32 sipi_vector;

	__u32 flags;

	struct {

		__u8 smm;

		__u8 pending;

		__u8 smm_inside_nmi;

		__u8 latched_init;

	} smi;

};



KVM_VCPUEVENT_VALID_SHADOW may be set in the flags field to signal that

interrupt.shadow contains a valid state. Otherwise, this field is undefined.

Only two fields are defined in the flags field:



- KVM_VCPUEVENT_VALID_SHADOW may be set in the flags field to signal that

  interrupt.shadow contains a valid state.



- KVM_VCPUEVENT_VALID_SMM may be set in the flags field to signal that

  smi contains a valid state.



4.32 KVM_SET_VCPU_EVENTS
@@ -841,17 +851,20 @@ vcpu. 
See KVM_GET_VCPU_EVENTS for the data structure.



Fields that may be modified asynchronously by running VCPUs can be excluded

from the update. These fields are nmi.pending and sipi_vector. Keep the

corresponding bits in the flags field cleared to suppress overwriting the

current in-kernel state. The bits are:

from the update. These fields are nmi.pending, sipi_vector, smi.smm,

smi.pending. Keep the corresponding bits in the flags field cleared to

suppress overwriting the current in-kernel state. The bits are:



KVM_VCPUEVENT_VALID_NMI_PENDING - transfer nmi.pending to the kernel

KVM_VCPUEVENT_VALID_SIPI_VECTOR - transfer sipi_vector

KVM_VCPUEVENT_VALID_SMM         - transfer the smi sub-struct.



If KVM_CAP_INTR_SHADOW is available, KVM_VCPUEVENT_VALID_SHADOW can be set in

the flags field to signal that interrupt.shadow contains a valid state and

shall be written into the VCPU.



KVM_VCPUEVENT_VALID_SMM can only be set if KVM_CAP_X86_SMM is available.





4.33 KVM_GET_DEBUGREGS
@@ -2979,6 +2992,16 @@ len must be a multiple of sizeof(struct kvm_s390_irq). It must be > 0 
and it must not exceed (max_vcpus + 32) * sizeof(struct kvm_s390_irq),

which is the maximum number of possibly pending cpu-local interrupts.



4.90 KVM_SMI



Capability: KVM_CAP_X86_SMM

Architectures: x86

Type: vcpu ioctl

Parameters: none

Returns: 0 on success, -1 on error



Queues an SMI on the thread's vcpu.



5. The kvm_run structure

------------------------
@@ -3014,7 +3037,12 @@ an interrupt can be injected now with KVM_INTERRUPT. 
The value of the current interrupt flag.  Only valid if in-kernel

local APIC is not used.



	__u8 padding2[2];

	__u16 flags;



More architecture-specific flags detailing state of the VCPU that may

affect the device's behavior.  The only currently defined flag is

KVM_RUN_X86_SMM, which is valid on x86 machines and is set if the

VCPU is in system management mode.



	/* in (pre_kvm_run), out (post_kvm_run) */

	__u64 cr8;

arch/x86/include/asm/kvm_host.h

+3 −0
Original line number Diff line number Diff line
@@ -471,6 +471,7 @@ struct kvm_vcpu_arch { 
	atomic_t nmi_queued;  /* unprocessed asynchronous NMIs */

	unsigned nmi_pending; /* NMI queued after currently running handler */

	bool nmi_injected;    /* Trying to inject an NMI this entry */

	bool smi_pending;    /* SMI queued after currently running handler */



	struct mtrr_state_type mtrr_state;

	u64 pat;
@@ -1115,6 +1116,8 @@ enum { 
#define HF_NMI_MASK		(1 << 3)

#define HF_IRET_MASK		(1 << 4)

#define HF_GUEST_MASK		(1 << 5) /* VCPU is in guest-mode */

#define HF_SMM_MASK		(1 << 6)

#define HF_SMM_INSIDE_NMI_MASK	(1 << 7)



/*

 * Hardware virtualization extension instructions may fault if a

arch/x86/include/uapi/asm/kvm.h

+10 −1
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ struct kvm_ioapic_state { 
#define KVM_IRQCHIP_IOAPIC       2

#define KVM_NR_IRQCHIPS          3



#define KVM_RUN_X86_SMM		 (1 << 0)



/* for KVM_GET_REGS and KVM_SET_REGS */

struct kvm_regs {

	/* out (KVM_GET_REGS) / in (KVM_SET_REGS) */
@@ -281,6 +283,7 @@ struct kvm_reinject_control { 
#define KVM_VCPUEVENT_VALID_NMI_PENDING	0x00000001

#define KVM_VCPUEVENT_VALID_SIPI_VECTOR	0x00000002

#define KVM_VCPUEVENT_VALID_SHADOW	0x00000004

#define KVM_VCPUEVENT_VALID_SMM		0x00000008



/* Interrupt shadow states */

#define KVM_X86_SHADOW_INT_MOV_SS	0x01
@@ -309,7 +312,13 @@ struct kvm_vcpu_events { 
	} nmi;

	__u32 sipi_vector;

	__u32 flags;

	__u32 reserved[10];

	struct {

		__u8 smm;

		__u8 pending;

		__u8 smm_inside_nmi;

		__u8 latched_init;

	} smi;

	__u32 reserved[9];

};



/* for KVM_GET/SET_DEBUGREGS */

arch/x86/kvm/kvm_cache_regs.h

+5 −0
Original line number Diff line number Diff line
@@ -99,4 +99,9 @@ static inline bool is_guest_mode(struct kvm_vcpu *vcpu) 
	return vcpu->arch.hflags & HF_GUEST_MASK;

}



static inline bool is_smm(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.hflags & HF_SMM_MASK;

}



#endif

arch/x86/kvm/lapic.h

+5 −0
Original line number Diff line number Diff line
@@ -159,6 +159,11 @@ static inline bool kvm_lowest_prio_delivery(struct kvm_lapic_irq *irq) 
			irq->msi_redir_hint);

}



static inline int kvm_lapic_latched_init(struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_has_lapic(vcpu) && test_bit(KVM_APIC_INIT, &vcpu->arch.apic->pending_events);

}



bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector);



void wait_lapic_expire(struct kvm_vcpu *vcpu);