From: Breno Leitao <leitao@debian.org>
To: linuxppc-dev@lists.ozlabs.org
Cc: mikey@neuling.org, paulus@ozlabs.org, gromero@linux.vnet.ibm.com,
mpe@ellerman.id.au, ldufour@linux.vnet.ibm.com,
Breno Leitao <leitao@debian.org>
Subject: [RFC PATCH 01/11] powerpc/tm: Reclaim transaction on kernel entry
Date: Wed, 12 Sep 2018 16:40:09 -0300 [thread overview]
Message-ID: <1536781219-13938-2-git-send-email-leitao@debian.org> (raw)
In-Reply-To: <1536781219-13938-1-git-send-email-leitao@debian.org>
This patch creates a macro that will be invoked on all entrance to the
kernel, so, in kernel space the transaction will be completely reclaimed
and not suspended anymore.
This patchset checks if we are coming from PR, if not, skip. This is useful
when there is a irq_replay() being called after recheckpoint, when the IRQ
is re-enable. In this case, we do not want to re-reclaim and
re-recheckpoint, thus, if not coming from PR, skip it completely.
This macro does not care about TM SPR also, it will only be saved and
restore in the context switch code now on.
This macro will return 0 or 1 in r3 register, to specify if a reclaim was
executed or not.
This patchset is based on initial work done by Cyril:
https://patchwork.ozlabs.org/cover/875341/
Signed-off-by: Breno Leitao <leitao@debian.org>
---
arch/powerpc/include/asm/exception-64s.h | 46 ++++++++++++++++++++++++
arch/powerpc/kernel/entry_64.S | 10 ++++++
arch/powerpc/kernel/exceptions-64s.S | 12 +++++--
3 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index a86feddddad0..db90b6d7826e 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -36,6 +36,7 @@
*/
#include <asm/head-64.h>
#include <asm/feature-fixups.h>
+#include <asm/tm.h>
/* PACA save area offsets (exgen, exmc, etc) */
#define EX_R9 0
@@ -686,10 +687,54 @@ BEGIN_FTR_SECTION \
beql ppc64_runlatch_on_trampoline; \
END_FTR_SECTION_IFSET(CPU_FTR_CTRL)
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+
+/*
+ * This macro will reclaim a transaction if called when coming from userspace
+ * (MSR.PR = 1) and if the transaction state is active or suspended.
+ *
+ * Since we don't want to reclaim when coming from kernel, for instance after
+ * a trechkpt. or a IRQ replay, the live MSR is not useful and instead of it the
+ * MSR from thread stack is used to check the MSR.PR bit.
+ * This macro has one argument which is the cause that will be used by treclaim.
+ * and returns in r3 '1' if the reclaim happens or '0' if reclaim didn't
+ * happen, which is useful to know what registers were clobbered.
+ *
+ * NOTE: If addition registers are clobbered here, make sure the callee
+ * function restores them before proceeding.
+ */
+#define TM_KERNEL_ENTRY(cause) \
+ ld r3, _MSR(r1); \
+ andi. r0, r3, MSR_PR; /* Coming from userspace? */ \
+ beq 1f; /* Skip reclaim if MSR.PR != 1 */ \
+ rldicl. r0, r3, (64-MSR_TM_LG), 63; /* Is TM enabled? */ \
+ beq 1f; /* Skip reclaim if TM is off */ \
+ rldicl. r0, r3, (64-MSR_TS_LG), 62; /* Is active */ \
+ beq 1f; /* Skip reclaim if neither */ \
+ /* \
+ * If there is a transaction active or suspended, save the \
+ * non-volatile GPRs if they are not already saved. \
+ */ \
+ bl save_nvgprs; \
+ /* \
+ * Soft disable the IRQs, otherwise it might cause a CPU hang. \
+ */ \
+ RECONCILE_IRQ_STATE(r10, r11); \
+ li r3, cause; \
+ bl tm_reclaim_current; \
+ li r3, 1; /* Reclaim happened */ \
+ b 2f; \
+1: li r3, 0; /* Reclaim didn't happen */ \
+2:
+#else
+#define TM_KERNEL_ENTRY(cause)
+#endif
+
#define EXCEPTION_COMMON(area, trap, label, hdlr, ret, additions) \
EXCEPTION_PROLOG_COMMON(trap, area); \
/* Volatile regs are potentially clobbered here */ \
additions; \
+ TM_KERNEL_ENTRY(TM_CAUSE_MISC); \
addi r3,r1,STACK_FRAME_OVERHEAD; \
bl hdlr; \
b ret
@@ -704,6 +749,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_CTRL)
EXCEPTION_PROLOG_COMMON_3(trap); \
/* Volatile regs are potentially clobbered here */ \
additions; \
+ TM_KERNEL_ENTRY(TM_CAUSE_MISC); \
addi r3,r1,STACK_FRAME_OVERHEAD; \
bl hdlr
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 2206912ea4f0..c38677b7442c 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -131,6 +131,16 @@ BEGIN_FW_FTR_SECTION
END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR)
#endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE && CONFIG_PPC_SPLPAR */
+#if CONFIG_PPC_TRANSACTIONAL_MEM
+ TM_KERNEL_ENTRY(TM_CAUSE_SYSCALL)
+ cmpdi r3, 0x1
+ bne 44f
+ /* Restore from r4 to r12 */
+ REST_8GPRS(4,r1)
+44: /* treclaim was not called, just restore r3 and r0 */
+ REST_GPR(3, r1)
+ REST_GPR(0, r1)
+#endif
/*
* A syscall should always be called with interrupts enabled
* so we just unconditionally hard-enable here. When some kind
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index ea04dfb8c092..78aba71a4b2d 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -805,6 +805,7 @@ EXC_COMMON_BEGIN(alignment_common)
std r3,_DAR(r1)
std r4,_DSISR(r1)
bl save_nvgprs
+ TM_KERNEL_ENTRY(TM_CAUSE_ALIGNMENT)
RECONCILE_IRQ_STATE(r10, r11)
addi r3,r1,STACK_FRAME_OVERHEAD
bl alignment_exception
@@ -839,6 +840,8 @@ EXC_COMMON_BEGIN(program_check_common)
b 3f /* Jump into the macro !! */
1: EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN)
bl save_nvgprs
+ ld r3, _MSR(r1)
+ TM_KERNEL_ENTRY(TM_CAUSE_FAC_UNAV)
RECONCILE_IRQ_STATE(r10, r11)
addi r3,r1,STACK_FRAME_OVERHEAD
bl program_check_exception
@@ -1738,7 +1741,9 @@ do_hash_page:
/* Here we have a page fault that hash_page can't handle. */
handle_page_fault:
-11: andis. r0,r4,DSISR_DABRMATCH@h
+11: TM_KERNEL_ENTRY(TM_CAUSE_TLBI)
+ ld r4,_DSISR(r1)
+ andis. r0,r4,DSISR_DABRMATCH@h
bne- handle_dabr_fault
ld r4,_DAR(r1)
ld r5,_DSISR(r1)
@@ -1769,6 +1774,8 @@ handle_dabr_fault:
*/
13: bl save_nvgprs
mr r5,r3
+ TM_KERNEL_ENTRY(TM_CAUSE_TLBI)
+ REST_GPR(3,r1)
addi r3,r1,STACK_FRAME_OVERHEAD
ld r4,_DAR(r1)
bl low_hash_fault
@@ -1783,7 +1790,8 @@ handle_dabr_fault:
* the access, or panic if there isn't a handler.
*/
77: bl save_nvgprs
- mr r4,r3
+ TM_KERNEL_ENTRY(TM_CAUSE_TLBI)
+ ld r4,_DAR(r1)
addi r3,r1,STACK_FRAME_OVERHEAD
li r5,SIGSEGV
bl bad_page_fault
--
2.19.0
next prev parent reply other threads:[~2018-09-12 19:40 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-12 19:40 [RFC PATCH 00/11] New TM Model Breno Leitao
2018-09-12 19:40 ` Breno Leitao [this message]
2018-09-18 1:31 ` [RFC PATCH 01/11] powerpc/tm: Reclaim transaction on kernel entry Michael Neuling
2018-09-27 20:28 ` Breno Leitao
2018-09-27 20:28 ` Breno Leitao
2018-09-12 19:40 ` [RFC PATCH 02/11] powerpc/tm: Reclaim on unavailable exception Breno Leitao
2018-09-12 19:40 ` [RFC PATCH 03/11] powerpc/tm: Recheckpoint when exiting from kernel Breno Leitao
2018-09-12 19:40 ` [RFC PATCH 04/11] powerpc/tm: Always set TIF_RESTORE_TM on reclaim Breno Leitao
2018-09-12 19:40 ` [RFC PATCH 05/11] powerpc/tm: Function that updates the failure code Breno Leitao
2018-09-17 5:29 ` Michael Neuling
2018-09-18 1:29 ` Michael Neuling
2018-09-27 20:58 ` Breno Leitao
2018-09-28 5:27 ` Michael Neuling
2018-09-18 3:27 ` Michael Neuling
2018-09-12 19:40 ` [RFC PATCH 06/11] powerpc/tm: Refactor the __switch_to_tm code Breno Leitao
2018-09-18 4:04 ` Michael Neuling
2018-09-27 20:48 ` Breno Leitao
2018-09-12 19:40 ` [RFC PATCH 07/11] powerpc/tm: Do not recheckpoint at sigreturn Breno Leitao
2018-09-18 5:32 ` Michael Neuling
2018-09-12 19:40 ` [RFC PATCH 08/11] powerpc/tm: Do not reclaim on ptrace Breno Leitao
2018-09-18 5:36 ` Michael Neuling
2018-09-27 21:03 ` Breno Leitao
2018-09-28 5:36 ` Michael Neuling
2018-09-30 23:51 ` Breno Leitao
2018-10-01 0:34 ` Michael Neuling
2018-09-12 19:40 ` [RFC PATCH 09/11] powerpc/tm: Do not restore default DSCR Breno Leitao
2018-09-18 5:41 ` Michael Neuling
2018-09-27 20:51 ` Breno Leitao
2018-09-28 5:03 ` Michael Neuling
2018-09-12 19:40 ` [RFC PATCH 10/11] powerpc/tm: Set failure summary Breno Leitao
2018-09-18 5:50 ` Michael Neuling
2018-09-27 20:52 ` Breno Leitao
2018-09-28 5:17 ` Michael Neuling
2018-09-12 19:40 ` [RFC PATCH 11/11] selftests/powerpc: Adapt the test Breno Leitao
2018-09-18 6:36 ` Michael Neuling
2018-09-27 20:57 ` Breno Leitao
2018-09-28 5:25 ` Michael Neuling
2018-10-01 17:50 ` Breno Leitao
2018-09-17 5:25 ` [RFC PATCH 00/11] New TM Model Michael Neuling
2018-09-27 20:13 ` Breno Leitao
2018-09-27 20:13 ` Breno Leitao
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=1536781219-13938-2-git-send-email-leitao@debian.org \
--to=leitao@debian.org \
--cc=gromero@linux.vnet.ibm.com \
--cc=ldufour@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@ozlabs.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).