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

Commit bd2742e8 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Greg Kroah-Hartman
Browse files

KVM: x86: pass kvm_vcpu to kvm_read_guest_virt and kvm_write_guest_virt_system 



commit ce14e868a54edeb2e30cb7a7b104a2fc4b9d76ca upstream.

Int the next patch the emulator's .read_std and .write_std callbacks will
grow another argument, which is not needed in kvm_read_guest_virt and
kvm_write_guest_virt_system's callers.  Since we have to make separate
functions, let's give the currently existing names a nicer interface, too.

Fixes: 129a72a0 ("KVM: x86: Introduce segmented_write_std", 2017-01-12)
Cc: stable@vger.kernel.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b1bd9caf

arch/x86/kvm/vmx.c

+10 −13
Original line number Diff line number Diff line
@@ -7317,8 +7317,7 @@ static int nested_vmx_get_vmptr(struct kvm_vcpu *vcpu, gpa_t *vmpointer) 
			vmcs_read32(VMX_INSTRUCTION_INFO), false, &gva))

		return 1;



	if (kvm_read_guest_virt(&vcpu->arch.emulate_ctxt, gva, vmpointer,

				sizeof(*vmpointer), &e)) {

	if (kvm_read_guest_virt(vcpu, gva, vmpointer, sizeof(*vmpointer), &e)) {

		kvm_inject_page_fault(vcpu, &e);

		return 1;

	}
@@ -7802,8 +7801,8 @@ static int handle_vmread(struct kvm_vcpu *vcpu) 
				vmx_instruction_info, true, &gva))

			return 1;

		/* _system ok, nested_vmx_check_permission has verified cpl=0 */

		kvm_write_guest_virt_system(&vcpu->arch.emulate_ctxt, gva,

			     &field_value, (is_long_mode(vcpu) ? 8 : 4), NULL);

		kvm_write_guest_virt_system(vcpu, gva, &field_value,

					    (is_long_mode(vcpu) ? 8 : 4), NULL);

	}



	nested_vmx_succeed(vcpu);
@@ -7839,8 +7838,8 @@ static int handle_vmwrite(struct kvm_vcpu *vcpu) 
		if (get_vmx_mem_address(vcpu, exit_qualification,

				vmx_instruction_info, false, &gva))

			return 1;

		if (kvm_read_guest_virt(&vcpu->arch.emulate_ctxt, gva,

			   &field_value, (is_64_bit_mode(vcpu) ? 8 : 4), &e)) {

		if (kvm_read_guest_virt(vcpu, gva, &field_value,

					(is_64_bit_mode(vcpu) ? 8 : 4), &e)) {

			kvm_inject_page_fault(vcpu, &e);

			return 1;

		}
@@ -7945,7 +7944,7 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu) 
			vmx_instruction_info, true, &vmcs_gva))

		return 1;

	/* *_system ok, nested_vmx_check_permission has verified cpl=0 */

	if (kvm_write_guest_virt_system(&vcpu->arch.emulate_ctxt, vmcs_gva,

	if (kvm_write_guest_virt_system(vcpu, vmcs_gva,

					(void *)&to_vmx(vcpu)->nested.current_vmptr,

					sizeof(u64), &e)) {

		kvm_inject_page_fault(vcpu, &e);
@@ -7994,8 +7993,7 @@ static int handle_invept(struct kvm_vcpu *vcpu) 
	if (get_vmx_mem_address(vcpu, vmcs_readl(EXIT_QUALIFICATION),

			vmx_instruction_info, false, &gva))

		return 1;

	if (kvm_read_guest_virt(&vcpu->arch.emulate_ctxt, gva, &operand,

				sizeof(operand), &e)) {

	if (kvm_read_guest_virt(vcpu, gva, &operand, sizeof(operand), &e)) {

		kvm_inject_page_fault(vcpu, &e);

		return 1;

	}
@@ -8059,8 +8057,7 @@ static int handle_invvpid(struct kvm_vcpu *vcpu) 
	if (get_vmx_mem_address(vcpu, vmcs_readl(EXIT_QUALIFICATION),

			vmx_instruction_info, false, &gva))

		return 1;

	if (kvm_read_guest_virt(&vcpu->arch.emulate_ctxt, gva, &operand,

				sizeof(operand), &e)) {

	if (kvm_read_guest_virt(vcpu, gva, &operand, sizeof(operand), &e)) {

		kvm_inject_page_fault(vcpu, &e);

		return 1;

	}

arch/x86/kvm/x86.c

+26 −13
Original line number Diff line number Diff line
@@ -4492,11 +4492,10 @@ static int kvm_fetch_guest_virt(struct x86_emulate_ctxt *ctxt, 
	return X86EMUL_CONTINUE;

}



int kvm_read_guest_virt(struct x86_emulate_ctxt *ctxt,

int kvm_read_guest_virt(struct kvm_vcpu *vcpu,

			       gva_t addr, void *val, unsigned int bytes,

			       struct x86_exception *exception)

{

	struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);

	u32 access = (kvm_x86_ops->get_cpl(vcpu) == 3) ? PFERR_USER_MASK : 0;



	return kvm_read_guest_virt_helper(addr, val, bytes, vcpu, access,
@@ -4504,7 +4503,7 @@ int kvm_read_guest_virt(struct x86_emulate_ctxt *ctxt, 
}

EXPORT_SYMBOL_GPL(kvm_read_guest_virt);



static int kvm_read_guest_virt_system(struct x86_emulate_ctxt *ctxt,

static int emulator_read_std(struct x86_emulate_ctxt *ctxt,

			     gva_t addr, void *val, unsigned int bytes,

			     struct x86_exception *exception)

{
@@ -4521,18 +4520,16 @@ static int kvm_read_guest_phys_system(struct x86_emulate_ctxt *ctxt, 
	return r < 0 ? X86EMUL_IO_NEEDED : X86EMUL_CONTINUE;

}



int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,

				       gva_t addr, void *val,

				       unsigned int bytes,

static int kvm_write_guest_virt_helper(gva_t addr, void *val, unsigned int bytes,

				      struct kvm_vcpu *vcpu, u32 access,

				      struct x86_exception *exception)

{

	struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);

	void *data = val;

	int r = X86EMUL_CONTINUE;



	while (bytes) {

		gpa_t gpa =  vcpu->arch.walk_mmu->gva_to_gpa(vcpu, addr,

							     PFERR_WRITE_MASK,

							     access,

							     exception);

		unsigned offset = addr & (PAGE_SIZE-1);

		unsigned towrite = min(bytes, (unsigned)PAGE_SIZE - offset);
@@ -4553,6 +4550,22 @@ int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt, 
out:

	return r;

}



static int emulator_write_std(struct x86_emulate_ctxt *ctxt, gva_t addr, void *val,

			      unsigned int bytes, struct x86_exception *exception)

{

	struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);



	return kvm_write_guest_virt_helper(addr, val, bytes, vcpu,

					   PFERR_WRITE_MASK, exception);

}



int kvm_write_guest_virt_system(struct kvm_vcpu *vcpu, gva_t addr, void *val,

				unsigned int bytes, struct x86_exception *exception)

{

	return kvm_write_guest_virt_helper(addr, val, bytes, vcpu,

					   PFERR_WRITE_MASK, exception);

}

EXPORT_SYMBOL_GPL(kvm_write_guest_virt_system);



static int vcpu_is_mmio_gpa(struct kvm_vcpu *vcpu, unsigned long gva,
@@ -5287,8 +5300,8 @@ static void emulator_set_hflags(struct x86_emulate_ctxt *ctxt, unsigned emul_fla 
static const struct x86_emulate_ops emulate_ops = {

	.read_gpr            = emulator_read_gpr,

	.write_gpr           = emulator_write_gpr,

	.read_std            = kvm_read_guest_virt_system,

	.write_std           = kvm_write_guest_virt_system,

	.read_std            = emulator_read_std,

	.write_std           = emulator_write_std,

	.read_phys           = kvm_read_guest_phys_system,

	.fetch               = kvm_fetch_guest_virt,

	.read_emulated       = emulator_read_emulated,

arch/x86/kvm/x86.h

+2 −2
Original line number Diff line number Diff line
@@ -213,11 +213,11 @@ int kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq, int inc_eip); 
void kvm_write_tsc(struct kvm_vcpu *vcpu, struct msr_data *msr);

u64 get_kvmclock_ns(struct kvm *kvm);



int kvm_read_guest_virt(struct x86_emulate_ctxt *ctxt,

int kvm_read_guest_virt(struct kvm_vcpu *vcpu,

	gva_t addr, void *val, unsigned int bytes,

	struct x86_exception *exception);



int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,

int kvm_write_guest_virt_system(struct kvm_vcpu *vcpu,

	gva_t addr, void *val, unsigned int bytes,

	struct x86_exception *exception);