Commit 4bc6dcaa authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-x86-svm-6.3' of https://github.com/kvm-x86/linux into HEAD 

KVM SVM changes for 6.3:

 - Fix a mostly benign overflow bug in SEV's send|receive_update_data()

 - Move the SVM-specific "host flags" into vcpu_svm (extracted from the
   vNMI enabling series)

 - A handful for fixes and cleanups
parents e84183f6 f94f053a

arch/x86/include/asm/kvm_host.h

+3 −6
Original line number Diff line number Diff line
@@ -2092,14 +2092,11 @@ enum { 
	TASK_SWITCH_GATE = 3,

};



#define HF_GIF_MASK		(1 << 0)

#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_GUEST_MASK		(1 << 0) /* VCPU is in guest-mode */



#ifdef CONFIG_KVM_SMM

#define HF_SMM_MASK		(1 << 6)

#define HF_SMM_INSIDE_NMI_MASK	(1 << 7)

#define HF_SMM_MASK		(1 << 1)

#define HF_SMM_INSIDE_NMI_MASK	(1 << 2)



# define __KVM_VCPU_MULTIPLE_ADDRESS_SPACE

# define KVM_ADDRESS_SPACE_NUM 2

arch/x86/kvm/emulate.c

+5 −6
Original line number Diff line number Diff line
@@ -2310,7 +2310,7 @@ static int em_lseg(struct x86_emulate_ctxt *ctxt) 


static int em_rsm(struct x86_emulate_ctxt *ctxt)

{

	if ((ctxt->ops->get_hflags(ctxt) & X86EMUL_SMM_MASK) == 0)

	if (!ctxt->ops->is_smm(ctxt))

		return emulate_ud(ctxt);



	if (ctxt->ops->leave_smm(ctxt))
@@ -5133,7 +5133,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) 
	const struct x86_emulate_ops *ops = ctxt->ops;

	int rc = X86EMUL_CONTINUE;

	int saved_dst_type = ctxt->dst.type;

	unsigned emul_flags;

	bool is_guest_mode = ctxt->ops->is_guest_mode(ctxt);



	ctxt->mem_read.pos = 0;
@@ -5148,7 +5148,6 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) 
		goto done;

	}



	emul_flags = ctxt->ops->get_hflags(ctxt);

	if (unlikely(ctxt->d &

		     (No64|Undefined|Sse|Mmx|Intercept|CheckPerm|Priv|Prot|String))) {

		if ((ctxt->mode == X86EMUL_MODE_PROT64 && (ctxt->d & No64)) ||
@@ -5182,7 +5181,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) 
				fetch_possible_mmx_operand(&ctxt->dst);

		}



		if (unlikely(emul_flags & X86EMUL_GUEST_MASK) && ctxt->intercept) {

		if (unlikely(is_guest_mode) && ctxt->intercept) {

			rc = emulator_check_intercept(ctxt, ctxt->intercept,

						      X86_ICPT_PRE_EXCEPT);

			if (rc != X86EMUL_CONTINUE)
@@ -5211,7 +5210,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) 
				goto done;

		}



		if (unlikely(emul_flags & X86EMUL_GUEST_MASK) && (ctxt->d & Intercept)) {

		if (unlikely(is_guest_mode) && (ctxt->d & Intercept)) {

			rc = emulator_check_intercept(ctxt, ctxt->intercept,

						      X86_ICPT_POST_EXCEPT);

			if (rc != X86EMUL_CONTINUE)
@@ -5265,7 +5264,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) 


special_insn:



	if (unlikely(emul_flags & X86EMUL_GUEST_MASK) && (ctxt->d & Intercept)) {

	if (unlikely(is_guest_mode) && (ctxt->d & Intercept)) {

		rc = emulator_check_intercept(ctxt, ctxt->intercept,

					      X86_ICPT_POST_MEMACCESS);

		if (rc != X86EMUL_CONTINUE)

arch/x86/kvm/kvm_emulate.h

+2 −5
Original line number Diff line number Diff line
@@ -220,7 +220,8 @@ struct x86_emulate_ops { 


	void (*set_nmi_mask)(struct x86_emulate_ctxt *ctxt, bool masked);



	unsigned (*get_hflags)(struct x86_emulate_ctxt *ctxt);

	bool (*is_smm)(struct x86_emulate_ctxt *ctxt);

	bool (*is_guest_mode)(struct x86_emulate_ctxt *ctxt);

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

	void (*triple_fault)(struct x86_emulate_ctxt *ctxt);

	int (*set_xcr)(struct x86_emulate_ctxt *ctxt, u32 index, u64 xcr);
@@ -275,10 +276,6 @@ enum x86emul_mode { 
	X86EMUL_MODE_PROT64,	/* 64-bit (long) mode.    */

};



/* These match some of the HF_* flags defined in kvm_host.h  */

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

#define X86EMUL_SMM_MASK             (1 << 6)



/*

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

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

arch/x86/kvm/smm.c

+0 −2
Original line number Diff line number Diff line
@@ -111,8 +111,6 @@ static void check_smram_offsets(void) 


void kvm_smm_changed(struct kvm_vcpu *vcpu, bool entering_smm)

{

	BUILD_BUG_ON(HF_SMM_MASK != X86EMUL_SMM_MASK);



	trace_kvm_smm_transition(vcpu->vcpu_id, vcpu->arch.smbase, entering_smm);



	if (entering_smm) {

arch/x86/kvm/svm/avic.c

+1 −1
Original line number Diff line number Diff line
@@ -1120,7 +1120,7 @@ void avic_vcpu_unblocking(struct kvm_vcpu *vcpu) 
 * - Hypervisor can support both xAVIC and x2AVIC in the same guest.

 * - The mode can be switched at run-time.

 */

bool avic_hardware_setup(struct kvm_x86_ops *x86_ops)

bool avic_hardware_setup(void)

{

	if (!npt_enabled)

		return false;