interrupt entry wrappers
Subsystems (2)
Nicholas Piggin
reviewercover interrupt entry wrappers
This series moves more stuff to C, and fixes context tracking on 64s.
Nicholas Piggin (12):
powerpc/64s: move the last of the page fault handling logic to C
powerpc: remove arguments from interrupt handler functions
powerpc: interrupt handler wrapper functions
powerpc: add interrupt_cond_local_irq_enable helper powerpc/64s: Do context tracking in interrupt entry wrapper powerpc/64s: reconcile interrupts in C
powerpc/64: move account_stolen_time into its own function powerpc/64: entry cpu time accounting in C
powerpc: move NMI entry/exit code into wrapper powerpc/64s: move NMI soft-mask handling to C powerpc/64s: runlatch interrupt handling in C powerpc/64s: power4 nap fixup in C
arch/powerpc/Kconfig | 2 +- arch/powerpc/include/asm/asm-prototypes.h | 28 -- arch/powerpc/include/asm/bug.h | 2 +- arch/powerpc/include/asm/cputime.h | 15 + arch/powerpc/include/asm/hw_irq.h | 9 - arch/powerpc/include/asm/interrupt.h | 316 ++++++++++++++++++++++ arch/powerpc/include/asm/ppc_asm.h | 24 -- arch/powerpc/include/asm/processor.h | 1 + arch/powerpc/include/asm/thread_info.h | 6 + arch/powerpc/include/asm/time.h | 2 + arch/powerpc/kernel/dbell.c | 3 +- arch/powerpc/kernel/exceptions-64e.S | 3 - arch/powerpc/kernel/exceptions-64s.S | 307 ++------------------- arch/powerpc/kernel/idle_book3s.S | 4 + arch/powerpc/kernel/irq.c | 3 +- arch/powerpc/kernel/mce.c | 17 +- arch/powerpc/kernel/ptrace/ptrace.c | 4 - arch/powerpc/kernel/signal.c | 4 - arch/powerpc/kernel/syscall_64.c | 24 +- arch/powerpc/kernel/tau_6xx.c | 2 +- arch/powerpc/kernel/time.c | 3 +- arch/powerpc/kernel/traps.c | 198 ++++++-------- arch/powerpc/kernel/watchdog.c | 15 +- arch/powerpc/kvm/book3s_hv_builtin.c | 1 + arch/powerpc/mm/book3s64/hash_utils.c | 82 ++++-- arch/powerpc/mm/book3s64/slb.c | 12 +- arch/powerpc/mm/fault.c | 74 ++++- arch/powerpc/platforms/powernv/idle.c | 1 + 28 files changed, 608 insertions(+), 554 deletions(-) create mode 100644 arch/powerpc/include/asm/interrupt.h
Signature · 1 line
2.23.0
Nicholas Piggin
reviewerRFC PATCH 1/12 powerpc/64s: move the last of the page fault handling logic to C
The page fault handling still has some complex logic particularly around hash table handling, in asm. Implement this in C instead.
--- arch/powerpc/include/asm/bug.h | 1 + arch/powerpc/kernel/exceptions-64s.S | 131 +++++--------------------- arch/powerpc/mm/book3s64/hash_utils.c | 77 +++++++++------ arch/powerpc/mm/fault.c | 55 ++++++++++- 4 files changed, 124 insertions(+), 140 deletions(-)
arch/powerpc/include/asm/bug.h +1 -0
@@ -112,6 +112,7 @@struct pt_regs ;extern int do_page_fault (struct pt_regs *,unsigned long ,unsigned long ); +extern int hash__do_page_fault (struct pt_regs *,unsigned long ,unsigned long );extern void bad_page_fault (struct pt_regs *,unsigned long ,int );extern void _exception (int ,struct pt_regs *,int ,unsigned long );extern void _exception_pkey (struct pt_regs *,unsigned long ,int );
arch/powerpc/kernel/exceptions-64s.S +22 -109
161 lines not on this page · raw message
arch/powerpc/mm/book3s64/hash_utils.c +49 -28
105 lines not on this page · raw message
arch/powerpc/mm/fault.c +52 -3
71 lines not on this page · raw message
Signature · 1 line
2.23.0
Nicholas Piggin
reviewerRFC PATCH 2/12 powerpc: remove arguments from interrupt handler functions
In reply to Nicholas PigginMake interrupt handlers all just take the pt_regs * argument and load DAR/DSISR etc from that. Make those that return a value return long.
This is done to make the function signatures match more closely, which will help with a future patch to add wrappers. Explicit arguments could be re-added for performance in future but that would require more complex wrapper macros.
--- arch/powerpc/include/asm/asm-prototypes.h | 4 ++-- arch/powerpc/include/asm/bug.h | 4 ++-- arch/powerpc/kernel/exceptions-64e.S | 2 -- arch/powerpc/kernel/exceptions-64s.S | 14 ++------------ arch/powerpc/mm/book3s64/hash_utils.c | 8 +++++--- arch/powerpc/mm/book3s64/slb.c | 11 +++++++---- arch/powerpc/mm/fault.c | 16 +++++++++------- 7 files changed, 27 insertions(+), 32 deletions(-)
arch/powerpc/include/asm/asm-prototypes.h +2 -2
@@ -81,8 +81,8 @@ void kernel_bad_stack(struct pt_regs *regs);void system_reset_exception (struct pt_regs *regs);void machine_check_exception (struct pt_regs *regs);void emulation_assist_interrupt (struct pt_regs *regs); -long do_slb_fault (struct pt_regs *regs,unsigned long ea); -void do_bad_slb_fault (struct pt_regs *regs,unsigned long ea,long err); +long do_slb_fault (struct pt_regs *regs); +void do_bad_slb_fault (struct pt_regs *regs);/* signals, syscalls and interrupts */ long sys_swapcontext(struct ucontext __user *old_ctx,
arch/powerpc/include/asm/bug.h +2 -2
@@ -111,8 +111,8 @@#ifndef __ASSEMBLY__struct pt_regs ; -extern int do_page_fault (struct pt_regs *,unsigned long ,unsigned long ); -extern int hash__do_page_fault (struct pt_regs *,unsigned long ,unsigned long ); +extern long do_page_fault (struct pt_regs *); +extern long hash__do_page_fault (struct pt_regs *);extern void bad_page_fault (struct pt_regs *,unsigned long ,int );extern void _exception (int ,struct pt_regs *,int ,unsigned long );extern void _exception_pkey (struct pt_regs *,unsigned long ,int );
arch/powerpc/kernel/exceptions-64e.S +0 -2
@@ -1012,8 +1012,6 @@ storage_fault_common: std r14,_DAR(r1) std r15,_DSISR(r1) addi r3,r1,STACK_FRAME_OVERHEAD - mr r4,r14 - mr r5,r15 ld r14,PACA_EXGEN+EX_R14(r13) ld r15,PACA_EXGEN+EX_R15(r13) bl do_page_fault
arch/powerpc/kernel/exceptions-64s.S +2 -12
@@ -1437,8 +1437,6 @@ EXC_VIRT_BEGIN(data_access, 0x4300, 0x80) EXC_VIRT_END(data_access, 0x4300, 0x80) EXC_COMMON_BEGIN(data_access_common) GEN_COMMON data_access - ld r4,_DAR(r1) - ld r5,_DSISR(r1) addi r3,r1,STACK_FRAME_OVERHEAD BEGIN_MMU_FTR_SECTION bl do_hash_fault
@@ -1491,10 +1489,9 @@ EXC_VIRT_BEGIN(data_access_slb, 0x4380, 0x80) EXC_VIRT_END(data_access_slb, 0x4380, 0x80) EXC_COMMON_BEGIN(data_access_slb_common) GEN_COMMON data_access_slb - ld r4,_DAR(r1) - addi r3,r1,STACK_FRAME_OVERHEAD BEGIN_MMU_FTR_SECTION /* HPT case, do SLB fault */ + addi r3,r1,STACK_FRAME_OVERHEAD bl do_slb_fault cmpdi r3,0 bne- 1f
@@ -1506,8 +1503,6 @@ MMU_FTR_SECTION_ELSE ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) std r3,RESULT(r1) RECONCILE_IRQ_STATE(r10, r11) - ld r4,_DAR(r1) - ld r5,RESULT(r1) addi r3,r1,STACK_FRAME_OVERHEAD bl do_bad_slb_fault b interrupt_return
@@ -1542,8 +1537,6 @@ EXC_VIRT_BEGIN(instruction_access, 0x4400, 0x80) EXC_VIRT_END(instruction_access, 0x4400, 0x80) EXC_COMMON_BEGIN(instruction_access_common) GEN_COMMON instruction_access - ld r4,_DAR(r1) - ld r5,_DSISR(r1) addi r3,r1,STACK_FRAME_OVERHEAD BEGIN_MMU_FTR_SECTION bl do_hash_fault
@@ -1587,10 +1580,9 @@ EXC_VIRT_BEGIN(instruction_access_slb, 0x4480, 0x80) EXC_VIRT_END(instruction_access_slb, 0x4480, 0x80) EXC_COMMON_BEGIN(instruction_access_slb_common) GEN_COMMON instruction_access_slb - ld r4,_DAR(r1) - addi r3,r1,STACK_FRAME_OVERHEAD BEGIN_MMU_FTR_SECTION /* HPT case, do SLB fault */ + addi r3,r1,STACK_FRAME_OVERHEAD bl do_slb_fault cmpdi r3,0 bne- 1f
@@ -1602,8 +1594,6 @@ MMU_FTR_SECTION_ELSE ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) std r3,RESULT(r1) RECONCILE_IRQ_STATE(r10, r11) - ld r4,_DAR(r1) - ld r5,RESULT(r1) addi r3,r1,STACK_FRAME_OVERHEAD bl do_bad_slb_fault b interrupt_return
arch/powerpc/mm/book3s64/hash_utils.c +5 -3
@@ -1500,13 +1500,15 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap, }EXPORT_SYMBOL_GPL (hash_page); -int do_hash_fault (struct pt_regs *regs,unsigned long ea,unsigned long dsisr) +long do_hash_fault (struct pt_regs *regs) { +unsigned long ea = regs->dar; +unsigned long dsisr = regs->dsisr;unsigned long access = _PAGE_PRESENT | _PAGE_READ;unsigned long flags =0 ;struct mm_struct *mm;unsigned int region_id; -int err; +long err;if (unlikely (dsisr & (DSISR_BAD_FAULT_64S |DSISR_DABRMATCH |DSISR_KEYFAULT ))) goto _do_page_fault;
@@ -1570,7 +1572,7 @@ int do_hash_fault(struct pt_regs *regs, unsigned long ea, unsigned long dsisr) }else if (err) { _do_page_fault: - err =hash__do_page_fault (regs, ea, dsisr); + err =hash__do_page_fault (regs); }return err;
arch/powerpc/mm/book3s64/slb.c +7 -4
@@ -837,8 +837,9 @@ static long slb_allocate_user(struct mm_struct *mm, unsigned long ea)return slb_insert_entry (ea, context, flags, ssize, false); } -long do_slb_fault (struct pt_regs *regs,unsigned long ea) +long do_slb_fault (struct pt_regs *regs) { +unsigned long ea = regs->dar;unsigned long id =get_region_id (ea);/* IRQs are not reconciled here, so can't check irqs_disabled */
@@ -889,13 +890,15 @@ long do_slb_fault(struct pt_regs *regs, unsigned long ea) } } -void do_bad_slb_fault (struct pt_regs *regs,unsigned long ea,long err) +void do_bad_slb_fault (struct pt_regs *regs) { +int err = regs->result; +if (err == -EFAULT ) {if (user_mode (regs)) -_exception (SIGSEGV , regs,SEGV_BNDERR , ea); +_exception (SIGSEGV , regs,SEGV_BNDERR , regs->dar);else -bad_page_fault (regs, ea,SIGSEGV ); +bad_page_fault (regs, regs->dar,SIGSEGV ); }else if (err == -EINVAL ) {unrecoverable_exception (regs); }else {
arch/powerpc/mm/fault.c +9 -7
@@ -547,11 +547,12 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, }NOKPROBE_SYMBOL (__do_page_fault); -int do_page_fault (struct pt_regs *regs,unsigned long address, -unsigned long error_code) +long do_page_fault (struct pt_regs *regs) {enum ctx_state prev_state =exception_enter (); -int err; +unsigned long address = regs->dar; +unsigned long error_code = regs->dsisr; +long err; err =__do_page_fault (regs, address, error_code);
@@ -578,11 +579,12 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,NOKPROBE_SYMBOL (do_page_fault);#ifdef CONFIG_PPC_BOOK3S_64 -/* Same as do_page_fault but interrupt entry has already run in do_hash_fault */ -int hash__do_page_fault (struct pt_regs *regs,unsigned long address, -unsigned long error_code) +/* Same as do_page_fault but no interrupt entry */ +long hash__do_page_fault (struct pt_regs *regs) { -int err; +unsigned long address = regs->dar; +unsigned long error_code = regs->dsisr; +long err; err =__do_page_fault (regs, address, error_code);if (unlikely (err)) {
Signature · 1 line
2.23.0
Re: [RFC PATCH 02/12] powerpc: remove arguments from interrupt handler functions
Le 05/09/2020 à 19:43, Nicholas Piggin a écrit :
Quoted 2 lines
Make interrupt handlers all just take the
pt_regs* argument and load DAR/DSISR etc from that. Make those that return a value return long.
I like this, it will likely simplify a bit the VMAP_STACK mess.
Not sure it is that easy. My board is stuck after the start of init.
On the 8xx, on Instruction TLB Error exception, we do
andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */
On book3s/32, on ISI exception we do:
andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */
On 40x and bookE, on ISI exception we do:
li r5,0 /* Pass zero as arg3 */
And regs->dsisr will just contain nothing
So it means we should at least write back r5 into regs->dsisr from there ? The performance impact should be minimal as we already write _DAR so the cache line should already be in the cache.
A hacky 'stw r5, _DSISR(r1)' in handle_page_fault() does the trick, allthough we don't want to do it for both ISI and DSI at the end, so you'll have to do it in every head_xxx.S
While you are at it, it would probably also make sense to do remove the address param of bad_page_fault(), there is no point in loading back regs->dar in handle_page_fault() and machine_check_8xx() and alignment_exception(), just read regs->dar in bad_page_fault()
The case of do_break() should also be looked at.
Why changing return code from int to long ?
Christophe
Quoted 22 lines
This is done to make the function signatures match more closely, which will help with a future patch to add wrappers. Explicit arguments could be re-added for performance in future but that would require more complex wrapper macros.
Signed-off-by Nicholas Piggin <[email protected]>--- arch/powerpc/include/asm/asm-prototypes.h | 4 ++-- arch/powerpc/include/asm/bug.h | 4 ++-- arch/powerpc/kernel/exceptions-64e.S | 2 -- arch/powerpc/kernel/exceptions-64s.S | 14 ++------------ arch/powerpc/mm/book3s64/hash_utils.c | 8 +++++--- arch/powerpc/mm/book3s64/slb.c | 11 +++++++---- arch/powerpc/mm/fault.c | 16 +++++++++------- 7 files changed, 27 insertions(+), 32 deletions(-)arch/powerpc/include/asm/bug.h +0
-0
arch/powerpc/include/asm/bug.h line 115
Quoted 7 lines
arch/powerpc/include/asm/bug.h +2
-2@@ -111,8 +111,8 @@#ifndef __ASSEMBLY__struct pt_regs ; -extern int do_page_fault (struct pt_regs *,unsigned long ,unsigned long ); -extern int hash__do_page_fault (struct pt_regs *,unsigned long ,unsigned long ); +extern long do_page_fault (struct pt_regs *); +extern long hash__do_page_fault (struct pt_regs *);
no extern
arch/powerpc/include/asm/bug.h line 118
Quoted 3 lines
arch/powerpc/include/asm/bug.h +0
-0extern void bad_page_fault (struct pt_regs *,unsigned long ,int );extern void _exception (int ,struct pt_regs *,int ,unsigned long );extern void _exception_pkey (struct pt_regs *,unsigned long ,int );
Christophe
Re: [RFC PATCH 02/12] powerpc: remove arguments from interrupt handler functions
Quoted 23 lines · Christophe Leroy
Quoted 2 lines · Nicholas Piggin
Make interrupt handlers all just take the
pt_regs* argument and load DAR/DSISR etc from that. Make those that return a value return long.I like this, it will likely simplify a bit the
VMAP_STACKmess.Not sure it is that easy. My board is stuck after the start of init.
On the 8xx, on Instruction TLB Error exception, we do
andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */On book3s/32, on ISI exception we do:
andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */On 40x and bookE, on ISI exception we do:
li r5,0 /* Pass zero as arg3 */And
regs->dsisrwill just contain nothing
Quoted 7 lines
So it means we should at least write back r5 into
regs->dsisrfrom there ? The performance impact should be minimal as we already write_DARso the cache line should already be in the cache.A hacky 'stw r5,
_DSISR(r1)' inhandle_page_fault()does the trick, allthough we don't want to do it for both ISI and DSI at the end, so you'll have to do it in everyhead_xxx.S
To get you series build and work, I did the following hacks:
(quoted diff) +0 -0
b/arch/powerpc/include/asm/interrupt.h
index acfcc7d5779b..c11045d3113a 100644
arch/powerpc/include/asm/interrupt.h +0 -0
@@ -93,7 +93,9 @@ static inline void interrupt_nmi_exit_prepare(struct
pt_regs *regs, struct inter
{
nmi_exit();
+#ifdef CONFIG_PPC64
this_cpu_set_ftrace_enabled(state->ftrace_enabled);
+#endif
#ifdef CONFIG_PPC_BOOK3S_64
/* Check we didn't change the pending interrupt mask. */
(quoted diff) +0 -0
b/arch/powerpc/kernel/entry_32.S
index f4d0af8e1136..66f7adbe1076 100644
arch/powerpc/kernel/entry_32.S +1 -0
@@ -663,6 +663,7 @@ ppc_swapcontext: */ .globl handle_page_fault handle_page_fault: + stw r5,_DSISR(r1) addi r3,r1,STACK_FRAME_OVERHEAD #ifdef CONFIG_PPC_BOOK3S_32 andis. r0,r5,DSISR_DABRMATCH@h
---
Christophe
Nicholas Piggin
reviewerRe: [RFC PATCH 02/12] powerpc: remove arguments from interrupt handler functions
Excerpts from Christophe Leroy's message of September 7, 2020 9:34 pm:
Quoted 28 lines · Christophe Leroy
Quoted 27 lines · Nicholas Piggin
Quoted 2 lines
Make interrupt handlers all just take the
pt_regs* argument and load DAR/DSISR etc from that. Make those that return a value return long.I like this, it will likely simplify a bit the
VMAP_STACKmess.Not sure it is that easy. My board is stuck after the start of init.
On the 8xx, on Instruction TLB Error exception, we do
andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */On book3s/32, on ISI exception we do:
andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */On 40x and bookE, on ISI exception we do:
li r5,0 /* Pass zero as arg3 */And
regs->dsisrwill just contain nothingSo it means we should at least write back r5 into
regs->dsisrfrom there ? The performance impact should be minimal as we already write_DARso the cache line should already be in the cache.
Quoted 5 lines
Quoted 3 lines
A hacky 'stw r5,
_DSISR(r1)' inhandle_page_fault()does the trick, allthough we don't want to do it for both ISI and DSI at the end, so you'll have to do it in everyhead_xxx.STo get you series build and work, I did the following hacks:
Great, thanks for this.
arch/powerpc/include/asm/interrupt.h
Quoted 13 lines
arch/powerpc/include/asm/interrupt.h +0
-0@@ -93,7 +93,9 @@ static inline void interrupt_nmi_exit_prepare(struct
pt_regs*regs, struct inter
{arch/powerpc/include/asm/interrupt.h +2
-0nmi_exit (); +#ifdef CONFIG_PPC64 this_cpu_set_ftrace_enabled (state->ftrace_enabled); +#endif
This seems okay, not a hack.
Quoted 8 lines
#ifdef
CONFIG_PPC_BOOK3S_64arch/powerpc/include/asm/interrupt.h +0
-0/* Check we didn't change the pending interrupt mask. */ arch/powerpc/kernel/entry_32.S +0
-0
arch/powerpc/kernel/entry_32.S ppc_swapcontext: · line 669
Quoted 7 lines
arch/powerpc/kernel/entry_32.S +1
-0@@ -663,6 +663,7 @@ ppc_swapcontext: */ .globl handle_page_fault handle_page_fault: + stw r5,_DSISR(r1) addi r3,r1,STACK_FRAME_OVERHEAD #ifdef CONFIG_PPC_BOOK3S_32 andis. r0,r5,DSISR_DABRMATCH@h
Is this what you want to do for 32, or do you want to seperate ISI and DSI sides?
Thanks,
Nick
Re: [RFC PATCH 02/12] powerpc: remove arguments from interrupt handler functions
Le 08/09/2020 à 09:48, Nicholas Piggin a écrit :
Quoted 63 lines
Excerpts from Christophe Leroy's message of September 7, 2020 9:34 pm:
Quoted 28 lines · Christophe Leroy
Quoted 27 lines · Nicholas Piggin
Quoted 2 lines
Make interrupt handlers all just take the
pt_regs* argument and load DAR/DSISR etc from that. Make those that return a value return long.I like this, it will likely simplify a bit the
VMAP_STACKmess.Not sure it is that easy. My board is stuck after the start of init.
On the 8xx, on Instruction TLB Error exception, we do
andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */On book3s/32, on ISI exception we do:
andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */On 40x and bookE, on ISI exception we do:
li r5,0 /* Pass zero as arg3 */And
regs->dsisrwill just contain nothingSo it means we should at least write back r5 into
regs->dsisrfrom there ? The performance impact should be minimal as we already write_DARso the cache line should already be in the cache.Quoted 5 lines
Quoted 3 lines
A hacky 'stw r5,
_DSISR(r1)' inhandle_page_fault()does the trick, allthough we don't want to do it for both ISI and DSI at the end, so you'll have to do it in everyhead_xxx.STo get you series build and work, I did the following hacks:
Great, thanks for this.
arch/powerpc/include/asm/interrupt.h
Quoted 13 lines
arch/powerpc/include/asm/interrupt.h +0
-0@@ -93,7 +93,9 @@ static inline void interrupt_nmi_exit_prepare(struct
pt_regs*regs, struct inter
{
nmi_exit();arch/powerpc/include/asm/interrupt.h +2
-0+#ifdef CONFIG_PPC64 this_cpu_set_ftrace_enabled (state->ftrace_enabled); +#endif This seems okay, not a hack.
Quoted 10 lines
#ifdef
CONFIG_PPC_BOOK3S_64
/* Check we didn't change the pending interrupt mask. */arch/powerpc/kernel/entry_32.S +0
-0@@ -663,6 +663,7 @@ ppc_swapcontext: */ .globl handle_page_fault
Quoted 9 lines
arch/powerpc/kernel/entry_32.S ppc_swapcontext: · line 669
Quoted 5 lines
arch/powerpc/kernel/entry_32.S +1
-0handle_page_fault: + stw r5,_DSISR(r1) addi r3,r1,STACK_FRAME_OVERHEAD #ifdef CONFIG_PPC_BOOK3S_32 andis. r0,r5,DSISR_DABRMATCH@hIs this what you want to do for 32, or do you want to seperate ISI and DSI sides?
No I think we want to separate ISI and DSI sides.
And I think the specific filtering done in ISI could be done in do_page_fault() in C. Ok, it would make a special handling for is_exec but there are already several places where the behaviour differs based on is_exec.
The only thing we need to keep at ASM level is the DABR stuff for calling do_break() in handle_page_fault(), because it is used to decide whether full regs are saved or not. But it could be a test done earlier in the prolog and the result being kept in one of the CR bits.
That way we can avoid reloading dsisr and dar from the stack, especially for VMAP stack as they are saved quite early in the prolog.
Or we can take them out of the thread struct and save them in the stack a little latter in the prolog, but then we have to keep the RI bit a bit cleared longer.
While we are playing with do_page_fault(), did you have a look at the series I sent https://patchwork.ozlabs.org/project/linuxppc-dev/patch/7baae4086cbb9ffb08c933b065ff7d29dbc03dd6.1596734104.git.christophe.leroy@csgroup.eu/
Christophe
Re: [RFC PATCH 02/12] powerpc: remove arguments from interrupt handler functions
Le 08/09/2020 à 10:29, Christophe Leroy a écrit :
Quoted 75 lines
Le 08/09/2020 à 09:48, Nicholas Piggin a écrit :
Quoted 62 lines
Excerpts from Christophe Leroy's message of September 7, 2020 9:34 pm:
Quoted 28 lines · Christophe Leroy
Quoted 27 lines · Nicholas Piggin
Quoted 2 lines
Make interrupt handlers all just take the
pt_regs* argument and load DAR/DSISR etc from that. Make those that return a value return long.I like this, it will likely simplify a bit the
VMAP_STACKmess.Not sure it is that easy. My board is stuck after the start of init.
On the 8xx, on Instruction TLB Error exception, we do
andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */
On book3s/32, on ISI exception we do:
andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */On 40x and bookE, on ISI exception we do:
li r5,0 /* Pass zero as arg3 */And
regs->dsisrwill just contain nothingSo it means we should at least write back r5 into
regs->dsisrfrom there ? The performance impact should be minimal as we already write_DARso the cache line should already be in the cache.Quoted 5 lines
Quoted 3 lines
A hacky 'stw r5,
_DSISR(r1)' inhandle_page_fault()does the trick, allthough we don't want to do it for both ISI and DSI at the end, so you'll have to do it in everyhead_xxx.STo get you series build and work, I did the following hacks:
Great, thanks for this.
Quoted 6 lines
arch/powerpc/include/asm/interrupt.h +0
-0@@ -93,7 +93,9 @@ static inline void interrupt_nmi_exit_prepare(structQuoted 6 lines
pt_regs*regs, struct inter
{
nmi_exit();
+#ifdefCONFIG_PPC64this_cpu_set_ftrace_enabled(state->ftrace_enabled); +#endifThis seems okay, not a hack.
Quoted 10 lines
#ifdef
CONFIG_PPC_BOOK3S_64
/* Check we didn't change the pending interrupt mask. */arch/powerpc/kernel/entry_32.S +0
-0@@ -663,6 +663,7 @@ ppc_swapcontext: */.globl
handle_page_faultQuoted 9 lines
Quoted 5 lines
handle_page_fault:
+ stw r5,_DSISR(r1)
addi r3,r1,STACK_FRAME_OVERHEAD
#ifdefCONFIG_PPC_BOOK3S_32
andis. r0,r5,DSISR_DABRMATCH@hIs this what you want to do for 32, or do you want to seperate ISI and DSI sides?
Quoted 4 lines
No I think we want to separate ISI and DSI sides.
And I think the specific filtering done in ISI could be done in
do_page_fault()in C. Ok, it would make a special handling foris_execbut there are already several places where the behaviour differs based onis_exec.
The only thing we need to keep at ASM level is the DABR stuff for callingdo_break()inhandle_page_fault(), because it is used to decide whether full regs are saved or not. But it could be a test done earlier in the prolog and the result being kept in one of the CR bits.
Looking at it once more, I'm wondering whether we really need a full regs.
Before commit https://github.com/linuxppc/linux/commit/d300627c6a53693fb01479b59b0cdd293761b1fa#diff-f9658f412252f3bb3093e0a95b37f3ac do_break() was called from do_page_fault() without a full regs set.
Christophe
Nicholas Piggin
reviewerRe: [RFC PATCH 02/12] powerpc: remove arguments from interrupt handler functions
In reply to Christophe LeroyExcerpts from Christophe Leroy's message of September 7, 2020 7:20 pm:
Quoted 19 lines
Le 05/09/2020 à 19:43, Nicholas Piggin a écrit :
Quoted 2 lines
Make interrupt handlers all just take the
pt_regs* argument and load DAR/DSISR etc from that. Make those that return a value return long.I like this, it will likely simplify a bit the
VMAP_STACKmess.Not sure it is that easy. My board is stuck after the start of init.
On the 8xx, on Instruction TLB Error exception, we do
andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */On book3s/32, on ISI exception we do:
andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */On 40x and bookE, on ISI exception we do:
Quoted 8 lines
li r5,0 /* Pass zero as arg3 */And
regs->dsisrwill just contain nothingSo it means we should at least write back r5 into
regs->dsisrfrom there ? The performance impact should be minimal as we already write_DARso the cache line should already be in the cache.
Yes, I think that would be required. Sorry I didn't look closely at 32 bit.
Quoted 11 lines
A hacky 'stw r5,
_DSISR(r1)' inhandle_page_fault()does the trick, allthough we don't want to do it for both ISI and DSI at the end, so you'll have to do it in everyhead_xxx.SWhile you are at it, it would probably also make sense to do remove the address param of
bad_page_fault(), there is no point in loading backregs->darinhandle_page_fault()andmachine_check_8xx()andalignment_exception(), just readregs->darinbad_page_fault()The case of
do_break()should also be looked at.
Yeah that's valid, I didn't do that because bad_page_fault was also being called from asm, but an incremental patch should be quite easy.
Quoted 1 line
Why changing return code from int to long ?
Oh it's to make the next patch work without any changes to function prototypes. Some handlers are returning int, others long. There is no reason not to just return long AFAIKS so that's what I changed to.
Thanks,
Nick
Nicholas Piggin
reviewerRFC PATCH 3/12 powerpc: interrupt handler wrapper functions
In reply to Nicholas PigginAdd wrapper functions (derived from x86 macros) for interrupt handler functions. This allows interrupt entry code to be written in C.
--- arch/powerpc/include/asm/asm-prototypes.h | 28 --- arch/powerpc/include/asm/bug.h | 1 - arch/powerpc/include/asm/hw_irq.h | 9 - arch/powerpc/include/asm/interrupt.h | 201 ++++++++++++++++++++++ arch/powerpc/include/asm/time.h | 2 + arch/powerpc/kernel/dbell.c | 3 +- arch/powerpc/kernel/exceptions-64s.S | 8 +- arch/powerpc/kernel/irq.c | 3 +- arch/powerpc/kernel/mce.c | 5 +- arch/powerpc/kernel/tau_6xx.c | 2 +- arch/powerpc/kernel/time.c | 3 +- arch/powerpc/kernel/traps.c | 78 ++++++--- arch/powerpc/kernel/watchdog.c | 7 +- arch/powerpc/kvm/book3s_hv_builtin.c | 1 + arch/powerpc/mm/book3s64/hash_utils.c | 3 +- arch/powerpc/mm/book3s64/slb.c | 5 +- arch/powerpc/mm/fault.c | 10 +- arch/powerpc/platforms/powernv/idle.c | 1 + 18 files changed, 290 insertions(+), 80 deletions(-) create mode 100644 arch/powerpc/include/asm/interrupt.h
arch/powerpc/include/asm/asm-prototypes.h +0 -28
@@ -56,34 +56,6 @@ int exit_vmx_usercopy(void);int enter_vmx_ops (void );void *exit_vmx_ops (void *dest); -/* Traps */ -long machine_check_early (struct pt_regs *regs); -long hmi_exception_realmode (struct pt_regs *regs); -void SMIException (struct pt_regs *regs); -void handle_hmi_exception (struct pt_regs *regs); -void instruction_breakpoint_exception (struct pt_regs *regs); -void RunModeException (struct pt_regs *regs); -void single_step_exception (struct pt_regs *regs); -void program_check_exception (struct pt_regs *regs); -void alignment_exception (struct pt_regs *regs); -void StackOverflow (struct pt_regs *regs); -void kernel_fp_unavailable_exception (struct pt_regs *regs); -void altivec_unavailable_exception (struct pt_regs *regs); -void vsx_unavailable_exception (struct pt_regs *regs); -void fp_unavailable_tm (struct pt_regs *regs); -void altivec_unavailable_tm (struct pt_regs *regs); -void vsx_unavailable_tm (struct pt_regs *regs); -void facility_unavailable_exception (struct pt_regs *regs); -void TAUException (struct pt_regs *regs); -void altivec_assist_exception (struct pt_regs *regs); -void unrecoverable_exception (struct pt_regs *regs); -void kernel_bad_stack (struct pt_regs *regs); -void system_reset_exception (struct pt_regs *regs); -void machine_check_exception (struct pt_regs *regs); -void emulation_assist_interrupt (struct pt_regs *regs); -long do_slb_fault (struct pt_regs *regs); -void do_bad_slb_fault (struct pt_regs *regs); -/* signals, syscalls and interrupts */ long sys_swapcontext(struct ucontext __user *old_ctx, struct ucontext __user *new_ctx,
arch/powerpc/include/asm/bug.h +0 -1
@@ -111,7 +111,6 @@#ifndef __ASSEMBLY__struct pt_regs ; -extern long do_page_fault (struct pt_regs *);extern long hash__do_page_fault (struct pt_regs *);extern void bad_page_fault (struct pt_regs *,unsigned long ,int );extern void _exception (int ,struct pt_regs *,int ,unsigned long );
arch/powerpc/include/asm/hw_irq.h +0 -9
@@ -51,15 +51,6 @@#ifndef __ASSEMBLY__ -extern void replay_system_reset (void ); -extern void replay_soft_interrupts (void ); - -extern void timer_interrupt (struct pt_regs *); -extern void timer_broadcast_interrupt (void ); -extern void performance_monitor_exception (struct pt_regs *regs); -extern void WatchdogException (struct pt_regs *regs); -extern void unknown_exception (struct pt_regs *regs); -#ifdef CONFIG_PPC64 #include <asm/paca.h>
arch/powerpc/include/asm/interrupt.h new file +201 -0
201 lines not on this page · raw message
arch/powerpc/include/asm/time.h +2 -0
@@ -181,6 +181,8 @@ DECLARE_PER_CPU(u64, decrementers_next_tb);/* Convert timebase ticks to nanoseconds */ unsigned long long tb_to_ns (unsigned long long tb_ticks); +void timer_broadcast_interrupt (void ); +/* SPLPAR */ void accumulate_stolen_time (void );
arch/powerpc/kernel/dbell.c +2 -1
@@ -12,13 +12,14 @@#include <linux/hardirq.h> #include <asm/dbell.h> +#include <asm/interrupt.h> #include <asm/irq_regs.h> #include <asm/kvm_ppc.h> #include <asm/trace.h> #ifdef CONFIG_SMP -void doorbell_exception (struct pt_regs *regs) +DEFINE_INTERRUPT_HANDLER_ASYNC (doorbell_exception) {struct pt_regs *old_regs =set_irq_regs (regs);
arch/powerpc/kernel/exceptions-64s.S +3 -5
@@ -1922,7 +1922,7 @@ EXC_COMMON_BEGIN(doorbell_super_common) #ifdef CONFIG_PPC_DOORBELL bl doorbell_exception #else - bl unknown_exception + bl unknown_async_exception #endif b interrupt_return
@@ -2135,9 +2135,7 @@ EXC_COMMON_BEGIN(h_data_storage_common) GEN_COMMON h_data_storage addi r3,r1,STACK_FRAME_OVERHEAD BEGIN_MMU_FTR_SECTION - ld r4,_DAR(r1) - li r5,SIGSEGV - bl bad_page_fault + bl do_bad_page_fault MMU_FTR_SECTION_ELSE bl unknown_exception ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_TYPE_RADIX)
@@ -2310,7 +2308,7 @@ EXC_COMMON_BEGIN(h_doorbell_common) #ifdef CONFIG_PPC_DOORBELL bl doorbell_exception #else - bl unknown_exception + bl unknown_async_exception #endif b interrupt_return
arch/powerpc/kernel/irq.c +2 -1
@@ -54,6 +54,7 @@#include <linux/pgtable.h> #include <linux/uaccess.h> +#include <asm/interrupt.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/cache.h>
@@ -725,7 +726,7 @@ void __do_irq(struct pt_regs *regs)irq_exit (); } -void do_IRQ (struct pt_regs *regs) +DEFINE_INTERRUPT_HANDLER_ASYNC (do_IRQ) {struct pt_regs *old_regs =set_irq_regs (regs);void *cursp, *irqsp, *sirqsp;
arch/powerpc/kernel/mce.c +3 -2
@@ -18,6 +18,7 @@#include <linux/extable.h> #include <linux/ftrace.h> +#include <asm/interrupt.h> #include <asm/machdep.h> #include <asm/mce.h> #include <asm/nmi.h>
@@ -588,7 +589,7 @@ EXPORT_SYMBOL_GPL(machine_check_print_event_info);* * regs->nip and regs->msr contains srr0 and ssr1. */ -long notrace machine_check_early (struct pt_regs *regs) +DEFINE_INTERRUPT_HANDLER_NMI (machine_check_early) {long handled =0 ;bool nested =in_nmi ();
@@ -723,7 +724,7 @@ long hmi_handle_debugtrig(struct pt_regs *regs)/* * Return values: */ -long hmi_exception_realmode (struct pt_regs *regs) +DEFINE_INTERRUPT_HANDLER_NMI (hmi_exception_realmode) {int ret;
arch/powerpc/kernel/tau_6xx.c +1 -1
@@ -124,7 +124,7 @@ static void TAUupdate(int cpu)* with interrupts disabled */ -void TAUException (struct pt_regs * regs) +DEFINE_INTERRUPT_HANDLER (TAUException)/* XXX async? */ {int cpu =smp_processor_id ();
arch/powerpc/kernel/time.c +2 -1
@@ -56,6 +56,7 @@#include <linux/processor.h> #include <asm/trace.h> +#include <asm/interrupt.h> #include <asm/io.h> #include <asm/nvram.h> #include <asm/cache.h>
@@ -564,7 +565,7 @@ void arch_irq_work_raise(void)* timer_interrupt - gets called when the decrementer overflows, * with interrupts disabled. */ -void timer_interrupt (struct pt_regs *regs) +DEFINE_INTERRUPT_HANDLER_ASYNC (timer_interrupt) {struct clock_event_device *evt =this_cpu_ptr (&decrementers);u64 *next_tb =this_cpu_ptr (&decrementers_next_tb);
arch/powerpc/kernel/traps.c +53 -25
245 lines not on this page · raw message
arch/powerpc/kernel/watchdog.c +5 -2
@@ -26,6 +26,7 @@#include <linux/delay.h> #include <linux/smp.h> +#include <asm/interrupt.h> #include <asm/paca.h> /*
@@ -247,14 +248,14 @@ static void watchdog_timer_interrupt(int cpu)watchdog_smp_panic (cpu, tb); } -void soft_nmi_interrupt (struct pt_regs *regs) +DEFINE_INTERRUPT_HANDLER_NMI (soft_nmi_interrupt) {unsigned long flags;int cpu =raw_smp_processor_id ();u64 tb;if (!cpumask_test_cpu (cpu, &wd_cpus_enabled)) -return ; +return 0 ;nmi_enter ();
@@ -291,6 +292,8 @@ void soft_nmi_interrupt(struct pt_regs *regs) out:nmi_exit (); + +return 0 ; }static enum hrtimer_restart watchdog_timer_fn (struct hrtimer *hrtimer)
arch/powerpc/kvm/book3s_hv_builtin.c +1 -0
@@ -17,6 +17,7 @@#include <asm/asm-prototypes.h> #include <asm/cputable.h> +#include <asm/interrupt.h> #include <asm/kvm_ppc.h> #include <asm/kvm_book3s.h> #include <asm/archrandom.h>
arch/powerpc/mm/book3s64/hash_utils.c +2 -1
@@ -38,6 +38,7 @@#include <linux/pgtable.h> #include <asm/debugfs.h> +#include <asm/interrupt.h> #include <asm/processor.h> #include <asm/mmu.h> #include <asm/mmu_context.h>
@@ -1500,7 +1501,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap, }EXPORT_SYMBOL_GPL (hash_page); -long do_hash_fault (struct pt_regs *regs) +DEFINE_INTERRUPT_HANDLER_RET (do_hash_fault) {unsigned long ea = regs->dar;unsigned long dsisr = regs->dsisr;
arch/powerpc/mm/book3s64/slb.c +3 -2
@@ -10,6 +10,7 @@*/ #include <asm/asm-prototypes.h> +#include <asm/interrupt.h> #include <asm/mmu.h> #include <asm/mmu_context.h> #include <asm/paca.h>
@@ -837,7 +838,7 @@ static long slb_allocate_user(struct mm_struct *mm, unsigned long ea)return slb_insert_entry (ea, context, flags, ssize, false); } -long do_slb_fault (struct pt_regs *regs) +DEFINE_INTERRUPT_HANDLER_RAW (do_slb_fault) {unsigned long ea = regs->dar;unsigned long id =get_region_id (ea);
@@ -890,7 +891,7 @@ long do_slb_fault(struct pt_regs *regs) } } -void do_bad_slb_fault (struct pt_regs *regs) +DEFINE_INTERRUPT_HANDLER (do_bad_slb_fault) {int err = regs->result;
arch/powerpc/mm/fault.c +9 -1
@@ -34,6 +34,7 @@#include <linux/uaccess.h> #include <asm/firmware.h> +#include <asm/interrupt.h> #include <asm/page.h> #include <asm/mmu.h> #include <asm/mmu_context.h>
@@ -547,7 +548,7 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, }NOKPROBE_SYMBOL (__do_page_fault); -long do_page_fault (struct pt_regs *regs) +DEFINE_INTERRUPT_HANDLER_RET (do_page_fault) {enum ctx_state prev_state =exception_enter ();unsigned long address = regs->dar;
@@ -654,3 +655,10 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)die ("Kernel access of bad area" , regs, sig); } + +#ifdef CONFIG_PPC_BOOK3S_64 +DEFINE_INTERRUPT_HANDLER (do_bad_page_fault) +{ +bad_page_fault (regs, regs->dar,SIGSEGV ); +} +#endif
arch/powerpc/platforms/powernv/idle.c +1 -0
@@ -14,6 +14,7 @@#include <asm/asm-prototypes.h> #include <asm/firmware.h> +#include <asm/interrupt.h> #include <asm/machdep.h> #include <asm/opal.h> #include <asm/cputhreads.h>
Signature · 1 line
2.23.0
Nicholas Piggin
reviewerRFC PATCH 4/12 powerpc: add interrupt_cond_local_irq_enable helper
In reply to Nicholas PigginSimple helper for synchronous interrupt handlers to use to enable interrupts if they were taken in interrupt-enabled context.
--- arch/powerpc/include/asm/interrupt.h | 7 +++++++ arch/powerpc/kernel/traps.c | 24 +++++++----------------- arch/powerpc/mm/fault.c | 4 +--- 3 files changed, 15 insertions(+), 20 deletions(-)
arch/powerpc/include/asm/interrupt.h +7 -0
@@ -3,6 +3,7 @@#define _ASM_POWERPC_INTERRUPT_H#include <linux/context_tracking.h> +#include <linux/hardirq.h> #include <asm/ftrace.h> /**
@@ -198,4 +199,10 @@ DECLARE_INTERRUPT_HANDLER_ASYNC(unknown_async_exception);void replay_system_reset (void );void replay_soft_interrupts (void ); +static inline void interrupt_cond_local_irq_enable (struct pt_regs *regs) +{ +if (!arch_irq_disabled_regs (regs)) +local_irq_enable (); +} +#endif /* _ASM_POWERPC_INTERRUPT_H */
arch/powerpc/kernel/traps.c +7 -17
@@ -343,8 +343,8 @@ static bool exception_common(int signr, struct pt_regs *regs, int code,show_signal_msg (signr, regs, code, addr); -if (arch_irqs_disabled () && !arch_irq_disabled_regs (regs)) -local_irq_enable (); +if (arch_irqs_disabled ()) +interrupt_cond_local_irq_enable (regs); current->thread.trap_nr = code;
@@ -1579,9 +1579,7 @@ DEFINE_INTERRUPT_HANDLER(program_check_exception)if (!user_mode (regs)) goto sigill; -/* We restore the interrupt state now */ -if (!arch_irq_disabled_regs (regs)) -local_irq_enable (); +interrupt_cond_local_irq_enable (regs);/* (reason & REASON_ILLEGAL) would be the obvious thing here, * but there seems to be a hardware bug on the 405GP (RevD)
@@ -1635,9 +1633,7 @@ DEFINE_INTERRUPT_HANDLER(alignment_exception)int sig, code, fixed =0 ;unsigned long reason; -/* We restore the interrupt state now */ -if (!arch_irq_disabled_regs (regs)) -local_irq_enable (); +interrupt_cond_local_irq_enable (regs); reason =get_reason (regs);
@@ -1798,9 +1794,7 @@ DEFINE_INTERRUPT_HANDLER(facility_unavailable_exception)die ("Unexpected facility unavailable exception" , regs,SIGABRT ); } -/* We restore the interrupt state now */ -if (!arch_irq_disabled_regs (regs)) -local_irq_enable (); +interrupt_cond_local_irq_enable (regs);if (status ==FSCR_DSCR_LG ) {/*
@@ -2145,9 +2139,7 @@ void SPEFloatingPointException(struct pt_regs *regs)int code =FPE_FLTUNK ;int err; -/* We restore the interrupt state now */ -if (!arch_irq_disabled_regs (regs)) -local_irq_enable (); +interrupt_cond_local_irq_enable (regs);flush_spe_to_thread (current);
@@ -2194,9 +2186,7 @@ void SPEFloatingPointRoundException(struct pt_regs *regs)extern int speround_handler (struct pt_regs *regs);int err; -/* We restore the interrupt state now */ -if (!arch_irq_disabled_regs (regs)) -local_irq_enable (); +interrupt_cond_local_irq_enable (regs);preempt_disable ();if (regs->msr &MSR_SPE )
arch/powerpc/mm/fault.c +1 -3
@@ -441,9 +441,7 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address,return bad_area_nosemaphore (regs, address); } -/* We restore the interrupt state now */ -if (!arch_irq_disabled_regs (regs)) -local_irq_enable (); +interrupt_cond_local_irq_enable (regs);perf_sw_event (PERF_COUNT_SW_PAGE_FAULTS ,1 , regs, address);
Signature · 1 line
2.23.0
Nicholas Piggin
reviewerRFC PATCH 5/12 powerpc/64s: Do context tracking in interrupt entry wrapper
In reply to Nicholas PigginContext tracking is very broken currently. Add a helper function that is to be called first thing by any normal interrupt handler function to track user exits, and user entry is done by the interrupt exit prepare functions.
Context tracking is disabled on 64e for now, it must move to interrupt exit in C before enabling it.
--- arch/powerpc/Kconfig | 2 +- arch/powerpc/include/asm/interrupt.h | 23 +++++++++ arch/powerpc/kernel/ptrace/ptrace.c | 4 -- arch/powerpc/kernel/signal.c | 4 -- arch/powerpc/kernel/syscall_64.c | 14 +++++ arch/powerpc/kernel/traps.c | 74 ++++++--------------------- arch/powerpc/mm/book3s64/hash_utils.c | 2 - arch/powerpc/mm/fault.c | 3 -- 8 files changed, 55 insertions(+), 71 deletions(-)
arch/powerpc/Kconfig +1 -1
@@ -189,7 +189,7 @@ config PPC select HAVE_CBPF_JIT if !PPC64 select HAVE_STACKPROTECTOR if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13) select HAVE_STACKPROTECTOR if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2) - select HAVE_CONTEXT_TRACKING if PPC64 + select HAVE_CONTEXT_TRACKING if PPC_BOOK3S_64 select HAVE_TIF_NOHZ if PPC64 select HAVE_DEBUG_KMEMLEAK select HAVE_DEBUG_STACKOVERFLOW
arch/powerpc/include/asm/interrupt.h +23 -0
@@ -6,6 +6,23 @@#include <linux/hardirq.h> #include <asm/ftrace.h> +#ifdef CONFIG_PPC_BOOK3S_64 +static inline void interrupt_enter_prepare (struct pt_regs *regs) +{ +if (user_mode (regs)) { +CT_WARN_ON (ct_state () ==CONTEXT_KERNEL ); +user_exit_irqoff (); + }else { +CT_WARN_ON (ct_state () ==CONTEXT_USER ); + } +} + +#else /* CONFIG_PPC_BOOK3S_64 */ +static inline void interrupt_enter_prepare (struct pt_regs *regs) +{ +} +#endif /* CONFIG_PPC_BOOK3S_64 */ +/** * DECLARE_INTERRUPT_HANDLER_RAW - Declare raw interrupt handler function * @func: Function name of the entry point
@@ -60,6 +77,8 @@ static __always_inline void ___##func(struct pt_regs *regs); \ \ __visible noinstr void func(struct pt_regs *regs) \ { \ +interrupt_enter_prepare (regs); \ + \ ___##func (regs); \ } \ \
@@ -90,6 +109,8 @@ __visible noinstr long func(struct pt_regs *regs) \ { \long ret; \ \ +interrupt_enter_prepare (regs); \ + \ ret = ___##func (regs); \ \return ret; \
@@ -118,6 +139,8 @@ static __always_inline void ___##func(struct pt_regs *regs); \ \ __visible noinstr void func(struct pt_regs *regs) \ { \ +interrupt_enter_prepare (regs); \ + \ ___##func (regs); \ } \ \
arch/powerpc/kernel/ptrace/ptrace.c +0 -4
@@ -290,8 +290,6 @@ long do_syscall_trace_enter(struct pt_regs *regs) {u32 flags; -user_exit (); - flags =READ_ONCE (current_thread_info ()->flags) & (_TIF_SYSCALL_EMU | _TIF_SYSCALL_TRACE);
@@ -368,8 +366,6 @@ void do_syscall_trace_leave(struct pt_regs *regs) step =test_thread_flag (TIF_SINGLESTEP );if (step ||test_thread_flag (TIF_SYSCALL_TRACE ))tracehook_report_syscall_exit (regs, step); - -user_enter (); }void __init pt_regs_check (void );
arch/powerpc/kernel/signal.c +0 -4
@@ -310,8 +310,6 @@ static void do_signal(struct task_struct *tsk)void do_notify_resume (struct pt_regs *regs,unsigned long thread_info_flags) { -user_exit (); -/* Check valid addr_limit, TIF check is done there */ addr_limit_user_check ();
@@ -331,8 +329,6 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)tracehook_notify_resume (regs);rseq_handle_notify_resume (NULL , regs); } - -user_enter (); }unsigned long get_tm_stackpointer (struct task_struct *tsk)
arch/powerpc/kernel/syscall_64.c +14 -0
@@ -1,9 +1,11 @@// SPDX-License-Identifier: GPL-2.0-or-later +#include <linux/context_tracking.h> #include <linux/err.h> #include <asm/asm-prototypes.h> #include <asm/book3s/64/kup-radix.h> #include <asm/cputime.h> +#include <asm/interrupt.h> #include <asm/hw_irq.h> #include <asm/kprobes.h> #include <asm/paca.h>
@@ -27,6 +29,9 @@ notrace long system_call_exception(long r3, long r4, long r5,if (IS_ENABLED (CONFIG_PPC_IRQ_SOFT_MASK_DEBUG ))BUG_ON (irq_soft_mask_return () !=IRQS_ALL_DISABLED ); +CT_WARN_ON (ct_state () ==CONTEXT_KERNEL ); +user_exit_irqoff (); +trace_hardirqs_off ();/* finish reconciling */ if (IS_ENABLED (CONFIG_PPC_BOOK3S ))
@@ -157,6 +162,8 @@ notrace unsigned long syscall_exit_prepare(unsigned long r3,unsigned long ti_flags;unsigned long ret =0 ; +CT_WARN_ON (ct_state () ==CONTEXT_USER ); +kuap_check_amr (); regs->result = r3;
@@ -233,8 +240,11 @@ notrace unsigned long syscall_exit_prepare(unsigned long r3, } } +user_enter_irqoff (); +/* scv need not set RI=0 because SRRs are not used */ if (unlikely (!prep_irq_for_enabled_exit (!scv))) { +user_exit_irqoff ();local_irq_enable (); goto again; }
@@ -264,6 +274,7 @@ notrace unsigned long interrupt_exit_user_prepare(struct pt_regs *regs, unsignedBUG_ON (!(regs->msr &MSR_PR ));BUG_ON (!FULL_REGS (regs));BUG_ON (regs->softe !=IRQS_ENABLED ); +CT_WARN_ON (ct_state () ==CONTEXT_USER );/* * We don't need to restore AMR on the way back to userspace for KUAP.
@@ -306,7 +317,9 @@ notrace unsigned long interrupt_exit_user_prepare(struct pt_regs *regs, unsigned } } +user_enter_irqoff ();if (unlikely (!prep_irq_for_enabled_exit (true))) { +user_exit_irqoff ();local_irq_enable ();local_irq_disable (); goto again;
@@ -347,6 +360,7 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs, unsignunrecoverable_exception (regs);BUG_ON (regs->msr &MSR_PR );BUG_ON (!FULL_REGS (regs)); +CT_WARN_ON (ct_state () ==CONTEXT_USER ); amr =kuap_get_and_check_amr ();
arch/powerpc/kernel/traps.c +17 -57
230 lines not on this page · raw message
arch/powerpc/mm/book3s64/hash_utils.c +0 -2
@@ -1279,7 +1279,6 @@ int hash_page_mm(struct mm_struct *mm, unsigned long ea, unsigned long flags) {bool is_thp; -enum ctx_state prev_state =exception_enter ();pgd_t *pgdir;unsigned long vsid;pte_t *ptep;
@@ -1479,7 +1478,6 @@ int hash_page_mm(struct mm_struct *mm, unsigned long ea,DBG_LOW (" -> rc=%d\n" , rc); bail: -exception_exit (prev_state);return rc; }EXPORT_SYMBOL_GPL (hash_page_mm);
arch/powerpc/mm/fault.c +0 -3
@@ -548,7 +548,6 @@ NOKPROBE_SYMBOL(__do_page_fault);DEFINE_INTERRUPT_HANDLER_RET (do_page_fault) { -enum ctx_state prev_state =exception_enter ();unsigned long address = regs->dar;unsigned long error_code = regs->dsisr;long err;
@@ -571,8 +570,6 @@ DEFINE_INTERRUPT_HANDLER_RET(do_page_fault) }#endif -exception_exit (prev_state); -return err; }NOKPROBE_SYMBOL (do_page_fault);
Signature · 1 line
2.23.0
Nicholas Piggin
reviewerRFC PATCH 6/12 powerpc/64s: reconcile interrupts in C
In reply to Nicholas PigginThere is no need for this to be in asm, use the new intrrupt entry wrapper.
--- arch/powerpc/include/asm/interrupt.h | 4 ++++ arch/powerpc/kernel/exceptions-64s.S | 26 -------------------------- 2 files changed, 4 insertions(+), 26 deletions(-)
arch/powerpc/include/asm/interrupt.h +4 -0
@@ -9,6 +9,10 @@#ifdef CONFIG_PPC_BOOK3S_64 static inline void interrupt_enter_prepare (struct pt_regs *regs) { +if (irq_soft_mask_set_return (IRQS_ALL_DISABLED ) ==IRQS_ENABLED ) +trace_hardirqs_off (); + local_paca->irq_happened |=PACA_IRQ_HARD_DIS ; +if (user_mode (regs)) {CT_WARN_ON (ct_state () ==CONTEXT_KERNEL );user_exit_irqoff ();
arch/powerpc/kernel/exceptions-64s.S +0 -26
@@ -139,7 +139,6 @@ name: #define IKVM_VIRT .L_IKVM_VIRT_\name\() /* Virt entry tests KVM */ #define ISTACK .L_ISTACK_\name\() /* Set regular kernel stack */ #define __ISTACK(name) .L_ISTACK_ ## name -#define IRECONCILE .L_IRECONCILE_\name\() /* Do RECONCILE_IRQ_STATE */ #define IKUAP .L_IKUAP_\name\() /* Do KUAP lock */ #define INT_DEFINE_BEGIN(n) \
@@ -203,9 +202,6 @@ do_define_int n .ifndef ISTACK ISTACK=1 .endif - .ifndef IRECONCILE - IRECONCILE=1 - .endif .ifndef IKUAP IKUAP=1 .endif
@@ -653,10 +649,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) .if ISTACK ACCOUNT_STOLEN_TIME .endif - - .if IRECONCILE - RECONCILE_IRQ_STATE(r10, r11) - .endif .endm /*
@@ -935,7 +927,6 @@ INT_DEFINE_BEGIN(system_reset) */ ISET_RI=0 ISTACK=0 - IRECONCILE=0 IKVM_REAL=1 INT_DEFINE_END(system_reset)
@@ -1125,7 +1116,6 @@ INT_DEFINE_BEGIN(machine_check_early) ISTACK=0 IDAR=1 IDSISR=1 - IRECONCILE=0 IKUAP=0 /* We don't touch AMR here, we never go to virtual mode */ INT_DEFINE_END(machine_check_early)
@@ -1473,7 +1463,6 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) INT_DEFINE_BEGIN(data_access_slb) IVEC=0x380 IAREA=PACA_EXSLB - IRECONCILE=0 IDAR=1 #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE IKVM_SKIP=1
@@ -1502,7 +1491,6 @@ MMU_FTR_SECTION_ELSE li r3,-EFAULT ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) std r3,RESULT(r1) - RECONCILE_IRQ_STATE(r10, r11) addi r3,r1,STACK_FRAME_OVERHEAD bl do_bad_slb_fault b interrupt_return
@@ -1564,7 +1552,6 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) INT_DEFINE_BEGIN(instruction_access_slb) IVEC=0x480 IAREA=PACA_EXSLB - IRECONCILE=0 IISIDE=1 IDAR=1 #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
@@ -1593,7 +1580,6 @@ MMU_FTR_SECTION_ELSE li r3,-EFAULT ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) std r3,RESULT(r1) - RECONCILE_IRQ_STATE(r10, r11) addi r3,r1,STACK_FRAME_OVERHEAD bl do_bad_slb_fault b interrupt_return
@@ -1753,7 +1739,6 @@ EXC_COMMON_BEGIN(program_check_common) */ INT_DEFINE_BEGIN(fp_unavailable) IVEC=0x800 - IRECONCILE=0 #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE IKVM_REAL=1 #endif
@@ -1768,7 +1753,6 @@ EXC_VIRT_END(fp_unavailable, 0x4800, 0x100) EXC_COMMON_BEGIN(fp_unavailable_common) GEN_COMMON fp_unavailable bne 1f /* if from user, just load it up */ - RECONCILE_IRQ_STATE(r10, r11) addi r3,r1,STACK_FRAME_OVERHEAD bl kernel_fp_unavailable_exception 0: trap
@@ -1787,7 +1771,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_TM) b fast_interrupt_return #ifdef CONFIG_PPC_TRANSACTIONAL_MEM 2: /* User process was in a transaction */ - RECONCILE_IRQ_STATE(r10, r11) addi r3,r1,STACK_FRAME_OVERHEAD bl fp_unavailable_tm b interrupt_return
@@ -1852,7 +1835,6 @@ INT_DEFINE_BEGIN(hdecrementer) IVEC=0x980 IHSRR=1 ISTACK=0 - IRECONCILE=0 IKVM_REAL=1 IKVM_VIRT=1 INT_DEFINE_END(hdecrementer)
@@ -2226,7 +2208,6 @@ INT_DEFINE_BEGIN(hmi_exception_early) IHSRR=1 IREALMODE_COMMON=1 ISTACK=0 - IRECONCILE=0 IKUAP=0 /* We don't touch AMR here, we never go to virtual mode */ IKVM_REAL=1 INT_DEFINE_END(hmi_exception_early)
@@ -2400,7 +2381,6 @@ EXC_COMMON_BEGIN(performance_monitor_common) */ INT_DEFINE_BEGIN(altivec_unavailable) IVEC=0xf20 - IRECONCILE=0 #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE IKVM_REAL=1 #endif
@@ -2430,7 +2410,6 @@ BEGIN_FTR_SECTION b fast_interrupt_return #ifdef CONFIG_PPC_TRANSACTIONAL_MEM 2: /* User process was in a transaction */ - RECONCILE_IRQ_STATE(r10, r11) addi r3,r1,STACK_FRAME_OVERHEAD bl altivec_unavailable_tm b interrupt_return
@@ -2438,7 +2417,6 @@ BEGIN_FTR_SECTION 1: END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) #endif - RECONCILE_IRQ_STATE(r10, r11) addi r3,r1,STACK_FRAME_OVERHEAD bl altivec_unavailable_exception b interrupt_return
@@ -2454,7 +2432,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) */ INT_DEFINE_BEGIN(vsx_unavailable) IVEC=0xf40 - IRECONCILE=0 #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE IKVM_REAL=1 #endif
@@ -2483,7 +2460,6 @@ BEGIN_FTR_SECTION b load_up_vsx #ifdef CONFIG_PPC_TRANSACTIONAL_MEM 2: /* User process was in a transaction */ - RECONCILE_IRQ_STATE(r10, r11) addi r3,r1,STACK_FRAME_OVERHEAD bl vsx_unavailable_tm b interrupt_return
@@ -2491,7 +2467,6 @@ BEGIN_FTR_SECTION 1: END_FTR_SECTION_IFSET(CPU_FTR_VSX) #endif - RECONCILE_IRQ_STATE(r10, r11) addi r3,r1,STACK_FRAME_OVERHEAD bl vsx_unavailable_exception b interrupt_return
@@ -2826,7 +2801,6 @@ EXC_VIRT_NONE(0x5800, 0x100) INT_DEFINE_BEGIN(soft_nmi) IVEC=0x900 ISTACK=0 - IRECONCILE=0 /* Soft-NMI may fire under local_irq_disable */ INT_DEFINE_END(soft_nmi) /*
Signature · 1 line
2.23.0
Nicholas Piggin
reviewerRFC PATCH 7/12 powerpc/64: move account_stolen_time into its own function
In reply to Nicholas PigginThis will be used by interrupt entry as well.
--- arch/powerpc/include/asm/cputime.h | 15 +++++++++++++++ arch/powerpc/kernel/syscall_64.c | 10 +--------- 2 files changed, 16 insertions(+), 9 deletions(-)
arch/powerpc/include/asm/cputime.h +15 -0
@@ -87,6 +87,18 @@ static notrace inline void account_cpu_user_exit(void) acct->starttime_user = tb; } +static notrace inline void account_stolen_time(void) +{ +#ifdef CONFIG_PPC_SPLPAR +if (IS_ENABLED (CONFIG_VIRT_CPU_ACCOUNTING_NATIVE ) && +firmware_has_feature (FW_FEATURE_SPLPAR )) { +struct lppaca *lp = local_paca->lppaca_ptr; + +if (unlikely (local_paca->dtl_ridx !=be64_to_cpu (lp->dtl_idx))) +accumulate_stolen_time (); + } +#endif +}#endif /* __KERNEL__ */ #else /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */
@@ -96,5 +108,8 @@ static inline void account_cpu_user_entry(void)static inline void account_cpu_user_exit (void ) { } +static notrace inline void account_stolen_time(void) +{ +}#endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */ #endif /* __POWERPC_CPUTIME_H */
arch/powerpc/kernel/syscall_64.c +1 -9
@@ -44,15 +44,7 @@ notrace long system_call_exception(long r3, long r4, long r5,account_cpu_user_entry (); -#ifdef CONFIG_PPC_SPLPAR -if (IS_ENABLED (CONFIG_VIRT_CPU_ACCOUNTING_NATIVE ) && -firmware_has_feature (FW_FEATURE_SPLPAR )) { -struct lppaca *lp = local_paca->lppaca_ptr; - -if (unlikely (local_paca->dtl_ridx !=be64_to_cpu (lp->dtl_idx))) -accumulate_stolen_time (); - } -#endif +account_stolen_time ();/* * This is not required for the syscall exit path, but makes the
Signature · 1 line
2.23.0
Nicholas Piggin
reviewerRFC PATCH 8/12 powerpc/64: entry cpu time accounting in C
In reply to Nicholas PigginThere is no need for this to be in asm, use the new intrrupt entry wrapper.
--- arch/powerpc/include/asm/interrupt.h | 4 ++++ arch/powerpc/include/asm/ppc_asm.h | 24 ------------------------ arch/powerpc/kernel/exceptions-64e.S | 1 - arch/powerpc/kernel/exceptions-64s.S | 5 ----- 4 files changed, 4 insertions(+), 30 deletions(-)
arch/powerpc/include/asm/interrupt.h +4 -0
@@ -4,6 +4,7 @@#include <linux/context_tracking.h> #include <linux/hardirq.h> +#include <asm/cputime.h> #include <asm/ftrace.h> #ifdef CONFIG_PPC_BOOK3S_64
@@ -16,6 +17,9 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs)if (user_mode (regs)) {CT_WARN_ON (ct_state () ==CONTEXT_KERNEL );user_exit_irqoff (); + +account_cpu_user_entry (); +account_stolen_time (); }else {CT_WARN_ON (ct_state () ==CONTEXT_USER ); }
arch/powerpc/include/asm/ppc_asm.h +0 -24
@@ -25,7 +25,6 @@#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE #define ACCOUNT_CPU_USER_ENTRY (ptr, ra, rb)#define ACCOUNT_CPU_USER_EXIT (ptr, ra, rb) -#define ACCOUNT_STOLEN_TIME #else #define ACCOUNT_CPU_USER_ENTRY (ptr, ra, rb) \ MFTB(ra);/* get timebase */ \
@@ -44,29 +43,6 @@PPC_LL ra,ACCOUNT_SYSTEM_TIME (ptr ); \add ra,ra,rb;/* add on to system time */ \ PPC_STL ra, ACCOUNT_SYSTEM_TIME(ptr) - -#ifdef CONFIG_PPC_SPLPAR -#define ACCOUNT_STOLEN_TIME \ -BEGIN_FW_FTR_SECTION; \ - beq 33f; \ -/* from user - see if there are any DTL entries to process */ \ -ld r10,PACALPPACAPTR (r13 );/* get ptr to VPA */ \ -ld r11,PACA_DTL_RIDX (r13 );/* get log read index */ \ -addi r10,r10,LPPACA_DTLIDX ; \ - LDX_BE r10,0,r10; /* get log write index */ \ -cmpd cr1,r11,r10; \ - beq+ cr1,33f ; \ -bl accumulate_stolen_time; \ -ld r12,_MSR (r1 ); \ - andi. r10,r12,MSR_PR ;/* Restore cr0 (coming from user) */ \ -33: \ -END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR) - -#else /* CONFIG_PPC_SPLPAR */ -#define ACCOUNT_STOLEN_TIME - -#endif /* CONFIG_PPC_SPLPAR */ -#endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */ /*
arch/powerpc/kernel/exceptions-64e.S +0 -1
@@ -398,7 +398,6 @@ exc_##n##_common: \ std r10,_NIP(r1); /* save SRR0 to stackframe */ \ std r11,_MSR(r1); /* save SRR1 to stackframe */ \ beq 2f; /* if from kernel mode */ \ - ACCOUNT_CPU_USER_ENTRY(r13,r10,r11);/* accounting (uses cr0+eq) */ \ 2: ld r3,excf+EX_R10(r13); /* get back r10 */ \ ld r4,excf+EX_R11(r13); /* get back r11 */ \ mfspr r5,scratch; /* get back r13 */ \
arch/powerpc/kernel/exceptions-64s.S +0 -5
@@ -577,7 +577,6 @@ DEFINE_FIXED_SYMBOL(\name\()_common_real) kuap_save_amr_and_lock r9, r10, cr1, cr0 .endif beq 101f /* if from kernel mode */ - ACCOUNT_CPU_USER_ENTRY(r13, r9, r10) BEGIN_FTR_SECTION ld r9,IAREA+EX_PPR(r13) /* Read PPR from paca */ std r9,_PPR(r1)
@@ -645,10 +644,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) ld r11,exception_marker@toc(r2) std r10,RESULT(r1) /* clear regs->result */ std r11,STACK_FRAME_OVERHEAD-16(r1) /* mark the frame */ - - .if ISTACK - ACCOUNT_STOLEN_TIME - .endif .endm /*
Signature · 1 line
2.23.0
Nicholas Piggin
reviewerRFC PATCH 9/12 powerpc: move NMI entry/exit code into wrapper
In reply to Nicholas PigginThis moves the common NMI entry and exit code into the interrupt handler wrappers.
This changes the behaviour of soft-NMI (watchdog) and HMI interrupts, and also MCE interrupts on 64e, by adding missing parts of the NMI entry to them.
--- arch/powerpc/include/asm/interrupt.h | 26 +++++++++++++++++++ arch/powerpc/kernel/mce.c | 12 --------- arch/powerpc/kernel/traps.c | 38 +++++----------------------- arch/powerpc/kernel/watchdog.c | 10 +++----- 4 files changed, 37 insertions(+), 49 deletions(-)
arch/powerpc/include/asm/interrupt.h +26 -0
@@ -31,6 +31,27 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs) }#endif /* CONFIG_PPC_BOOK3S_64 */ +struct interrupt_nmi_state { +#ifdef CONFIG_PPC64 +u8 ftrace_enabled; +#endif +}; + +static inline void interrupt_nmi_enter_prepare (struct pt_regs *regs,struct interrupt_nmi_state *state) +{ +this_cpu_set_ftrace_enabled (0 ); + +nmi_enter (); +} + +static inline void interrupt_nmi_exit_prepare (struct pt_regs *regs,struct interrupt_nmi_state *state) +{ +nmi_exit (); + +this_cpu_set_ftrace_enabled (state->ftrace_enabled); +} + +/** * DECLARE_INTERRUPT_HANDLER_RAW - Declare raw interrupt handler function * @func: Function name of the entry point
@@ -177,10 +198,15 @@ static __always_inline long ___##func(struct pt_regs *regs); \ \ __visible noinstr long func(struct pt_regs *regs) \ { \ +struct interrupt_nmi_state state; \long ret; \ \ +interrupt_nmi_enter_prepare (regs, &state); \ + \ ret = ___##func (regs); \ \ +interrupt_nmi_exit_prepare (regs, &state); \ + \return ret; \ } \ \
arch/powerpc/kernel/mce.c +0 -12
@@ -592,13 +592,6 @@ EXPORT_SYMBOL_GPL(machine_check_print_event_info);DEFINE_INTERRUPT_HANDLER_NMI (machine_check_early) {long handled =0 ; -bool nested =in_nmi (); -u8 ftrace_enabled =this_cpu_get_ftrace_enabled (); - -this_cpu_set_ftrace_enabled (0 ); - -if (!nested) -nmi_enter ();hv_nmi_check_nonrecoverable (regs);
@@ -608,11 +601,6 @@ DEFINE_INTERRUPT_HANDLER_NMI(machine_check_early)if (ppc_md.machine_check_early) handled = ppc_md.machine_check_early (regs); -if (!nested) -nmi_exit (); - -this_cpu_set_ftrace_enabled (ftrace_enabled); -return handled; }
arch/powerpc/kernel/traps.c +7 -31
@@ -443,11 +443,6 @@ DEFINE_INTERRUPT_HANDLER_NMI(system_reset_exception) {unsigned long hsrr0, hsrr1;bool saved_hsrrs = false; -u8 ftrace_enabled =this_cpu_get_ftrace_enabled (); - -this_cpu_set_ftrace_enabled (0 ); - -nmi_enter ();/* * System reset can interrupt code where HSRRs are live and MSR[RI]=1.
@@ -519,10 +514,6 @@ DEFINE_INTERRUPT_HANDLER_NMI(system_reset_exception)mtspr (SPRN_HSRR1 , hsrr1); } -nmi_exit (); - -this_cpu_set_ftrace_enabled (ftrace_enabled); -/* What should we do here? We could issue a shutdown or hard reset. */ return 0 ;
@@ -828,6 +819,12 @@ int machine_check_generic(struct pt_regs *regs)#endif /* everything else */ +/* +* BOOK3S_64 does not call this handler as a non-maskable interrupt +* (it uses its own early real-mode handler to handle the MCE proper +* and then raises irq_work to call this handler when interrupts are +* enabled). +*/ #ifdef CONFIG_PPC_BOOK3S_64 DEFINE_INTERRUPT_HANDLER_ASYNC (machine_check_exception) #else
@@ -836,20 +833,6 @@ DEFINE_INTERRUPT_HANDLER_NMI(machine_check_exception) {int recover =0 ; -/* -* BOOK3S_64 does not call this handler as a non-maskable interrupt -* (it uses its own early real-mode handler to handle the MCE proper -* and then raises irq_work to call this handler when interrupts are -* enabled). -* -* This is silly. The BOOK3S_64 should just call a different function -* rather than expecting semantics to magically change. Something -* like 'non_nmi_machine_check_exception()', perhaps? -*/ -const bool nmi = !IS_ENABLED (CONFIG_PPC_BOOK3S_64 ); - -if (nmi)nmi_enter (); -__this_cpu_inc (irq_stat.mce_exceptions);add_taint (TAINT_MACHINE_CHECK ,LOCKDEP_NOW_UNRELIABLE );
@@ -874,24 +857,17 @@ DEFINE_INTERRUPT_HANDLER_NMI(machine_check_exception)if (check_io_access (regs)) goto bail; -if (nmi)nmi_exit (); -die ("Machine check" , regs,SIGBUS );/* Must die if the interrupt is not recoverable */ if (!(regs->msr &MSR_RI ))die ("Unrecoverable Machine check" , regs,SIGBUS ); -#ifdef CONFIG_PPC_BOOK3S_64 bail: +#ifdef CONFIG_PPC_BOOK3S_64 return;#else return 0 ; - -bail: -if (nmi)nmi_exit (); - -return 0 ;#endif }
arch/powerpc/kernel/watchdog.c +4 -6
@@ -254,11 +254,12 @@ DEFINE_INTERRUPT_HANDLER_NMI(soft_nmi_interrupt)int cpu =raw_smp_processor_id ();u64 tb; +/* should only arrive from kernel, with irqs disabled */ +WARN_ON_ONCE (!arch_irq_disabled_regs (regs)); +if (!cpumask_test_cpu (cpu, &wd_cpus_enabled))return 0 ; -nmi_enter (); -__this_cpu_inc (irq_stat.soft_nmi_irqs); tb =get_tb ();
@@ -266,7 +267,7 @@ DEFINE_INTERRUPT_HANDLER_NMI(soft_nmi_interrupt)wd_smp_lock (&flags);if (cpumask_test_cpu (cpu, &wd_smp_cpus_stuck)) {wd_smp_unlock (&flags); - goto out; +return 0 ; }set_cpu_stuck (cpu, tb);
@@ -290,9 +291,6 @@ DEFINE_INTERRUPT_HANDLER_NMI(soft_nmi_interrupt)if (wd_panic_timeout_tb <0x7fffffff )mtspr (SPRN_DEC , wd_panic_timeout_tb); -out: -nmi_exit (); -return 0 ; }
Signature · 1 line
2.23.0
Re: [RFC PATCH 09/12] powerpc: move NMI entry/exit code into wrapper
Quoted 31 lines · Nicholas Piggin
This moves the common NMI entry and exit code into the interrupt handler wrappers.
This changes the behaviour of soft-NMI (watchdog) and HMI interrupts, and also MCE interrupts on 64e, by adding missing parts of the NMI entry to them.
Signed-off-by Nicholas Piggin <[email protected]>--- arch/powerpc/include/asm/interrupt.h | 26 +++++++++++++++++++ arch/powerpc/kernel/mce.c | 12 --------- arch/powerpc/kernel/traps.c | 38 +++++----------------------- arch/powerpc/kernel/watchdog.c | 10 +++----- 4 files changed, 37 insertions(+), 49 deletions(-)arch/powerpc/include/asm/interrupt.h +8
-0@@ -31,6 +31,27 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs) }#endif /* CONFIG_PPC_BOOK3S_64 */ +struct interrupt_nmi_state { +#ifdef CONFIG_PPC64 +u8 ftrace_enabled; +#endif +}; + +static inline void interrupt_nmi_enter_prepare (struct pt_regs *regs,struct interrupt_nmi_state *state) +{
arch/powerpc/include/asm/interrupt.h static inline void interrupt_enter_prepare(struct pt_regs *regs) · line 51
Quoted 10 lines
arch/powerpc/include/asm/interrupt.h +10
-0+this_cpu_set_ftrace_enabled (0 ); + +nmi_enter (); +} + +static inline void interrupt_nmi_exit_prepare (struct pt_regs *regs,struct interrupt_nmi_state *state) +{ +nmi_exit (); + +this_cpu_set_ftrace_enabled (state->ftrace_enabled);
PPC32 build:
In file included from arch/powerpc/kernel/irq.c:57:0:./arch/powerpc/include/asm/interrupt.h: In function ‘interrupt_nmi_exit_prepare’:./arch/powerpc/include/asm/interrupt.h:96:35: error: ‘struct interrupt_nmi_state’ has no member named ‘ftrace_enabled’
this_cpu_set_ftrace_enabled(state->ftrace_enabled);
^Quoted 12 lines
arch/powerpc/include/asm/interrupt.h +4
-0+} + +/** * DECLARE_INTERRUPT_HANDLER_RAW - Declare raw interrupt handler function * @func: Function name of the entry point @@ -177,10 +198,15 @@ static __always_inline long ___##func(struct pt_regs *regs); \ \ __visible noinstr long func(struct pt_regs *regs) \ { \ +struct interrupt_nmi_state state; \long ret; \
arch/powerpc/include/asm/interrupt.h static __always_inline long ___##func(struct pt_regs *regs); \ · line 212
Quoted 10 lines
arch/powerpc/include/asm/interrupt.h +4
-0\ +interrupt_nmi_enter_prepare (regs, &state); \ + \ ret = ___##func (regs); \ \ +interrupt_nmi_exit_prepare (regs, &state); \ + \return ret; \ } \ \
Christophe
Nicholas Piggin
reviewerRFC PATCH 10/12 powerpc/64s: move NMI soft-mask handling to C
In reply to Nicholas PigginSaving and restoring soft-mask state can now be done in C using the interrupt handler wrapper functions.
--- arch/powerpc/include/asm/interrupt.h | 25 ++++++++++++ arch/powerpc/kernel/exceptions-64s.S | 60 ---------------------------- 2 files changed, 25 insertions(+), 60 deletions(-)
arch/powerpc/include/asm/interrupt.h +25 -0
@@ -33,12 +33,30 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs)struct interrupt_nmi_state {#ifdef CONFIG_PPC64 +#ifdef CONFIG_PPC_BOOK3S_64 +u8 irq_soft_mask; +u8 irq_happened; +#endif u8 ftrace_enabled;#endif };static inline void interrupt_nmi_enter_prepare (struct pt_regs *regs,struct interrupt_nmi_state *state) { +#ifdef CONFIG_PPC_BOOK3S_64 + state->irq_soft_mask = local_paca->irq_soft_mask; + state->irq_happened = local_paca->irq_happened; + state->ftrace_enabled =this_cpu_get_ftrace_enabled (); + +/* +* Set IRQS_ALL_DISABLED unconditionally so irqs_disabled() does +* the right thing, and set IRQ_HARD_DIS. We do not want to reconcile +* because that goes through irq tracing which we don't want in NMI. +*/ + local_paca->irq_soft_mask =IRQS_ALL_DISABLED ; + local_paca->irq_happened |=PACA_IRQ_HARD_DIS ; +#endif +this_cpu_set_ftrace_enabled (0 );nmi_enter ();
@@ -49,6 +67,13 @@ static inline void interrupt_nmi_exit_prepare(struct pt_regs *regs, struct internmi_exit ();this_cpu_set_ftrace_enabled (state->ftrace_enabled); + +#ifdef CONFIG_PPC_BOOK3S_64 +/* Check we didn't change the pending interrupt mask. */ +WARN_ON_ONCE ((state->irq_happened |PACA_IRQ_HARD_DIS ) != local_paca->irq_happened); + local_paca->irq_happened = state->irq_happened; + local_paca->irq_soft_mask = state->irq_soft_mask; +#endif }
arch/powerpc/kernel/exceptions-64s.S +0 -60
95 lines not on this page · raw message
Signature · 1 line
2.23.0
Nicholas Piggin
reviewerRFC PATCH 11/12 powerpc/64s: runlatch interrupt handling in C
In reply to Nicholas PigginThere is no need for this to be in asm, use the new intrrupt entry wrapper.
--- arch/powerpc/include/asm/interrupt.h | 16 ++++++++++++++-- arch/powerpc/kernel/exceptions-64s.S | 18 ------------------ 2 files changed, 14 insertions(+), 20 deletions(-)
arch/powerpc/include/asm/interrupt.h +14 -2
@@ -6,6 +6,7 @@#include <linux/hardirq.h> #include <asm/cputime.h> #include <asm/ftrace.h> +#include <asm/runlatch.h> #ifdef CONFIG_PPC_BOOK3S_64 static inline void interrupt_enter_prepare (struct pt_regs *regs)
@@ -25,10 +26,22 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs) } } +static inline void interrupt_async_enter_prepare (struct pt_regs *regs) +{ +interrupt_enter_prepare (regs); + +if (cpu_has_feature (CPU_FTR_CTRL ) && + !test_thread_local_flags (_TLF_RUNLATCH)) +__ppc64_runlatch_on (); +} +#else /* CONFIG_PPC_BOOK3S_64 */ static inline void interrupt_enter_prepare (struct pt_regs *regs) { } +static inline void interrupt_async_enter_prepare (struct pt_regs *regs) +{ +}#endif /* CONFIG_PPC_BOOK3S_64 */ struct interrupt_nmi_state {
@@ -76,7 +89,6 @@ static inline void interrupt_nmi_exit_prepare(struct pt_regs *regs, struct inter#endif } -/** * DECLARE_INTERRUPT_HANDLER_RAW - Declare raw interrupt handler function * @func: Function name of the entry point
@@ -193,7 +205,7 @@ static __always_inline void ___##func(struct pt_regs *regs); \ \ __visible noinstr void func(struct pt_regs *regs) \ { \ -interrupt_enter_prepare (regs); \ +interrupt_async_enter_prepare (regs); \ \ ___##func (regs); \ } \
arch/powerpc/kernel/exceptions-64s.S +0 -18
@@ -692,14 +692,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) ld r1,GPR1(r1) .endm -#define RUNLATCH_ON \ -BEGIN_FTR_SECTION \ - ld r3, PACA_THREAD_INFO(r13); \ - ld r4,TI_LOCAL_FLAGS(r3); \ - andi. r0,r4,_TLF_RUNLATCH; \ - beql ppc64_runlatch_on_trampoline; \ -END_FTR_SECTION_IFSET(CPU_FTR_CTRL) - /* * When the idle code in power4_idle puts the CPU into NAP mode, * it has to do so in a loop, and relies on the external interrupt
@@ -1581,7 +1573,6 @@ EXC_VIRT_END(hardware_interrupt, 0x4500, 0x100) EXC_COMMON_BEGIN(hardware_interrupt_common) GEN_COMMON hardware_interrupt FINISH_NAP - RUNLATCH_ON addi r3,r1,STACK_FRAME_OVERHEAD bl do_IRQ b interrupt_return
@@ -1767,7 +1758,6 @@ EXC_VIRT_END(decrementer, 0x4900, 0x80) EXC_COMMON_BEGIN(decrementer_common) GEN_COMMON decrementer FINISH_NAP - RUNLATCH_ON addi r3,r1,STACK_FRAME_OVERHEAD bl timer_interrupt b interrupt_return
@@ -1853,7 +1843,6 @@ EXC_VIRT_END(doorbell_super, 0x4a00, 0x100) EXC_COMMON_BEGIN(doorbell_super_common) GEN_COMMON doorbell_super FINISH_NAP - RUNLATCH_ON addi r3,r1,STACK_FRAME_OVERHEAD #ifdef CONFIG_PPC_DOORBELL bl doorbell_exception
@@ -2208,7 +2197,6 @@ EXC_COMMON_BEGIN(hmi_exception_early_common) EXC_COMMON_BEGIN(hmi_exception_common) GEN_COMMON hmi_exception FINISH_NAP - RUNLATCH_ON addi r3,r1,STACK_FRAME_OVERHEAD bl handle_hmi_exception b interrupt_return
@@ -2238,7 +2226,6 @@ EXC_VIRT_END(h_doorbell, 0x4e80, 0x20) EXC_COMMON_BEGIN(h_doorbell_common) GEN_COMMON h_doorbell FINISH_NAP - RUNLATCH_ON addi r3,r1,STACK_FRAME_OVERHEAD #ifdef CONFIG_PPC_DOORBELL bl doorbell_exception
@@ -2272,7 +2259,6 @@ EXC_VIRT_END(h_virt_irq, 0x4ea0, 0x20) EXC_COMMON_BEGIN(h_virt_irq_common) GEN_COMMON h_virt_irq FINISH_NAP - RUNLATCH_ON addi r3,r1,STACK_FRAME_OVERHEAD bl do_IRQ b interrupt_return
@@ -2319,7 +2305,6 @@ EXC_VIRT_END(performance_monitor, 0x4f00, 0x20) EXC_COMMON_BEGIN(performance_monitor_common) GEN_COMMON performance_monitor FINISH_NAP - RUNLATCH_ON addi r3,r1,STACK_FRAME_OVERHEAD bl performance_monitor_exception b interrupt_return
@@ -3030,9 +3015,6 @@ kvmppc_skip_Hinterrupt: * come here. */ -EXC_COMMON_BEGIN(ppc64_runlatch_on_trampoline) - b __ppc64_runlatch_on - USE_FIXED_SECTION(virt_trampolines) /* * All code below __end_interrupts is treated as soft-masked. If
Signature · 1 line
2.23.0
Nicholas Piggin
reviewerRFC PATCH 12/12 powerpc/64s: power4 nap fixup in C
In reply to Nicholas PigginThere is no need for this to be in asm, use the new intrrupt entry wrapper.
--- arch/powerpc/include/asm/interrupt.h | 14 ++++++++ arch/powerpc/include/asm/processor.h | 1 + arch/powerpc/include/asm/thread_info.h | 6 ++++ arch/powerpc/kernel/exceptions-64s.S | 45 -------------------------- arch/powerpc/kernel/idle_book3s.S | 4 +++ 5 files changed, 25 insertions(+), 45 deletions(-)
arch/powerpc/include/asm/interrupt.h +14 -0
@@ -8,6 +8,16 @@#include <asm/ftrace.h> #include <asm/runlatch.h> +static inline void nap_adjust_return (struct pt_regs *regs) +{ +#ifdef CONFIG_PPC_970_NAP +if (test_thread_local_flags (_TLF_NAPPING)) { +clear_thread_local_flags (_TLF_NAPPING); + regs->nip = (unsigned long )power4_idle_nap_return; + } +#endif +} +#ifdef CONFIG_PPC_BOOK3S_64 static inline void interrupt_enter_prepare (struct pt_regs *regs) {
@@ -33,6 +43,8 @@ static inline void interrupt_async_enter_prepare(struct pt_regs *regs)if (cpu_has_feature (CPU_FTR_CTRL ) && !test_thread_local_flags (_TLF_RUNLATCH))__ppc64_runlatch_on (); + + nap_adjust_return(regs); }#else /* CONFIG_PPC_BOOK3S_64 */
@@ -72,6 +84,8 @@ static inline void interrupt_nmi_enter_prepare(struct pt_regs *regs, struct intethis_cpu_set_ftrace_enabled (0 ); +nap_adjust_return (regs); +nmi_enter (); }
arch/powerpc/include/asm/processor.h +1 -0
@@ -424,6 +424,7 @@ extern unsigned long isa300_idle_stop_mayloss(unsigned long psscr_val);extern unsigned long isa206_idle_insn_mayloss (unsigned long type);#ifdef CONFIG_PPC_970_NAP extern void power4_idle_nap (void ); +extern void power4_idle_nap_return (void );#endif extern unsigned long cpuidle_disable;
arch/powerpc/include/asm/thread_info.h +6 -0
@@ -156,6 +156,12 @@ void arch_setup_new_exec(void);#ifndef __ASSEMBLY__ +static inline void clear_thread_local_flags (unsigned int flags) +{ +struct thread_info *ti =current_thread_info (); + ti->local_flags &= ~flags; +} +static inline bool test_thread_local_flags (unsigned int flags) {struct thread_info *ti =current_thread_info ();
arch/powerpc/kernel/exceptions-64s.S +0 -45
105 lines not on this page · raw message
arch/powerpc/kernel/idle_book3s.S +4 -0
@@ -201,4 +201,8 @@ _GLOBAL(power4_idle_nap) mtmsrd r7 isync b 1b + + .globl power4_idle_nap_return +power4_idle_nap_return: + blr #endif
Signature · 1 line
2.23.0
Re: [RFC PATCH 12/12] powerpc/64s: power4 nap fixup in C
Le 05/09/2020 à 19:43, Nicholas Piggin a écrit :
Quoted 16 lines
There is no need for this to be in asm, use the new intrrupt entry wrapper.
Signed-off-by Nicholas Piggin <[email protected]>--- arch/powerpc/include/asm/interrupt.h | 14 ++++++++ arch/powerpc/include/asm/processor.h | 1 + arch/powerpc/include/asm/thread_info.h | 6 ++++ arch/powerpc/kernel/exceptions-64s.S | 45 -------------------------- arch/powerpc/kernel/idle_book3s.S | 4 +++ 5 files changed, 25 insertions(+), 45 deletions(-)arch/powerpc/include/asm/interrupt.h +0
-0
arch/powerpc/include/asm/interrupt.h line 13
Quoted 6 lines
arch/powerpc/include/asm/interrupt.h +3
-0@@ -8,6 +8,16 @@#include <asm/ftrace.h> #include <asm/runlatch.h> +static inline void nap_adjust_return (struct pt_regs *regs) +{ +#ifdef CONFIG_PPC_970_NAP
Avoid #ifdef, you can use IS_ENABLED(CONFIG_PPC_970_NAP) in the 'if' below
Quoted 33 lines
arch/powerpc/include/asm/interrupt.h +11
-0+if (test_thread_local_flags (_TLF_NAPPING)) { +clear_thread_local_flags (_TLF_NAPPING); + regs->nip = (unsigned long )power4_idle_nap_return; + } +#endif +} +#ifdef CONFIG_PPC_BOOK3S_64 static inline void interrupt_enter_prepare (struct pt_regs *regs) {@@ -33,6 +43,8 @@ static inline void interrupt_async_enter_prepare(struct pt_regs *regs)if (cpu_has_feature (CPU_FTR_CTRL ) && !test_thread_local_flags (_TLF_RUNLATCH))__ppc64_runlatch_on (); + + nap_adjust_return(regs); }#else /* CONFIG_PPC_BOOK3S_64 */ @@ -72,6 +84,8 @@ static inline void interrupt_nmi_enter_prepare(struct pt_regs *regs, struct intethis_cpu_set_ftrace_enabled (0 ); +nap_adjust_return (regs); +nmi_enter (); }arch/powerpc/include/asm/processor.h +0
-0
arch/powerpc/include/asm/processor.h extern unsigned long isa300_idle_stop_mayloss(unsigned long psscr_val); · line 427
Quoted 4 lines
arch/powerpc/include/asm/processor.h +1
-0@@ -424,6 +424,7 @@ extern unsigned long isa300_idle_stop_mayloss(unsigned long psscr_val);extern unsigned long isa206_idle_insn_mayloss (unsigned long type);#ifdef CONFIG_PPC_970_NAP extern void power4_idle_nap (void ); +extern void power4_idle_nap_return (void );
Please please please, 'extern' keyword is pointless and deprecated for function prototypes. Don't add new ones.
Also, put it outside the #ifdef, so that you can use IS_ENABLED() instead of #ifdef when using it.
Quoted 144 lines
arch/powerpc/include/asm/processor.h +0
-0#endif extern unsigned long cpuidle_disable;arch/powerpc/include/asm/thread_info.h +6
-0@@ -156,6 +156,12 @@ void arch_setup_new_exec(void);#ifndef __ASSEMBLY__ +static inline void clear_thread_local_flags (unsigned int flags) +{ +struct thread_info *ti =current_thread_info (); + ti->local_flags &= ~flags; +} +static inline bool test_thread_local_flags (unsigned int flags) {struct thread_info *ti =current_thread_info ();arch/powerpc/kernel/exceptions-64s.S +0
-45@@ -692,25 +692,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) ld r1,GPR1(r1) .endm -/* - * When the idle code in power4_idle puts the CPU into NAP mode, - * it has to do so in a loop, and relies on the external interrupt - * and decrementer interrupt entry code to get it out of the loop. - * It sets the _TLF_NAPPING bit in current_thread_info()->local_flags - * to signal that it is in the loop and needs help to get out. - */ -#ifdef CONFIG_PPC_970_NAP -#define FINISH_NAP \ -BEGIN_FTR_SECTION \ - ld r11, PACA_THREAD_INFO(r13); \ - ld r9,TI_LOCAL_FLAGS(r11); \ - andi. r10,r9,_TLF_NAPPING; \ - bnel power4_fixup_nap; \ -END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP) -#else -#define FINISH_NAP -#endif - /* * There are a few constraints to be concerned with. * - Real mode exceptions code/data must be located at their physical location.@@ -1250,7 +1231,6 @@ EXC_COMMON_BEGIN(machine_check_common) */ GEN_COMMON machine_check - FINISH_NAP /* Enable MSR_RI when finished with PACA_EXMC */ li r10,MSR_RI mtmsrd r10,1@@ -1572,7 +1552,6 @@ EXC_VIRT_BEGIN(hardware_interrupt, 0x4500, 0x100) EXC_VIRT_END(hardware_interrupt, 0x4500, 0x100) EXC_COMMON_BEGIN(hardware_interrupt_common) GEN_COMMON hardware_interrupt - FINISH_NAP addi r3,r1,STACK_FRAME_OVERHEAD bl do_IRQ b interrupt_return@@ -1757,7 +1736,6 @@ EXC_VIRT_BEGIN(decrementer, 0x4900, 0x80) EXC_VIRT_END(decrementer, 0x4900, 0x80) EXC_COMMON_BEGIN(decrementer_common) GEN_COMMON decrementer - FINISH_NAP addi r3,r1,STACK_FRAME_OVERHEAD bl timer_interrupt b interrupt_return@@ -1842,7 +1820,6 @@ EXC_VIRT_BEGIN(doorbell_super, 0x4a00, 0x100) EXC_VIRT_END(doorbell_super, 0x4a00, 0x100) EXC_COMMON_BEGIN(doorbell_super_common) GEN_COMMON doorbell_super - FINISH_NAP addi r3,r1,STACK_FRAME_OVERHEAD #ifdef CONFIG_PPC_DOORBELL bl doorbell_exception@@ -2196,7 +2173,6 @@ EXC_COMMON_BEGIN(hmi_exception_early_common) EXC_COMMON_BEGIN(hmi_exception_common) GEN_COMMON hmi_exception - FINISH_NAP addi r3,r1,STACK_FRAME_OVERHEAD bl handle_hmi_exception b interrupt_return@@ -2225,7 +2201,6 @@ EXC_VIRT_BEGIN(h_doorbell, 0x4e80, 0x20) EXC_VIRT_END(h_doorbell, 0x4e80, 0x20) EXC_COMMON_BEGIN(h_doorbell_common) GEN_COMMON h_doorbell - FINISH_NAP addi r3,r1,STACK_FRAME_OVERHEAD #ifdef CONFIG_PPC_DOORBELL bl doorbell_exception@@ -2258,7 +2233,6 @@ EXC_VIRT_BEGIN(h_virt_irq, 0x4ea0, 0x20) EXC_VIRT_END(h_virt_irq, 0x4ea0, 0x20) EXC_COMMON_BEGIN(h_virt_irq_common) GEN_COMMON h_virt_irq - FINISH_NAP addi r3,r1,STACK_FRAME_OVERHEAD bl do_IRQ b interrupt_return@@ -2304,7 +2278,6 @@ EXC_VIRT_BEGIN(performance_monitor, 0x4f00, 0x20) EXC_VIRT_END(performance_monitor, 0x4f00, 0x20) EXC_COMMON_BEGIN(performance_monitor_common) GEN_COMMON performance_monitor - FINISH_NAP addi r3,r1,STACK_FRAME_OVERHEAD bl performance_monitor_exception b interrupt_return@@ -3032,24 +3005,6 @@ USE_FIXED_SECTION(virt_trampolines) __end_interrupts: DEFINE_FIXED_SYMBOL(__end_interrupts) -#ifdef CONFIG_PPC_970_NAP - /* - * Called by exception entry code if _TLF_NAPPING was set, this clears - * the NAPPING flag, and redirects the exception exit to - * power4_fixup_nap_return. - */ - .globl power4_fixup_nap -EXC_COMMON_BEGIN(power4_fixup_nap) - andc r9,r9,r10 - std r9,TI_LOCAL_FLAGS(r11) - LOAD_REG_ADDR(r10, power4_idle_nap_return) - std r10,_NIP(r1) - blr - -power4_idle_nap_return: - blr -#endif - CLOSE_FIXED_SECTION(real_vectors); CLOSE_FIXED_SECTION(real_trampolines); CLOSE_FIXED_SECTION(virt_vectors);arch/powerpc/kernel/idle_book3s.S +0
-0
arch/powerpc/kernel/idle_book3s.S _GLOBAL(power4_idle_nap) · line 207
Quoted 7 lines
arch/powerpc/kernel/idle_book3s.S +4
-0@@ -201,4 +201,8 @@ _GLOBAL(power4_idle_nap) mtmsrd r7 isync b 1b + + .globl power4_idle_nap_return +power4_idle_nap_return: + blr
Can't this be written in C somewhere ?
arch/powerpc/kernel/idle_book3s.S _GLOBAL(power4_idle_nap) · line 208
Quoted 2 lines
arch/powerpc/kernel/idle_book3s.S +0
-0#endif
Christophe
Nicholas Piggin
reviewerRe: [RFC PATCH 12/12] powerpc/64s: power4 nap fixup in C
Excerpts from Christophe Leroy's message of September 6, 2020 5:32 pm:
Quoted 22 lines
Le 05/09/2020 à 19:43, Nicholas Piggin a écrit :
Quoted 19 lines
There is no need for this to be in asm, use the new intrrupt entry wrapper.
Signed-off-by Nicholas Piggin <[email protected]>--- arch/powerpc/include/asm/interrupt.h | 14 ++++++++ arch/powerpc/include/asm/processor.h | 1 + arch/powerpc/include/asm/thread_info.h | 6 ++++ arch/powerpc/kernel/exceptions-64s.S | 45 -------------------------- arch/powerpc/kernel/idle_book3s.S | 4 +++ 5 files changed, 25 insertions(+), 45 deletions(-)arch/powerpc/include/asm/interrupt.h +0
-0@@ -8,6 +8,16 @@#include <asm/ftrace.h> #include <asm/runlatch.h>
Quoted 5 lines
arch/powerpc/include/asm/interrupt.h line 13
Quoted 3 lines
arch/powerpc/include/asm/interrupt.h +3
-0+static inline void nap_adjust_return (struct pt_regs *regs) +{ +#ifdef CONFIG_PPC_970_NAP Avoid #ifdef, you can use
IS_ENABLED(CONFIG_PPC_970_NAP)in the 'if' below
Yeah I guess.
Quoted 41 lines
Quoted 33 lines
arch/powerpc/include/asm/interrupt.h +11
-0+if (test_thread_local_flags (_TLF_NAPPING)) { +clear_thread_local_flags (_TLF_NAPPING); + regs->nip = (unsigned long )power4_idle_nap_return; + } +#endif +} +#ifdef CONFIG_PPC_BOOK3S_64 static inline void interrupt_enter_prepare (struct pt_regs *regs) {@@ -33,6 +43,8 @@ static inline void interrupt_async_enter_prepare(struct pt_regs *regs)if (cpu_has_feature (CPU_FTR_CTRL ) && !test_thread_local_flags (_TLF_RUNLATCH))__ppc64_runlatch_on (); + + nap_adjust_return(regs); }#else /* CONFIG_PPC_BOOK3S_64 */ @@ -72,6 +84,8 @@ static inline void interrupt_nmi_enter_prepare(struct pt_regs *regs, struct intethis_cpu_set_ftrace_enabled (0 ); +nap_adjust_return (regs); +nmi_enter (); }arch/powerpc/include/asm/processor.h +0
-0arch/powerpc/include/asm/processor.h extern unsigned long isa300_idle_stop_mayloss(unsigned long psscr_val); · line 427
Quoted 4 lines
arch/powerpc/include/asm/processor.h +1
-0@@ -424,6 +424,7 @@ extern unsigned long isa300_idle_stop_mayloss(unsigned long psscr_val);extern unsigned long isa206_idle_insn_mayloss (unsigned long type);#ifdef CONFIG_PPC_970_NAP extern void power4_idle_nap (void ); +extern void power4_idle_nap_return (void );Please please please, 'extern' keyword is pointless and deprecated for function prototypes. Don't add new ones.
Quoted 2 lines
Also, put it outside the #ifdef, so that you can use
IS_ENABLED()instead of #ifdef when using it.
I just copy paste and forget to remove it. I expect someone will do a "cleanup" patch to get rid of them in one go, I find a random assortment of extern and not extern to be even uglier :(
Quoted 145 lines
Quoted 145 lines
arch/powerpc/include/asm/processor.h +0
-0#endif extern unsigned long cpuidle_disable;arch/powerpc/include/asm/thread_info.h +6
-0@@ -156,6 +156,12 @@ void arch_setup_new_exec(void);#ifndef __ASSEMBLY__ +static inline void clear_thread_local_flags (unsigned int flags) +{ +struct thread_info *ti =current_thread_info (); + ti->local_flags &= ~flags; +} +static inline bool test_thread_local_flags (unsigned int flags) {struct thread_info *ti =current_thread_info ();arch/powerpc/kernel/exceptions-64s.S +0
-45@@ -692,25 +692,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) ld r1,GPR1(r1) .endm -/* - * When the idle code in power4_idle puts the CPU into NAP mode, - * it has to do so in a loop, and relies on the external interrupt - * and decrementer interrupt entry code to get it out of the loop. - * It sets the _TLF_NAPPING bit in current_thread_info()->local_flags - * to signal that it is in the loop and needs help to get out. - */ -#ifdef CONFIG_PPC_970_NAP -#define FINISH_NAP \ -BEGIN_FTR_SECTION \ - ld r11, PACA_THREAD_INFO(r13); \ - ld r9,TI_LOCAL_FLAGS(r11); \ - andi. r10,r9,_TLF_NAPPING; \ - bnel power4_fixup_nap; \ -END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP) -#else -#define FINISH_NAP -#endif - /* * There are a few constraints to be concerned with. * - Real mode exceptions code/data must be located at their physical location.@@ -1250,7 +1231,6 @@ EXC_COMMON_BEGIN(machine_check_common) */ GEN_COMMON machine_check - FINISH_NAP /* Enable MSR_RI when finished with PACA_EXMC */ li r10,MSR_RI mtmsrd r10,1@@ -1572,7 +1552,6 @@ EXC_VIRT_BEGIN(hardware_interrupt, 0x4500, 0x100) EXC_VIRT_END(hardware_interrupt, 0x4500, 0x100) EXC_COMMON_BEGIN(hardware_interrupt_common) GEN_COMMON hardware_interrupt - FINISH_NAP addi r3,r1,STACK_FRAME_OVERHEAD bl do_IRQ b interrupt_return@@ -1757,7 +1736,6 @@ EXC_VIRT_BEGIN(decrementer, 0x4900, 0x80) EXC_VIRT_END(decrementer, 0x4900, 0x80) EXC_COMMON_BEGIN(decrementer_common) GEN_COMMON decrementer - FINISH_NAP addi r3,r1,STACK_FRAME_OVERHEAD bl timer_interrupt b interrupt_return@@ -1842,7 +1820,6 @@ EXC_VIRT_BEGIN(doorbell_super, 0x4a00, 0x100) EXC_VIRT_END(doorbell_super, 0x4a00, 0x100) EXC_COMMON_BEGIN(doorbell_super_common) GEN_COMMON doorbell_super - FINISH_NAP addi r3,r1,STACK_FRAME_OVERHEAD #ifdef CONFIG_PPC_DOORBELL bl doorbell_exception@@ -2196,7 +2173,6 @@ EXC_COMMON_BEGIN(hmi_exception_early_common) EXC_COMMON_BEGIN(hmi_exception_common) GEN_COMMON hmi_exception - FINISH_NAP addi r3,r1,STACK_FRAME_OVERHEAD bl handle_hmi_exception b interrupt_return@@ -2225,7 +2201,6 @@ EXC_VIRT_BEGIN(h_doorbell, 0x4e80, 0x20) EXC_VIRT_END(h_doorbell, 0x4e80, 0x20) EXC_COMMON_BEGIN(h_doorbell_common) GEN_COMMON h_doorbell - FINISH_NAP addi r3,r1,STACK_FRAME_OVERHEAD #ifdef CONFIG_PPC_DOORBELL bl doorbell_exception@@ -2258,7 +2233,6 @@ EXC_VIRT_BEGIN(h_virt_irq, 0x4ea0, 0x20) EXC_VIRT_END(h_virt_irq, 0x4ea0, 0x20) EXC_COMMON_BEGIN(h_virt_irq_common) GEN_COMMON h_virt_irq - FINISH_NAP addi r3,r1,STACK_FRAME_OVERHEAD bl do_IRQ b interrupt_return@@ -2304,7 +2278,6 @@ EXC_VIRT_BEGIN(performance_monitor, 0x4f00, 0x20) EXC_VIRT_END(performance_monitor, 0x4f00, 0x20) EXC_COMMON_BEGIN(performance_monitor_common) GEN_COMMON performance_monitor - FINISH_NAP addi r3,r1,STACK_FRAME_OVERHEAD bl performance_monitor_exception b interrupt_return@@ -3032,24 +3005,6 @@ USE_FIXED_SECTION(virt_trampolines) __end_interrupts: DEFINE_FIXED_SYMBOL(__end_interrupts) -#ifdef CONFIG_PPC_970_NAP - /* - * Called by exception entry code if _TLF_NAPPING was set, this clears - * the NAPPING flag, and redirects the exception exit to - * power4_fixup_nap_return. - */ - .globl power4_fixup_nap -EXC_COMMON_BEGIN(power4_fixup_nap) - andc r9,r9,r10 - std r9,TI_LOCAL_FLAGS(r11) - LOAD_REG_ADDR(r10, power4_idle_nap_return) - std r10,_NIP(r1) - blr - -power4_idle_nap_return: - blr -#endif - CLOSE_FIXED_SECTION(real_vectors); CLOSE_FIXED_SECTION(real_trampolines); CLOSE_FIXED_SECTION(virt_vectors);arch/powerpc/kernel/idle_book3s.S +0
-0@@ -201,4 +201,8 @@ _GLOBAL(power4_idle_nap) mtmsrd r7
Quoted 8 lines
arch/powerpc/kernel/idle_book3s.S _GLOBAL(power4_idle_nap) · line 207
Quoted 6 lines
arch/powerpc/kernel/idle_book3s.S +4
-0isync b 1b + + .globl power4_idle_nap_return +power4_idle_nap_return: + blrCan't this be written in C somewhere ?
Yes I think so if you did the entire power4_idle_nap function in C and used inline asm for the mtmsrd and fixup label (basically the same way as copy user exceptions return to a fixup location).
You have to return to the same C function of course because you can't control the stack otherwise. But I don't care too much about avoiding an extra function call/return here, all the important stuff is in C now.
Thanks,
Nick
Re: [RFC PATCH 12/12] powerpc/64s: power4 nap fixup in C
Le 07/09/2020 à 06:02, Nicholas Piggin a écrit :
Quoted 28 lines
Excerpts from Christophe Leroy's message of September 6, 2020 5:32 pm:
Quoted 27 lines
Le 05/09/2020 à 19:43, Nicholas Piggin a écrit :
Quoted 16 lines
There is no need for this to be in asm, use the new intrrupt entry wrapper.
Signed-off-by Nicholas Piggin <[email protected]>--- arch/powerpc/include/asm/interrupt.h | 14 ++++++++ arch/powerpc/include/asm/processor.h | 1 + arch/powerpc/include/asm/thread_info.h | 6 ++++ arch/powerpc/kernel/exceptions-64s.S | 45 -------------------------- arch/powerpc/kernel/idle_book3s.S | 4 +++ 5 files changed, 25 insertions(+), 45 deletions(-)arch/powerpc/include/asm/processor.h +0
-0arch/powerpc/include/asm/processor.h extern unsigned long isa300_idle_stop_mayloss(unsigned long psscr_val); · line 427
Quoted 4 lines
arch/powerpc/include/asm/processor.h +1
-0@@ -424,6 +424,7 @@ extern unsigned long isa300_idle_stop_mayloss(unsigned long psscr_val);extern unsigned long isa206_idle_insn_mayloss (unsigned long type);#ifdef CONFIG_PPC_970_NAP extern void power4_idle_nap (void ); +extern void power4_idle_nap_return (void );Please please please, 'extern' keyword is pointless and deprecated for function prototypes. Don't add new ones.
Quoted 6 lines
Quoted 2 lines
Also, put it outside the #ifdef, so that you can use
IS_ENABLED()instead of #ifdef when using it.I just copy paste and forget to remove it. I expect someone will do a "cleanup" patch to get rid of them in one go, I find a random assortment of extern and not extern to be even uglier :(
If we don't want to make fixes backporting a huge headache, some transition with random assortment is the price to pay.
One day, when 'extern' have become the minority, we can get rid of the few last ones.
But if someone believe it is not such a problem with backporting, I can provide a cleanup patch now.
Christophe
Nicholas Piggin
reviewerRe: [RFC PATCH 12/12] powerpc/64s: power4 nap fixup in C
Excerpts from Christophe Leroy's message of September 7, 2020 2:48 pm:
Quoted 38 lines
Le 07/09/2020 à 06:02, Nicholas Piggin a écrit :
Quoted 28 lines
Excerpts from Christophe Leroy's message of September 6, 2020 5:32 pm:
Quoted 27 lines
Le 05/09/2020 à 19:43, Nicholas Piggin a écrit :
Quoted 16 lines
There is no need for this to be in asm, use the new intrrupt entry wrapper.
Signed-off-by Nicholas Piggin <[email protected]>--- arch/powerpc/include/asm/interrupt.h | 14 ++++++++ arch/powerpc/include/asm/processor.h | 1 + arch/powerpc/include/asm/thread_info.h | 6 ++++ arch/powerpc/kernel/exceptions-64s.S | 45 -------------------------- arch/powerpc/kernel/idle_book3s.S | 4 +++ 5 files changed, 25 insertions(+), 45 deletions(-)arch/powerpc/include/asm/processor.h +0
-0arch/powerpc/include/asm/processor.h extern unsigned long isa300_idle_stop_mayloss(unsigned long psscr_val); · line 427
Quoted 4 lines
arch/powerpc/include/asm/processor.h +1
-0@@ -424,6 +424,7 @@ extern unsigned long isa300_idle_stop_mayloss(unsigned long psscr_val);extern unsigned long isa206_idle_insn_mayloss (unsigned long type);#ifdef CONFIG_PPC_970_NAP extern void power4_idle_nap (void ); +extern void power4_idle_nap_return (void );Please please please, 'extern' keyword is pointless and deprecated for function prototypes. Don't add new ones.
Quoted 6 lines
Quoted 2 lines
Also, put it outside the #ifdef, so that you can use
IS_ENABLED()instead of #ifdef when using it.I just copy paste and forget to remove it. I expect someone will do a "cleanup" patch to get rid of them in one go, I find a random assortment of extern and not extern to be even uglier :(
Quoted 8 lines
If we don't want to make fixes backporting a huge headache, some transition with random assortment is the price to pay.
One day, when 'extern' have become the minority, we can get rid of the few last ones.
But if someone believe it is not such a problem with backporting, I can provide a cleanup patch now.
I can't really see declarations being a big problem for backporting or git history. But maybe Michael won't like a patch.
I will try to remember externs though.
Thanks,
Nick