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

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

KVM x86 misc changes for 6.9:

 - Explicitly initialize a variety of on-stack variables in the emulator that
   triggered KMSAN false positives (though in fairness in KMSAN, it's comically
   difficult to see that the uninitialized memory is never truly consumed).

 - Fix the deubgregs ABI for 32-bit KVM, and clean up code related to reading
   DR6 and DR7.

 - Rework the "force immediate exit" code so that vendor code ultimately
   decides how and when to force the exit.  This allows VMX to further optimize
   handling preemption timer exits, and allows SVM to avoid sending a duplicate
   IPI (SVM also has a need to force an exit).

 - Fix a long-standing bug where kvm_has_noapic_vcpu could be left elevated if
   vCPU creation ultimately failed, and add WARN to guard against similar bugs.

 - Provide a dedicated arch hook for checking if a different vCPU was in-kernel
   (for directed yield), and simplify the logic for checking if the currently
   loaded vCPU is in-kernel.

 - Misc cleanups and fixes.
parents 507e72f8 78ccfce7

arch/x86/include/asm/kvm-x86-ops.h

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ KVM_X86_OP(write_tsc_multiplier) 
KVM_X86_OP(get_exit_info)

KVM_X86_OP(check_intercept)

KVM_X86_OP(handle_exit_irqoff)

KVM_X86_OP(request_immediate_exit)

KVM_X86_OP(sched_in)

KVM_X86_OP_OPTIONAL(update_cpu_dirty_logging)

KVM_X86_OP_OPTIONAL(vcpu_blocking)

arch/x86/include/asm/kvm_host.h

+3 −5
Original line number Diff line number Diff line
@@ -1665,7 +1665,8 @@ struct kvm_x86_ops { 
	void (*flush_tlb_guest)(struct kvm_vcpu *vcpu);



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

	enum exit_fastpath_completion (*vcpu_run)(struct kvm_vcpu *vcpu);

	enum exit_fastpath_completion (*vcpu_run)(struct kvm_vcpu *vcpu,

						  bool force_immediate_exit);

	int (*handle_exit)(struct kvm_vcpu *vcpu,

		enum exit_fastpath_completion exit_fastpath);

	int (*skip_emulated_instruction)(struct kvm_vcpu *vcpu);
@@ -1733,8 +1734,6 @@ struct kvm_x86_ops { 
			       struct x86_exception *exception);

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



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



	void (*sched_in)(struct kvm_vcpu *vcpu, int cpu);



	/*
@@ -2047,7 +2046,7 @@ int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3); 
int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4);

int kvm_set_cr8(struct kvm_vcpu *vcpu, unsigned long cr8);

int kvm_set_dr(struct kvm_vcpu *vcpu, int dr, unsigned long val);

void kvm_get_dr(struct kvm_vcpu *vcpu, int dr, unsigned long *val);

unsigned long kvm_get_dr(struct kvm_vcpu *vcpu, int dr);

unsigned long kvm_get_cr8(struct kvm_vcpu *vcpu);

void kvm_lmsw(struct kvm_vcpu *vcpu, unsigned long msw);

int kvm_emulate_xsetbv(struct kvm_vcpu *vcpu);
@@ -2240,7 +2239,6 @@ extern bool kvm_find_async_pf_gfn(struct kvm_vcpu *vcpu, gfn_t gfn); 


int kvm_skip_emulated_instruction(struct kvm_vcpu *vcpu);

int kvm_complete_insn_gp(struct kvm_vcpu *vcpu, int err);

void __kvm_request_immediate_exit(struct kvm_vcpu *vcpu);



void __user *__x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa,

				     u32 size);

arch/x86/include/asm/svm.h

+4 −4
Original line number Diff line number Diff line
@@ -358,10 +358,10 @@ struct sev_es_save_area { 
	struct vmcb_seg ldtr;

	struct vmcb_seg idtr;

	struct vmcb_seg tr;

	u64 vmpl0_ssp;

	u64 vmpl1_ssp;

	u64 vmpl2_ssp;

	u64 vmpl3_ssp;

	u64 pl0_ssp;

	u64 pl1_ssp;

	u64 pl2_ssp;

	u64 pl3_ssp;

	u64 u_cet;

	u8 reserved_0xc8[2];

	u8 vmpl;

arch/x86/kvm/emulate.c

+19 −26
Original line number Diff line number Diff line
@@ -1820,22 +1820,22 @@ static int writeback(struct x86_emulate_ctxt *ctxt, struct operand *op) 
	return X86EMUL_CONTINUE;

}



static int push(struct x86_emulate_ctxt *ctxt, void *data, int bytes)

static int emulate_push(struct x86_emulate_ctxt *ctxt, const void *data, int len)

{

	struct segmented_address addr;



	rsp_increment(ctxt, -bytes);

	rsp_increment(ctxt, -len);

	addr.ea = reg_read(ctxt, VCPU_REGS_RSP) & stack_mask(ctxt);

	addr.seg = VCPU_SREG_SS;



	return segmented_write(ctxt, addr, data, bytes);

	return segmented_write(ctxt, addr, data, len);

}



static int em_push(struct x86_emulate_ctxt *ctxt)

{

	/* Disable writeback. */

	ctxt->dst.type = OP_NONE;

	return push(ctxt, &ctxt->src.val, ctxt->op_bytes);

	return emulate_push(ctxt, &ctxt->src.val, ctxt->op_bytes);

}



static int emulate_pop(struct x86_emulate_ctxt *ctxt,
@@ -1863,7 +1863,8 @@ static int emulate_popf(struct x86_emulate_ctxt *ctxt, 
			void *dest, int len)

{

	int rc;

	unsigned long val, change_mask;

	unsigned long val = 0;

	unsigned long change_mask;

	int iopl = (ctxt->eflags & X86_EFLAGS_IOPL) >> X86_EFLAGS_IOPL_BIT;

	int cpl = ctxt->ops->cpl(ctxt);
@@ -1920,7 +1921,7 @@ static int em_enter(struct x86_emulate_ctxt *ctxt) 
		return X86EMUL_UNHANDLEABLE;



	rbp = reg_read(ctxt, VCPU_REGS_RBP);

	rc = push(ctxt, &rbp, stack_size(ctxt));

	rc = emulate_push(ctxt, &rbp, stack_size(ctxt));

	if (rc != X86EMUL_CONTINUE)

		return rc;

	assign_masked(reg_rmw(ctxt, VCPU_REGS_RBP), reg_read(ctxt, VCPU_REGS_RSP),
@@ -1954,7 +1955,7 @@ static int em_push_sreg(struct x86_emulate_ctxt *ctxt) 
static int em_pop_sreg(struct x86_emulate_ctxt *ctxt)

{

	int seg = ctxt->src2.val;

	unsigned long selector;

	unsigned long selector = 0;

	int rc;



	rc = emulate_pop(ctxt, &selector, 2);
@@ -2000,7 +2001,7 @@ static int em_popa(struct x86_emulate_ctxt *ctxt) 
{

	int rc = X86EMUL_CONTINUE;

	int reg = VCPU_REGS_RDI;

	u32 val;

	u32 val = 0;



	while (reg >= VCPU_REGS_RAX) {

		if (reg == VCPU_REGS_RSP) {
@@ -2229,7 +2230,7 @@ static int em_cmpxchg8b(struct x86_emulate_ctxt *ctxt) 
static int em_ret(struct x86_emulate_ctxt *ctxt)

{

	int rc;

	unsigned long eip;

	unsigned long eip = 0;



	rc = emulate_pop(ctxt, &eip, ctxt->op_bytes);

	if (rc != X86EMUL_CONTINUE)
@@ -2241,7 +2242,8 @@ static int em_ret(struct x86_emulate_ctxt *ctxt) 
static int em_ret_far(struct x86_emulate_ctxt *ctxt)

{

	int rc;

	unsigned long eip, cs;

	unsigned long eip = 0;

	unsigned long cs = 0;

	int cpl = ctxt->ops->cpl(ctxt);

	struct desc_struct new_desc;
@@ -3011,7 +3013,7 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt, 
		ret = em_push(ctxt);

	}



	ops->get_dr(ctxt, 7, &dr7);

	dr7 = ops->get_dr(ctxt, 7);

	ops->set_dr(ctxt, 7, dr7 & ~(DR_LOCAL_ENABLE_MASK | DR_LOCAL_SLOWDOWN));



	return ret;
@@ -3184,7 +3186,7 @@ static int em_call_far(struct x86_emulate_ctxt *ctxt) 
static int em_ret_near_imm(struct x86_emulate_ctxt *ctxt)

{

	int rc;

	unsigned long eip;

	unsigned long eip = 0;



	rc = emulate_pop(ctxt, &eip, ctxt->op_bytes);

	if (rc != X86EMUL_CONTINUE)
@@ -3866,15 +3868,6 @@ static int check_cr_access(struct x86_emulate_ctxt *ctxt) 
	return X86EMUL_CONTINUE;

}



static int check_dr7_gd(struct x86_emulate_ctxt *ctxt)

{

	unsigned long dr7;



	ctxt->ops->get_dr(ctxt, 7, &dr7);



	return dr7 & DR7_GD;

}



static int check_dr_read(struct x86_emulate_ctxt *ctxt)

{

	int dr = ctxt->modrm_reg;
@@ -3887,10 +3880,10 @@ static int check_dr_read(struct x86_emulate_ctxt *ctxt) 
	if ((cr4 & X86_CR4_DE) && (dr == 4 || dr == 5))

		return emulate_ud(ctxt);



	if (check_dr7_gd(ctxt)) {

	if (ctxt->ops->get_dr(ctxt, 7) & DR7_GD) {

		ulong dr6;



		ctxt->ops->get_dr(ctxt, 6, &dr6);

		dr6 = ctxt->ops->get_dr(ctxt, 6);

		dr6 &= ~DR_TRAP_BITS;

		dr6 |= DR6_BD | DR6_ACTIVE_LOW;

		ctxt->ops->set_dr(ctxt, 6, dr6);
@@ -4505,11 +4498,11 @@ static const struct instr_dual instr_dual_0f_38_f1 = { 
};



static const struct gprefix three_byte_0f_38_f0 = {

	ID(0, &instr_dual_0f_38_f0), N, N, N

	ID(0, &instr_dual_0f_38_f0), ID(0, &instr_dual_0f_38_f0), N, N

};



static const struct gprefix three_byte_0f_38_f1 = {

	ID(0, &instr_dual_0f_38_f1), N, N, N

	ID(0, &instr_dual_0f_38_f1), ID(0, &instr_dual_0f_38_f1), N, N

};



/*
@@ -5449,7 +5442,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) 
		ctxt->dst.val = ops->get_cr(ctxt, ctxt->modrm_reg);

		break;

	case 0x21: /* mov from dr to reg */

		ops->get_dr(ctxt, ctxt->modrm_reg, &ctxt->dst.val);

		ctxt->dst.val = ops->get_dr(ctxt, ctxt->modrm_reg);

		break;

	case 0x40 ... 0x4f:	/* cmov */

		if (test_cc(ctxt->b, ctxt->eflags))

arch/x86/kvm/kvm_emulate.h

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ struct x86_emulate_ops { 
	ulong (*get_cr)(struct x86_emulate_ctxt *ctxt, int cr);

	int (*set_cr)(struct x86_emulate_ctxt *ctxt, int cr, ulong val);

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

	void (*get_dr)(struct x86_emulate_ctxt *ctxt, int dr, ulong *dest);

	ulong (*get_dr)(struct x86_emulate_ctxt *ctxt, int dr);

	int (*set_dr)(struct x86_emulate_ctxt *ctxt, int dr, ulong value);

	int (*set_msr_with_filter)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 data);

	int (*get_msr_with_filter)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 *pdata);