vNUMA : Implement vNUMA strategies diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -27,6 +27,7 @@ CTRL_SRCS-y += xc_mem_event.c CTRL_SRCS-y += xc_mem_paging.c CTRL_SRCS-y += xc_memshr.c +CTRL_SRCS-y += xc_cpumap.c CTRL_SRCS-y += xtl_core.c CTRL_SRCS-y += xtl_logger_stdio.c CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c diff --git a/tools/libxc/xc_cpumap.c b/tools/libxc/xc_cpumap.c new file mode 100644 --- /dev/null +++ b/tools/libxc/xc_cpumap.c @@ -0,0 +1,88 @@ +#include "xc_cpumap.h" +#include + +/* Author : Dulloor (dulloor@xxxxxxxxxx) */ + +uint32_t xc_cpumap_next(int cpu, struct xenctl_cpumap *srcp) +{ + uint8_t *p, pos; + uint8_t *addr = xc_cpumap_bits(srcp); + uint32_t size = xc_cpumap_len(srcp); + uint32_t offset = cpu+1; /* Find the next set cpu */ + + if (offset >= size) + return size; + + p = addr + XC_BITMAP_BYTE(offset); + pos = XC_BITMAP_BYTE_OFFSET(offset); + + do { + for (; (pos < XC_BITS_PER_BYTE) && !((*p)&(1<> 1) & 0x55); + res = (res & 0x33) + ((res >> 2) & 0x33); + return (res & 0x0F) + ((res >> 4) & 0x0F); +} + +int __xc_cpumap_weight(struct xenctl_cpumap *srcp) +{ + const uint8_t *sp = xc_cpumap_bits(srcp); + int k, w = 0, lim = XC_BITS_TO_BYTES(xc_cpumap_len(srcp)); + for (k=0; k = 0; i -= CHUNKSZ) { + chunkmask = ((1ULL << chunksz) - 1); + word = i / XC_BITS_PER_BYTE; + bit = i % XC_BITS_PER_BYTE; + val = (maskp[word] >> bit) & chunkmask; + len += snprintf(buf+len, buflen-len, "%s%0*lx", sep, + (chunksz+3)/4, val); + chunksz = CHUNKSZ; + sep = ","; + } + return len; +} diff --git a/tools/libxc/xc_cpumap.h b/tools/libxc/xc_cpumap.h new file mode 100644 --- /dev/null +++ b/tools/libxc/xc_cpumap.h @@ -0,0 +1,113 @@ +#ifndef __XENCTL_CPUMAP_H +#define __XENCTL_CPUMAP_H + +#include "xc_private.h" +#include +#include + +#define XC_BITS_PER_BYTE 8 +#define XC_BITS_TO_BYTES(bits) \ + (((bits)+XC_BITS_PER_BYTE-1)/XC_BITS_PER_BYTE) +#define XC_BITMAP_BIT(nr) (1 << (nr)) +#define XC_BITMAP_BIT_MASK(nr) (1 << ((nr) % XC_BITS_PER_BYTE)) +#define XC_BITMAP_BYTE(nr) ((nr) / XC_BITS_PER_BYTE) +#define XC_BITMAP_BYTE_OFFSET(nr) ((nr) % XC_BITS_PER_BYTE) +#define XC_BITMAP_BYTE_MASK (0xFF) +#define XC_BITMAP_LAST_BYTE_MASK(nbits) \ + (((nbits) % XC_BITS_PER_BYTE) ? \ + ((1<<((nbits) % XC_BITS_PER_BYTE))-1) : \ + XC_BITMAP_BYTE_MASK) + +#define xc_cpumap_bits(maskp) \ + ({ uint8_t *bitmap; \ + get_xen_guest_handle(bitmap, (maskp)->bitmap); \ + bitmap; }) +#define xc_cpumap_len(maskp) ((maskp)->nr_cpus) + +/* For iterating over the cpus set in the cpumap */ +#define xc_for_each_cpu(cpu, mask) \ + __xc_for_each_cpu(cpu, &(mask)) +#define __xc_for_each_cpu(cpu, mask) \ + for ((cpu) = -1; \ + (cpu) = xc_cpumap_next((cpu), (mask)), \ + (cpu) < xc_cpumap_len(mask);) +extern uint32_t xc_cpumap_next(int n, struct xenctl_cpumap *srcp); + +#define xc_cpumap_set_cpu(cpu, dst) __xc_cpumap_set_cpu(cpu, &(dst)) +static inline void __xc_cpumap_set_cpu(int cpu, struct xenctl_cpumap *dstp) +{ + uint8_t mask = XC_BITMAP_BIT_MASK(cpu); + uint8_t *p = ((uint8_t *)xc_cpumap_bits(dstp)) + XC_BITMAP_BYTE(cpu); + *p |= mask; +} + +#define xc_cpumap_clear_cpu(cpu, dst) __xc_cpumap_clear_cpu(cpu, &(dst)) +static inline void __xc_cpumap_clear_cpu(int cpu, struct xenctl_cpumap *dstp) +{ + uint8_t mask = XC_BITMAP_BIT_MASK(cpu); + uint8_t *p = ((uint8_t *)xc_cpumap_bits(dstp)) + XC_BITMAP_BYTE(cpu); + *p &= ~mask; +} + +#define xc_cpumap_test_cpu(cpu, dst) __xc_cpumap_test_cpu(cpu, &(dst)) +static inline int __xc_cpumap_test_cpu(int cpu, struct xenctl_cpumap *dstp) +{ + uint8_t mask = XC_BITMAP_BIT_MASK(cpu); + uint8_t *p = ((uint8_t *)xc_cpumap_bits(dstp)) + XC_BITMAP_BYTE(cpu); + return *p & mask; +} + +#define xc_cpumap_setall(dst) __xc_cpumap_setall(&(dst)) +static inline void __xc_cpumap_setall(struct xenctl_cpumap *dstp) +{ + uint8_t *dp = xc_cpumap_bits(dstp); + int nbits = xc_cpumap_len(dstp); + size_t nbytes = XC_BITS_TO_BYTES(nbits); + if (nbytes > 1) + memset(dp, 0xff, nbytes); + dp[nbytes-1] = XC_BITMAP_LAST_BYTE_MASK(nbits); +} + +#define xc_cpumap_clearall(dst) __xc_cpumap_clearall(&(dst)) +static inline void __xc_cpumap_clearall(struct xenctl_cpumap *dstp) +{ + size_t nbytes = XC_BITS_TO_BYTES(xc_cpumap_len(dstp)); + if (nbytes > 1) + memset(xc_cpumap_bits(dstp), 0x00, nbytes); +} + +#define xc_cpumap_or(dst, src1, src2) \ + __xc_cpumap_or(&(dst), &(src1), &(src2)) +extern void __xc_cpumap_or(struct xenctl_cpumap *dstp, + struct xenctl_cpumap *src1p, struct xenctl_cpumap *src2p); + +#define xc_cpumap_weight(src) __xc_cpumap_weight(&(src)) +extern int __xc_cpumap_weight(struct xenctl_cpumap *srcp); + +#define xc_cpumap_snprintf(buf, len, src) \ + __xc_cpumap_snprintf((buf), (len), &(src)) +extern int __xc_cpumap_snprintf(char *buf, unsigned int len, + const struct xenctl_cpumap *srcp); + +/***********************************************************************/ +static inline int +xc_cpumap_lock_pages(struct xenctl_cpumap *map) +{ + uint8_t *bitmap; + uint32_t nr_bytes = XC_BITS_TO_BYTES(map->nr_cpus); + get_xen_guest_handle(bitmap, map->bitmap); + if (lock_pages(bitmap, nr_bytes)) + return -1; + return 0; +} + +static inline void +xc_cpumap_unlock_pages(struct xenctl_cpumap *map) +{ + uint8_t *bitmap; + uint32_t nr_bytes = XC_BITS_TO_BYTES(map->nr_cpus); + get_xen_guest_handle(bitmap, map->bitmap); + unlock_pages(bitmap, nr_bytes); +} + +#endif /* __XENCTL_CPUMAP_H */