libxc: fix HVM core dump
PATCH v2 1/1 libxc: fix HVM core dump
f969bc9fc96 forbid get_address_size call on HVM guests, because that didn't make sense. It broke core dump functionality on HVM because libxc unconditionally asked for guest width.
Force guest_width to a sensible value.
---
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: Igor Druzhinin <[email protected]>
Cc: Juergen Gross <[email protected]>
Juergen, this is probably too late for 4.12, but you can at least add a release note somewhere.
Ian, please backport this to 4.12.
--- tools/libxc/xc_core.c | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-)
tools/libxc/xc_core.c +34 -6
@@ -459,12 +459,6 @@ xc_domain_dumpcore_via_callback(xc_interface *xch,struct xc_core_section_headers *sheaders =NULL ;Elf64_Shdr *shdr; -if (xc_domain_get_guest_width (xch, domid, &dinfo->guest_width) !=0 ) - { -PERROR ("Could not get address size for domain" ); -return sts; - } -xc_core_arch_context_init (&arch_ctxt);if ( (dump_mem_start =malloc (DUMP_INCREMENT *PAGE_SIZE )) ==NULL ) {
@@ -487,6 +481,40 @@ xc_domain_dumpcore_via_callback(xc_interface *xch, } auto_translated_physmap =xc_core_arch_auto_translated_physmap (&info); +if ( !auto_translated_physmap ) + + { +if (xc_domain_get_guest_width (xch, domid, &dinfo->guest_width) !=0 ) + { +PERROR ("Could not get address size for domain" ); + goto out; + } + } +else + { +/* +* Autotranslated guest never sets guest width in the first +* place. Force guest_width to be sizeof(unsigned long) so +* code below functions properly. +* +* Here is why this is correct. +* +* 1. Before f969bc9fc, xc_domain_get_guest_width for HVM (x86 +* and ARM) always returned hypervisor's idea of +* sizeof(unsigned long). +* +* 2. There has never been a situation in which hypervisor's +* word width is smaller than toolstack domain's (i.e. no +* 32bit hypervisor + 64bit toolstack). +* +* Predicates in code test guest_width against toolstack +* domain's sizeof(unsigned long), so setting guest_width to +* toolstack domain's idea of sizeof(unsigned long) matches +* the original behaviour for HVM guests. +*/ + dinfo->guest_width =sizeof (unsigned long ); + } +if ( domid != info.domid ) {PERROR ("Domain %d does not exist" , domid);
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Wei Liu writes ("[PATCH v2] libxc: fix HVM core dump"):
Quoted 8 lines
f969bc9fc96forbidget_address_sizecall on HVM guests, because that didn't make sense. It broke core dump functionality on HVM because libxc unconditionally asked for guest width.Force
guest_widthto a sensible value.Reported-by Igor Druzhinin <[email protected]>Signed-off-by Wei Liu <[email protected]>
LGTM. Thanks for the copious comment.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 5 lines · Ian Jackson
Wei Liu writes ("[PATCH v2] libxc: fix HVM core dump"):
Quoted 4 lines
f969bc9fc96forbidget_address_sizecall on HVM guests, because that didn't make sense. It broke core dump functionality on HVM because libxc unconditionally asked for guest width.
Quoted 8 lines
Quoted 4 lines
Force
guest_widthto a sensible value.Reported-by Igor Druzhinin <[email protected]>Signed-off-by Wei Liu <[email protected]>LGTM. Thanks for the copious comment.
Acked-by Ian Jackson <[email protected]>
Thanks. Pushed.
Wei.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 15 lines · Wei Liu
f969bc9fc96forbidget_address_sizecall on HVM guests, because that didn't make sense. It broke core dump functionality on HVM because libxc unconditionally asked for guest width.Force
guest_widthto a sensible value.Reported-by Igor Druzhinin <[email protected]>Signed-off-by Wei Liu <[email protected]>---
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: Igor Druzhinin <[email protected]>
Cc: Juergen Gross <[email protected]>
Quoted 4 lines
Juergen, this is probably too late for 4.12, but you can at least add a release note somewhere.
Ian, please backport this to 4.12.
As we have another blocker I'm fine with this patch for 4.12:
Juergen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel