[kvm-unit-tests PATCH v2 0/2] Fix some compilation issues on 32bit

[kvm-unit-tests PATCH v2 0/2] Fix some compilation issues on 32bit

[Claudio Imbrenda]

Two small patches to fix compilation issues on 32bit:

one for a typo in x86/cstart

one for a thinko in lib/alloc_page

notice that there is another patch for the lib/alloc_page issue floating
around, this patch is an alternative to that one

v1->v2
* use the z modifier for size_t variables, instead of casting to long

Claudio Imbrenda (2):
  x86/cstart: Fix compilation issue in 32 bit mode
  lib/alloc_page: Fix compilation issue on 32bit archs

 lib/alloc_page.c | 4 ++--
 x86/cstart.S     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.26.2

[kvm-unit-tests PATCH v2 1/2] x86/cstart: Fix compilation issue in 32 bit mode

[Claudio Imbrenda]

Fix a typo in x86/cstart.S so that 32bit code can be compiled again on x86.

Fixes: d86ef58519645 ("cstart: do not assume CR4 starts as zero")
Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
---
 x86/cstart.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x86/cstart.S b/x86/cstart.S
index e63e4e2..c0efc5f 100644
--- a/x86/cstart.S
+++ b/x86/cstart.S
@@ -125,7 +125,7 @@ start:
         jmpl $8, $start32
 
 prepare_32:
-	mov %(1 << 4), %eax // pse
+	mov $(1 << 4), %eax // pse
 	mov %eax, %cr4
 
 	mov $pt, %eax
-- 
2.26.2

[kvm-unit-tests PATCH v2 2/2] lib/alloc_page: Fix compilation issue on 32bit archs

[Claudio Imbrenda]

The assert in lib/alloc_page is hardcoded to long.

Use the z modifier instead, which is meant to be used for size_t.

Fixes: 73f4b202beb39 ("lib/alloc_page: change some parameter types")
Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
---
 lib/alloc_page.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/alloc_page.c b/lib/alloc_page.c
index fa3c527..74fe726 100644
--- a/lib/alloc_page.c
+++ b/lib/alloc_page.c
@@ -29,11 +29,11 @@ void free_pages(void *mem, size_t size)
 	assert_msg((unsigned long) mem % PAGE_SIZE == 0,
 		   "mem not page aligned: %p", mem);
 
-	assert_msg(size % PAGE_SIZE == 0, "size not page aligned: %#lx", size);
+	assert_msg(size % PAGE_SIZE == 0, "size not page aligned: %#zx", size);
 
 	assert_msg(size == 0 || (uintptr_t)mem == -size ||
 		   (uintptr_t)mem + size > (uintptr_t)mem,
-		   "mem + size overflow: %p + %#lx", mem, size);
+		   "mem + size overflow: %p + %#zx", mem, size);
 
 	if (size == 0) {
 		freelist = NULL;
-- 
2.26.2

Re: [kvm-unit-tests PATCH v2 2/2] lib/alloc_page: Fix compilation issue on 32bit archs

[Thomas Huth]

On 14/07/2020 15.00, Claudio Imbrenda wrote:
> The assert in lib/alloc_page is hardcoded to long.
> 
> Use the z modifier instead, which is meant to be used for size_t.
> 
> Fixes: 73f4b202beb39 ("lib/alloc_page: change some parameter types")
> Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
> ---
>  lib/alloc_page.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/alloc_page.c b/lib/alloc_page.c
> index fa3c527..74fe726 100644
> --- a/lib/alloc_page.c
> +++ b/lib/alloc_page.c
> @@ -29,11 +29,11 @@ void free_pages(void *mem, size_t size)
>  	assert_msg((unsigned long) mem % PAGE_SIZE == 0,
>  		   "mem not page aligned: %p", mem);
>  
> -	assert_msg(size % PAGE_SIZE == 0, "size not page aligned: %#lx", size);
> +	assert_msg(size % PAGE_SIZE == 0, "size not page aligned: %#zx", size);
>  
>  	assert_msg(size == 0 || (uintptr_t)mem == -size ||
>  		   (uintptr_t)mem + size > (uintptr_t)mem,
> -		   "mem + size overflow: %p + %#lx", mem, size);
> +		   "mem + size overflow: %p + %#zx", mem, size);
>  
>  	if (size == 0) {
>  		freelist = NULL;

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [kvm-unit-tests PATCH v2 1/2] x86/cstart: Fix compilation issue in 32 bit mode

[Claudio Imbrenda]

please disregard this patch, I had not noticed someone else had already
sent this same patch shortly before me

On Tue, 14 Jul 2020 15:00:29 +0200
Claudio Imbrenda <imbrenda@linux.ibm.com> wrote:

> Fix a typo in x86/cstart.S so that 32bit code can be compiled again
> on x86.
> 
> Fixes: d86ef58519645 ("cstart: do not assume CR4 starts as zero")
> Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
> ---
>  x86/cstart.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/x86/cstart.S b/x86/cstart.S
> index e63e4e2..c0efc5f 100644
> --- a/x86/cstart.S
> +++ b/x86/cstart.S
> @@ -125,7 +125,7 @@ start:
>          jmpl $8, $start32
>  
>  prepare_32:
> -	mov %(1 << 4), %eax // pse
> +	mov $(1 << 4), %eax // pse
>  	mov %eax, %cr4
>  
>  	mov $pt, %eax

Re: [kvm-unit-tests PATCH v2 2/2] lib/alloc_page: Fix compilation issue on 32bit archs

[Nadav Amit]

> On Jul 14, 2020, at 6:00 AM, Claudio Imbrenda <imbrenda@linux.ibm.com> wrote:
> 
> The assert in lib/alloc_page is hardcoded to long.
> 
> Use the z modifier instead, which is meant to be used for size_t.
> 
> Fixes: 73f4b202beb39 ("lib/alloc_page: change some parameter types")
> Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
> ---
> lib/alloc_page.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/alloc_page.c b/lib/alloc_page.c
> index fa3c527..74fe726 100644
> --- a/lib/alloc_page.c
> +++ b/lib/alloc_page.c
> @@ -29,11 +29,11 @@ void free_pages(void *mem, size_t size)
> 	assert_msg((unsigned long) mem % PAGE_SIZE == 0,
> 		   "mem not page aligned: %p", mem);
> 
> -	assert_msg(size % PAGE_SIZE == 0, "size not page aligned: %#lx", size);
> +	assert_msg(size % PAGE_SIZE == 0, "size not page aligned: %#zx", size);
> 
> 	assert_msg(size == 0 || (uintptr_t)mem == -size ||
> 		   (uintptr_t)mem + size > (uintptr_t)mem,
> -		   "mem + size overflow: %p + %#lx", mem, size);
> +		   "mem + size overflow: %p + %#zx", mem, size);
> 
> 	if (size == 0) {
> 		freelist = NULL;
> — 
> 2.26.2

Sean sent a different patch ("lib/alloc_page: Revert to 'unsigned long’ for
@size params”) that changes size to unsigned long, so you really should
synchronize.

Re: [kvm-unit-tests PATCH v2 2/2] lib/alloc_page: Fix compilation issue on 32bit archs

[Claudio Imbrenda]

On Thu, 16 Jul 2020 00:11:31 -0700
Nadav Amit <nadav.amit@gmail.com> wrote:

> > On Jul 14, 2020, at 6:00 AM, Claudio Imbrenda
> > <imbrenda@linux.ibm.com> wrote:
> > 
> > The assert in lib/alloc_page is hardcoded to long.
> > 
> > Use the z modifier instead, which is meant to be used for size_t.
> > 
> > Fixes: 73f4b202beb39 ("lib/alloc_page: change some parameter types")
> > Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
> > ---
> > lib/alloc_page.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/lib/alloc_page.c b/lib/alloc_page.c
> > index fa3c527..74fe726 100644
> > --- a/lib/alloc_page.c
> > +++ b/lib/alloc_page.c
> > @@ -29,11 +29,11 @@ void free_pages(void *mem, size_t size)
> > 	assert_msg((unsigned long) mem % PAGE_SIZE == 0,
> > 		   "mem not page aligned: %p", mem);
> > 
> > -	assert_msg(size % PAGE_SIZE == 0, "size not page aligned:
> > %#lx", size);
> > +	assert_msg(size % PAGE_SIZE == 0, "size not page aligned:
> > %#zx", size);
> > 
> > 	assert_msg(size == 0 || (uintptr_t)mem == -size ||
> > 		   (uintptr_t)mem + size > (uintptr_t)mem,
> > -		   "mem + size overflow: %p + %#lx", mem, size);
> > +		   "mem + size overflow: %p + %#zx", mem, size);
> > 
> > 	if (size == 0) {
> > 		freelist = NULL;
> > — 
> > 2.26.2  
> 
> Sean sent a different patch ("lib/alloc_page: Revert to 'unsigned
> long’ for @size params”) that changes size to unsigned long, so you
> really should synchronize.

I know, this is a (simpler) alternative to his patch.

Re: [kvm-unit-tests PATCH v2 0/2] Fix some compilation issues on 32bit

[Paolo Bonzini]

On 14/07/20 15:00, Claudio Imbrenda wrote:
> Two small patches to fix compilation issues on 32bit:
> 
> one for a typo in x86/cstart
> 
> one for a thinko in lib/alloc_page
> 
> notice that there is another patch for the lib/alloc_page issue floating
> around, this patch is an alternative to that one
> 
> v1->v2
> * use the z modifier for size_t variables, instead of casting to long
> 
> Claudio Imbrenda (2):
>   x86/cstart: Fix compilation issue in 32 bit mode
>   lib/alloc_page: Fix compilation issue on 32bit archs
> 
>  lib/alloc_page.c | 4 ++--
>  x86/cstart.S     | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 

Queued these, thanks.

Paolo