From: Alexander Graf <agraf@suse.de>
To: kvm-ppc@vger.kernel.org
Cc: Scott Wood <scottwood@freescale.com>,
linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org
Subject: [PATCH 29/38] KVM: PPC: bookehv: disable MAS register updates early
Date: Wed, 29 Feb 2012 01:09:57 +0100 [thread overview]
Message-ID: <1330474206-14794-30-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1330474206-14794-1-git-send-email-agraf@suse.de>
We need to make sure that no MAS updates happen automatically while we
have the guest MAS registers loaded. So move the disabling code a bit
higher up so that it covers the full time we have guest values in MAS
registers.
The race this patch fixes should never occur, but it makes the code a
bit more logical to do it this way around.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
arch/powerpc/kvm/bookehv_interrupts.S | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/kvm/bookehv_interrupts.S b/arch/powerpc/kvm/bookehv_interrupts.S
index 469bd3f..021d087 100644
--- a/arch/powerpc/kvm/bookehv_interrupts.S
+++ b/arch/powerpc/kvm/bookehv_interrupts.S
@@ -358,6 +358,7 @@ _GLOBAL(kvmppc_resume_host)
mtspr SPRN_MAS4, r6
stw r5, VCPU_SHARED_MAS7_3+0(r11)
mtspr SPRN_MAS6, r8
+ /* Enable MAS register updates via exception */
mfspr r3, SPRN_EPCR
rlwinm r3, r3, 0, ~SPRN_EPCR_DMIUH
mtspr SPRN_EPCR, r3
@@ -515,6 +516,11 @@ lightweight_exit:
mtspr SPRN_PID, r3
PPC_LL r11, VCPU_SHARED(r4)
+ /* Disable MAS register updates via exception */
+ mfspr r3, SPRN_EPCR
+ oris r3, r3, SPRN_EPCR_DMIUH@h
+ mtspr SPRN_EPCR, r3
+ isync
/* Save host mas4 and mas6 and load guest MAS registers */
mfspr r3, SPRN_MAS4
stw r3, VCPU_HOST_MAS4(r4)
@@ -538,10 +544,6 @@ lightweight_exit:
lwz r5, VCPU_SHARED_MAS7_3+0(r11)
mtspr SPRN_MAS6, r3
mtspr SPRN_MAS7, r5
- /* Disable MAS register updates via exception */
- mfspr r3, SPRN_EPCR
- oris r3, r3, SPRN_EPCR_DMIUH@h
- mtspr SPRN_EPCR, r3
/*
* Host interrupt handlers may have clobbered these guest-readable
--
1.6.0.2
next prev parent reply other threads:[~2012-02-29 0:10 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-29 0:09 [PATCH 00/38] KVM: PPC: e500mc support v3 Alexander Graf
2012-02-29 0:09 ` [PATCH 01/38] powerpc/booke: Set CPU_FTR_DEBUG_LVL_EXC on 32-bit Alexander Graf
2012-02-29 0:09 ` [PATCH 02/38] powerpc/e500: split CPU_FTRS_ALWAYS/CPU_FTRS_POSSIBLE Alexander Graf
2012-02-29 0:09 ` [PATCH 03/38] KVM: PPC: factor out lpid allocator from book3s_64_mmu_hv Alexander Graf
2012-02-29 0:09 ` [PATCH 04/38] KVM: PPC: booke: add booke-level vcpu load/put Alexander Graf
2012-02-29 0:09 ` [PATCH 05/38] KVM: PPC: booke: Move vm core init/destroy out of booke.c Alexander Graf
2012-02-29 0:09 ` [PATCH 06/38] KVM: PPC: e500: rename e500_tlb.h to e500.h Alexander Graf
2012-02-29 0:09 ` [PATCH 07/38] KVM: PPC: e500: merge <asm/kvm_e500.h> into arch/powerpc/kvm/e500.h Alexander Graf
2012-02-29 0:09 ` [PATCH 08/38] KVM: PPC: e500: clean up arch/powerpc/kvm/e500.h Alexander Graf
2012-02-29 0:09 ` [PATCH 09/38] KVM: PPC: e500: refactor core-specific TLB code Alexander Graf
2012-02-29 0:09 ` [PATCH 10/38] KVM: PPC: e500: Track TLB1 entries with a bitmap Alexander Graf
2012-02-29 0:09 ` [PATCH 11/38] KVM: PPC: e500: emulate tlbilx Alexander Graf
2012-02-29 0:09 ` [PATCH 12/38] powerpc/booke: Provide exception macros with interrupt name Alexander Graf
2012-03-21 18:04 ` Kumar Gala
2012-03-21 18:19 ` Scott Wood
2012-03-21 20:20 ` Kumar Gala
2012-02-29 0:09 ` [PATCH 13/38] KVM: PPC: booke: category E.HV (GS-mode) support Alexander Graf
2012-03-05 9:04 ` Bhushan Bharat-R65777
2012-03-05 9:57 ` tiejun.chen
2012-02-29 0:09 ` [PATCH 14/38] KVM: PPC: booke: standard PPC floating point support Alexander Graf
2012-02-29 0:09 ` [PATCH 15/38] KVM: PPC: e500mc support Alexander Graf
2012-02-29 0:09 ` [PATCH 16/38] KVM: PPC: e500mc: Add doorbell emulation support Alexander Graf
2012-02-29 0:09 ` [PATCH 17/38] KVM: PPC: e500mc: implicitly set MSR_GS Alexander Graf
2012-02-29 0:09 ` [PATCH 18/38] KVM: PPC: e500mc: Move r1/r2 restoration very early Alexander Graf
2012-02-29 0:09 ` [PATCH 19/38] KVM: PPC: e500mc: add load inst fixup Alexander Graf
2012-03-08 22:36 ` Marcelo Tosatti
2012-03-12 19:39 ` Alexander Graf
2012-02-29 0:09 ` [PATCH 20/38] KVM: PPC: rename CONFIG_KVM_E500 -> CONFIG_KVM_E500V2 Alexander Graf
2012-02-29 0:09 ` [PATCH 21/38] KVM: PPC: make e500v2 kvm and e500mc cpu mutually exclusive Alexander Graf
2012-02-29 0:09 ` [PATCH 22/38] KVM: PPC: booke: remove leftover debugging Alexander Graf
2012-02-29 0:09 ` [PATCH 23/38] KVM: PPC: booke: deliver program int on emulation failure Alexander Graf
2012-02-29 0:09 ` [PATCH 24/38] KVM: PPC: booke: rework rescheduling checks Alexander Graf
2012-02-29 0:09 ` [PATCH 25/38] KVM: PPC: booke: BOOKE_IRQPRIO_MAX is n+1 Alexander Graf
2012-02-29 0:09 ` [PATCH 26/38] KVM: PPC: bookehv: fix exit timing Alexander Graf
2012-02-29 0:09 ` [PATCH 27/38] KVM: PPC: bookehv: remove negation for CONFIG_64BIT Alexander Graf
2012-02-29 0:09 ` [PATCH 28/38] KVM: PPC: bookehv: remove SET_VCPU Alexander Graf
2012-02-29 0:09 ` Alexander Graf [this message]
2012-02-29 0:09 ` [PATCH 30/38] KVM: PPC: bookehv: add comment about shadow_msr Alexander Graf
2012-02-29 0:09 ` [PATCH 31/38] KVM: PPC: booke: Readd debug abort code for machine check Alexander Graf
2012-02-29 0:10 ` [PATCH 32/38] KVM: PPC: booke: add GS documentation for program interrupt Alexander Graf
2012-02-29 0:10 ` [PATCH 33/38] KVM: PPC: bookehv: remove unused code Alexander Graf
2012-02-29 0:10 ` [PATCH 34/38] KVM: PPC: e500: fix typo in tlb code Alexander Graf
2012-02-29 0:10 ` [PATCH 35/38] KVM: PPC: booke: Support perfmon interrupts Alexander Graf
2012-02-29 0:10 ` [PATCH 36/38] KVM: PPC: booke: expose good state on irq reinject Alexander Graf
2012-02-29 0:10 ` [PATCH 37/38] KVM: PPC: booke: Reinject performance monitor interrupts Alexander Graf
2012-02-29 0:10 ` [PATCH 38/38] KVM: PPC: Booke: only prepare to enter when we enter Alexander Graf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330474206-14794-30-git-send-email-agraf@suse.de \
--to=agraf@suse.de \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=scottwood@freescale.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).