|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen staging] bitmap: move to/from xenctl_bitmap conversion helpers
commit a1568878df7d914853ba8c712aaa2315cd33ed3c
Author: Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Aug 27 09:52:01 2020 +0200
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Aug 27 09:52:01 2020 +0200
bitmap: move to/from xenctl_bitmap conversion helpers
A subsequent change will exclude domctl.c from getting built for a
particular configuration, yet the two functions get used from elsewhere.
While moving the code
- drop unmotivated uses of min_t(),
- fix style violations in the moved code,
- xfree() as early as possible.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Julien Grall <jgrall@xxxxxxxxxx>
---
xen/common/bitmap.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++
xen/common/domctl.c | 85 ----------------------------------------------
xen/include/xen/bitmap.h | 7 ++++
xen/include/xen/domain.h | 3 --
4 files changed, 94 insertions(+), 88 deletions(-)
diff --git a/xen/common/bitmap.c b/xen/common/bitmap.c
index 88768bf8bc..b7aa2db7c7 100644
--- a/xen/common/bitmap.c
+++ b/xen/common/bitmap.c
@@ -9,6 +9,8 @@
#include <xen/errno.h>
#include <xen/bitmap.h>
#include <xen/bitops.h>
+#include <xen/cpumask.h>
+#include <xen/guest_access.h>
#include <asm/byteorder.h>
/*
@@ -384,3 +386,88 @@ void bitmap_byte_to_long(unsigned long *lp, const uint8_t
*bp, int nbits)
}
#endif
+
+int bitmap_to_xenctl_bitmap(struct xenctl_bitmap *xenctl_bitmap,
+ const unsigned long *bitmap, unsigned int nbits)
+{
+ unsigned int guest_bytes, copy_bytes, i;
+ uint8_t zero = 0;
+ int err = 0;
+ uint8_t *bytemap = xmalloc_array(uint8_t, (nbits + 7) / 8);
+
+ if ( !bytemap )
+ return -ENOMEM;
+
+ guest_bytes = (xenctl_bitmap->nr_bits + 7) / 8;
+ copy_bytes = min(guest_bytes, (nbits + 7) / 8);
+
+ bitmap_long_to_byte(bytemap, bitmap, nbits);
+
+ if ( copy_bytes &&
+ copy_to_guest(xenctl_bitmap->bitmap, bytemap, copy_bytes) )
+ err = -EFAULT;
+
+ xfree(bytemap);
+
+ for ( i = copy_bytes; !err && i < guest_bytes; i++ )
+ if ( copy_to_guest_offset(xenctl_bitmap->bitmap, i, &zero, 1) )
+ err = -EFAULT;
+
+ return err;
+}
+
+int xenctl_bitmap_to_bitmap(unsigned long *bitmap,
+ const struct xenctl_bitmap *xenctl_bitmap,
+ unsigned int nbits)
+{
+ unsigned int guest_bytes, copy_bytes;
+ int err = 0;
+ uint8_t *bytemap = xzalloc_array(uint8_t, (nbits + 7) / 8);
+
+ if ( !bytemap )
+ return -ENOMEM;
+
+ guest_bytes = (xenctl_bitmap->nr_bits + 7) / 8;
+ copy_bytes = min(guest_bytes, (nbits + 7) / 8);
+
+ if ( copy_bytes )
+ {
+ if ( copy_from_guest(bytemap, xenctl_bitmap->bitmap, copy_bytes) )
+ err = -EFAULT;
+ if ( (xenctl_bitmap->nr_bits & 7) && (guest_bytes == copy_bytes) )
+ bytemap[guest_bytes - 1] &= ~(0xff << (xenctl_bitmap->nr_bits &
7));
+ }
+
+ if ( !err )
+ bitmap_byte_to_long(bitmap, bytemap, nbits);
+
+ xfree(bytemap);
+
+ return err;
+}
+
+int cpumask_to_xenctl_bitmap(struct xenctl_bitmap *xenctl_cpumap,
+ const cpumask_t *cpumask)
+{
+ return bitmap_to_xenctl_bitmap(xenctl_cpumap, cpumask_bits(cpumask),
+ nr_cpu_ids);
+}
+
+int xenctl_bitmap_to_cpumask(cpumask_var_t *cpumask,
+ const struct xenctl_bitmap *xenctl_cpumap)
+{
+ int err = 0;
+
+ if ( alloc_cpumask_var(cpumask) )
+ {
+ err = xenctl_bitmap_to_bitmap(cpumask_bits(*cpumask), xenctl_cpumap,
+ nr_cpu_ids);
+ /* In case of error, cleanup is up to us, as the caller won't care! */
+ if ( err )
+ free_cpumask_var(*cpumask);
+ }
+ else
+ err = -ENOMEM;
+
+ return err;
+}
diff --git a/xen/common/domctl.c b/xen/common/domctl.c
index 20ef8399bd..5ac6e9c5ca 100644
--- a/xen/common/domctl.c
+++ b/xen/common/domctl.c
@@ -34,91 +34,6 @@
static DEFINE_SPINLOCK(domctl_lock);
-static int bitmap_to_xenctl_bitmap(struct xenctl_bitmap *xenctl_bitmap,
- const unsigned long *bitmap,
- unsigned int nbits)
-{
- unsigned int guest_bytes, copy_bytes, i;
- uint8_t zero = 0;
- int err = 0;
- uint8_t *bytemap = xmalloc_array(uint8_t, (nbits + 7) / 8);
-
- if ( !bytemap )
- return -ENOMEM;
-
- guest_bytes = (xenctl_bitmap->nr_bits + 7) / 8;
- copy_bytes = min_t(unsigned int, guest_bytes, (nbits + 7) / 8);
-
- bitmap_long_to_byte(bytemap, bitmap, nbits);
-
- if ( copy_bytes != 0 )
- if ( copy_to_guest(xenctl_bitmap->bitmap, bytemap, copy_bytes) )
- err = -EFAULT;
-
- for ( i = copy_bytes; !err && i < guest_bytes; i++ )
- if ( copy_to_guest_offset(xenctl_bitmap->bitmap, i, &zero, 1) )
- err = -EFAULT;
-
- xfree(bytemap);
-
- return err;
-}
-
-int xenctl_bitmap_to_bitmap(unsigned long *bitmap,
- const struct xenctl_bitmap *xenctl_bitmap,
- unsigned int nbits)
-{
- unsigned int guest_bytes, copy_bytes;
- int err = 0;
- uint8_t *bytemap = xzalloc_array(uint8_t, (nbits + 7) / 8);
-
- if ( !bytemap )
- return -ENOMEM;
-
- guest_bytes = (xenctl_bitmap->nr_bits + 7) / 8;
- copy_bytes = min_t(unsigned int, guest_bytes, (nbits + 7) / 8);
-
- if ( copy_bytes != 0 )
- {
- if ( copy_from_guest(bytemap, xenctl_bitmap->bitmap, copy_bytes) )
- err = -EFAULT;
- if ( (xenctl_bitmap->nr_bits & 7) && (guest_bytes == copy_bytes) )
- bytemap[guest_bytes-1] &= ~(0xff << (xenctl_bitmap->nr_bits & 7));
- }
-
- if ( !err )
- bitmap_byte_to_long(bitmap, bytemap, nbits);
-
- xfree(bytemap);
-
- return err;
-}
-
-int cpumask_to_xenctl_bitmap(struct xenctl_bitmap *xenctl_cpumap,
- const cpumask_t *cpumask)
-{
- return bitmap_to_xenctl_bitmap(xenctl_cpumap, cpumask_bits(cpumask),
- nr_cpu_ids);
-}
-
-int xenctl_bitmap_to_cpumask(cpumask_var_t *cpumask,
- const struct xenctl_bitmap *xenctl_cpumap)
-{
- int err = 0;
-
- if ( alloc_cpumask_var(cpumask) ) {
- err = xenctl_bitmap_to_bitmap(cpumask_bits(*cpumask), xenctl_cpumap,
- nr_cpu_ids);
- /* In case of error, cleanup is up to us, as the caller won't care! */
- if ( err )
- free_cpumask_var(*cpumask);
- }
- else
- err = -ENOMEM;
-
- return err;
-}
-
static int nodemask_to_xenctl_bitmap(struct xenctl_bitmap *xenctl_nodemap,
const nodemask_t *nodemask)
{
diff --git a/xen/include/xen/bitmap.h b/xen/include/xen/bitmap.h
index c44e009f8c..634a259645 100644
--- a/xen/include/xen/bitmap.h
+++ b/xen/include/xen/bitmap.h
@@ -273,6 +273,13 @@ static inline void bitmap_clear(unsigned long *map,
unsigned int start,
void bitmap_long_to_byte(uint8_t *bp, const unsigned long *lp, int nbits);
void bitmap_byte_to_long(unsigned long *lp, const uint8_t *bp, int nbits);
+struct xenctl_bitmap;
+int xenctl_bitmap_to_bitmap(unsigned long *bitmap,
+ const struct xenctl_bitmap *xenctl_bitmap,
+ unsigned int nbits);
+int bitmap_to_xenctl_bitmap(struct xenctl_bitmap *xenctl_bitmap,
+ const unsigned long *bitmap, unsigned int nbits);
+
#endif /* __ASSEMBLY__ */
#endif /* __XEN_BITMAP_H */
diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h
index 7e51d361de..1cb205d977 100644
--- a/xen/include/xen/domain.h
+++ b/xen/include/xen/domain.h
@@ -27,9 +27,6 @@ struct xen_domctl_getdomaininfo;
void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info);
void arch_get_domain_info(const struct domain *d,
struct xen_domctl_getdomaininfo *info);
-int xenctl_bitmap_to_bitmap(unsigned long *bitmap,
- const struct xenctl_bitmap *xenctl_bitmap,
- unsigned int nbits);
/*
* Arch-specifics.
--
generated by git-patchbot for /home/xen/git/xen.git#staging
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |