xen: x86 pvh: use XENMEM_add_to_physmap_range for foreign gmfn mappings

Squeezing the necessary fields into the existing XENMEM_add_to_physmap
interface was proving to be a bit tricky so we have decided to go with
a new interface upstream (the XENMAPSPACE_gmfn_foreign interface using
XENMEM_add_to_physmap was never committed anywhere). This interface
also allows for batching which was impossible to support at the same
time as foreign mfns in the old interface.

This reverts the relevant parts of "PVH: basic and header changes,
elfnote changes, ..." and followups and trivially converts
pvh_add_to_xen_p2m over.

Acked-by: Mukesh Rathor <mukesh.rathor@oracle.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index e78763a835b1315bad3d8c3c711be0f14f9d5846..6bf7b1d654937118ef40f6ea6d41c5896a1b96a8 100644 (file)
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -2525,13 +2525,19 @@ static int pvh_add_to_xen_p2m(unsigned long lpfn, unsigned long fgmfn,
                              unsigned int domid)
 {
        int rc;
-       struct xen_add_to_physmap xatp = { .foreign_domid = domid };
+       struct xen_add_to_physmap_range xatp = {
+               .domid = DOMID_SELF,
+               .foreign_domid = domid,
+               .size = 1,
+               .space = XENMAPSPACE_gmfn_foreign,
+       };
+       xen_ulong_t idx = fgmfn;
+       xen_pfn_t gpfn = lpfn;
+
+       set_xen_guest_handle(xatp.idxs, &idx);
+       set_xen_guest_handle(xatp.gpfns, &gpfn);
 
-       xatp.gpfn = lpfn;
-       xatp.idx = fgmfn;
-       xatp.domid = DOMID_SELF;
-       xatp.space = XENMAPSPACE_gmfn_foreign;
-       rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp);
+       rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap_range, &xatp);
        if (rc)
                pr_warn("d0: Failed to map pfn (0x%lx) to mfn (0x%lx) rc:%d\n",
                        lpfn, fgmfn, rc);

diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h
index a1221646c922f3af6b0de36e0904f8c631a3b617..2ecfe4f700d94ce9adefdf423e235fe7c5e3d14c 100644 (file)
--- a/include/xen/interface/memory.h
+++ b/include/xen/interface/memory.h
@@ -175,10 +175,7 @@ struct xen_add_to_physmap {
     uint16_t    size;
 
     /* Source mapping space. */
-    uint16_t space;
-    domid_t foreign_domid;         /* IFF XENMAPSPACE_gmfn_foreign */
-
-#define XENMAPIDX_grant_table_status 0x80000000
+    unsigned int space;
 
     /* Index into source mapping space. */
     xen_ulong_t idx;