Skip to contentSkip to conversation

tools/libxl: Correct error message units in libxl__domain_set_paging_mempool_size()

PATCH In review Andrew Cooper 3 participants 5 messages Nov 18, 2022 – Nov 21, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/libxl: Correct error message units in libxl__domain_set_paging_mempool_size()

The error message accidentally printed the bytes value as if it were kB.

Fixes 7c3bbd940dd8 ("xen/arm, libxl: Revert XEN_DOMCTL_shadow_op; use p2m mempool hypercalls")

---
CC: Anthony PERARD <[email protected]>
CC: Henry Wang <[email protected]>

For 4.17. This is a low risk change, and makes an error message accurate.

---
 tools/libs/light/libxl_dom.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/libs/light/libxl_dom.c +2 -1
index b59bbe00bb30..68ad9763b6ba 100644
@@ -1459,7 +1459,8 @@ int libxl__domain_set_paging_mempool_size(
     int r = xc_set_paging_mempool_size(CTX->xch, domid, shadow_mem);
     if (r) {
         LOGED(ERROR, domid,
-              "Failed to set paging mempool size to %"PRIu64"kB", shadow_mem);
+              "Failed to set paging mempool size to %lukB",
+              d_config->b_info.shadow_memkb);
         return ERROR_FAIL;
     }
 
Signature · 1 line
2.11.0
#1 lore raw

tools/libs/light/libxl_dom.c int libxl__domain_set_paging_mempool_size( · line 1463

Quoted 11 lines · Andrew Cooper
tools/libs/light/libxl_dom.c +2 -1
index b59bbe00bb30..68ad9763b6ba 100644
@@ -1459,7 +1459,8 @@ int libxl__domain_set_paging_mempool_size(
     int r = xc_set_paging_mempool_size(CTX->xch, domid, shadow_mem);
     if (r) {
         LOGED(ERROR, domid,
-              "Failed to set paging mempool size to %"PRIu64"kB", shadow_mem);
+              "Failed to set paging mempool size to %lukB",
+              d_config->b_info.shadow_memkb);

Unless I miss read, shadow_memkb is also "uint64_t", so I'm pretty sure the format doesn't need to be changed, and we should keep using PRIu64.

With that changed: Acked-by: Anthony PERARD <[email protected]>

Thanks,

Signature · 1 line
Anthony PERARD
#2 lore raw

Hi Anthony and Andrew,

Quoted 16 lines

-----Original Message-----
From: Anthony PERARD <[email protected]>
Subject: Re: [PATCH for-4.17] tools/libxl: Correct error message units in libxl__domain_set_paging_mempool_size()

tools/libs/light/libxl_dom.c int libxl__domain_set_paging_mempool_size( · line 1462

Quoted 9 lines · Andrew Cooper
tools/libs/light/libxl_dom.c +0 -1
index b59bbe00bb30..68ad9763b6ba 100644
@@ -1459,7 +1459,8 @@ int libxl__domain_set_paging_mempool_size(
     int r = xc_set_paging_mempool_size(CTX->xch, domid, shadow_mem);
     if (r) {
         LOGED(ERROR, domid,
-              "Failed to set paging mempool size to %"PRIu64"kB",

shadow_mem);

Quoted 6 lines

tools/libs/light/libxl_dom.c int libxl__domain_set_paging_mempool_size( · line 1463

Quoted 2 lines
tools/libs/light/libxl_dom.c +2 -0
+              "Failed to set paging mempool size to %lukB",
+              d_config->b_info.shadow_memkb);

Unless I miss read, shadow_memkb is also "uint64_t", so I'm pretty sure the format doesn't need to be changed, and we should keep using PRIu64.

I did a grep in current code, and:
In libs/light/libxl_types.idl, "shadow_memkb" is defined as MemKB, which
is MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT", json_gen_fn = "libxl__uint64_gen_json") so yes it is 64bit indeed. Using PRIu64 seems correct.

Kind regards,
Henry

Quoted 7 lines

With that changed: Acked-by: Anthony PERARD <[email protected]>

Thanks,

--
Anthony PERARD

#3 lore raw
Quoted 20 lines · Henry Wang

Hi Anthony and Andrew,

Quoted 18 lines

-----Original Message-----
From: Anthony PERARD <[email protected]>
Subject: Re: [PATCH for-4.17] tools/libxl: Correct error message units in libxl__domain_set_paging_mempool_size()

tools/libs/light/libxl_dom.c int libxl__domain_set_paging_mempool_size( · line 1462

Quoted 9 lines · Andrew Cooper
tools/libs/light/libxl_dom.c +0 -1
index b59bbe00bb30..68ad9763b6ba 100644
@@ -1459,7 +1459,8 @@ int libxl__domain_set_paging_mempool_size(
     int r = xc_set_paging_mempool_size(CTX->xch, domid, shadow_mem);
     if (r) {
         LOGED(ERROR, domid,
-              "Failed to set paging mempool size to %"PRIu64"kB",

shadow_mem);

Quoted 2 lines
tools/libs/light/libxl_dom.c +2 -0
+              "Failed to set paging mempool size to %lukB",
+              d_config->b_info.shadow_memkb);
Quoted 7 lines
Quoted 3 lines

Unless I miss read, shadow_memkb is also "uint64_t", so I'm pretty sure the format doesn't need to be changed, and we should keep using PRIu64.

I did a grep in current code, and:
In libs/light/libxl_types.idl, "shadow_memkb" is defined as MemKB, which
is MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT", json_gen_fn = "libxl__uint64_gen_json") so yes it is 64bit indeed. Using PRIu64 seems correct.

It highlights that there's yet another overflow bug, pre-existing from the old implementation.

~Andrew

#4 lore raw
In reply to Anthony PERARD

Hi Andrew,

Quoted 15 lines

-----Original Message-----
Subject: Re: [PATCH for-4.17] tools/libxl: Correct error message units in libxl__domain_set_paging_mempool_size()

tools/libs/light/libxl_dom.c int libxl__domain_set_paging_mempool_size( · line 1462

Quoted 9 lines · Andrew Cooper
tools/libs/light/libxl_dom.c +0 -1
index b59bbe00bb30..68ad9763b6ba 100644
@@ -1459,7 +1459,8 @@ int libxl__domain_set_paging_mempool_size(
     int r = xc_set_paging_mempool_size(CTX->xch, domid, shadow_mem);
     if (r) {
         LOGED(ERROR, domid,
-              "Failed to set paging mempool size to %"PRIu64"kB",

shadow_mem);

Quoted 8 lines

tools/libs/light/libxl_dom.c int libxl__domain_set_paging_mempool_size( · line 1463

Quoted 2 lines
tools/libs/light/libxl_dom.c +2 -0
+              "Failed to set paging mempool size to %lukB",
+              d_config->b_info.shadow_memkb);

Unless I miss read, shadow_memkb is also "uint64_t", so I'm pretty sure the format doesn't need to be changed, and we should keep using PRIu64.

With that changed: Acked-by: Anthony PERARD <[email protected]>

Kind regards,
Henry