From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
To: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Avi Kivity <avi@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
LKML <linux-kernel@vger.kernel.org>, KVM <kvm@vger.kernel.org>
Subject: [PATCH v5 04/12] KVM: introduce gfn_to_hva_read/kvm_read_hva/kvm_read_hva_atomic
Date: Tue, 07 Aug 2012 17:50:26 +0800 [thread overview]
Message-ID: <5020E4E2.2090406@linux.vnet.ibm.com> (raw)
In-Reply-To: <5020E423.9080004@linux.vnet.ibm.com>
This set of functions is only used to read data from host space, in the
later patch, we will only get a readonly hva in gfn_to_hva_read, and
the function name is a good hint to let gfn_to_hva_read to pair with
kvm_read_hva()/kvm_read_hva_atomic()
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
---
virt/kvm/kvm_main.c | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 543f9b7..26ffc87 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1002,6 +1002,27 @@ unsigned long gfn_to_hva(struct kvm *kvm, gfn_t gfn)
}
EXPORT_SYMBOL_GPL(gfn_to_hva);
+/*
+ * The hva returned by this function is only allowed to be read.
+ * It should pair with kvm_read_hva() or kvm_read_hva_atomic().
+ */
+static unsigned long gfn_to_hva_read(struct kvm *kvm, gfn_t gfn)
+{
+ return gfn_to_hva_many(gfn_to_memslot(kvm, gfn), gfn, NULL);
+}
+
+static int kvm_read_hva(void *data, void __user *hva, int len)
+{
+ return __copy_from_user(data, hva, len);
+
+}
+
+static int kvm_read_hva_atomic(void *data, void __user *hva, int len)
+{
+ return __copy_from_user_inatomic(data, hva, len);
+
+}
+
int get_user_page_nowait(struct task_struct *tsk, struct mm_struct *mm,
unsigned long start, int write, struct page **page)
{
@@ -1274,10 +1295,10 @@ int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset,
int r;
unsigned long addr;
- addr = gfn_to_hva(kvm, gfn);
+ addr = gfn_to_hva_read(kvm, gfn);
if (kvm_is_error_hva(addr))
return -EFAULT;
- r = __copy_from_user(data, (void __user *)addr + offset, len);
+ r = kvm_read_hva(data, (void __user *)addr + offset, len);
if (r)
return -EFAULT;
return 0;
@@ -1312,11 +1333,11 @@ int kvm_read_guest_atomic(struct kvm *kvm, gpa_t gpa, void *data,
gfn_t gfn = gpa >> PAGE_SHIFT;
int offset = offset_in_page(gpa);
- addr = gfn_to_hva(kvm, gfn);
+ addr = gfn_to_hva_read(kvm, gfn);
if (kvm_is_error_hva(addr))
return -EFAULT;
pagefault_disable();
- r = __copy_from_user_inatomic(data, (void __user *)addr + offset, len);
+ r = kvm_read_hva_atomic(data, (void __user *)addr + offset, len);
pagefault_enable();
if (r)
return -EFAULT;
--
1.7.7.6
next prev parent reply other threads:[~2012-08-07 9:50 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-07 9:47 [PATCH v5 00/12] KVM: introduce readonly memslot Xiao Guangrong
2012-08-07 9:48 ` [PATCH v5 01/12] KVM: fix missing check for memslot flags Xiao Guangrong
2012-08-07 9:48 ` [PATCH v5 02/12] KVM: hide KVM_MEMSLOT_INVALID from userspace Xiao Guangrong
2012-08-09 18:48 ` Marcelo Tosatti
2012-08-10 2:11 ` Xiao Guangrong
2012-08-07 9:49 ` [PATCH v5 03/12] KVM: introduce gfn_to_pfn_memslot_atomic Xiao Guangrong
2012-08-09 18:50 ` Marcelo Tosatti
2012-08-10 3:22 ` Xiao Guangrong
2012-08-07 9:50 ` Xiao Guangrong [this message]
2012-08-07 9:51 ` [PATCH v5 05/12] KVM: reorganize hva_to_pfn Xiao Guangrong
2012-08-10 17:51 ` Marcelo Tosatti
2012-08-11 3:11 ` Xiao Guangrong
2012-08-07 9:51 ` [PATCH v5 06/12] KVM: use 'writable' as a hint to map writable pfn Xiao Guangrong
2012-08-07 9:52 ` [PATCH v5 07/12] KVM: introduce KVM_PFN_ERR_RO_FAULT Xiao Guangrong
2012-08-07 9:52 ` [PATCH v5 08/12] KVM: introduce KVM_HVA_ERR_BAD Xiao Guangrong
2012-08-07 9:53 ` [PATCH v5 09/12] KVM: introduce KVM_HVA_ERR_RO_BAD Xiao Guangrong
2012-08-07 9:54 ` [PATCH v5 10/12] KVM: introduce readonly memslot Xiao Guangrong
2012-08-07 9:54 ` [PATCH v5 11/12] KVM: x86: introduce set_mmio_exit_info Xiao Guangrong
2012-08-10 18:03 ` Marcelo Tosatti
2012-08-11 3:13 ` Xiao Guangrong
2012-08-07 9:55 ` [PATCH v5 12/12] KVM: indicate readonly access fault Xiao Guangrong
2012-08-10 18:14 ` [PATCH v5 00/12] KVM: introduce readonly memslot Marcelo Tosatti
2012-08-11 3:36 ` Xiao Guangrong
2012-08-13 17:39 ` Marcelo Tosatti
2012-08-14 2:58 ` Xiao Guangrong
2012-08-14 15:25 ` Marcelo Tosatti
2012-08-16 5:49 ` Xiao Guangrong
2012-08-16 16:03 ` Marcelo Tosatti
2012-08-14 14:00 ` Avi Kivity
2012-08-14 15:51 ` Marcelo Tosatti
2012-08-15 10:44 ` Avi Kivity
2012-08-15 17:53 ` Marcelo Tosatti
2012-08-16 9:03 ` Avi Kivity
2012-08-16 15:57 ` Marcelo Tosatti
2012-08-16 16:17 ` Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5020E4E2.2090406@linux.vnet.ibm.com \
--to=xiaoguangrong@linux.vnet.ibm.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).