From patchwork Tue Aug 7 09:55:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 1284891 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 DEAFB3FCC5 for ; Tue, 7 Aug 2012 09:56:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753445Ab2HGJ4K (ORCPT ); Tue, 7 Aug 2012 05:56:10 -0400 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:44553 "EHLO e28smtp03.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752174Ab2HGJ4J (ORCPT ); Tue, 7 Aug 2012 05:56:09 -0400 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 Aug 2012 15:26:07 +0530 Received: from d28relay02.in.ibm.com (9.184.220.59) by e28smtp03.in.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 7 Aug 2012 15:25:42 +0530 Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q779tgFl27328766; Tue, 7 Aug 2012 15:25:42 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q77FPF71004406; Tue, 7 Aug 2012 20:55:16 +0530 Received: from localhost.localdomain ([9.123.236.99]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q77FPET3004343; Tue, 7 Aug 2012 20:55:14 +0530 Message-ID: <5020E61B.7090509@linux.vnet.ibm.com> Date: Tue, 07 Aug 2012 17:55:39 +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 v5 12/12] KVM: indicate readonly access fault References: <5020E423.9080004@linux.vnet.ibm.com> In-Reply-To: <5020E423.9080004@linux.vnet.ibm.com> x-cbid: 12080709-3864-0000-0000-00000413BDF1 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 | 12 ++++++++---- include/linux/kvm.h | 3 +++ include/linux/kvm_host.h | 1 + virt/kvm/kvm_main.c | 3 +++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8cde327..5e10482 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3704,9 +3704,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 { @@ -3736,7 +3737,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, @@ -3798,7 +3799,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: @@ -3820,6 +3822,7 @@ mmio: frag->gpa = gpa; frag->data = val; frag->len = now; + frag->write_readonly_mem = (ret == -EPERM); gpa += now; val += now; @@ -3837,6 +3840,7 @@ static void set_mmio_exit_info(struct kvm_vcpu *vcpu, run->mmio.phys_addr = frag->gpa; run->mmio.len = frag->len; run->mmio.is_write = vcpu->mmio_is_write = write; + run->mmio.write_readonly_mem = frag->write_readonly_mem; if (write) memcpy(run->mmio.data, frag->data, frag->len); diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 94867d0..9261541 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -222,6 +222,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 2df6861..c47979d 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -184,6 +184,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 5e899d9..d0babc9 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1445,6 +1445,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);