* [PATCH] arm, kvm: fix double lock on cpu_add_remove_lock
@ 2014-04-06 17:36 Ming Lei
2014-04-07 6:44 ` Srivatsa S. Bhat
0 siblings, 1 reply; 3+ messages in thread
From: Ming Lei @ 2014-04-06 17:36 UTC (permalink / raw)
To: kvm, linux-kernel
Cc: Ming Lei, Paolo Bonzini, Christoffer Dall, Srivatsa S. Bhat,
Rafael J. Wysocki
The patch of "arm, kvm: Fix CPU hotplug callback registration"
in -next tree holds the lock before calling the two functions:
kvm_vgic_hyp_init()
kvm_timer_hyp_init()
and both the two functions are calling register_cpu_notifier()
to register cpu notifier, so cause double lock on cpu_add_remove_lock.
Considered that both two functions are only called inside
kvm_arch_init() with holding cpu_add_remove_lock, so simply use
__register_cpu_notifier() to fix the problem.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Christoffer Dall <christoffer.dall@linaro.org>
Cc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
---
virt/kvm/arm/arch_timer.c | 2 +-
virt/kvm/arm/vgic.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index 5081e80..22fa819 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -277,7 +277,7 @@ int kvm_timer_hyp_init(void)
host_vtimer_irq = ppi;
- err = register_cpu_notifier(&kvm_timer_cpu_nb);
+ err = __register_cpu_notifier(&kvm_timer_cpu_nb);
if (err) {
kvm_err("Cannot register timer CPU notifier\n");
goto out_free;
diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index 8ca405c..47b2983 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -1496,7 +1496,7 @@ int kvm_vgic_hyp_init(void)
goto out;
}
- ret = register_cpu_notifier(&vgic_cpu_nb);
+ ret = __register_cpu_notifier(&vgic_cpu_nb);
if (ret) {
kvm_err("Cannot register vgic CPU notifier\n");
goto out_free_irq;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] arm, kvm: fix double lock on cpu_add_remove_lock
2014-04-06 17:36 [PATCH] arm, kvm: fix double lock on cpu_add_remove_lock Ming Lei
@ 2014-04-07 6:44 ` Srivatsa S. Bhat
2014-04-08 11:33 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Srivatsa S. Bhat @ 2014-04-07 6:44 UTC (permalink / raw)
To: Ming Lei
Cc: kvm, linux-kernel, Paolo Bonzini, Christoffer Dall,
Rafael J. Wysocki, ego
On 04/06/2014 11:06 PM, Ming Lei wrote:
> The patch of "arm, kvm: Fix CPU hotplug callback registration"
> in -next tree holds the lock before calling the two functions:
>
> kvm_vgic_hyp_init()
> kvm_timer_hyp_init()
>
> and both the two functions are calling register_cpu_notifier()
> to register cpu notifier, so cause double lock on cpu_add_remove_lock.
>
> Considered that both two functions are only called inside
> kvm_arch_init() with holding cpu_add_remove_lock, so simply use
> __register_cpu_notifier() to fix the problem.
>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Christoffer Dall <christoffer.dall@linaro.org>
> Cc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Sorry for missing that, and thank you for the fix!
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Regards,
Srivatsa S. Bhat
> ---
> virt/kvm/arm/arch_timer.c | 2 +-
> virt/kvm/arm/vgic.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
> index 5081e80..22fa819 100644
> --- a/virt/kvm/arm/arch_timer.c
> +++ b/virt/kvm/arm/arch_timer.c
> @@ -277,7 +277,7 @@ int kvm_timer_hyp_init(void)
>
> host_vtimer_irq = ppi;
>
> - err = register_cpu_notifier(&kvm_timer_cpu_nb);
> + err = __register_cpu_notifier(&kvm_timer_cpu_nb);
> if (err) {
> kvm_err("Cannot register timer CPU notifier\n");
> goto out_free;
> diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
> index 8ca405c..47b2983 100644
> --- a/virt/kvm/arm/vgic.c
> +++ b/virt/kvm/arm/vgic.c
> @@ -1496,7 +1496,7 @@ int kvm_vgic_hyp_init(void)
> goto out;
> }
>
> - ret = register_cpu_notifier(&vgic_cpu_nb);
> + ret = __register_cpu_notifier(&vgic_cpu_nb);
> if (ret) {
> kvm_err("Cannot register vgic CPU notifier\n");
> goto out_free_irq;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] arm, kvm: fix double lock on cpu_add_remove_lock
2014-04-07 6:44 ` Srivatsa S. Bhat
@ 2014-04-08 11:33 ` Rafael J. Wysocki
0 siblings, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2014-04-08 11:33 UTC (permalink / raw)
To: Srivatsa S. Bhat, Ming Lei
Cc: kvm, linux-kernel, Paolo Bonzini, Christoffer Dall,
Rafael J. Wysocki, ego
On Monday, April 07, 2014 12:14:22 PM Srivatsa S. Bhat wrote:
> On 04/06/2014 11:06 PM, Ming Lei wrote:
> > The patch of "arm, kvm: Fix CPU hotplug callback registration"
> > in -next tree holds the lock before calling the two functions:
> >
> > kvm_vgic_hyp_init()
> > kvm_timer_hyp_init()
> >
> > and both the two functions are calling register_cpu_notifier()
> > to register cpu notifier, so cause double lock on cpu_add_remove_lock.
> >
> > Considered that both two functions are only called inside
> > kvm_arch_init() with holding cpu_add_remove_lock, so simply use
> > __register_cpu_notifier() to fix the problem.
> >
> > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > Cc: Christoffer Dall <christoffer.dall@linaro.org>
> > Cc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
> > Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > Signed-off-by: Ming Lei <tom.leiming@gmail.com>
>
> Sorry for missing that, and thank you for the fix!
>
> Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Applied, thanks!
I'm going to include this into my next pull request.
> > ---
> > virt/kvm/arm/arch_timer.c | 2 +-
> > virt/kvm/arm/vgic.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
> > index 5081e80..22fa819 100644
> > --- a/virt/kvm/arm/arch_timer.c
> > +++ b/virt/kvm/arm/arch_timer.c
> > @@ -277,7 +277,7 @@ int kvm_timer_hyp_init(void)
> >
> > host_vtimer_irq = ppi;
> >
> > - err = register_cpu_notifier(&kvm_timer_cpu_nb);
> > + err = __register_cpu_notifier(&kvm_timer_cpu_nb);
> > if (err) {
> > kvm_err("Cannot register timer CPU notifier\n");
> > goto out_free;
> > diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
> > index 8ca405c..47b2983 100644
> > --- a/virt/kvm/arm/vgic.c
> > +++ b/virt/kvm/arm/vgic.c
> > @@ -1496,7 +1496,7 @@ int kvm_vgic_hyp_init(void)
> > goto out;
> > }
> >
> > - ret = register_cpu_notifier(&vgic_cpu_nb);
> > + ret = __register_cpu_notifier(&vgic_cpu_nb);
> > if (ret) {
> > kvm_err("Cannot register vgic CPU notifier\n");
> > goto out_free_irq;
> >
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-04-08 11:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-06 17:36 [PATCH] arm, kvm: fix double lock on cpu_add_remove_lock Ming Lei
2014-04-07 6:44 ` Srivatsa S. Bhat
2014-04-08 11:33 ` Rafael J. Wysocki
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.