Skip to contentSkip to conversation

Fix some compilation issues on 32bit

PATCH Applied Claudio Imbrenda 4 participants 8 messages Jul 14, 2020 – Jul 28, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover Fix some compilation issues on 32bit

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(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH v2 1/2 x86/cstart: Fix compilation issue in 32 bit mode

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")
---
 x86/cstart.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
x86/cstart.S +1 -1
index e63e4e2..c0efc5f 100644
@@ -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
Signature · 1 line
2.26.2
#2 lore raw

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

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

Quoted 22 lines · On Tue, 14 Jul 2020 15:00:29 +0200 Claudio Imbrenda <[email protected]>…

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")
---
 x86/cstart.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
x86/cstart.S +1 -1
index e63e4e2..c0efc5f 100644
@@ -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
#3 lore raw

PATCH v2 2/2 lib/alloc_page: Fix compilation issue on 32bit archs

In reply to 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")
---
 lib/alloc_page.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
lib/alloc_page.c +2 -2
index fa3c527..74fe726 100644
@@ -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;
Signature · 1 line
2.26.2
Reviewed-by on v2 2/2
#4 lore raw

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

Quoted 18 lines · 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")
---
 lib/alloc_page.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
lib/alloc_page.c +0 -0
index fa3c527..74fe726 100644
@@ -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);
 

lib/alloc_page.c void free_pages(void *mem, size_t size) · line 39

Quoted 10 lines
lib/alloc_page.c +2 -2
-	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;
#5 lore raw

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

In reply to Claudio Imbrenda
Quoted 30 lines · 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")

---
lib/alloc_page.c | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
lib/alloc_page.c +2 -2
index fa3c527..74fe726 100644
@@ -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;
Quoted 2 lines

—
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.

#6 lore raw

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

Quoted 31 lines · On Thu, 16 Jul 2020 00:11:31 -0700 Nadav Amit <[email protected]> wrote:
Quoted 31 lines

On Jul 14, 2020, at 6:00 AM, Claudio Imbrenda
<[email protected]> 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")

---
lib/alloc_page.c | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
lib/alloc_page.c +2 -2
index fa3c527..74fe726 100644
@@ -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);
 
Quoted 8 lines
Quoted 4 lines
	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.

maintainer Applied
#7 lore raw
In reply to Claudio Imbrenda
Quoted 12 lines · 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

Quoted 8 lines

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