openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virNumaGetHugePageInfo: Return page_avail and page_free as ULL 

https://bugzilla.redhat.com/show_bug.cgi?id=1569678

On some large systems (with ~400GB of RAM) it is possible for
unsigned int to overflow in which case we report invalid number
of 4K pages pool size. Switch to unsigned long long.

We hit overflow in virNumaGetPages when doing:

    huge_page_sum += 1024 * page_size * page_avail;

because although 'huge_page_sum' is an unsigned long long, the
page_size and page_avail are both unsigned int, so the promotion
to unsigned long long doesn't happen until the sum has been
calculated, by which time we've already overflowed.

Turning page_avail into a unsigned long long is not strictly
needed until we need ability to represent more than 2^32
4k pages, which equates to 16 TB of RAM. That's not
outside the realm of possibility, so makes sense that we
change it to unsigned long long to avoid future problems.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Michal Privoznik 2018-04-23 16:36:53 +02:00
parent cce57265c4
commit 31daccf5a5
6 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/conf/capabilities.c
View File

@ -816,7 +816,7 @@ virCapabilitiesFormatNUMATopology(virBufferPtr buf,
cells[i]->mem); cells[i]->mem);
for (j = 0; j < cells[i]->npageinfo; j++) { for (j = 0; j < cells[i]->npageinfo; j++) {
virBufferAsprintf(buf, "<pages unit='KiB' size='%u'>%zu</pages>\n", virBufferAsprintf(buf, "<pages unit='KiB' size='%u'>%llu</pages>\n",
cells[i]->pageinfo[j].size, cells[i]->pageinfo[j].size,
cells[i]->pageinfo[j].avail); cells[i]->pageinfo[j].avail);
} }
@ -1351,7 +1351,8 @@ virCapabilitiesGetNUMAPagesInfo(int node,
int *npageinfo) int *npageinfo)
{ {
int ret = -1; int ret = -1;
unsigned int *pages_size = NULL, *pages_avail = NULL; unsigned int *pages_size = NULL;
unsigned long long *pages_avail = NULL;
size_t npages, i; size_t npages, i;
if (virNumaGetPages(node, &pages_size, &pages_avail, NULL, &npages) < 0) if (virNumaGetPages(node, &pages_size, &pages_avail, NULL, &npages) < 0)

2
src/conf/capabilities.h
View File

@ -107,7 +107,7 @@ typedef struct _virCapsHostNUMACellPageInfo virCapsHostNUMACellPageInfo;
typedef virCapsHostNUMACellPageInfo *virCapsHostNUMACellPageInfoPtr; typedef virCapsHostNUMACellPageInfo *virCapsHostNUMACellPageInfoPtr;
struct _virCapsHostNUMACellPageInfo { struct _virCapsHostNUMACellPageInfo {
unsigned int size; /* page size in kibibytes */ unsigned int size; /* page size in kibibytes */
size_t avail; /* the size of pool */ unsigned long long avail; /* the size of pool */
}; };
typedef struct _virCapsHostNUMACell virCapsHostNUMACell; typedef struct _virCapsHostNUMACell virCapsHostNUMACell;

2
src/util/virhostmem.c
View File

@ -783,7 +783,7 @@ virHostMemGetFreePages(unsigned int npages,
for (cell = startCell; cell <= lastCell; cell++) { for (cell = startCell; cell <= lastCell; cell++) {
for (i = 0; i < npages; i++) { for (i = 0; i < npages; i++) {
unsigned int page_size = pages[i]; unsigned int page_size = pages[i];
unsigned int page_free; unsigned long long page_free;
if (virNumaGetPageInfo(cell, page_size, 0, NULL, &page_free) < 0) if (virNumaGetPageInfo(cell, page_size, 0, NULL, &page_free) < 0)
goto cleanup; goto cleanup;

32
src/util/virnuma.c
View File

@ -563,8 +563,8 @@ virNumaGetHugePageInfoDir(char **path, int node)
static int static int
virNumaGetHugePageInfo(int node, virNumaGetHugePageInfo(int node,
unsigned int page_size, unsigned int page_size,
unsigned int *page_avail, unsigned long long *page_avail,
unsigned int *page_free) unsigned long long *page_free)
{ {
int ret = -1; int ret = -1;
char *path = NULL; char *path = NULL;
@ -579,7 +579,7 @@ virNumaGetHugePageInfo(int node,
if (virFileReadAll(path, 1024, &buf) < 0) if (virFileReadAll(path, 1024, &buf) < 0)
goto cleanup; goto cleanup;
if (virStrToLong_ui(buf, &end, 10, page_avail) < 0 || if (virStrToLong_ull(buf, &end, 10, page_avail) < 0 ||
*end != '\n') { *end != '\n') {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unable to parse: %s"), _("unable to parse: %s"),
@ -598,7 +598,7 @@ virNumaGetHugePageInfo(int node,
if (virFileReadAll(path, 1024, &buf) < 0) if (virFileReadAll(path, 1024, &buf) < 0)
goto cleanup; goto cleanup;
if (virStrToLong_ui(buf, &end, 10, page_free) < 0 || if (virStrToLong_ull(buf, &end, 10, page_free) < 0 ||
*end != '\n') { *end != '\n') {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unable to parse: %s"), _("unable to parse: %s"),
@ -645,8 +645,8 @@ int
virNumaGetPageInfo(int node, virNumaGetPageInfo(int node,
unsigned int page_size, unsigned int page_size,
unsigned long long huge_page_sum, unsigned long long huge_page_sum,
unsigned int *page_avail, unsigned long long *page_avail,
unsigned int *page_free) unsigned long long *page_free)
{ {
int ret = -1; int ret = -1;
long system_page_size = virGetSystemPageSize(); long system_page_size = virGetSystemPageSize();
@ -709,8 +709,8 @@ virNumaGetPageInfo(int node,
int int
virNumaGetPages(int node, virNumaGetPages(int node,
unsigned int **pages_size, unsigned int **pages_size,
unsigned int **pages_avail, unsigned long long **pages_avail,
unsigned int **pages_free, unsigned long long **pages_free,
size_t *npages) size_t *npages)
{ {
int ret = -1; int ret = -1;
@ -718,7 +718,9 @@ virNumaGetPages(int node,
DIR *dir = NULL; DIR *dir = NULL;
int direrr = 0; int direrr = 0;
struct dirent *entry; struct dirent *entry;
unsigned int *tmp_size = NULL, *tmp_avail = NULL, *tmp_free = NULL; unsigned int *tmp_size = NULL;
unsigned long long *tmp_avail = NULL;
unsigned long long *tmp_free = NULL;
unsigned int ntmp = 0; unsigned int ntmp = 0;
size_t i; size_t i;
bool exchange; bool exchange;
@ -744,7 +746,9 @@ virNumaGetPages(int node,
while (dir && (direrr = virDirRead(dir, &entry, path)) > 0) { while (dir && (direrr = virDirRead(dir, &entry, path)) > 0) {
const char *page_name = entry->d_name; const char *page_name = entry->d_name;
unsigned int page_size, page_avail = 0, page_free = 0; unsigned int page_size;
unsigned long long page_avail = 0;
unsigned long long page_free = 0;
char *end; char *end;
/* Just to give you a hint, we're dealing with this: /* Just to give you a hint, we're dealing with this:
@ -934,8 +938,8 @@ int
virNumaGetPageInfo(int node ATTRIBUTE_UNUSED, virNumaGetPageInfo(int node ATTRIBUTE_UNUSED,
unsigned int page_size ATTRIBUTE_UNUSED, unsigned int page_size ATTRIBUTE_UNUSED,
unsigned long long huge_page_sum ATTRIBUTE_UNUSED, unsigned long long huge_page_sum ATTRIBUTE_UNUSED,
unsigned int *page_avail ATTRIBUTE_UNUSED, unsigned long long *page_avail ATTRIBUTE_UNUSED,
unsigned int *page_free ATTRIBUTE_UNUSED) unsigned long long *page_free ATTRIBUTE_UNUSED)
{ {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("page info is not supported on this platform")); _("page info is not supported on this platform"));
@ -946,8 +950,8 @@ virNumaGetPageInfo(int node ATTRIBUTE_UNUSED,
int int
virNumaGetPages(int node ATTRIBUTE_UNUSED, virNumaGetPages(int node ATTRIBUTE_UNUSED,
unsigned int **pages_size ATTRIBUTE_UNUSED, unsigned int **pages_size ATTRIBUTE_UNUSED,
unsigned int **pages_avail ATTRIBUTE_UNUSED, unsigned long long **pages_avail ATTRIBUTE_UNUSED,
unsigned int **pages_free ATTRIBUTE_UNUSED, unsigned long long **pages_free ATTRIBUTE_UNUSED,
size_t *npages ATTRIBUTE_UNUSED) size_t *npages ATTRIBUTE_UNUSED)
{ {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",

8
src/util/virnuma.h
View File

@ -52,12 +52,12 @@ int virNumaGetNodeCPUs(int node, virBitmapPtr *cpus) ATTRIBUTE_NOINLINE;
int virNumaGetPageInfo(int node, int virNumaGetPageInfo(int node,
unsigned int page_size, unsigned int page_size,
unsigned long long huge_page_sum, unsigned long long huge_page_sum,
unsigned int *page_avail, unsigned long long *page_avail,
unsigned int *page_free); unsigned long long *page_free);
int virNumaGetPages(int node, int virNumaGetPages(int node,
unsigned int **pages_size, unsigned int **pages_size,
unsigned int **pages_avail, unsigned long long **pages_avail,
unsigned int **pages_free, unsigned long long **pages_free,
size_t *npages) size_t *npages)
ATTRIBUTE_NONNULL(5) ATTRIBUTE_NOINLINE; ATTRIBUTE_NONNULL(5) ATTRIBUTE_NOINLINE;
int virNumaSetPagePoolSize(int node, int virNumaSetPagePoolSize(int node,

4
tests/virnumamock.c
View File

@ -125,8 +125,8 @@ virNumaGetDistances(int node ATTRIBUTE_UNUSED,
int int
virNumaGetPages(int node, virNumaGetPages(int node,
unsigned int **pages_size, unsigned int **pages_size,
unsigned int **pages_avail, unsigned long long **pages_avail,
unsigned int **pages_free, unsigned long long **pages_free,
size_t *npages) size_t *npages)
{ {
const int pages_def[] = { 4, 2 * 1024, 1 * 1024 * 1024}; const int pages_def[] = { 4, 2 * 1024, 1 * 1024 * 1024};