From patchwork Tue Aug 21 03:03:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 1351731 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A473B3FC33 for ; Tue, 21 Aug 2012 03:03:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756359Ab2HUDDm (ORCPT ); Mon, 20 Aug 2012 23:03:42 -0400 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:33856 "EHLO e28smtp02.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755740Ab2HUDDk (ORCPT ); Mon, 20 Aug 2012 23:03:40 -0400 Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 21 Aug 2012 08:33:38 +0530 Received: from d28relay04.in.ibm.com (9.184.220.61) by e28smtp02.in.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 21 Aug 2012 08:33:35 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q7L33MAL20054264; Tue, 21 Aug 2012 08:33:24 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q7L33MvQ000674; Tue, 21 Aug 2012 13:03:22 +1000 Received: from localhost.localdomain ([9.123.236.99]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q7L33KZZ000462; Tue, 21 Aug 2012 13:03:21 +1000 Message-ID: <5032FA78.9040405@linux.vnet.ibm.com> Date: Tue, 21 Aug 2012 11:03:20 +0800 From: Xiao Guangrong User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120717 Thunderbird/14.0 MIME-Version: 1.0 To: Xiao Guangrong CC: Avi Kivity , Marcelo Tosatti , LKML , KVM Subject: [PATCH v6 12/12] KVM: indicate readonly access fault References: <5032F8FD.2020306@linux.vnet.ibm.com> In-Reply-To: <5032F8FD.2020306@linux.vnet.ibm.com> x-cbid: 12082103-5816-0000-0000-00000414682E Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Introduce write_readonly_mem in mmio-exit-info to indicate this exit is caused by write access on readonly memslot Signed-off-by: Xiao Guangrong --- arch/x86/kvm/x86.c | 23 ++++++++++++++--------- include/linux/kvm.h | 3 +++ include/linux/kvm_host.h | 1 + virt/kvm/kvm_main.c | 3 +++ 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 42bbf41..6d7fe4a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3710,9 +3710,10 @@ int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa, ret = kvm_write_guest(vcpu->kvm, gpa, val, bytes); if (ret < 0) - return 0; + return ret; + kvm_mmu_pte_write(vcpu, gpa, val, bytes); - return 1; + return 0; } struct read_write_emulator_ops { @@ -3742,7 +3743,7 @@ static int read_prepare(struct kvm_vcpu *vcpu, void *val, int bytes) static int read_emulate(struct kvm_vcpu *vcpu, gpa_t gpa, void *val, int bytes) { - return !kvm_read_guest(vcpu->kvm, gpa, val, bytes); + return kvm_read_guest(vcpu->kvm, gpa, val, bytes); } static int write_emulate(struct kvm_vcpu *vcpu, gpa_t gpa, @@ -3807,7 +3808,8 @@ static int emulator_read_write_onepage(unsigned long addr, void *val, if (ret) goto mmio; - if (ops->read_write_emulate(vcpu, gpa, val, bytes)) + ret = ops->read_write_emulate(vcpu, gpa, val, bytes); + if (!ret) return X86EMUL_CONTINUE; mmio: @@ -3829,6 +3831,7 @@ mmio: frag->gpa = gpa; frag->data = val; frag->len = now; + frag->write_readonly_mem = (ret == -EPERM); gpa += now; val += now; @@ -3842,8 +3845,8 @@ int emulator_read_write(struct x86_emulate_ctxt *ctxt, unsigned long addr, struct x86_exception *exception, struct read_write_emulator_ops *ops) { + struct kvm_mmio_fragment *frag; struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt); - gpa_t gpa; int rc; if (ops->read_write_prepare && @@ -3875,17 +3878,18 @@ int emulator_read_write(struct x86_emulate_ctxt *ctxt, unsigned long addr, if (!vcpu->mmio_nr_fragments) return rc; - gpa = vcpu->mmio_fragments[0].gpa; + frag = &vcpu->mmio_fragments[0]; vcpu->mmio_needed = 1; vcpu->mmio_cur_fragment = 0; - vcpu->run->mmio.len = vcpu->mmio_fragments[0].len; + vcpu->run->mmio.len = frag->len; vcpu->run->mmio.is_write = vcpu->mmio_is_write = ops->write; vcpu->run->exit_reason = KVM_EXIT_MMIO; - vcpu->run->mmio.phys_addr = gpa; + vcpu->run->mmio.phys_addr = frag->gpa; + vcpu->run->mmio.write_readonly_mem = frag->write_readonly_mem; - return ops->read_write_exit_mmio(vcpu, gpa, val, bytes); + return ops->read_write_exit_mmio(vcpu, frag->gpa, val, bytes); } static int emulator_read_emulated(struct x86_emulate_ctxt *ctxt, @@ -5525,6 +5529,7 @@ static int complete_mmio(struct kvm_vcpu *vcpu) ++frag; run->exit_reason = KVM_EXIT_MMIO; run->mmio.phys_addr = frag->gpa; + vcpu->run->mmio.write_readonly_mem = frag->write_readonly_mem; if (vcpu->mmio_is_write) memcpy(run->mmio.data, frag->data, frag->len); run->mmio.len = frag->len; diff --git a/include/linux/kvm.h b/include/linux/kvm.h index d808694..9d8002f 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -226,6 +226,9 @@ struct kvm_run { __u8 data[8]; __u32 len; __u8 is_write; +#ifdef __KVM_HAVE_READONLY_MEM + __u8 write_readonly_mem; +#endif } mmio; /* KVM_EXIT_HYPERCALL */ struct { diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 5972c98..c37b225 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -189,6 +189,7 @@ struct kvm_mmio_fragment { gpa_t gpa; void *data; unsigned len; + bool write_readonly_mem; }; struct kvm_vcpu { diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 3416f8a..0c7def7 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1456,6 +1456,9 @@ int kvm_write_guest_page(struct kvm *kvm, gfn_t gfn, const void *data, unsigned long addr; addr = gfn_to_hva(kvm, gfn); + if (addr == KVM_HVA_ERR_RO_BAD) + return -EPERM; + if (kvm_is_error_hva(addr)) return -EFAULT; r = __copy_to_user((void __user *)addr + offset, data, len);