From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Nicholas Piggin <npiggin@gmail.com>
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH v15 02/13] powerpc/32: Fix CONFIG_VIRT_CPU_ACCOUNTING_NATIVE for 40x/booke
Date: Thu, 31 Jan 2019 10:08:46 +0000 (UTC) [thread overview]
Message-ID: <da718ce0da4303de0197b46570680843a188f216.1548852243.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1548852242.git.christophe.leroy@c-s.fr>
40x/booke have another path to reach 3f from transfer_to_handler,
make sure it also calls ACCOUNT_CPU_USER_ENTRY() when
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is selected.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/powerpc/kernel/entry_32.S | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 0768dfd8a64e..d4c6186aa7e8 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -166,6 +166,13 @@ transfer_to_handler:
internal debug mode bit to do this. */
lwz r12,THREAD_DBCR0(r12)
andis. r12,r12,DBCR0_IDM@h
+#endif
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
+ CURRENT_THREAD_INFO(r9, r1)
+ tophys(r9, r9)
+ ACCOUNT_CPU_USER_ENTRY(r9, r11, r12)
+#endif
+#if defined(CONFIG_40x) || defined(CONFIG_BOOKE)
beq+ 3f
/* From user and task is ptraced - load up global dbcr0 */
li r12,-1 /* clear all pending debug events */
@@ -185,11 +192,6 @@ transfer_to_handler:
addi r12,r12,-1
stw r12,4(r11)
#endif
-#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
- CURRENT_THREAD_INFO(r9, r1)
- tophys(r9, r9)
- ACCOUNT_CPU_USER_ENTRY(r9, r11, r12)
-#endif
b 3f
--
2.13.3
next prev parent reply other threads:[~2019-01-31 10:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-31 10:08 [PATCH v15 00/13] powerpc: Switch to CONFIG_THREAD_INFO_IN_TASK Christophe Leroy
2019-01-31 10:08 ` [PATCH v15 01/13] powerpc/irq: use memblock functions returning virtual address Christophe Leroy
2019-01-31 10:08 ` Christophe Leroy [this message]
2019-01-31 10:08 ` [PATCH v15 03/13] book3s/64: avoid circular header inclusion in mmu-hash.h Christophe Leroy
2019-01-31 10:08 ` [PATCH v15 04/13] powerpc: Only use task_struct 'cpu' field on SMP Christophe Leroy
2019-01-31 10:08 ` [PATCH v15 05/13] powerpc: prep stack walkers for THREAD_INFO_IN_TASK Christophe Leroy
2019-01-31 10:08 ` [PATCH v15 06/13] powerpc: Rename THREAD_INFO to TASK_STACK Christophe Leroy
2019-01-31 10:08 ` [PATCH v15 07/13] powerpc: Prepare for moving thread_info into task_struct Christophe Leroy
2019-01-31 10:08 ` [PATCH v15 08/13] powerpc: Activate CONFIG_THREAD_INFO_IN_TASK Christophe Leroy
2019-01-31 10:09 ` [PATCH v15 09/13] powerpc: regain entire stack space Christophe Leroy
2019-01-31 10:09 ` [PATCH v15 10/13] powerpc: 'current_set' is now a table of task_struct pointers Christophe Leroy
2019-01-31 10:09 ` [PATCH v15 11/13] powerpc/32: Remove CURRENT_THREAD_INFO and rename TI_CPU Christophe Leroy
2019-01-31 10:09 ` [PATCH v15 12/13] powerpc/64: Remove CURRENT_THREAD_INFO Christophe Leroy
2019-01-31 10:09 ` [PATCH v15 13/13] powerpc: clean stack pointers naming Christophe Leroy
2019-02-04 11:20 ` [PATCH v15 00/13] powerpc: Switch to CONFIG_THREAD_INFO_IN_TASK Michael Ellerman
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=da718ce0da4303de0197b46570680843a188f216.1548852243.git.christophe.leroy@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=paulus@samba.org \
/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).