|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] tools: Implement xc_map_foreign_range(s) in terms of common helper
commit ee09d0a5ed068870ef2991fdc1b292b94bd1455f
Author: Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Thu Jun 18 11:19:09 2015 +0100
Commit: Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri Jan 22 12:23:34 2016 +0000
tools: Implement xc_map_foreign_range(s) in terms of common helper
Both Linux and FreeBSD already implemented these functions using
identical helpers based on xc_map_foreign_pages. Make one copy of
these common helpers and switch all OSes to use them, even those which
previously had a specific lower level implementation of this
functionality.
This is makes two fewer low level interfaces to think about.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
tools/libxc/xc_foreign_memory.c | 50 +++++++++++++++++++++++++++
tools/libxc/xc_freebsd_osdep.c | 50 ---------------------------
tools/libxc/xc_linux_osdep.c | 49 ---------------------------
tools/libxc/xc_minios.c | 43 ------------------------
tools/libxc/xc_netbsd.c | 70 ---------------------------------------
tools/libxc/xc_solaris.c | 67 -------------------------------------
6 files changed, 50 insertions(+), 279 deletions(-)
diff --git a/tools/libxc/xc_foreign_memory.c b/tools/libxc/xc_foreign_memory.c
index 2413e75..d1130e6 100644
--- a/tools/libxc/xc_foreign_memory.c
+++ b/tools/libxc/xc_foreign_memory.c
@@ -50,6 +50,56 @@ void *xc_map_foreign_pages(xc_interface *xch, uint32_t dom,
int prot,
return res;
}
+void *xc_map_foreign_range(xc_interface *xch,
+ uint32_t dom, int size, int prot,
+ unsigned long mfn)
+{
+ xen_pfn_t *arr;
+ int num;
+ int i;
+ void *ret;
+
+ num = (size + XC_PAGE_SIZE - 1) >> XC_PAGE_SHIFT;
+ arr = calloc(num, sizeof(xen_pfn_t));
+ if ( arr == NULL )
+ return NULL;
+
+ for ( i = 0; i < num; i++ )
+ arr[i] = mfn + i;
+
+ ret = xc_map_foreign_pages(xch, dom, prot, arr, num);
+ free(arr);
+ return ret;
+}
+
+void *xc_map_foreign_ranges(xc_interface *xch,
+ uint32_t dom, size_t size,
+ int prot, size_t chunksize,
+ privcmd_mmap_entry_t entries[],
+ int nentries)
+{
+ xen_pfn_t *arr;
+ int num_per_entry;
+ int num;
+ int i;
+ int j;
+ void *ret;
+
+ num_per_entry = chunksize >> XC_PAGE_SHIFT;
+ num = num_per_entry * nentries;
+ arr = calloc(num, sizeof(xen_pfn_t));
+ if ( arr == NULL )
+ return NULL;
+
+ for ( i = 0; i < nentries; i++ )
+ for ( j = 0; j < num_per_entry; j++ )
+ arr[i * num_per_entry + j] = entries[i].mfn + j;
+
+ ret = xc_map_foreign_pages(xch, dom, prot, arr, num);
+ free(arr);
+ return ret;
+}
+
/*
* stub for all not yet converted OSes (NetBSD and Solaris). New OSes should
* just implement xc_map_foreign_bulk.
diff --git a/tools/libxc/xc_freebsd_osdep.c b/tools/libxc/xc_freebsd_osdep.c
index 6b440ee..7745d28 100644
--- a/tools/libxc/xc_freebsd_osdep.c
+++ b/tools/libxc/xc_freebsd_osdep.c
@@ -125,56 +125,6 @@ void *xc_map_foreign_bulk(xc_interface *xch,
return addr;
}
-void *xc_map_foreign_range(xc_interface *xch,
- uint32_t dom, int size, int prot,
- unsigned long mfn)
-{
- xen_pfn_t *arr;
- int num;
- int i;
- void *ret;
-
- num = (size + XC_PAGE_SIZE - 1) >> XC_PAGE_SHIFT;
- arr = calloc(num, sizeof(xen_pfn_t));
- if ( arr == NULL )
- return NULL;
-
- for ( i = 0; i < num; i++ )
- arr[i] = mfn + i;
-
- ret = xc_map_foreign_pages(xch, dom, prot, arr, num);
- free(arr);
- return ret;
-}
-
-void *xc_map_foreign_ranges(xc_interface *xch,
- uint32_t dom, size_t size,
- int prot, size_t chunksize,
- privcmd_mmap_entry_t entries[],
- int nentries)
-{
- xen_pfn_t *arr;
- int num_per_entry;
- int num;
- int i;
- int j;
- void *ret;
-
- num_per_entry = chunksize >> XC_PAGE_SHIFT;
- num = num_per_entry * nentries;
- arr = calloc(num, sizeof(xen_pfn_t));
- if ( arr == NULL )
- return NULL;
-
- for ( i = 0; i < nentries; i++ )
- for ( j = 0; j < num_per_entry; j++ )
- arr[i * num_per_entry + j] = entries[i].mfn + j;
-
- ret = xc_map_foreign_pages(xch, dom, prot, arr, num);
- free(arr);
- return ret;
-}
-
/*
* Local variables:
* mode: C
diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c
index 39c88ce..acf44ce 100644
--- a/tools/libxc/xc_linux_osdep.c
+++ b/tools/libxc/xc_linux_osdep.c
@@ -290,55 +290,6 @@ void *xc_map_foreign_bulk(xc_interface *xch,
return addr;
}
-void *xc_map_foreign_range(xc_interface *xch,
- uint32_t dom, int size, int prot,
- unsigned long mfn)
-{
- xen_pfn_t *arr;
- int num;
- int i;
- void *ret;
-
- num = (size + XC_PAGE_SIZE - 1) >> XC_PAGE_SHIFT;
- arr = calloc(num, sizeof(xen_pfn_t));
- if ( arr == NULL )
- return NULL;
-
- for ( i = 0; i < num; i++ )
- arr[i] = mfn + i;
-
- ret = xc_map_foreign_pages(xch, dom, prot, arr, num);
- free(arr);
- return ret;
-}
-
-void *xc_map_foreign_ranges(xc_interface *xch,
- uint32_t dom, size_t size, int prot,
- size_t chunksize, privcmd_mmap_entry_t entries[],
- int nentries)
-{
- xen_pfn_t *arr;
- int num_per_entry;
- int num;
- int i;
- int j;
- void *ret;
-
- num_per_entry = chunksize >> XC_PAGE_SHIFT;
- num = num_per_entry * nentries;
- arr = calloc(num, sizeof(xen_pfn_t));
- if ( arr == NULL )
- return NULL;
-
- for ( i = 0; i < nentries; i++ )
- for ( j = 0; j < num_per_entry; j++ )
- arr[i * num_per_entry + j] = entries[i].mfn + j;
-
- ret = xc_map_foreign_pages(xch, dom, prot, arr, num);
- free(arr);
- return ret;
-}
-
/*
* Local variables:
* mode: C
diff --git a/tools/libxc/xc_minios.c b/tools/libxc/xc_minios.c
index 3ea3124..d8ca948 100644
--- a/tools/libxc/xc_minios.c
+++ b/tools/libxc/xc_minios.c
@@ -73,49 +73,6 @@ void *xc_map_foreign_bulk(xc_interface *xch,
return map_frames_ex(arr, num, 1, 0, 1, dom, err, pt_prot);
}
-void *xc_map_foreign_range(xc_interface *xch,
- uint32_t dom,
- int size, int prot,
- unsigned long mfn)
-{
- unsigned long pt_prot = 0;
-
- if (prot & PROT_READ)
- pt_prot = L1_PROT_RO;
- if (prot & PROT_WRITE)
- pt_prot = L1_PROT;
-
- assert(!(size % getpagesize()));
- return map_frames_ex(&mfn, size / getpagesize(), 0, 1, 1, dom, NULL,
pt_prot);
-}
-
-void *xc_map_foreign_ranges(xc_interface *xch,
- uint32_t dom,
- size_t size, int prot, size_t chunksize,
- privcmd_mmap_entry_t entries[], int nentries)
-{
- unsigned long *mfns;
- int i, j, n;
- unsigned long pt_prot = 0;
- void *ret;
-
- if (prot & PROT_READ)
- pt_prot = L1_PROT_RO;
- if (prot & PROT_WRITE)
- pt_prot = L1_PROT;
-
- mfns = malloc((size / XC_PAGE_SIZE) * sizeof(*mfns));
-
- n = 0;
- for (i = 0; i < nentries; i++)
- for (j = 0; j < chunksize / XC_PAGE_SIZE; j++)
- mfns[n++] = entries[i].mfn + j;
-
- ret = map_frames_ex(mfns, n, 1, 0, 1, dom, NULL, pt_prot);
- free(mfns);
- return ret;
-}
-
/* Optionally flush file to disk and discard page cache */
void discard_file_cache(xc_interface *xch, int fd, int flush)
{
diff --git a/tools/libxc/xc_netbsd.c b/tools/libxc/xc_netbsd.c
index 6a7ff9f..3470bc4 100644
--- a/tools/libxc/xc_netbsd.c
+++ b/tools/libxc/xc_netbsd.c
@@ -96,76 +96,6 @@ void *osdep_map_foreign_batch(xc_interface *xch,
}
-void *xc_map_foreign_range(xc_interface *xch,
- uint32_t dom,
- int size, int prot,
- unsigned long mfn)
-{
- int fd = xch->privcmdfd;
- privcmd_mmap_t ioctlx;
- privcmd_mmap_entry_t entry;
- void *addr;
- addr = mmap(NULL, size, prot, MAP_ANON | MAP_SHARED, -1, 0);
- if ( addr == MAP_FAILED ) {
- PERROR("xc_map_foreign_range: mmap failed");
- return NULL;
- }
-
- ioctlx.num=1;
- ioctlx.dom=dom;
- ioctlx.entry=&entry;
- entry.va=(unsigned long) addr;
- entry.mfn=mfn;
- entry.npages=(size+XC_PAGE_SIZE-1)>>XC_PAGE_SHIFT;
- if ( ioctl(fd, IOCTL_PRIVCMD_MMAP, &ioctlx) < 0 )
- {
- int saved_errno = errno;
- PERROR("xc_map_foreign_range: ioctl failed");
- (void)munmap(addr, size);
- errno = saved_errno;
- return NULL;
- }
- return addr;
-}
-
-void *xc_map_foreign_ranges(xc_interface *xch,
- uint32_t dom,
- size_t size, int prot, size_t chunksize,
- privcmd_mmap_entry_t entries[], int nentries)
-{
- int fd = xch->privcmdfd;
- privcmd_mmap_t ioctlx;
- int i, rc;
- void *addr;
-
- addr = mmap(NULL, size, prot, MAP_ANON | MAP_SHARED, -1, 0);
- if (addr == MAP_FAILED)
- goto mmap_failed;
-
- for (i = 0; i < nentries; i++) {
- entries[i].va = (uintptr_t)addr + (i * chunksize);
- entries[i].npages = chunksize >> XC_PAGE_SHIFT;
- }
-
- ioctlx.num = nentries;
- ioctlx.dom = dom;
- ioctlx.entry = entries;
-
- rc = ioctl(fd, IOCTL_PRIVCMD_MMAP, &ioctlx);
- if (rc)
- goto ioctl_failed;
-
- return addr;
-
-ioctl_failed:
- rc = munmap(addr, size);
- if (rc == -1)
- ERROR("%s: error in error path\n", __FUNCTION__);
-
-mmap_failed:
- return NULL;
-}
-
/* Optionally flush file to disk and discard page cache */
void discard_file_cache(xc_interface *xch, int fd, int flush)
{
diff --git a/tools/libxc/xc_solaris.c b/tools/libxc/xc_solaris.c
index 2df7a06..d686867 100644
--- a/tools/libxc/xc_solaris.c
+++ b/tools/libxc/xc_solaris.c
@@ -94,73 +94,6 @@ void *osdep_map_foreign_batch(xc_interface *xch,
}
-void *xc_map_foreign_range(xc_interface *xch,
- uint32_t dom,
- int size, int prot,
- unsigned long mfn)
-{
- int fd = xch->privcmdfd;
- privcmd_mmap_t ioctlx;
- privcmd_mmap_entry_t entry;
- void *addr;
- addr = mmap(NULL, size, prot, MAP_SHARED, fd, 0);
- if ( addr == MAP_FAILED )
- return NULL;
-
- ioctlx.num=1;
- ioctlx.dom=dom;
- ioctlx.entry=&entry;
- entry.va=(unsigned long) addr;
- entry.mfn=mfn;
- entry.npages=(size+XC_PAGE_SIZE-1)>>XC_PAGE_SHIFT;
- if ( ioctl(fd, IOCTL_PRIVCMD_MMAP, &ioctlx) < 0 )
- {
- int saved_errno = errno;
- (void)munmap(addr, size);
- errno = saved_errno;
- return NULL;
- }
- return addr;
-}
-
-void *xc_map_foreign_ranges(xc_interface *xch,
- uint32_t dom,
- size_t size, int prot, size_t chunksize,
- privcmd_mmap_entry_t entries[], int nentries)
-{
- int fd = xch->privcmdfd;
- privcmd_mmap_t ioctlx;
- int i, rc;
- void *addr;
-
- addr = mmap(NULL, size, prot, MAP_SHARED, fd, 0);
- if (addr == MAP_FAILED)
- goto mmap_failed;
-
- for (i = 0; i < nentries; i++) {
- entries[i].va = (uintptr_t)addr + (i * chunksize);
- entries[i].npages = chunksize >> XC_PAGE_SHIFT;
- }
-
- ioctlx.num = nentries;
- ioctlx.dom = dom;
- ioctlx.entry = entries;
-
- rc = ioctl(fd, IOCTL_PRIVCMD_MMAP, &ioctlx);
- if (rc)
- goto ioctl_failed;
-
- return addr;
-
-ioctl_failed:
- rc = munmap(addr, size);
- if (rc == -1)
- PERROR("%s: error in error path", __FUNCTION__);
-
-mmap_failed:
- return NULL;
-}
-
/* Optionally flush file to disk and discard page cache */
void discard_file_cache(xc_interface *xch, int fd, int flush)
{
--
generated by git-patchbot for /home/xen/git/xen.git#master
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |