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 18/38] KVM: PPC: e500mc: Move r1/r2 restoration very early
Date: Wed, 29 Feb 2012 01:09:46 +0100 [thread overview]
Message-ID: <1330474206-14794-19-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1330474206-14794-1-git-send-email-agraf@suse.de>
If we hit any exception whatsoever in the restore path and r1/r2 aren't the
host registers, we don't get a working oops. So it's always a good idea to
restore them as early as possible.
This time, it actually has practical reasons to do so too, since we need to
have the host page fault handler fix up our guest instruction read code. And
for that to work we need r1/r2 restored.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
arch/powerpc/kvm/bookehv_interrupts.S | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/kvm/bookehv_interrupts.S b/arch/powerpc/kvm/bookehv_interrupts.S
index 9eaeebd..63023ae 100644
--- a/arch/powerpc/kvm/bookehv_interrupts.S
+++ b/arch/powerpc/kvm/bookehv_interrupts.S
@@ -67,6 +67,12 @@
* saved in vcpu: cr, ctr, r3-r13
*/
.macro kvm_handler_common intno, srr0, flags
+ /* Restore host stack pointer */
+ PPC_STL r1, VCPU_GPR(r1)(r4)
+ PPC_STL r2, VCPU_GPR(r2)(r4)
+ PPC_LL r1, VCPU_HOST_STACK(r4)
+ PPC_LL r2, HOST_R2(r1)
+
mfspr r10, SPRN_PID
lwz r8, VCPU_HOST_PID(r4)
PPC_LL r11, VCPU_SHARED(r4)
@@ -290,10 +296,8 @@ _GLOBAL(kvmppc_resume_host)
/* Save remaining volatile guest register state to vcpu. */
mfspr r3, SPRN_VRSAVE
PPC_STL r0, VCPU_GPR(r0)(r4)
- PPC_STL r1, VCPU_GPR(r1)(r4)
mflr r5
mfspr r6, SPRN_SPRG4
- PPC_STL r2, VCPU_GPR(r2)(r4)
PPC_STL r5, VCPU_LR(r4)
mfspr r7, SPRN_SPRG5
PPC_STL r3, VCPU_VRSAVE(r4)
@@ -334,10 +338,6 @@ _GLOBAL(kvmppc_resume_host)
mtspr SPRN_EPCR, r3
isync
- /* Restore host stack pointer */
- PPC_LL r1, VCPU_HOST_STACK(r4)
- PPC_LL r2, HOST_R2(r1)
-
/* Switch to kernel stack and jump to handler. */
PPC_LL r3, HOST_RUN(r1)
mr r5, r14 /* intno */
--
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 ` Alexander Graf [this message]
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 ` [PATCH 29/38] KVM: PPC: bookehv: disable MAS register updates early Alexander Graf
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-19-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).