From: Michal Suchanek <msuchanek@suse.de>
To: linuxppc-dev@lists.ozlabs.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Oleg Nesterov <oleg@redhat.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <christian@brauner.io>,
Nicholas Piggin <npiggin@gmail.com>,
Allison Randal <allison@lohutok.net>,
"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>,
Michal Suchanek <msuchanek@suse.de>,
Thomas Gleixner <tglx@linutronix.de>,
Breno Leitao <leitao@debian.org>,
Christophe Leroy <christophe.leroy@c-s.fr>,
Claudio Carvalho <cclaudio@linux.ibm.com>,
Russell Currey <ruscur@russell.cc>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>,
Arnd Bergmann <arnd@arndb.de>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Firoz Khan <firoz.khan@linaro.org>,
Dmitry Vyukov <dvyukov@google.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Hari Bathini <hbathini@linux.ibm.com>,
Andrew Donnellan <andrew.donnellan@au1.ibm.com>,
Nicolai Stange <nstange@suse.de>,
Valentin Schneider <valentin.schneider@arm.com>,
Diana Craciun <diana.craciun@nxp.com>,
Daniel Axtens <dja@axtens.net>,
Michael Neuling <mikey@neuling.org>,
Gustavo Romero <gromero@linux.ibm.com>,
Mathieu Malaterre <malat@debian.org>,
"Steven Rostedt" <rostedt@goodmis.org>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
David Howells <dhowells@redhat.com>,
Brajeswar Ghosh <brajeswar.linux@gmail.com>,
Jagadeesh Pagadala <jagdsh.linux@gmail.com>,
David Hildenbrand <david@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Madhavan Srinivasan <maddy@linux.vnet.ibm.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 rebase 08/34] powerpc/64s/exception: Remove old INT_KVM_HANDLER
Date: Wed, 27 Nov 2019 11:38:44 +0100 [thread overview]
Message-ID: <30a4962a03cebc03f0e2100e39b1cadd749174c1.1574803684.git.msuchanek@suse.de> (raw)
In-Reply-To: <cover.1574803684.git.msuchanek@suse.de>
From: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/kernel/exceptions-64s.S | 55 +++++++++++++---------------
1 file changed, 26 insertions(+), 29 deletions(-)
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index f318869607db..bef0c2eee7dc 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -266,15 +266,6 @@ do_define_int n
.endif
.endm
-.macro INT_KVM_HANDLER name, vec, hsrr, area, skip
- TRAMP_KVM_BEGIN(\name\()_kvm)
- KVM_HANDLER \vec, \hsrr, \area, \skip
-.endm
-
-.macro GEN_KVM name
- KVM_HANDLER IVEC, IHSRR, IAREA, IKVM_SKIP
-.endm
-
#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
/*
@@ -293,35 +284,35 @@ do_define_int n
bne \name\()_kvm
.endm
-.macro KVM_HANDLER vec, hsrr, area, skip
- .if \skip
+.macro GEN_KVM name
+ .if IKVM_SKIP
cmpwi r10,KVM_GUEST_MODE_SKIP
beq 89f
.else
BEGIN_FTR_SECTION_NESTED(947)
- ld r10,\area+EX_CFAR(r13)
+ ld r10,IAREA+EX_CFAR(r13)
std r10,HSTATE_CFAR(r13)
END_FTR_SECTION_NESTED(CPU_FTR_CFAR,CPU_FTR_CFAR,947)
.endif
BEGIN_FTR_SECTION_NESTED(948)
- ld r10,\area+EX_PPR(r13)
+ ld r10,IAREA+EX_PPR(r13)
std r10,HSTATE_PPR(r13)
END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948)
- ld r10,\area+EX_R10(r13)
+ ld r10,IAREA+EX_R10(r13)
std r12,HSTATE_SCRATCH0(r13)
sldi r12,r9,32
/* HSRR variants have the 0x2 bit added to their trap number */
- .if \hsrr == EXC_HV_OR_STD
+ .if IHSRR == EXC_HV_OR_STD
BEGIN_FTR_SECTION
- ori r12,r12,(\vec + 0x2)
+ ori r12,r12,(IVEC + 0x2)
FTR_SECTION_ELSE
- ori r12,r12,(\vec)
+ ori r12,r12,(IVEC)
ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206)
- .elseif \hsrr
- ori r12,r12,(\vec + 0x2)
+ .elseif IHSRR
+ ori r12,r12,(IVEC+ 0x2)
.else
- ori r12,r12,(\vec)
+ ori r12,r12,(IVEC)
.endif
#ifdef CONFIG_RELOCATABLE
@@ -334,25 +325,25 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948)
std r9,HSTATE_SCRATCH1(r13)
__LOAD_FAR_HANDLER(r9, kvmppc_interrupt)
mtctr r9
- ld r9,\area+EX_R9(r13)
+ ld r9,IAREA+EX_R9(r13)
bctr
#else
- ld r9,\area+EX_R9(r13)
+ ld r9,IAREA+EX_R9(r13)
b kvmppc_interrupt
#endif
- .if \skip
+ .if IKVM_SKIP
89: mtocrf 0x80,r9
- ld r9,\area+EX_R9(r13)
- ld r10,\area+EX_R10(r13)
- .if \hsrr == EXC_HV_OR_STD
+ ld r9,IAREA+EX_R9(r13)
+ ld r10,IAREA+EX_R10(r13)
+ .if IHSRR == EXC_HV_OR_STD
BEGIN_FTR_SECTION
b kvmppc_skip_Hinterrupt
FTR_SECTION_ELSE
b kvmppc_skip_interrupt
ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206)
- .elseif \hsrr
+ .elseif IHSRR
b kvmppc_skip_Hinterrupt
.else
b kvmppc_skip_interrupt
@@ -363,7 +354,7 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948)
#else
.macro KVMTEST name, hsrr, n
.endm
-.macro KVM_HANDLER name, vec, hsrr, area, skip
+.macro GEN_KVM name
.endm
#endif
@@ -1640,6 +1631,12 @@ EXC_VIRT_NONE(0x4b00, 0x100)
* without saving, though xer is not a good idea to use, as hardware may
* interpret some bits so it may be costly to change them.
*/
+INT_DEFINE_BEGIN(system_call)
+ IVEC=0xc00
+ IKVM_REAL=1
+ IKVM_VIRT=1
+INT_DEFINE_END(system_call)
+
.macro SYSTEM_CALL virt
#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
/*
@@ -1733,7 +1730,7 @@ TRAMP_KVM_BEGIN(system_call_kvm)
SET_SCRATCH0(r10)
std r9,PACA_EXGEN+EX_R9(r13)
mfcr r9
- KVM_HANDLER 0xc00, EXC_STD, PACA_EXGEN, 0
+ GEN_KVM system_call
#endif
--
2.23.0
next prev parent reply other threads:[~2019-11-27 10:39 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 10:38 [PATCH v2 rebase 00/34] exception cleanup, syscall in C and !COMPAT Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 01/34] powerpc/64s/exception: Introduce INT_DEFINE parameter block for code generation Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 02/34] powerpc/64s/exception: Add GEN_COMMON macro that uses INT_DEFINE parameters Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 03/34] powerpc/64s/exception: Add GEN_KVM " Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 04/34] powerpc/64s/exception: Expand EXC_COMMON and EXC_COMMON_ASYNC macros Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 05/34] powerpc/64s/exception: Move all interrupt handlers to new style code gen macros Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 06/34] powerpc/64s/exception: Remove old INT_ENTRY macro Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 07/34] powerpc/64s/exception: Remove old INT_COMMON macro Michal Suchanek
2019-11-27 10:38 ` Michal Suchanek [this message]
2019-11-27 10:38 ` [PATCH v2 rebase 09/34] powerpc/64s/exception: Add ISIDE option Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 10/34] powerpc/64s/exception: move real->virt switch into the common handler Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 11/34] powerpc/64s/exception: move soft-mask test to common code Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 12/34] powerpc/64s/exception: move KVM " Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 13/34] powerpc/64s/exception: remove confusing IEARLY option Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 14/34] powerpc/64s/exception: remove the SPR saving patch code macros Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 15/34] powerpc/64s/exception: trim unused arguments from KVMTEST macro Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 16/34] powerpc/64s/exception: hdecrementer avoid touching the stack Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 17/34] powerpc/64s/exception: re-inline some handlers Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 18/34] powerpc/64s/exception: Clean up SRR specifiers Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 19/34] powerpc/64s/exception: add more comments for interrupt handlers Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 20/34] powerpc/64s/exception: only test KVM in SRR interrupts when PR KVM is supported Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 21/34] powerpc/64s/exception: soft nmi interrupt should not use ret_from_except Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 22/34] powerpc/64: system call remove non-volatile GPR save optimisation Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 23/34] powerpc/64: system call implement the bulk of the logic in C Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 24/34] powerpc/64s: interrupt return " Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 25/34] powerpc/64s/exception: remove lite interrupt return Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 26/34] powerpc/64: system call: Fix sparse warning about missing declaration Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 27/34] powerpc: Add back __ARCH_WANT_SYS_LLSEEK macro Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 28/34] powerpc: move common register copy functions from signal_32.c to signal.c Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 29/34] powerpc/perf: consolidate read_user_stack_32 Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 30/34] powerpc/perf: consolidate valid_user_sp Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 31/34] powerpc/64: make buildable without CONFIG_COMPAT Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 32/34] powerpc/64: Make COMPAT user-selectable disabled on littleendian by default Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 33/34] powerpc/perf: split callchain.c by bitness Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 34/34] MAINTAINERS: perf: Add pattern that matches ppc perf to the perf entry Michal Suchanek
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=30a4962a03cebc03f0e2100e39b1cadd749174c1.1574803684.git.msuchanek@suse.de \
--to=msuchanek@suse.de \
--cc=akpm@linux-foundation.org \
--cc=allison@lohutok.net \
--cc=andrew.donnellan@au1.ibm.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=brajeswar.linux@gmail.com \
--cc=cclaudio@linux.ibm.com \
--cc=christian@brauner.io \
--cc=christophe.leroy@c-s.fr \
--cc=david@redhat.com \
--cc=dhowells@redhat.com \
--cc=diana.craciun@nxp.com \
--cc=dja@axtens.net \
--cc=dvyukov@google.com \
--cc=ebiederm@xmission.com \
--cc=firoz.khan@linaro.org \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=gromero@linux.ibm.com \
--cc=hbathini@linux.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=jagdsh.linux@gmail.com \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.vnet.ibm.com \
--cc=mahesh@linux.vnet.ibm.com \
--cc=malat@debian.org \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--cc=npiggin@gmail.com \
--cc=nstange@suse.de \
--cc=oleg@redhat.com \
--cc=paulus@samba.org \
--cc=rostedt@goodmis.org \
--cc=ruscur@russell.cc \
--cc=tglx@linutronix.de \
--cc=valentin.schneider@arm.com \
--cc=viro@zeniv.linux.org.uk \
--cc=yamada.masahiro@socionext.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).