From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>,
Julien Grall <julien@xen.org>, Wei Liu <wl@xen.org>,
George Dunlap <George.Dunlap@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <ian.jackson@citrix.com>
Subject: [PATCH 5/8] bitmap: move to/from xenctl_bitmap conversion helpers
Date: Wed, 15 Jul 2020 12:40:23 +0200 [thread overview]
Message-ID: <5835147f-8428-1d74-7d6e-bbb5522289c7@suse.com> (raw)
In-Reply-To: <3375cacd-d3b7-9f06-44a7-4b684b6a77d6@suse.com>
A subsequent change will exclude domctl.c from getting built for a
particular configuration, yet the two functions get used from elsewhere.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/common/bitmap.c
+++ b/xen/common/bitmap.c
@@ -9,6 +9,9 @@
#include <xen/errno.h>
#include <xen/bitmap.h>
#include <xen/bitops.h>
+#include <xen/cpumask.h>
+#include <xen/domain.h>
+#include <xen/guest_access.h>
#include <asm/byteorder.h>
/*
@@ -384,3 +387,87 @@ void bitmap_byte_to_long(unsigned long *
}
#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_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;
+}
--- 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)
{
--- a/xen/include/xen/domain.h
+++ b/xen/include/xen/domain.h
@@ -30,6 +30,8 @@ void arch_get_domain_info(const struct d
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);
/*
* Arch-specifics.
next prev parent reply other threads:[~2020-07-15 10:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 10:29 [PATCH 0/8] x86: build adjustments Jan Beulich
2020-07-15 10:37 ` [PATCH 1/8] x86/EFI: sanitize build logic Jan Beulich
2020-07-15 10:37 ` [PATCH 2/8] x86: don't build with EFI support in shim-exclusive mode Jan Beulich
2020-07-15 10:38 ` [PATCH 3/8] x86: shrink struct arch_{vcpu,domain} when !HVM Jan Beulich
2020-07-15 10:39 ` [PATCH 4/8] Arm: prune #include-s needed by domain.h Jan Beulich
2020-07-15 16:54 ` Stefano Stabellini
2020-07-17 14:44 ` Julien Grall
2020-07-20 8:17 ` Jan Beulich
2020-07-20 9:09 ` Julien Grall
2020-07-20 11:28 ` Jan Beulich
2020-07-20 15:15 ` Julien Grall
2020-07-20 16:17 ` Julien Grall
2020-07-15 10:40 ` Jan Beulich [this message]
2020-07-20 16:20 ` [PATCH 5/8] bitmap: move to/from xenctl_bitmap conversion helpers Julien Grall
2020-07-21 7:31 ` Jan Beulich
2020-07-15 10:40 ` [PATCH 6/8] x86: move domain_cpu_policy_changed() Jan Beulich
2020-07-15 10:41 ` [PATCH 7/8] x86: move cpu_{up,down}_helper() Jan Beulich
2020-07-15 10:41 ` [PATCH 8/8] x86: don't include domctl and alike in shim-exclusive builds Jan Beulich
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=5835147f-8428-1d74-7d6e-bbb5522289c7@suse.com \
--to=jbeulich@suse.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.jackson@citrix.com \
--cc=julien@xen.org \
--cc=sstabellini@kernel.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.