x86/hyperv: Fix hyperv_pcpu_input_arg handling when CPUs go online/offline
Subsystems (5)
PATCH v2 1/2 x86/hyperv: Fix hyperv_pcpu_input_arg handling when CPUs go online/offline
These commits
a494aef23dfc ("PCI: hv: Replace retarget_msi_interrupt_params with hyperv_pcpu_input_arg") 2c6ba4216844 ("PCI: hv: Enable PCI pass-thru devices in Confidential VMs")
update the Hyper-V virtual PCI driver to use the hyperv_pcpu_input_arg because that memory will be correctly marked as decrypted or encrypted for all VM types (CoCo or normal). But problems ensue when CPUs in the VM go online or offline after virtual PCI devices have been configured.
When a CPU is brought online, the hyperv_pcpu_input_arg for that CPU is initialized by hv_cpu_init() running under state CPUHP_AP_ONLINE_DYN. But this state occurs after state CPUHP_AP_IRQ_AFFINITY_ONLINE, which may call the virtual PCI driver and fault trying to use the as yet uninitialized hyperv_pcpu_input_arg. A similar problem occurs in a CoCo VM if the MMIO read and write hypercalls are used from state CPUHP_AP_IRQ_AFFINITY_ONLINE.
When a CPU is taken offline, IRQs may be reassigned in state CPUHP_TEARDOWN_CPU. Again, the virtual PCI driver may fault trying to use the hyperv_pcpu_input_arg that has already been freed by a higher state.
Fix the onlining problem by adding state CPUHP_AP_HYPERV_ONLINE immediately after CPUHP_AP_ONLINE_IDLE (similar to CPUHP_AP_KVM_ONLINE) and before CPUHP_AP_IRQ_AFFINITY_ONLINE. Use this new state for Hyper-V initialization so that hyperv_pcpu_input_arg is allocated early enough.
Fix the offlining problem by not freeing hyperv_pcpu_input_arg when a CPU goes offline. Retain the allocated memory, and reuse it if the CPU comes back online later.
---
Changes in v2:
* Put CPUHP_AP_HYPERV_ONLINE before CPUHP_AP_KVM_ONLINE [Vitaly Kuznetsov]
arch/x86/hyperv/hv_init.c | 2 +- drivers/hv/hv_common.c | 48 +++++++++++++++++++++++----------------------- include/linux/cpuhotplug.h | 1 + 3 files changed, 26 insertions(+), 25 deletions(-)
arch/x86/hyperv/hv_init.c +1 -1
@@ -416,7 +416,7 @@ void __init hyperv_init(void) goto free_vp_assist_page; } - cpuhp =cpuhp_setup_state (CPUHP_AP_ONLINE_DYN ,"x86/hyperv_init:online" , + cpuhp =cpuhp_setup_state (CPUHP_AP_HYPERV_ONLINE ,"x86/hyperv_init:online" , hv_cpu_init, hv_cpu_die);if (cpuhp <0 ) goto free_ghcb_page;
drivers/hv/hv_common.c +24 -24
61 lines not on this page · raw message
include/linux/cpuhotplug.h +1 -0
@@ -200,6 +200,7 @@ enum cpuhp_state {/* Online section invoked on the hotplugged CPU from the hotplug thread */ CPUHP_AP_ONLINE_IDLE , +CPUHP_AP_HYPERV_ONLINE ,CPUHP_AP_KVM_ONLINE ,CPUHP_AP_SCHED_WAIT_EMPTY , CPUHP_AP_SMPBOOT_THREADS,
Signature · 7 lines
1.8.3.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 2/2 arm64/hyperv: Use CPUHP_AP_HYPERV_ONLINE state to fix CPU online sequencing
State CPUHP_AP_HYPERV_ONLINE has been introduced to correctly sequence the initialization of hyperv_pcpu_input_arg. Use this new state for Hyper-V initialization so that hyperv_pcpu_input_arg is allocated early enough.
---
Changes in v2:
* Fixed typo in commit message [Dexuan Cui]
arch/arm64/hyperv/mshyperv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/hyperv/mshyperv.c +1 -1
@@ -67,7 +67,7 @@ static int __init hyperv_init(void)if (ret)return ret; - ret =cpuhp_setup_state (CPUHP_AP_ONLINE_DYN ,"arm64/hyperv_init:online" , + ret =cpuhp_setup_state (CPUHP_AP_HYPERV_ONLINE ,"arm64/hyperv_init:online" , hv_common_cpu_init, hv_common_cpu_die);if (ret <0 ) {hv_common_free ();
Signature · 7 lines
1.8.3.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RE: [PATCH v2 2/2] arm64/hyperv: Use CPUHP_AP_HYPERV_ONLINE state to fix CPU online sequencing
Quoted 18 lines
From: Michael Kelley (LINUX) <[email protected]>
Sent: Tuesday, May 23, 2023 10:14 AM
To: KY Srinivasan <[email protected]>; Haiyang Zhang <[email protected]>; [email protected]; Dexuan Cui <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: Michael Kelley (LINUX) <[email protected]>
Subject: [PATCH v2 2/2] arm64/hyperv: UseCPUHP_AP_HYPERV_ONLINEstate to fix CPU online sequencingState
CPUHP_AP_HYPERV_ONLINEhas been introduced to correctly sequence the
initialization ofhyperv_pcpu_input_arg. Use this new state for Hyper-V initialization so thathyperv_pcpu_input_argis allocated early enough.
Quoted 5 lines
Signed-off-by Michael Kelley <[email protected]>---
Changes in v2:
* Fixed typo in commit message [Dexuan Cui]
Quoted 48 lines
From: Michael Kelley (LINUX) <[email protected]>
Sent: Tuesday, May 23, 2023 10:14 AM
To: KY Srinivasan <[email protected]>; Haiyang Zhang <[email protected]>; [email protected]; Dexuan Cui <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: Michael Kelley (LINUX) <[email protected]>
Subject: [PATCH v2 1/2] x86/hyperv: Fixhyperv_pcpu_input_arghandling when CPUs go online/offlineThese commits
a494aef23dfc("PCI: hv: Replaceretarget_msi_interrupt_paramswithhyperv_pcpu_input_arg")2c6ba4216844("PCI: hv: Enable PCI pass-thru devices in Confidential VMs")update the Hyper-V virtual PCI driver to use the
hyperv_pcpu_input_argbecause that memory will be correctly marked as decrypted or encrypted for all VM types (CoCo or normal). But problems ensue when CPUs in the VM go online or offline after virtual PCI devices have been configured.When a CPU is brought online, the
hyperv_pcpu_input_argfor that CPU is initialized byhv_cpu_init()running under stateCPUHP_AP_ONLINE_DYN. But this state occurs after stateCPUHP_AP_IRQ_AFFINITY_ONLINE, which may call the virtual PCI driver and fault trying to use the as yet uninitializedhyperv_pcpu_input_arg. A similar problem occurs in a CoCo VM if the MMIO read and write hypercalls are used from stateCPUHP_AP_IRQ_AFFINITY_ONLINE.When a CPU is taken offline, IRQs may be reassigned in state
CPUHP_TEARDOWN_CPU. Again, the virtual PCI driver may fault trying to use thehyperv_pcpu_input_argthat has already been freed by a higher state.Fix the onlining problem by adding state
CPUHP_AP_HYPERV_ONLINEimmediately afterCPUHP_AP_ONLINE_IDLE(similar toCPUHP_AP_KVM_ONLINE)
and beforeCPUHP_AP_IRQ_AFFINITY_ONLINE. Use this new state for Hyper-V initialization so thathyperv_pcpu_input_argis allocated early enough.Fix the offlining problem by not freeing
hyperv_pcpu_input_argwhen a CPU goes offline. Retain the allocated memory, and reuse it if the CPU comes back online later.
Quoted 6 lines
Signed-off-by Michael Kelley <[email protected]>---
Changes in v2:
* PutCPUHP_AP_HYPERV_ONLINEbeforeCPUHP_AP_KVM_ONLINE[Vitaly Kuznetsov]
Wei Liu
maintainerOn Tue, May 23, 2023 at 10:14:21AM -0700, Michael Kelley wrote:
[...]
include/linux/cpuhotplug.h enum cpuhp_state { · line 203
Quoted 9 lines
include/linux/cpuhotplug.h +1
-0@@ -200,6 +200,7 @@ enum cpuhp_state {/* Online section invoked on the hotplugged CPU from the hotplug thread */ CPUHP_AP_ONLINE_IDLE , + CPUHP_AP_HYPERV_ONLINE,
x86 maintainers, are you okay with this?
Thanks,
Wei.
Quoted 6 lines
include/linux/cpuhotplug.h +0
-0CPUHP_AP_KVM_ONLINE ,CPUHP_AP_SCHED_WAIT_EMPTY , CPUHP_AP_SMPBOOT_THREADS,Signature · 1 line
1.8.3.1
From: Wei Liu <[email protected]>
Quoted 9 lines · Michael Kelley
[...]
Quoted 6 lines
include/linux/cpuhotplug.h +0
-0@@ -200,6 +200,7 @@ enum cpuhp_state {
Quoted 6 lines
include/linux/cpuhotplug.h enum cpuhp_state { · line 203
Quoted 3 lines
include/linux/cpuhotplug.h +1
-0/* Online section invoked on the hotplugged CPU from the hotplug thread */ CPUHP_AP_ONLINE_IDLE , + CPUHP_AP_HYPERV_ONLINE,x86 maintainers, are you okay with this?
Boris -- Are you OK with this, and could give an ACK? This small patch set fixes a problem introduced into 6.4-rc1 by other Confidential VM changes, so this fix needs to be incorporated before 6.4 is released.
Michael
Quoted 6 lines
Quoted 6 lines
include/linux/cpuhotplug.h +0
-1CPUHP_AP_KVM_ONLINE ,CPUHP_AP_SCHED_WAIT_EMPTY , CPUHP_AP_SMPBOOT_THREADS, --1.8.3.1
Dexuan Cui
maintainerQuoted 21 lines
From: Michael Kelley (LINUX) <[email protected]>
Sent: Thursday, June 8, 2023 7:39 AM
To: [email protected]From: Wei Liu <[email protected]>
Quoted 10 lines · Michael Kelley
[...]
include/linux/cpuhotplug.h enum cpuhp_state { · line 201
Quoted 7 lines
include/linux/cpuhotplug.h +0
-0@@ -200,6 +200,7 @@ enum cpuhp_state {/* Online section invoked on the hotplugged CPU from the hotplug thread */
Quoted 4 lines
include/linux/cpuhotplug.h enum cpuhp_state { · line 203
Quoted 2 lines
include/linux/cpuhotplug.h +1
-0CPUHP_AP_ONLINE_IDLE , + CPUHP_AP_HYPERV_ONLINE,x86 maintainers, are you okay with this?
Quoted 5 lines
Boris -- Are you OK with this, and could give an ACK? This small patch set fixes a problem introduced into 6.4-rc1 by other Confidential VM changes, so this fix needs to be incorporated before 6.4 is released.
Michael
Hi Boris, gentle ping -- I hope this patch can be accepted soon as I and Tianyu need to rebase our SNP/TDX patches on this patch.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
include/linux/cpuhotplug.h +0
-1CPUHP_AP_KVM_ONLINE ,CPUHP_AP_SCHED_WAIT_EMPTY , CPUHP_AP_SMPBOOT_THREADS, --1.8.3.1
Quoted 29 lines · Michael Kelley
These commits
a494aef23dfc("PCI: hv: Replaceretarget_msi_interrupt_paramswithhyperv_pcpu_input_arg")2c6ba4216844("PCI: hv: Enable PCI pass-thru devices in Confidential VMs")update the Hyper-V virtual PCI driver to use the
hyperv_pcpu_input_argbecause that memory will be correctly marked as decrypted or encrypted for all VM types (CoCo or normal). But problems ensue when CPUs in the VM go online or offline after virtual PCI devices have been configured.When a CPU is brought online, the
hyperv_pcpu_input_argfor that CPU is initialized byhv_cpu_init()running under stateCPUHP_AP_ONLINE_DYN. But this state occurs after stateCPUHP_AP_IRQ_AFFINITY_ONLINE, which may call the virtual PCI driver and fault trying to use the as yet uninitializedhyperv_pcpu_input_arg. A similar problem occurs in a CoCo VM if the MMIO read and write hypercalls are used from stateCPUHP_AP_IRQ_AFFINITY_ONLINE.When a CPU is taken offline, IRQs may be reassigned in state
CPUHP_TEARDOWN_CPU. Again, the virtual PCI driver may fault trying to use thehyperv_pcpu_input_argthat has already been freed by a higher state.Fix the onlining problem by adding state
CPUHP_AP_HYPERV_ONLINEimmediately afterCPUHP_AP_ONLINE_IDLE(similar toCPUHP_AP_KVM_ONLINE) and beforeCPUHP_AP_IRQ_AFFINITY_ONLINE. Use this new state for Hyper-V initialization so thathyperv_pcpu_input_argis allocated early enough.
Quoted 5 lines
Fix the offlining problem by not freeing
hyperv_pcpu_input_argwhen a CPU goes offline. Retain the allocated memory, and reuse it if the CPU comes back online later.Signed-off-by Michael Kelley <[email protected]>
Very minor nitpick: I would've changed the Subject of the patch to something a bit more meaningful, e.g.
"x86/hyperv: Avoid freeing per-CPU hyperv_pcpu_{input,output}_arg upon CPU offlining"
or something like that.
Quoted 35 lines
---
Changes in v2:
* PutCPUHP_AP_HYPERV_ONLINEbeforeCPUHP_AP_KVM_ONLINE[Vitaly Kuznetsov]arch/x86/hyperv/hv_init.c | 2 +- drivers/hv/hv_common.c | 48 +++++++++++++++++++++++----------------------- include/linux/cpuhotplug.h | 1 + 3 files changed, 26 insertions(+), 25 deletions(-)arch/x86/hyperv/hv_init.c +1
-1@@ -416,7 +416,7 @@ void __init hyperv_init(void) goto free_vp_assist_page; } - cpuhp =cpuhp_setup_state (CPUHP_AP_ONLINE_DYN ,"x86/hyperv_init:online" , + cpuhp =cpuhp_setup_state (CPUHP_AP_HYPERV_ONLINE ,"x86/hyperv_init:online" , hv_cpu_init, hv_cpu_die);if (cpuhp <0 ) goto free_ghcb_page;drivers/hv/hv_common.c +0
-3@@ -364,13 +364,20 @@ int hv_common_cpu_init(unsigned int cpu) flags =irqs_disabled () ?GFP_ATOMIC :GFP_KERNEL ; inputarg = (void **)this_cpu_ptr (hyperv_pcpu_input_arg); - *inputarg =kmalloc (pgcount *HV_HYP_PAGE_SIZE , flags); -if (!(*inputarg)) -return -ENOMEM ;
drivers/hv/hv_common.c int hv_common_cpu_init(unsigned int cpu) · line 373
Quoted 10 lines
drivers/hv/hv_common.c +6
-3-if (hv_root_partition) { - outputarg = (void **)this_cpu_ptr (hyperv_pcpu_output_arg); - *outputarg = (char *)(*inputarg) +HV_HYP_PAGE_SIZE ; +/* +* hyperv_pcpu_input_arg and hyperv_pcpu_output_arg memory is already +* allocated if this CPU was previously online and then taken offline +*/ +if (!*inputarg) { + *inputarg =kmalloc (pgcount *HV_HYP_PAGE_SIZE , flags);
Nitpick: I see this was in the original code but we could probably switch to kcalloc() here.
Quoted 51 lines
drivers/hv/hv_common.c +18
-18+if (!(*inputarg)) +return -ENOMEM ; + +if (hv_root_partition) { + outputarg = (void **)this_cpu_ptr (hyperv_pcpu_output_arg); + *outputarg = (char *)(*inputarg) +HV_HYP_PAGE_SIZE ; + } } msr_vp_index =hv_get_register (HV_REGISTER_VP_INDEX );@@ -385,24 +392,17 @@ int hv_common_cpu_init(unsigned int cpu)int hv_common_cpu_die (unsigned int cpu) { -unsigned long flags; -void **inputarg, **outputarg; -void *mem; - -local_irq_save (flags); - - inputarg = (void **)this_cpu_ptr (hyperv_pcpu_input_arg); - mem = *inputarg; - *inputarg =NULL ; - -if (hv_root_partition) { - outputarg = (void **)this_cpu_ptr (hyperv_pcpu_output_arg); - *outputarg =NULL ; - } - -local_irq_restore (flags); - -kfree (mem); +/* +* The hyperv_pcpu_input_arg and hyperv_pcpu_output_arg memory +* is not freed when the CPU goes offline as the hyperv_pcpu_input_arg +* may be used by the Hyper-V vPCI driver in reassigning interrupts +* as part of the offlining process. The interrupt reassignment +* happens *after* the CPUHP_AP_HYPERV_ONLINE state has run and +* called this function. +* +* If a previously offlined CPU is brought back online again, the +* originally allocated memory is reused in hv_common_cpu_init(). +*/ return 0 ; }include/linux/cpuhotplug.h +0
-0
include/linux/cpuhotplug.h enum cpuhp_state { · line 206
Quoted 7 lines
include/linux/cpuhotplug.h +1
-0@@ -200,6 +200,7 @@ enum cpuhp_state {/* Online section invoked on the hotplugged CPU from the hotplug thread */ CPUHP_AP_ONLINE_IDLE , +CPUHP_AP_HYPERV_ONLINE ,CPUHP_AP_KVM_ONLINE ,CPUHP_AP_SCHED_WAIT_EMPTY , CPUHP_AP_SMPBOOT_THREADS,
Signature · 7 lines
Vitaly _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 36 lines · Michael Kelley
These commits
a494aef23dfc("PCI: hv: Replaceretarget_msi_interrupt_paramswithhyperv_pcpu_input_arg")2c6ba4216844("PCI: hv: Enable PCI pass-thru devices in Confidential VMs")update the Hyper-V virtual PCI driver to use the
hyperv_pcpu_input_argbecause that memory will be correctly marked as decrypted or encrypted for all VM types (CoCo or normal). But problems ensue when CPUs in the VM go online or offline after virtual PCI devices have been configured.When a CPU is brought online, the
hyperv_pcpu_input_argfor that CPU is initialized byhv_cpu_init()running under stateCPUHP_AP_ONLINE_DYN. But this state occurs after stateCPUHP_AP_IRQ_AFFINITY_ONLINE, which may call the virtual PCI driver and fault trying to use the as yet uninitializedhyperv_pcpu_input_arg. A similar problem occurs in a CoCo VM if the MMIO read and write hypercalls are used from stateCPUHP_AP_IRQ_AFFINITY_ONLINE.When a CPU is taken offline, IRQs may be reassigned in state
CPUHP_TEARDOWN_CPU. Again, the virtual PCI driver may fault trying to use thehyperv_pcpu_input_argthat has already been freed by a higher state.Fix the onlining problem by adding state
CPUHP_AP_HYPERV_ONLINEimmediately afterCPUHP_AP_ONLINE_IDLE(similar toCPUHP_AP_KVM_ONLINE) and beforeCPUHP_AP_IRQ_AFFINITY_ONLINE. Use this new state for Hyper-V initialization so thathyperv_pcpu_input_argis allocated early enough.Fix the offlining problem by not freeing
hyperv_pcpu_input_argwhen a CPU goes offline. Retain the allocated memory, and reuse it if the CPU comes back online later.Signed-off-by Michael Kelley <[email protected]>---
Quoted 8 lines
Changes in v2:
* PutCPUHP_AP_HYPERV_ONLINEbeforeCPUHP_AP_KVM_ONLINE[Vitaly Kuznetsov]arch/x86/hyperv/hv_init.c | 2 +- drivers/hv/hv_common.c | 48 +++++++++++++++++++++++----------------------- include/linux/cpuhotplug.h | 1 + 3 files changed, 26 insertions(+), 25 deletions(-)
Signature · 9 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel