aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.9.21/0004-KVM-x86-pass-kvm_vcpu-to-kvm_read_guest_virt-and-kvm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0004-KVM-x86-pass-kvm_vcpu-to-kvm_read_guest_virt-and-kvm.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.9.21/0004-KVM-x86-pass-kvm_vcpu-to-kvm_read_guest_virt-and-kvm.patch200
1 files changed, 0 insertions, 200 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0004-KVM-x86-pass-kvm_vcpu-to-kvm_read_guest_virt-and-kvm.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0004-KVM-x86-pass-kvm_vcpu-to-kvm_read_guest_virt-and-kvm.patch
deleted file mode 100644
index b1c3c02d..00000000
--- a/common/recipes-kernel/linux/linux-yocto-4.9.21/0004-KVM-x86-pass-kvm_vcpu-to-kvm_read_guest_virt-and-kvm.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From 1ea42745a9e721d08413cd0c6728934da385010b Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Wed, 6 Jun 2018 17:37:49 +0200
-Subject: [PATCH 04/10] 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: 129a72a0d3c8 ("KVM: x86: Introduce segmented_write_std", 2017-01-12)
-Cc: stable@vger.kernel.org
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/kvm/vmx.c | 23 ++++++++++-------------
- arch/x86/kvm/x86.c | 39 ++++++++++++++++++++++++++-------------
- arch/x86/kvm/x86.h | 4 ++--
- 3 files changed, 38 insertions(+), 28 deletions(-)
-
-diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index d39062c..a81463d 100644
---- a/arch/x86/kvm/vmx.c
-+++ b/arch/x86/kvm/vmx.c
-@@ -6906,8 +6906,7 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason,
- vmcs_read32(VMX_INSTRUCTION_INFO), false, &gva))
- return 1;
-
-- if (kvm_read_guest_virt(&vcpu->arch.emulate_ctxt, gva, &vmptr,
-- sizeof(vmptr), &e)) {
-+ if (kvm_read_guest_virt(vcpu, gva, &vmptr, sizeof(vmptr), &e)) {
- kvm_inject_page_fault(vcpu, &e);
- return 1;
- }
-@@ -7455,8 +7454,8 @@ static int handle_vmread(struct kvm_vcpu *vcpu)
- vmx_instruction_info, true, &gva))
- return 1;
- /* _system ok, as nested_vmx_check_permission 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);
-@@ -7491,8 +7490,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;
- }
-@@ -7589,9 +7588,9 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu)
- vmx_instruction_info, true, &vmcs_gva))
- return 1;
- /* ok to use *_system, as nested_vmx_check_permission verified cpl=0 */
-- if (kvm_write_guest_virt_system(&vcpu->arch.emulate_ctxt, vmcs_gva,
-- (void *)&to_vmx(vcpu)->nested.current_vmptr,
-- sizeof(u64), &e)) {
-+ 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);
- return 1;
- }
-@@ -7645,8 +7644,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;
- }
-@@ -7709,8 +7707,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, &vpid,
-- sizeof(u32), &e)) {
-+ if (kvm_read_guest_virt(vcpu, gva, &vpid, sizeof(u32), &e)) {
- kvm_inject_page_fault(vcpu, &e);
- return 1;
- }
-diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index d7974fc..af8e120 100644
---- a/arch/x86/kvm/x86.c
-+++ b/arch/x86/kvm/x86.c
-@@ -4370,11 +4370,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,
-@@ -4382,9 +4381,9 @@ 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,
-- gva_t addr, void *val, unsigned int bytes,
-- struct x86_exception *exception)
-+static int emulator_read_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_read_guest_virt_helper(addr, val, bytes, vcpu, 0, exception);
-@@ -4399,18 +4398,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,
-- struct x86_exception *exception)
-+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);
-@@ -4431,6 +4428,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_mmio_gva_to_gpa(struct kvm_vcpu *vcpu, unsigned long gva,
-@@ -5137,8 +5150,8 @@ static void emulator_set_nmi_mask(struct x86_emulate_ctxt *ctxt, bool masked)
- 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,
-diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
-index e8ff3e4..2133a18 100644
---- a/arch/x86/kvm/x86.h
-+++ b/arch/x86/kvm/x86.h
-@@ -161,11 +161,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);
-
---
-2.7.4
-
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-20 01:34:33 +0000