The crash MSRs have no formal semantics and nothing depends on their contents, so the register assignment can be reshuffled freely.
Reserve crash MSR P2 for passing the KHO radix tree root physical address to the crash kernel for MSHV page exclusion during dump collection. Stop overwriting it in the panic reporting paths. Move IP/PC to P3 and SP to P4 in hyperv_report_panic() on both x86 and ARM64. Remove the P2 write from hv_kmsg_dump(). Signed-off-by: Jork Loeser <[email protected]> --- arch/arm64/hyperv/hv_core.c | 6 +++--- arch/x86/hyperv/hv_init.c | 4 ++-- drivers/hv/hv_common.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/hyperv/hv_core.c b/arch/arm64/hyperv/hv_core.c index e33a9e3c366a..b75337c4892d 100644 --- a/arch/arm64/hyperv/hv_core.c +++ b/arch/arm64/hyperv/hv_core.c @@ -185,9 +185,9 @@ void hyperv_report_panic(struct pt_regs *regs, long err, bool in_die) */ hv_set_vpreg(HV_REGISTER_GUEST_CRASH_P0, err); hv_set_vpreg(HV_REGISTER_GUEST_CRASH_P1, guest_id); - hv_set_vpreg(HV_REGISTER_GUEST_CRASH_P2, regs->pc); - hv_set_vpreg(HV_REGISTER_GUEST_CRASH_P3, regs->sp); - hv_set_vpreg(HV_REGISTER_GUEST_CRASH_P4, 0); + /* P2 is reserved for the KHO preserved-pages tree root PA */ + hv_set_vpreg(HV_REGISTER_GUEST_CRASH_P3, regs->pc); + hv_set_vpreg(HV_REGISTER_GUEST_CRASH_P4, regs->sp); /* * Let Hyper-V know there is crash data available diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c index 55a8b6de2865..cd75e2be19b2 100644 --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c @@ -675,8 +675,8 @@ void hyperv_report_panic(struct pt_regs *regs, long err, bool in_die) wrmsrq(HV_X64_MSR_CRASH_P0, err); wrmsrq(HV_X64_MSR_CRASH_P1, guest_id); - wrmsrq(HV_X64_MSR_CRASH_P2, regs->ip); - wrmsrq(HV_X64_MSR_CRASH_P3, regs->ax); + /* P2 is reserved for the KHO preserved-pages tree root PA */ + wrmsrq(HV_X64_MSR_CRASH_P3, regs->ip); wrmsrq(HV_X64_MSR_CRASH_P4, regs->sp); /* diff --git a/drivers/hv/hv_common.c b/drivers/hv/hv_common.c index 8a593117e9b8..ae6415f42f25 100644 --- a/drivers/hv/hv_common.c +++ b/drivers/hv/hv_common.c @@ -212,7 +212,7 @@ static void hv_kmsg_dump(struct kmsg_dumper *dumper, */ hv_set_msr(HV_MSR_CRASH_P0, 0); hv_set_msr(HV_MSR_CRASH_P1, 0); - hv_set_msr(HV_MSR_CRASH_P2, 0); + /* P2 is reserved for the KHO preserved-pages tree root PA */ hv_set_msr(HV_MSR_CRASH_P3, bytes_written ? virt_to_phys(hv_panic_page) : 0); hv_set_msr(HV_MSR_CRASH_P4, bytes_written); -- 2.43.0
