Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f832da06 authored by Ian Campbell's avatar Ian Campbell
Browse files

xen: arm: implement remap interfaces needed for privcmd mappings. 



We use XENMEM_add_to_physmap_range which is the preferred interface
for foreign mappings.

Acked-by: default avatarMukesh Rathor <mukesh.rathor@oracle.com>
Acked-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 7892f692

arch/arm/include/asm/xen/interface.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ DEFINE_GUEST_HANDLE(void); 
DEFINE_GUEST_HANDLE(uint64_t);

DEFINE_GUEST_HANDLE(uint32_t);

DEFINE_GUEST_HANDLE(xen_pfn_t);

DEFINE_GUEST_HANDLE(xen_ulong_t);



/* Maximum number of virtual CPUs in multi-processor guests. */

#define MAX_VIRT_CPUS 1

arch/arm/xen/enlighten.c

+97 −3
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <xen/platform_pci.h>

#include <xen/xenbus.h>

#include <xen/page.h>

#include <xen/xen-ops.h>

#include <asm/xen/hypervisor.h>

#include <asm/xen/hypercall.h>

#include <linux/interrupt.h>
@@ -18,6 +19,8 @@ 
#include <linux/of_irq.h>

#include <linux/of_address.h>



#include <linux/mm.h>



struct start_info _xen_start_info;

struct start_info *xen_start_info = &_xen_start_info;

EXPORT_SYMBOL_GPL(xen_start_info);
@@ -43,15 +46,106 @@ EXPORT_SYMBOL_GPL(xen_platform_pci_unplug); 


static __read_mostly int xen_events_irq = -1;



/* map fgmfn of domid to lpfn in the current domain */

static int map_foreign_page(unsigned long lpfn, unsigned long fgmfn,

			    unsigned int domid)

{

	int rc;

	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);



	rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap_range, &xatp);

	if (rc) {

		pr_warn("Failed to map pfn to mfn rc:%d pfn:%lx mfn:%lx\n",

			rc, lpfn, fgmfn);

		return 1;

	}

	return 0;

}



struct remap_data {

	xen_pfn_t fgmfn; /* foreign domain's gmfn */

	pgprot_t prot;

	domid_t  domid;

	struct vm_area_struct *vma;

	int index;

	struct page **pages;

	struct xen_remap_mfn_info *info;

};



static int remap_pte_fn(pte_t *ptep, pgtable_t token, unsigned long addr,

			void *data)

{

	struct remap_data *info = data;

	struct page *page = info->pages[info->index++];

	unsigned long pfn = page_to_pfn(page);

	pte_t pte = pfn_pte(pfn, info->prot);



	if (map_foreign_page(pfn, info->fgmfn, info->domid))

		return -EFAULT;

	set_pte_at(info->vma->vm_mm, addr, ptep, pte);



	return 0;

}



int xen_remap_domain_mfn_range(struct vm_area_struct *vma,

			       unsigned long addr,

			       unsigned long mfn, int nr,

			       pgprot_t prot, unsigned domid)

			       xen_pfn_t mfn, int nr,

			       pgprot_t prot, unsigned domid,

			       struct page **pages)

{

	return -ENOSYS;

	int err;

	struct remap_data data;



	/* TBD: Batching, current sole caller only does page at a time */

	if (nr > 1)

		return -EINVAL;



	data.fgmfn = mfn;

	data.prot = prot;

	data.domid = domid;

	data.vma = vma;

	data.index = 0;

	data.pages = pages;

	err = apply_to_page_range(vma->vm_mm, addr, nr << PAGE_SHIFT,

				  remap_pte_fn, &data);

	return err;

}

EXPORT_SYMBOL_GPL(xen_remap_domain_mfn_range);



int xen_unmap_domain_mfn_range(struct vm_area_struct *vma,

			       int nr, struct page **pages)

{

	int i;



	for (i = 0; i < nr; i++) {

		struct xen_remove_from_physmap xrp;

		unsigned long rc, pfn;



		pfn = page_to_pfn(pages[i]);



		xrp.domid = DOMID_SELF;

		xrp.gpfn = pfn;

		rc = HYPERVISOR_memory_op(XENMEM_remove_from_physmap, &xrp);

		if (rc) {

			pr_warn("Failed to unmap pfn:%lx rc:%ld\n",

				pfn, rc);

			return rc;

		}

	}

	return 0;

}

EXPORT_SYMBOL_GPL(xen_unmap_domain_mfn_range);



/*

 * see Documentation/devicetree/bindings/arm/xen.txt for the

 * documentation of the Xen Device Tree format.

arch/x86/include/asm/xen/interface.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ DEFINE_GUEST_HANDLE(void); 
DEFINE_GUEST_HANDLE(uint64_t);

DEFINE_GUEST_HANDLE(uint32_t);

DEFINE_GUEST_HANDLE(xen_pfn_t);

DEFINE_GUEST_HANDLE(xen_ulong_t);

#endif



#ifndef HYPERVISOR_VIRT_START

include/xen/interface/memory.h

+42 −2
Original line number Diff line number Diff line
@@ -153,6 +153,14 @@ struct xen_machphys_mapping { 
};

DEFINE_GUEST_HANDLE_STRUCT(xen_machphys_mapping_t);



#define XENMAPSPACE_shared_info  0 /* shared info page */

#define XENMAPSPACE_grant_table  1 /* grant table page */

#define XENMAPSPACE_gmfn         2 /* GMFN */

#define XENMAPSPACE_gmfn_range   3 /* GMFN range, XENMEM_add_to_physmap only. */

#define XENMAPSPACE_gmfn_foreign 4 /* GMFN from another dom,

				    * XENMEM_add_to_physmap_range only.

				    */



/*

 * Sets the GPFN at which a particular page appears in the specified guest's

 * pseudophysical address space.
@@ -167,8 +175,6 @@ struct xen_add_to_physmap { 
    uint16_t    size;



    /* Source mapping space. */

#define XENMAPSPACE_shared_info 0 /* shared info page */

#define XENMAPSPACE_grant_table 1 /* grant table page */

    unsigned int space;



    /* Index into source mapping space. */
@@ -182,6 +188,24 @@ DEFINE_GUEST_HANDLE_STRUCT(xen_add_to_physmap); 
/*** REMOVED ***/

/*#define XENMEM_translate_gpfn_list  8*/



#define XENMEM_add_to_physmap_range 23

struct xen_add_to_physmap_range {

    /* Which domain to change the mapping for. */

    domid_t domid;

    uint16_t space; /* => enum phys_map_space */



    /* Number of pages to go through */

    uint16_t size;

    domid_t foreign_domid; /* IFF gmfn_foreign */



    /* Indexes into space being mapped. */

    GUEST_HANDLE(xen_ulong_t) idxs;



    /* GPFN in domid where the source mapping page should appear. */

    GUEST_HANDLE(xen_pfn_t) gpfns;

};

DEFINE_GUEST_HANDLE_STRUCT(xen_add_to_physmap_range);



/*

 * Returns the pseudo-physical memory map as it was when the domain

 * was started (specified by XENMEM_set_memory_map).
@@ -217,4 +241,20 @@ DEFINE_GUEST_HANDLE_STRUCT(xen_memory_map); 
 * during a driver critical region.

 */

extern spinlock_t xen_reservation_lock;



/*

 * Unmaps the page appearing at a particular GPFN from the specified guest's

 * pseudophysical address space.

 * arg == addr of xen_remove_from_physmap_t.

 */

#define XENMEM_remove_from_physmap      15

struct xen_remove_from_physmap {

    /* Which domain to change the mapping for. */

    domid_t domid;



    /* GPFN of the current mapping of the page. */

    xen_pfn_t gpfn;

};

DEFINE_GUEST_HANDLE_STRUCT(xen_remove_from_physmap);



#endif /* __XEN_PUBLIC_MEMORY_H__ */