* [PATCH] arm64: KVM: Register CPU notifiers when the kernel runs at HYP
@ 2016-03-30 15:56 James Morse
2016-03-30 16:30 ` Marc Zyngier
0 siblings, 1 reply; 3+ messages in thread
From: James Morse @ 2016-03-30 15:56 UTC (permalink / raw)
To: linux-arm-kernel
When the kernel is running at EL2, it doesn't need init_hyp_mode() to
configure page tables for HYP. This function also registers the CPU
hotplug and lower power notifiers that cause HYP to be re-initialised
after the CPU has been reset.
To avoid losing the register state that controls stage2 translation, move
the registering of these notifiers into init_subsystems(), and add an
is_kernel_in_hyp_mode() path to each callback.
Fixes: 1e947bad0b6 ("arm64: KVM: Skip HYP setup when already running in HYP")
Signed-off-by: James Morse <james.morse@arm.com>
---
arch/arm/kvm/arm.c | 51 +++++++++++++++++++++++++++++++++------------------
1 file changed, 33 insertions(+), 18 deletions(-)
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 6accd66d26f0..cf0184edf4f5 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -1067,8 +1067,16 @@ static int hyp_init_cpu_notify(struct notifier_block *self,
switch (action) {
case CPU_STARTING:
case CPU_STARTING_FROZEN:
- if (__hyp_get_vectors() == hyp_default_vectors)
- cpu_init_hyp_mode(NULL);
+ if (is_kernel_in_hyp_mode()) {
+ /*
+ * cpu_init_stage2() is safe to call even if the PM
+ * event was cancelled before the CPU was reset.
+ */
+ cpu_init_stage2(NULL);
+ } else {
+ if (__hyp_get_vectors() == hyp_default_vectors)
+ cpu_init_hyp_mode(NULL);
+ }
break;
}
@@ -1084,9 +1092,13 @@ static int hyp_init_cpu_pm_notifier(struct notifier_block *self,
unsigned long cmd,
void *v)
{
- if (cmd == CPU_PM_EXIT &&
- __hyp_get_vectors() == hyp_default_vectors) {
- cpu_init_hyp_mode(NULL);
+ if (cmd == CPU_PM_EXIT) {
+ if (is_kernel_in_hyp_mode()) {
+ cpu_init_stage2(NULL);
+ } else {
+ if (__hyp_get_vectors() == hyp_default_vectors)
+ cpu_init_hyp_mode(NULL);
+ }
return NOTIFY_OK;
}
@@ -1128,6 +1140,22 @@ static int init_subsystems(void)
int err;
/*
+ * Register CPU Hotplug notifier
+ */
+ cpu_notifier_register_begin();
+ err = __register_cpu_notifier(&hyp_init_cpu_nb);
+ cpu_notifier_register_done();
+ if (err) {
+ kvm_err("Cannot register KVM init CPU notifier (%d)\n", err);
+ return err;
+ }
+
+ /*
+ * Register CPU lower-power notifier
+ */
+ hyp_cpu_pm_init();
+
+ /*
* Init HYP view of VGIC
*/
err = kvm_vgic_hyp_init();
@@ -1270,19 +1298,6 @@ static int init_hyp_mode(void)
free_boot_hyp_pgd();
#endif
- cpu_notifier_register_begin();
-
- err = __register_cpu_notifier(&hyp_init_cpu_nb);
-
- cpu_notifier_register_done();
-
- if (err) {
- kvm_err("Cannot register HYP init CPU notifier (%d)\n", err);
- goto out_err;
- }
-
- hyp_cpu_pm_init();
-
/* set size of VMID supported by CPU */
kvm_vmid_bits = kvm_get_vmid_bits();
kvm_info("%d-bit VMID\n", kvm_vmid_bits);
--
2.8.0.rc3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] arm64: KVM: Register CPU notifiers when the kernel runs at HYP
2016-03-30 15:56 [PATCH] arm64: KVM: Register CPU notifiers when the kernel runs at HYP James Morse
@ 2016-03-30 16:30 ` Marc Zyngier
2016-03-30 16:46 ` James Morse
0 siblings, 1 reply; 3+ messages in thread
From: Marc Zyngier @ 2016-03-30 16:30 UTC (permalink / raw)
To: linux-arm-kernel
Hi James,
On 30/03/16 16:56, James Morse wrote:
> When the kernel is running at EL2, it doesn't need init_hyp_mode() to
> configure page tables for HYP. This function also registers the CPU
> hotplug and lower power notifiers that cause HYP to be re-initialised
> after the CPU has been reset.
>
> To avoid losing the register state that controls stage2 translation, move
> the registering of these notifiers into init_subsystems(), and add an
> is_kernel_in_hyp_mode() path to each callback.
>
> Fixes: 1e947bad0b6 ("arm64: KVM: Skip HYP setup when already running in HYP")
> Signed-off-by: James Morse <james.morse@arm.com>
> ---
> arch/arm/kvm/arm.c | 51 +++++++++++++++++++++++++++++++++------------------
> 1 file changed, 33 insertions(+), 18 deletions(-)
>
> diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
> index 6accd66d26f0..cf0184edf4f5 100644
> --- a/arch/arm/kvm/arm.c
> +++ b/arch/arm/kvm/arm.c
> @@ -1067,8 +1067,16 @@ static int hyp_init_cpu_notify(struct notifier_block *self,
> switch (action) {
> case CPU_STARTING:
> case CPU_STARTING_FROZEN:
> - if (__hyp_get_vectors() == hyp_default_vectors)
> - cpu_init_hyp_mode(NULL);
> + if (is_kernel_in_hyp_mode()) {
> + /*
> + * cpu_init_stage2() is safe to call even if the PM
> + * event was cancelled before the CPU was reset.
> + */
> + cpu_init_stage2(NULL);
> + } else {
> + if (__hyp_get_vectors() == hyp_default_vectors)
> + cpu_init_hyp_mode(NULL);
> + }
> break;
> }
>
> @@ -1084,9 +1092,13 @@ static int hyp_init_cpu_pm_notifier(struct notifier_block *self,
> unsigned long cmd,
> void *v)
> {
> - if (cmd == CPU_PM_EXIT &&
> - __hyp_get_vectors() == hyp_default_vectors) {
> - cpu_init_hyp_mode(NULL);
> + if (cmd == CPU_PM_EXIT) {
> + if (is_kernel_in_hyp_mode()) {
> + cpu_init_stage2(NULL);
> + } else {
> + if (__hyp_get_vectors() == hyp_default_vectors)
> + cpu_init_hyp_mode(NULL);
> + }
Any reason why we can't isolate that snippet in a separate function and
use it in both locations?
> return NOTIFY_OK;
> }
>
> @@ -1128,6 +1140,22 @@ static int init_subsystems(void)
> int err;
>
> /*
> + * Register CPU Hotplug notifier
> + */
> + cpu_notifier_register_begin();
> + err = __register_cpu_notifier(&hyp_init_cpu_nb);
> + cpu_notifier_register_done();
> + if (err) {
> + kvm_err("Cannot register KVM init CPU notifier (%d)\n", err);
> + return err;
> + }
> +
> + /*
> + * Register CPU lower-power notifier
> + */
> + hyp_cpu_pm_init();
> +
> + /*
> * Init HYP view of VGIC
> */
> err = kvm_vgic_hyp_init();
> @@ -1270,19 +1298,6 @@ static int init_hyp_mode(void)
> free_boot_hyp_pgd();
> #endif
>
> - cpu_notifier_register_begin();
> -
> - err = __register_cpu_notifier(&hyp_init_cpu_nb);
> -
> - cpu_notifier_register_done();
> -
> - if (err) {
> - kvm_err("Cannot register HYP init CPU notifier (%d)\n", err);
> - goto out_err;
> - }
> -
> - hyp_cpu_pm_init();
> -
> /* set size of VMID supported by CPU */
> kvm_vmid_bits = kvm_get_vmid_bits();
> kvm_info("%d-bit VMID\n", kvm_vmid_bits);
>
Otherwise looks good to me.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] arm64: KVM: Register CPU notifiers when the kernel runs at HYP
2016-03-30 16:30 ` Marc Zyngier
@ 2016-03-30 16:46 ` James Morse
0 siblings, 0 replies; 3+ messages in thread
From: James Morse @ 2016-03-30 16:46 UTC (permalink / raw)
To: linux-arm-kernel
On 30/03/16 17:30, Marc Zyngier wrote:
>> diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
>> index 6accd66d26f0..cf0184edf4f5 100644
>> --- a/arch/arm/kvm/arm.c
>> +++ b/arch/arm/kvm/arm.c
>> @@ -1084,9 +1092,13 @@ static int hyp_init_cpu_pm_notifier(struct notifier_block *self,
>> unsigned long cmd,
>> void *v)
>> {
>> - if (cmd == CPU_PM_EXIT &&
>> - __hyp_get_vectors() == hyp_default_vectors) {
>> - cpu_init_hyp_mode(NULL);
>> + if (cmd == CPU_PM_EXIT) {
>> + if (is_kernel_in_hyp_mode()) {
>> + cpu_init_stage2(NULL);
>> + } else {
>> + if (__hyp_get_vectors() == hyp_default_vectors)
>> + cpu_init_hyp_mode(NULL);
>> + }
>
> Any reason why we can't isolate that snippet in a separate function and
> use it in both locations?
I thought I did that ... bother, wrong branch.
We can argue about the name, I called it 'cpu_hyp_reinit()', which pairs up with
'cpu_hyp_reset()' in a rebased version of the kexec/hibernate hyp-shutdown code.
(cpu_ seems to be the prefix for per-cpu functions in this file)
v2 shortly,
Thanks/Sorry,
James
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-30 16:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-30 15:56 [PATCH] arm64: KVM: Register CPU notifiers when the kernel runs at HYP James Morse
2016-03-30 16:30 ` Marc Zyngier
2016-03-30 16:46 ` James Morse
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).