tools/libs/guest: fix save and restore of pv domains after 32-bit de-support
PATCH 1/1 tools/libs/guest: fix save and restore of pv domains after 32-bit de-support
After 32-bit PV-guests have been security de-supported when not running under PV-shim, the hypervisor will no longer be configured to support those domains per default when not being built as PV-shim.
Unfortunately libxenguest will fail saving or restoring a PV domain due to this restriction, as it is trying to get the compat MFN list even for 64 bit guests.
Fix that by obtaining the compat MFN list only for 32-bit PV guests.
--- tools/libs/guest/xg_sr_common_x86_pv.c | 1 + 1 file changed, 1 insertion(+)
tools/libs/guest/xg_sr_common_x86_pv.c +1 -0
@@ -154,6 +154,7 @@ int x86_pv_map_m2p(struct xc_sr_context *ctx) ctx->x86.pv.compat_m2p_mfn0 = entries[0].mfn; #else /* 64 bit toolstacks need to ask Xen specially for it */ + if ( ctx->x86.pv.levels == 3 ) { struct xen_machphys_mfn_list xmml = { .max_extents = 1,
Signature · 1 line
2.26.2
Quoted 4 lines · Juergen Gross
After 32-bit PV-guests have been security de-supported when not running under PV-shim, the hypervisor will no longer be configured to support those domains per default when not being built as PV-shim.
Quoted 8 lines
Unfortunately libxenguest will fail saving or restoring a PV domain due to this restriction, as it is trying to get the compat MFN list even for 64 bit guests.
Fix that by obtaining the compat MFN list only for 32-bit PV guests.
Fixes 1a0f2fe2297d122a08fe ("SUPPORT.md: Un-shimmed 32-bit PV guests are no longer supported")Signed-off-by Juergen Gross <[email protected]>
As this will do for the single present consumer of the field
Nevertheless I wonder ...
tools/libs/guest/xg_sr_common_x86_pv.c int x86_pv_map_m2p(struct xc_sr_context *ctx) · line 160
Quoted 10 lines
tools/libs/guest/xg_sr_common_x86_pv.c +1
-0@@ -154,6 +154,7 @@ int x86_pv_map_m2p(struct xc_sr_context *ctx) ctx->x86.pv.compat_m2p_mfn0 = entries[0].mfn; #else /* 64 bit toolstacks need to ask Xen specially for it */ + if ( ctx->x86.pv.levels == 3 ) { struct xen_machphys_mfn_list xmml = { .max_extents = 1,
... whether the field wouldn't better get set to an always-invalid value in all other cases (either by pre-setting or by adding an "else" here), e.g. ~0.
Jan
Quoted 21 lines · Juergen Gross
After 32-bit PV-guests have been security de-supported when not running under PV-shim, the hypervisor will no longer be configured to support those domains per default when not being built as PV-shim.
Unfortunately libxenguest will fail saving or restoring a PV domain due to this restriction, as it is trying to get the compat MFN list even for 64 bit guests.
Fix that by obtaining the compat MFN list only for 32-bit PV guests.
Fixes 1a0f2fe2297d122a08fe ("SUPPORT.md: Un-shimmed 32-bit PV guests are no longer supported")Signed-off-by Juergen Gross <[email protected]>--- tools/libs/guest/xg_sr_common_x86_pv.c | 1 + 1 file changed, 1 insertion(+)tools/libs/guest/xg_sr_common_x86_pv.c +0
-0
tools/libs/guest/xg_sr_common_x86_pv.c int x86_pv_map_m2p(struct xc_sr_context *ctx) · line 160
Quoted 7 lines
tools/libs/guest/xg_sr_common_x86_pv.c +1
-0@@ -154,6 +154,7 @@ int x86_pv_map_m2p(struct xc_sr_context *ctx) ctx->x86.pv.compat_m2p_mfn0 = entries[0].mfn; #else /* 64 bit toolstacks need to ask Xen specially for it */ + if ( ctx->x86.pv.levels == 3 ) { struct xen_machphys_mfn_list xmml = { .max_extents = 1,
This wants to encompass the whole ifdef block, to avoid having differing behaviour between compile widths.
Also the comment next to compat_m2p_mfn0 wants adjusting to say "only set for 32bit PV guests".
~Andrew
Quoted 33 lines · Andrew Cooper
Quoted 21 lines · Juergen Gross
After 32-bit PV-guests have been security de-supported when not running under PV-shim, the hypervisor will no longer be configured to support those domains per default when not being built as PV-shim.
Unfortunately libxenguest will fail saving or restoring a PV domain due to this restriction, as it is trying to get the compat MFN list even for 64 bit guests.
Fix that by obtaining the compat MFN list only for 32-bit PV guests.
Fixes 1a0f2fe2297d122a08fe ("SUPPORT.md: Un-shimmed 32-bit PV guests are no longer supported")Signed-off-by Juergen Gross <[email protected]>--- tools/libs/guest/xg_sr_common_x86_pv.c | 1 + 1 file changed, 1 insertion(+)tools/libs/guest/xg_sr_common_x86_pv.c +0
-0tools/libs/guest/xg_sr_common_x86_pv.c int x86_pv_map_m2p(struct xc_sr_context *ctx) · line 160
Quoted 7 lines
tools/libs/guest/xg_sr_common_x86_pv.c +1
-0@@ -154,6 +154,7 @@ int x86_pv_map_m2p(struct xc_sr_context *ctx) ctx->x86.pv.compat_m2p_mfn0 = entries[0].mfn; #else /* 64 bit toolstacks need to ask Xen specially for it */ + if ( ctx->x86.pv.levels == 3 ) { struct xen_machphys_mfn_list xmml = { .max_extents = 1,This wants to encompass the whole ifdef block, to avoid having differing behaviour between compile widths.
Quoted 2 lines
Also the comment next to
compat_m2p_mfn0wants adjusting to say "only set for 32bit PV guests".
Okay, together with Jan's suggestion this makes sense.
Juergen