Skip to contentSkip to conversation

tools/xen-foreign: Update the size for vcpu_guest_{core_regs, context}

PATCH In review Julien Grall 4 participants 7 messages Jul 6, 2021 – Jul 7, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/xen-foreign: Update the size for vcpu_guest_{core_regs, context}

From: Julien Grall <[email protected]>

Commit 918b8842a852 ("arm64: Change type of hsr, cpsr, spsr_el1 to uint64_t") updated the size of the structure vcpu_guest_core_regs and indirectly vcpu_guest_context.

On Arm, the two structures are only accessible to the tools and the hypervisor (and therefore stable). However, they are still checked by the scripts in tools/include/xen-foreign are not able to understand that.

Ideally we should rework the scripts so we don't have to update the size for non-stable structure. But I don't have limited time to spend on the issue. So chose the simple solution and update the size accordingly.

Note that we need to keep vcpu_guest_core_regs around because the structure is used by vcpu_guest_context and therefore the scripts expects the generated header to contain it.

Fixes 918b8842a852 ("arm64: Change type of hsr, cpsr, spsr_el1 to uint64_t")

---

---
 tools/include/xen-foreign/reference.size | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/include/xen-foreign/reference.size +2 -2
index a0409db5c458..11a06a7a432c 100644
@@ -4,8 +4,8 @@ structs                   |   arm32   arm64  x86_32  x86_64
 start_info                |       -       -    1112    1168
 trap_info                 |       -       -       8      16
 cpu_user_regs             |       -       -      68     200
-vcpu_guest_core_regs      |     304     304       -       -
-vcpu_guest_context        |     344     344    2800    5168
+vcpu_guest_core_regs      |     312     312       -       -
+vcpu_guest_context        |     352     352    2800    5168
 arch_vcpu_info            |       0       0      24      16
 vcpu_time_info            |      32      32      32      32
 vcpu_info                 |      48      48      64      64
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw

Hi Julien,

Quoted 18 lines · Julien Grall

From: Julien Grall <[email protected]>

Commit 918b8842a852 ("arm64: Change type of hsr, cpsr, spsr_el1 to uint64_t") updated the size of the structure vcpu_guest_core_regs and indirectly vcpu_guest_context.

On Arm, the two structures are only accessible to the tools and the hypervisor (and therefore stable). However, they are still checked by the scripts in tools/include/xen-foreign are not able to understand that.

Ideally we should rework the scripts so we don't have to update the size for non-stable structure. But I don't have limited time to spend on the issue. So chose the simple solution and update the size accordingly.

Quoted 7 lines

Note that we need to keep vcpu_guest_core_regs around because the structure is used by vcpu_guest_context and therefore the scripts expects the generated header to contain it.

Fixes 918b8842a852 ("arm64: Change type of hsr, cpsr, spsr_el1 to uint64_t")

But I have other issues now:
xg_dom_arm.c:143:15: error: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'uint64_t' {aka 'long long unsigned int'} [-Werror=format=]

  143 |     DOMPRINTF("Initial state CPSR %#"PRIx32" PC %#"PRIx32,
      |               ^~~~~~~~~~~~~~~~~~~~~~~
  144 |            ctxt->user_regs.cpsr, ctxt->user_regs.pc32);
      |            ~~~~~~~~~~~~~~~~~~~~
      |                           |
      |                           uint64_t {aka long long unsigned int}

We will work on a patch to fix those.

Cheers
Bertrand

Quoted 28 lines

---

---
tools/include/xen-foreign/reference.size | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
tools/include/xen-foreign/reference.size +0 -0
index a0409db5c458..11a06a7a432c 100644
@@ -4,8 +4,8 @@ structs                   |   arm32   arm64  x86_32  x86_64
start_info                |       -       -    1112    1168
trap_info                 |       -       -       8      16
cpu_user_regs             |       -       -      68     200
tools/include/xen-foreign/reference.size +2 -2
-vcpu_guest_core_regs      |     304     304       -       -
-vcpu_guest_context        |     344     344    2800    5168
+vcpu_guest_core_regs      |     312     312       -       -
+vcpu_guest_context        |     352     352    2800    5168
arch_vcpu_info            |       0       0      24      16
vcpu_time_info            |      32      32      32      32
vcpu_info                 |      48      48      64      64
Signature · 1 line
2.17.1
#2 lore raw
In reply to Julien Grall
Quoted 8 lines · Julien Grall

From: Julien Grall <[email protected]>

Commit 918b8842a852 ("arm64: Change type of hsr, cpsr, spsr_el1 to uint64_t") updated the size of the structure vcpu_guest_core_regs and indirectly vcpu_guest_context.

On Arm, the two structures are only accessible to the tools and the hypervisor (and therefore stable). However, they are still checked

I suppose s/stable/not stable/ and ...

Quoted 5 lines

by the scripts in tools/include/xen-foreign are not able to understand that.

Ideally we should rework the scripts so we don't have to update the size for non-stable structure. But I don't have limited time

... s/don't/only/ ?

Quoted 6 lines

to spend on the issue. So chose the simple solution and update the size accordingly.

Note that we need to keep vcpu_guest_core_regs around because the structure is used by vcpu_guest_context and therefore the scripts expects the generated header to contain it.

If vcpu_guest_context is also tools-only, why does it need keeping (for Arm)? IOW can't you drop vcpu_guest_core_regs from the scripts altogether, and mark vcpu_guest_context with valid sizes for x86 only?

Jan

#3 lore raw

Hi,

Quoted 12 lines · Jan Beulich
Quoted 8 lines · Julien Grall

From: Julien Grall <[email protected]>

Commit 918b8842a852 ("arm64: Change type of hsr, cpsr, spsr_el1 to uint64_t") updated the size of the structure vcpu_guest_core_regs and indirectly vcpu_guest_context.

On Arm, the two structures are only accessible to the tools and the hypervisor (and therefore stable). However, they are still checked

I suppose s/stable/not stable/ and ...

Quoted 7 lines
Quoted 5 lines

by the scripts in tools/include/xen-foreign are not able to understand that.

Ideally we should rework the scripts so we don't have to update the size for non-stable structure. But I don't have limited time

... s/don't/only/ ?

Yes I will update.

Quoted 4 lines
Quoted 4 lines

to spend on the issue. So chose the simple solution and update the size accordingly.

Quoted 8 lines
Quoted 3 lines

Note that we need to keep vcpu_guest_core_regs around because the structure is used by vcpu_guest_context and therefore the scripts expects the generated header to contain it.

If vcpu_guest_context is also tools-only, why does it need keeping (for Arm)? IOW can't you drop vcpu_guest_core_regs from the scripts altogether, and mark vcpu_guest_context with valid sizes for x86 only?

I have tried to use "-" in place of the size but the checker is still not happy. I didn't find another way without modifying the script...

I don't know the script and I don't have a lot of time to work on the bug fix. So this is not something I could do this week.

So this leave us to the following options:
1) Someone volunteer to fix the script
2) Revert the patch that broke the build
3) Accept this patch

I would prefer 3) so we have more time to work on making the script a lot smarter.

Cheers,

Signature · 1 line
Julien Grall
#4 lore raw
Quoted 41 lines · Julien Grall
Quoted 12 lines · Jan Beulich
Quoted 8 lines · Julien Grall

From: Julien Grall <[email protected]>

Commit 918b8842a852 ("arm64: Change type of hsr, cpsr, spsr_el1 to uint64_t") updated the size of the structure vcpu_guest_core_regs and indirectly vcpu_guest_context.

On Arm, the two structures are only accessible to the tools and the hypervisor (and therefore stable). However, they are still checked

I suppose s/stable/not stable/ and ...

Quoted 7 lines
Quoted 5 lines

by the scripts in tools/include/xen-foreign are not able to understand that.

Ideally we should rework the scripts so we don't have to update the size for non-stable structure. But I don't have limited time

... s/don't/only/ ?

Yes I will update.

Quoted 4 lines
Quoted 4 lines

to spend on the issue. So chose the simple solution and update the size accordingly.

Quoted 8 lines
Quoted 3 lines

Note that we need to keep vcpu_guest_core_regs around because the structure is used by vcpu_guest_context and therefore the scripts expects the generated header to contain it.

If vcpu_guest_context is also tools-only, why does it need keeping (for Arm)? IOW can't you drop vcpu_guest_core_regs from the scripts altogether, and mark vcpu_guest_context with valid sizes for x86 only?

I have tried to use "-" in place of the size but the checker is still not happy. I didn't find another way without modifying the script...

I don't know the script and I don't have a lot of time to work on the bug fix. So this is not something I could do this week.

Quoted 7 lines

So this leave us to the following options:
1) Someone volunteer to fix the script
2) Revert the patch that broke the build
3) Accept this patch

I would prefer 3) so we have more time to work on making the script a lot smarter.

Well, if we have no-one who knows the script, and the simple thing of removing the one obvious line doesn't help, then I agree we want to go with 3) for now, even if it looks odd to adjust number for something that's not supposed to be checked in the first place. Of course I also wouldn't mind 2), as it seems pretty clear that the patch was insufficiently build-tested.

Jan

#5 lore raw

Hi Jan,

Quoted 50 lines · Jan Beulich
Quoted 41 lines · Julien Grall
Quoted 12 lines · Jan Beulich
Quoted 8 lines · Julien Grall

From: Julien Grall <[email protected]>

Commit 918b8842a852 ("arm64: Change type of hsr, cpsr, spsr_el1 to uint64_t") updated the size of the structure vcpu_guest_core_regs and indirectly vcpu_guest_context.

On Arm, the two structures are only accessible to the tools and the hypervisor (and therefore stable). However, they are still checked

I suppose s/stable/not stable/ and ...

Quoted 7 lines
Quoted 5 lines

by the scripts in tools/include/xen-foreign are not able to understand that.

Ideally we should rework the scripts so we don't have to update the size for non-stable structure. But I don't have limited time

... s/don't/only/ ?

Yes I will update.

Quoted 4 lines
Quoted 4 lines

to spend on the issue. So chose the simple solution and update the size accordingly.

Quoted 8 lines
Quoted 3 lines

Note that we need to keep vcpu_guest_core_regs around because the structure is used by vcpu_guest_context and therefore the scripts expects the generated header to contain it.

If vcpu_guest_context is also tools-only, why does it need keeping (for Arm)? IOW can't you drop vcpu_guest_core_regs from the scripts altogether, and mark vcpu_guest_context with valid sizes for x86 only?

I have tried to use "-" in place of the size but the checker is still not happy. I didn't find another way without modifying the script...

I don't know the script and I don't have a lot of time to work on the bug fix. So this is not something I could do this week.

Quoted 7 lines

So this leave us to the following options:
1) Someone volunteer to fix the script
2) Revert the patch that broke the build
3) Accept this patch

I would prefer 3) so we have more time to work on making the script a lot smarter.

Quoted 6 lines

Well, if we have no-one who knows the script, and the simple thing of removing the one obvious line doesn't help, then I agree we want to go with 3) for now, even if it looks odd to adjust number for something that's not supposed to be checked in the first place. Of course I also wouldn't mind 2), as it seems pretty clear that the patch was insufficiently build-tested.

The series has dragged on for quite a while on the ML. So I would like to avoid a revert and wait for further rework in the tools side.

Also Bertrand pointed out there is a second fix necessary (I think they should still live separately). I will wait him to confirm that the toolstack is building for 32-bit and 64-bit after the two patches are applied.

Cheers,

Signature · 1 line
Julien Grall
Reviewed-by Tested-by on v1 1/1
#6 lore raw
In reply to Julien Grall
Quoted 16 lines · Julien Grall

From: Julien Grall <[email protected]>

Commit 918b8842a852 ("arm64: Change type of hsr, cpsr, spsr_el1 to uint64_t") updated the size of the structure vcpu_guest_core_regs and indirectly vcpu_guest_context.

On Arm, the two structures are only accessible to the tools and the hypervisor (and therefore stable). However, they are still checked by the scripts in tools/include/xen-foreign are not able to understand that.

Ideally we should rework the scripts so we don't have to update the size for non-stable structure. But I don't have limited time to spend on the issue. So chose the simple solution and update the size accordingly.

Quoted 5 lines

Note that we need to keep vcpu_guest_core_regs around because the structure is used by vcpu_guest_context and therefore the scripts expects the generated header to contain it.

Fixes 918b8842a852 ("arm64: Change type of hsr, cpsr, spsr_el1 to uint64_t")

Sorry for this inconvenience due to the lack of xen-tools testing.

Quoted 3 lines
Quoted 24 lines

---

---
 tools/include/xen-foreign/reference.size | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/include/xen-foreign/reference.size +2 -2
index a0409db5c458..11a06a7a432c 100644
@@ -4,8 +4,8 @@ structs                   |   arm32   arm64  x86_32  x86_64
 start_info                |       -       -    1112    1168
 trap_info                 |       -       -       8      16
 cpu_user_regs             |       -       -      68     200
-vcpu_guest_core_regs      |     304     304       -       -
-vcpu_guest_context        |     344     344    2800    5168
+vcpu_guest_core_regs      |     312     312       -       -
+vcpu_guest_context        |     352     352    2800    5168
 arch_vcpu_info            |       0       0      24      16
 vcpu_time_info            |      32      32      32      32
 vcpu_info                 |      48      48      64      64