* [v2][PATCH 1/1] KVM: PPC: Book3E HV: call SOFT_DISABLE_INTS to sync the software state
@ 2013-08-07 2:05 Tiejun Chen
2013-08-14 11:56 ` Alexander Graf
0 siblings, 1 reply; 5+ messages in thread
From: Tiejun Chen @ 2013-08-07 2:05 UTC (permalink / raw)
To: agraf; +Cc: kvm, kvm-ppc, scottwood
We enter with interrupts disabled in hardware, but we need to
call SOFT_DISABLE_INTS anyway to ensure that the software state
is kept in sync instead of calling hard_irq_disable() directly.
Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com>
---
arch/powerpc/kvm/booke.c | 11 -----------
arch/powerpc/kvm/bookehv_interrupts.S | 10 ++++++++++
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 17722d8..7653c9c 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -833,17 +833,6 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
int s;
int idx;
-#ifdef CONFIG_PPC64
- WARN_ON(local_paca->irq_happened != 0);
-#endif
-
- /*
- * We enter with interrupts disabled in hardware, but
- * we need to call hard_irq_disable anyway to ensure that
- * the software state is kept in sync.
- */
- hard_irq_disable();
-
/* update before a new last_exit_type is rewritten */
kvmppc_update_timing_stats(vcpu);
diff --git a/arch/powerpc/kvm/bookehv_interrupts.S b/arch/powerpc/kvm/bookehv_interrupts.S
index e8ed7d6..4deaf2e 100644
--- a/arch/powerpc/kvm/bookehv_interrupts.S
+++ b/arch/powerpc/kvm/bookehv_interrupts.S
@@ -33,6 +33,8 @@
#ifdef CONFIG_64BIT
#include <asm/exception-64e.h>
+#include <asm/hw_irq.h>
+#include <asm/irqflags.h>
#else
#include "../kernel/head_booke.h" /* for THREAD_NORMSAVE() */
#endif
@@ -465,6 +467,14 @@ _GLOBAL(kvmppc_resume_host)
mtspr SPRN_EPCR, r3
isync
+#ifdef CONFIG_64BIT
+ /*
+ * We enter with interrupts disabled in hardware, but
+ * we need to call SOFT_DISABLE_INTS anyway to ensure
+ * that the software state is kept in sync.
+ */
+ SOFT_DISABLE_INTS(r3,r5)
+#endif
/* Switch to kernel stack and jump to handler. */
PPC_LL r3, HOST_RUN(r1)
mr r5, r14 /* intno */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [v2][PATCH 1/1] KVM: PPC: Book3E HV: call SOFT_DISABLE_INTS to sync the software state
2013-08-07 2:05 [v2][PATCH 1/1] KVM: PPC: Book3E HV: call SOFT_DISABLE_INTS to sync the software state Tiejun Chen
@ 2013-08-14 11:56 ` Alexander Graf
2013-08-14 19:34 ` Scott Wood
0 siblings, 1 reply; 5+ messages in thread
From: Alexander Graf @ 2013-08-14 11:56 UTC (permalink / raw)
To: Tiejun Chen
Cc: kvm@vger.kernel.org list, kvm-ppc, Scott Wood,
Benjamin Herrenschmidt
On 07.08.2013, at 04:05, Tiejun Chen wrote:
> We enter with interrupts disabled in hardware, but we need to
> call SOFT_DISABLE_INTS anyway to ensure that the software state
> is kept in sync instead of calling hard_irq_disable() directly.
>
> Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com>
Scott, Ben, could you please ack?
Alex
> ---
> arch/powerpc/kvm/booke.c | 11 -----------
> arch/powerpc/kvm/bookehv_interrupts.S | 10 ++++++++++
> 2 files changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
> index 17722d8..7653c9c 100644
> --- a/arch/powerpc/kvm/booke.c
> +++ b/arch/powerpc/kvm/booke.c
> @@ -833,17 +833,6 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
> int s;
> int idx;
>
> -#ifdef CONFIG_PPC64
> - WARN_ON(local_paca->irq_happened != 0);
> -#endif
> -
> - /*
> - * We enter with interrupts disabled in hardware, but
> - * we need to call hard_irq_disable anyway to ensure that
> - * the software state is kept in sync.
> - */
> - hard_irq_disable();
> -
> /* update before a new last_exit_type is rewritten */
> kvmppc_update_timing_stats(vcpu);
>
> diff --git a/arch/powerpc/kvm/bookehv_interrupts.S b/arch/powerpc/kvm/bookehv_interrupts.S
> index e8ed7d6..4deaf2e 100644
> --- a/arch/powerpc/kvm/bookehv_interrupts.S
> +++ b/arch/powerpc/kvm/bookehv_interrupts.S
> @@ -33,6 +33,8 @@
>
> #ifdef CONFIG_64BIT
> #include <asm/exception-64e.h>
> +#include <asm/hw_irq.h>
> +#include <asm/irqflags.h>
> #else
> #include "../kernel/head_booke.h" /* for THREAD_NORMSAVE() */
> #endif
> @@ -465,6 +467,14 @@ _GLOBAL(kvmppc_resume_host)
> mtspr SPRN_EPCR, r3
> isync
>
> +#ifdef CONFIG_64BIT
> + /*
> + * We enter with interrupts disabled in hardware, but
> + * we need to call SOFT_DISABLE_INTS anyway to ensure
> + * that the software state is kept in sync.
> + */
> + SOFT_DISABLE_INTS(r3,r5)
> +#endif
> /* Switch to kernel stack and jump to handler. */
> PPC_LL r3, HOST_RUN(r1)
> mr r5, r14 /* intno */
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [v2][PATCH 1/1] KVM: PPC: Book3E HV: call SOFT_DISABLE_INTS to sync the software state
2013-08-14 11:56 ` Alexander Graf
@ 2013-08-14 19:34 ` Scott Wood
2013-08-14 21:01 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 5+ messages in thread
From: Scott Wood @ 2013-08-14 19:34 UTC (permalink / raw)
To: Alexander Graf
Cc: Tiejun Chen, kvm@vger.kernel.org list, kvm-ppc,
Benjamin Herrenschmidt
On Wed, 2013-08-14 at 13:56 +0200, Alexander Graf wrote:
> On 07.08.2013, at 04:05, Tiejun Chen wrote:
>
> > We enter with interrupts disabled in hardware, but we need to
> > call SOFT_DISABLE_INTS anyway to ensure that the software state
> > is kept in sync instead of calling hard_irq_disable() directly.
> >
> > Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com>
>
> Scott, Ben, could you please ack?
ACK, but it needs to be updated due to this patch that renames
SOFT_DISABLE_INTS:
http://patchwork.ozlabs.org/patch/259337/
-Scott
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [v2][PATCH 1/1] KVM: PPC: Book3E HV: call SOFT_DISABLE_INTS to sync the software state
2013-08-14 19:34 ` Scott Wood
@ 2013-08-14 21:01 ` Benjamin Herrenschmidt
2013-08-15 3:19 ` "“tiejun.chen”"
0 siblings, 1 reply; 5+ messages in thread
From: Benjamin Herrenschmidt @ 2013-08-14 21:01 UTC (permalink / raw)
To: Scott Wood; +Cc: Alexander Graf, Tiejun Chen, kvm@vger.kernel.org list, kvm-ppc
On Wed, 2013-08-14 at 14:34 -0500, Scott Wood wrote:
> On Wed, 2013-08-14 at 13:56 +0200, Alexander Graf wrote:
> > On 07.08.2013, at 04:05, Tiejun Chen wrote:
> >
> > > We enter with interrupts disabled in hardware, but we need to
> > > call SOFT_DISABLE_INTS anyway to ensure that the software state
> > > is kept in sync instead of calling hard_irq_disable() directly.
> > >
> > > Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com>
> >
> > Scott, Ben, could you please ack?
>
> ACK, but it needs to be updated due to this patch that renames
> SOFT_DISABLE_INTS:
>
> http://patchwork.ozlabs.org/patch/259337/
Note that the latter was applied to powerpc -next already.
Cheers,
Ben.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [v2][PATCH 1/1] KVM: PPC: Book3E HV: call SOFT_DISABLE_INTS to sync the software state
2013-08-14 21:01 ` Benjamin Herrenschmidt
@ 2013-08-15 3:19 ` "“tiejun.chen”"
0 siblings, 0 replies; 5+ messages in thread
From: "“tiejun.chen”" @ 2013-08-15 3:19 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Scott Wood, Alexander Graf
Cc: kvm@vger.kernel.org list, kvm-ppc
On 08/15/2013 05:01 AM, Benjamin Herrenschmidt wrote:
> On Wed, 2013-08-14 at 14:34 -0500, Scott Wood wrote:
>> On Wed, 2013-08-14 at 13:56 +0200, Alexander Graf wrote:
>>> On 07.08.2013, at 04:05, Tiejun Chen wrote:
>>>
>>>> We enter with interrupts disabled in hardware, but we need to
>>>> call SOFT_DISABLE_INTS anyway to ensure that the software state
>>>> is kept in sync instead of calling hard_irq_disable() directly.
>>>>
>>>> Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com>
>>>
>>> Scott, Ben, could you please ack?
>>
>> ACK, but it needs to be updated due to this patch that renames
>> SOFT_DISABLE_INTS:
>>
>> http://patchwork.ozlabs.org/patch/259337/
>
> Note that the latter was applied to powerpc -next already.
>
Thanks Ben and Scott.
Alex,
Should I resend an updated patch after you sync powerpc -next?
Tiejun
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-08-15 3:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-07 2:05 [v2][PATCH 1/1] KVM: PPC: Book3E HV: call SOFT_DISABLE_INTS to sync the software state Tiejun Chen
2013-08-14 11:56 ` Alexander Graf
2013-08-14 19:34 ` Scott Wood
2013-08-14 21:01 ` Benjamin Herrenschmidt
2013-08-15 3:19 ` "“tiejun.chen”"
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).