xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Mukesh Rathor <mukesh.rathor@oracle.com>
To: Xen-devel@lists.xensource.com
Subject: [PATCH 02/18 V2 RESEND]: PVH xen: add XENMEM_add_to_physmap_range
Date: Tue, 19 Mar 2013 15:33:04 -0700	[thread overview]
Message-ID: <1363732400-11785-2-git-send-email-mukesh.rathor@oracle.com> (raw)
In-Reply-To: <1363732400-11785-1-git-send-email-mukesh.rathor@oracle.com>

In this patch we add a new function xenmem_add_to_physmap_range(), and
change xenmem_add_to_physmap_once parameters so it can be called from
xenmem_add_to_physmap_range. There is no PVH specific change here.

Changes in V2:
   - Do not break parameter so xenmem_add_to_physmap_once() but pass in
     struct xen_add_to_physmap.

Signed-off-by: Mukesh Rathor <mukesh.rathor@oracle.com>
---
 xen/arch/x86/mm.c |   82 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index d00d9a2..6603752 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -4268,7 +4268,8 @@ static int handle_iomem_range(unsigned long s, unsigned long e, void *p)
 
 static int xenmem_add_to_physmap_once(
     struct domain *d,
-    const struct xen_add_to_physmap *xatp)
+    const struct xen_add_to_physmap *xatp,
+    domid_t foreign_domid)
 {
     struct page_info *page = NULL;
     unsigned long gfn = 0; /* gcc ... */
@@ -4395,7 +4396,7 @@ static int xenmem_add_to_physmap(struct domain *d,
         start_xatp = *xatp;
         while ( xatp->size > 0 )
         {
-            rc = xenmem_add_to_physmap_once(d, xatp);
+            rc = xenmem_add_to_physmap_once(d, xatp, -1);
             if ( rc < 0 )
                 return rc;
 
@@ -4421,7 +4422,52 @@ static int xenmem_add_to_physmap(struct domain *d,
         return rc;
     }
 
-    return xenmem_add_to_physmap_once(d, xatp);
+    return xenmem_add_to_physmap_once(d, xatp, -1);
+}
+
+static noinline int xenmem_add_to_physmap_range(struct domain *d,
+                                       struct xen_add_to_physmap_range *xatpr)
+{
+    int rc;
+
+    /* Process entries in reverse order to allow continuations */
+    while ( xatpr->size > 0 )
+    {
+        xen_ulong_t idx;
+        xen_pfn_t gpfn;
+        struct xen_add_to_physmap xatp;
+
+        rc = copy_from_guest_offset(&idx, xatpr->idxs, xatpr->size-1, 1);
+        if ( rc < 0 )
+            goto out;
+
+        rc = copy_from_guest_offset(&gpfn, xatpr->gpfns, xatpr->size-1, 1);
+        if ( rc < 0 )
+            goto out;
+
+        xatp.space = xatpr->space;
+        xatp.idx = idx;
+        xatp.gpfn = gpfn;
+        rc = xenmem_add_to_physmap_once(d, &xatp, xatpr->foreign_domid);
+
+        if (rc)
+            goto out;
+
+        xatpr->size--;
+
+        /* Check for continuation if it's not the last interation */
+        if ( xatpr->size > 0 && hypercall_preempt_check() )
+        {
+            rc = -EAGAIN;
+            goto out;
+        }
+    }
+
+    rc = 0;
+
+out:
+    return rc;
+
 }
 
 long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg)
@@ -4438,6 +4484,10 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg)
         if ( copy_from_guest(&xatp, arg, 1) )
             return -EFAULT;
 
+        /* This one is only supported for add_to_physmap_range */
+        if ( xatp.space == XENMAPSPACE_gmfn_foreign )
+            return -EINVAL;
+
         d = rcu_lock_domain_by_any_id(xatp.domid);
         if ( d == NULL )
             return -ESRCH;
@@ -4465,6 +4515,32 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg)
         return rc;
     }
 
+    case XENMEM_add_to_physmap_range:
+    {
+        struct xen_add_to_physmap_range xatpr;
+        struct domain *d;
+
+        if ( copy_from_guest(&xatpr, arg, 1) )
+            return -EFAULT;
+
+        rc = rcu_lock_target_domain_by_id(xatpr.domid, &d);
+        if ( rc != 0 )
+            return rc;
+
+        rc = xenmem_add_to_physmap_range(d, &xatpr);
+
+        rcu_unlock_domain(d);
+
+        if ( rc && copy_to_guest(arg, &xatpr, 1) )
+            rc = -EFAULT;
+
+        if ( rc == -EAGAIN )
+            rc = hypercall_create_continuation(
+                __HYPERVISOR_memory_op, "ih", op, arg);
+
+        return rc;
+    }
+
     case XENMEM_set_memory_map:
     {
         struct xen_foreign_memory_map fmap;
-- 
1.7.2.3

  reply	other threads:[~2013-03-19 22:33 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-19 22:33 [PATCH 01/18 V2 RESEND] PVH xen: turn gdb_frames/gdt_ents into union Mukesh Rathor
2013-03-19 22:33 ` Mukesh Rathor [this message]
2013-03-19 22:33 ` [PATCH 03/18 V2 RESEND]: PVH xen: create domctl_memory_mapping() function Mukesh Rathor
2013-03-19 22:33 ` [PATCH 04/18 V2 RESEND]: PVH xen: add params to read_segment_register Mukesh Rathor
2013-03-19 22:33 ` [PATCH 05/18 V2 RESEND]: PVH xen: more preparatory changes for PVH Mukesh Rathor
2013-03-19 22:33 ` [PATCH 06/18 V2 RESEND]: PVH xen: Introduce PVH guest type Mukesh Rathor
2013-03-19 22:33 ` [PATCH 07/18 V2 RESEND]: PVH xen: tools changes to create PVH domain Mukesh Rathor
2013-03-19 22:33 ` [PATCH 08/18 V2 RESEND]: PVH xen: domain creation code changes Mukesh Rathor
2013-03-19 22:33 ` [PATCH 09/18 V2 RESEND]: PVH xen: create PVH vmcs, and initialization Mukesh Rathor
2013-03-19 22:33 ` [PATCH 10/18 V2 RESEND]: PVH xen: introduce vmx_pvh.c and pvh.c Mukesh Rathor
2013-03-19 22:33 ` [PATCH 11/18 V2 RESEND]: PVH xen: some misc changes like mtrr, intr, msi Mukesh Rathor
2013-03-19 22:33 ` [PATCH 12/18 V2 RESEND]: PVH xen: support invalid op, return PVH features etc Mukesh Rathor
2013-03-19 22:33 ` [PATCH 13/18 V2 RESEND]: PVH xen: introduce p2m_map_foreign Mukesh Rathor
2013-03-19 22:33 ` [PATCH 14/18 V2 RESEND]: PVH xen: add xenmem_add_foreign_to_pmap() Mukesh Rathor
2013-03-19 22:33 ` [PATCH 15/18 V2 RESEND]: PVH xen: grant related changes Mukesh Rathor
2013-03-19 22:33 ` [PATCH 16/18 V2 RESEND]: PVH xen: elf changes to pref for dom0 PVH Mukesh Rathor
2013-03-19 22:33 ` [PATCH 17/18 V2 RESEND]: PVH xen: PVH dom0 creation Mukesh Rathor
2013-03-19 22:33 ` [PATCH 18/18 V2 RESEND]: PVH xen: Enable PVH Mukesh Rathor

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=1363732400-11785-2-git-send-email-mukesh.rathor@oracle.com \
    --to=mukesh.rathor@oracle.com \
    --cc=Xen-devel@lists.xensource.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).