From: Wei Liu <wei.liu2@citrix.com>
To: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Julien Grall <julien.grall@citrix.com>,
Wei Liu <wei.liu2@citrix.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Xen-devel <xen-devel@lists.xen.org>
Subject: Re: [PATCH v3 22/28] tools/libxc: Modify bitmap operations to take void pointers
Date: Thu, 17 Mar 2016 12:17:23 +0000 [thread overview]
Message-ID: <20160317121723.GB28955@citrix.com> (raw)
In-Reply-To: <1458056124-8024-23-git-send-email-andrew.cooper3@citrix.com>
On Tue, Mar 15, 2016 at 03:35:18PM +0000, Andrew Cooper wrote:
> The type of the pointer to a bitmap is not interesting; it does not affect the
> representation of the block of bits being pointed to.
>
> Make the libxc functions consistent with those in Xen, so they can work just
> as well with 'unsigned int *' based bitmaps.
>
> As part of doing so, change the implementation to be in terms of char rather
> than unsigned long. This fixes alignment concerns with ARM.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> ---
> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
> CC: Wei Liu <wei.liu2@citrix.com>
>
> v3:
> * Implement in terms of char rather than unsigned long to fix alignment
> issues for ARM.
I'm very illiterate on this subject so I've CC Julien and Stefano for
input.
> v2:
> * New
> ---
> tools/libxc/xc_bitops.h | 37 ++++++++++++++++++++-----------------
> 1 file changed, 20 insertions(+), 17 deletions(-)
>
> diff --git a/tools/libxc/xc_bitops.h b/tools/libxc/xc_bitops.h
> index cd749f4..c2c96d3 100644
> --- a/tools/libxc/xc_bitops.h
> +++ b/tools/libxc/xc_bitops.h
> @@ -6,70 +6,73 @@
> #include <stdlib.h>
> #include <string.h>
>
> +/* Needed by several includees, but no longer used for bitops. */
> #define BITS_PER_LONG (sizeof(unsigned long) * 8)
> #define ORDER_LONG (sizeof(unsigned long) == 4 ? 5 : 6)
>
> -#define BITMAP_ENTRY(_nr,_bmap) ((_bmap))[(_nr)/BITS_PER_LONG]
> -#define BITMAP_SHIFT(_nr) ((_nr) % BITS_PER_LONG)
> +#define BITMAP_ENTRY(_nr,_bmap) ((_bmap))[(_nr) / 8]
> +#define BITMAP_SHIFT(_nr) ((_nr) % 8)
>
> /* calculate required space for number of longs needed to hold nr_bits */
> static inline int bitmap_size(int nr_bits)
> {
> - int nr_long, nr_bytes;
> - nr_long = (nr_bits + BITS_PER_LONG - 1) >> ORDER_LONG;
> - nr_bytes = nr_long * sizeof(unsigned long);
> - return nr_bytes;
> + return (nr_bits + 7) >> 8;
> }
>
> -static inline unsigned long *bitmap_alloc(int nr_bits)
> +static inline void *bitmap_alloc(int nr_bits)
> {
> return calloc(1, bitmap_size(nr_bits));
> }
>
> -static inline void bitmap_set(unsigned long *addr, int nr_bits)
> +static inline void bitmap_set(void *addr, int nr_bits)
> {
> memset(addr, 0xff, bitmap_size(nr_bits));
> }
>
> -static inline void bitmap_clear(unsigned long *addr, int nr_bits)
> +static inline void bitmap_clear(void *addr, int nr_bits)
> {
> memset(addr, 0, bitmap_size(nr_bits));
> }
>
> -static inline int test_bit(int nr, unsigned long *addr)
> +static inline int test_bit(int nr, const void *_addr)
> {
> + const char *addr = _addr;
> return (BITMAP_ENTRY(nr, addr) >> BITMAP_SHIFT(nr)) & 1;
> }
>
> -static inline void clear_bit(int nr, unsigned long *addr)
> +static inline void clear_bit(int nr, void *_addr)
> {
> + char *addr = _addr;
> BITMAP_ENTRY(nr, addr) &= ~(1UL << BITMAP_SHIFT(nr));
> }
>
> -static inline void set_bit(int nr, unsigned long *addr)
> +static inline void set_bit(int nr, void *_addr)
> {
> + char *addr = _addr;
> BITMAP_ENTRY(nr, addr) |= (1UL << BITMAP_SHIFT(nr));
> }
>
> -static inline int test_and_clear_bit(int nr, unsigned long *addr)
> +static inline int test_and_clear_bit(int nr, void *addr)
> {
> int oldbit = test_bit(nr, addr);
> clear_bit(nr, addr);
> return oldbit;
> }
>
> -static inline int test_and_set_bit(int nr, unsigned long *addr)
> +static inline int test_and_set_bit(int nr, void *addr)
> {
> int oldbit = test_bit(nr, addr);
> set_bit(nr, addr);
> return oldbit;
> }
>
> -static inline void bitmap_or(unsigned long *dst, const unsigned long *other,
> +static inline void bitmap_or(void *_dst, const void *_other,
> int nr_bits)
> {
> - int i, nr_longs = (bitmap_size(nr_bits) / sizeof(unsigned long));
> - for ( i = 0; i < nr_longs; ++i )
> + char *dst = _dst;
> + const char *other = _other;
> + int i;
> + for ( i = 0; i < bitmap_size(nr_bits); ++i )
> dst[i] |= other[i];
> }
>
> --
> 2.1.4
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-03-17 12:17 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-15 15:34 [PATCH RFC v3 00/28] x86: Improvements to cpuid handling for guests Andrew Cooper
2016-03-15 15:34 ` [PATCH v3 01/28] xen/x86: Drop unused and non-useful feature definitions Andrew Cooper
2016-03-16 7:53 ` Konrad Rzeszutek Wilk
2016-03-16 9:49 ` Andrew Cooper
2016-03-22 14:06 ` Doug Goldstein
2016-03-22 14:38 ` Jan Beulich
2016-03-15 15:34 ` [PATCH v3 02/28] xen/x86: Rename features to be closer to the vendor definitions Andrew Cooper
2016-03-16 8:01 ` Konrad Rzeszutek Wilk
2016-03-17 19:46 ` Andrew Cooper
2016-03-15 15:34 ` [PATCH v3 03/28] xen/public: Export cpu featureset information in the public API Andrew Cooper
2016-03-16 8:32 ` Konrad Rzeszutek Wilk
2016-03-22 10:39 ` Andrew Cooper
2016-03-18 15:52 ` Jan Beulich
2016-03-15 15:35 ` [PATCH v3 04/28] xen/x86: Script to automatically process featureset information Andrew Cooper
2016-03-16 8:41 ` Konrad Rzeszutek Wilk
2016-03-15 15:35 ` [PATCH v3 05/28] xen/x86: Collect more cpuid feature leaves Andrew Cooper
2016-03-16 8:50 ` Konrad Rzeszutek Wilk
2016-03-15 15:35 ` [PATCH v3 06/28] xen/x86: Mask out unknown features from Xen's capabilities Andrew Cooper
2016-03-16 18:01 ` Konrad Rzeszutek Wilk
2016-03-15 15:35 ` [PATCH v3 07/28] xen/x86: Annotate special features Andrew Cooper
2016-03-16 18:04 ` Konrad Rzeszutek Wilk
2016-03-18 16:29 ` Jan Beulich
2016-03-15 15:35 ` [PATCH v3 08/28] xen/x86: Annotate VM applicability in featureset Andrew Cooper
2016-03-16 18:15 ` Konrad Rzeszutek Wilk
2016-03-18 16:57 ` Jan Beulich
2016-03-18 18:56 ` Andrew Cooper
2016-03-21 11:53 ` Jan Beulich
2016-03-21 13:39 ` Andrew Cooper
2016-03-15 15:35 ` [PATCH v3 09/28] xen/x86: Calculate maximum host and guest featuresets Andrew Cooper
2016-03-16 18:24 ` Konrad Rzeszutek Wilk
2016-03-18 17:09 ` Jan Beulich
2016-03-22 11:23 ` Andrew Cooper
2016-03-22 12:39 ` Jan Beulich
2016-03-22 14:37 ` Andrew Cooper
2016-03-22 14:52 ` Jan Beulich
2016-03-22 15:01 ` Andrew Cooper
2016-03-22 16:10 ` Jan Beulich
2016-03-15 15:35 ` [PATCH v3 10/28] xen/x86: Generate deep dependencies of features Andrew Cooper
2016-03-17 19:45 ` Konrad Rzeszutek Wilk
2016-03-17 20:14 ` Andrew Cooper
2016-03-17 20:32 ` Konrad Rzeszutek Wilk
2016-03-21 15:41 ` Jan Beulich
2016-03-15 15:35 ` [PATCH v3 11/28] xen/x86: Clear dependent features when clearing a cpu cap Andrew Cooper
2016-03-17 19:51 ` Konrad Rzeszutek Wilk
2016-03-17 19:56 ` Andrew Cooper
2016-03-28 15:02 ` Konrad Rzeszutek Wilk
2016-03-21 15:45 ` Jan Beulich
2016-03-15 15:35 ` [PATCH v3 12/28] xen/x86: Improve disabling of features which have dependencies Andrew Cooper
2016-03-15 15:35 ` [PATCH v3 13/28] xen/x86: Improvements to in-hypervisor cpuid sanity checks Andrew Cooper
2016-03-21 16:11 ` Jan Beulich
2016-03-22 15:30 ` Andrew Cooper
2016-03-15 15:35 ` [PATCH v3 14/28] x86/cpu: Move set_cpumask() calls into c_early_init() Andrew Cooper
2016-03-21 16:16 ` Jan Beulich
2016-03-15 15:35 ` [PATCH v3 15/28] x86/cpu: Sysctl and common infrastructure for levelling context switching Andrew Cooper
2016-03-15 17:35 ` Joao Martins
2016-03-15 19:29 ` Andrew Cooper
2016-03-15 19:34 ` Joao Martins
2016-03-21 16:23 ` Jan Beulich
2016-03-22 15:57 ` Andrew Cooper
2016-03-22 16:16 ` Jan Beulich
2016-03-15 15:35 ` [PATCH v3 16/28] x86/cpu: Rework AMD masking MSR setup Andrew Cooper
2016-03-21 16:51 ` Jan Beulich
2016-03-21 16:55 ` Andrew Cooper
2016-03-15 15:35 ` [PATCH v3 17/28] x86/cpu: Rework Intel masking/faulting setup Andrew Cooper
2016-03-21 16:44 ` Jan Beulich
2016-03-15 15:35 ` [PATCH v3 18/28] x86/cpu: Context switch cpuid masks and faulting state in context_switch() Andrew Cooper
2016-03-15 15:35 ` [PATCH v3 19/28] x86/pv: Provide custom cpumasks for PV domains Andrew Cooper
2016-03-21 16:53 ` Jan Beulich
2016-03-15 15:35 ` [PATCH v3 20/28] x86/domctl: Update PV domain cpumasks when setting cpuid policy Andrew Cooper
2016-03-21 17:06 ` Jan Beulich
2016-03-22 16:37 ` Andrew Cooper
2016-03-22 16:51 ` Jan Beulich
2016-03-15 15:35 ` [PATCH v3 21/28] xen+tools: Export maximum host and guest cpu featuresets via SYSCTL Andrew Cooper
2016-03-16 18:23 ` Wei Liu
2016-03-16 20:38 ` David Scott
2016-03-22 8:43 ` Jan Beulich
2016-03-22 20:39 ` Andrew Cooper
2016-03-15 15:35 ` [PATCH v3 22/28] tools/libxc: Modify bitmap operations to take void pointers Andrew Cooper
2016-03-16 15:24 ` Andrew Cooper
2016-03-17 12:17 ` Wei Liu [this message]
2016-03-15 15:35 ` [PATCH v3 23/28] tools/libxc: Use public/featureset.h for cpuid policy generation Andrew Cooper
2016-03-15 15:35 ` [PATCH v3 24/28] tools/libxc: Expose the automatically generated cpu featuremask information Andrew Cooper
2016-03-15 15:35 ` [PATCH v3 25/28] tools: Utility for dealing with featuresets Andrew Cooper
2016-03-16 18:23 ` Wei Liu
2016-03-15 15:35 ` [PATCH v3 26/28] tools/libxc: Wire a featureset through to cpuid policy logic Andrew Cooper
2016-03-15 15:35 ` [PATCH v3 27/28] tools/libxc: Use featuresets rather than guesswork Andrew Cooper
2016-03-15 15:35 ` [PATCH v3 28/28] tools/libxc: Calculate xstate cpuid leaf from guest information Andrew Cooper
2016-03-16 18:23 ` Wei Liu
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=20160317121723.GB28955@citrix.com \
--to=wei.liu2@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=julien.grall@citrix.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xen.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).