Fix "[v3, 25/32] powerpc/64: system call implement entry/exit logic in C"
Nicholas Piggin
reviewerPATCH 1/2 Fix "[v3, 25/32] powerpc/64: system call implement entry/exit logic in C"
Changes Christophe asked for to help ppc32 implementation, and move a stray hunk into a later patch.
Signed-off-by Nicholas Piggin <[email protected]>
--- arch/powerpc/include/asm/asm-prototypes.h | 4 --- arch/powerpc/include/asm/cputime.h | 38 +++++++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-)
arch/powerpc/include/asm/asm-prototypes.h +0 -4
@@ -97,12 +97,8 @@ ppc_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp,unsigned long __init early_init (unsigned long dt_ptr);void __init machine_init (u64 dt_ptr);#endif -#ifdef CONFIG_PPC64 long system_call_exception (long r3,long r4,long r5,long r6,long r7,long r8,unsigned long r0,struct pt_regs *regs);notrace unsigned long syscall_exit_prepare (unsigned long r3,struct pt_regs *regs); -notrace unsigned long interrupt_exit_user_prepare (struct pt_regs *regs,unsigned long msr); -notrace unsigned long interrupt_exit_kernel_prepare (struct pt_regs *regs,unsigned long msr); -#endif long ppc_fadvise64_64 (int fd,int advice,u32 offset_high,u32 offset_low,u32 len_high,u32 len_low);
arch/powerpc/include/asm/cputime.h +21 -17
@@ -43,8 +43,26 @@ static inline unsigned long cputime_to_usecs(const cputime_t ct)*/ #ifdef CONFIG_PPC64 #define get_accounting (tsk) (&get_paca()->accounting) +#define raw_get_accounting (tsk) (&local_paca->accounting)static inline void arch_vtime_task_switch (struct task_struct *tsk) { } +#else +#define get_accounting (tsk) (&task_thread_info(tsk)->accounting) +#define raw_get_accounting (tsk) get_accounting(tsk) +/* +* Called from the context switch with interrupts disabled, to charge all +* accumulated times to the current process, and to prepare accounting on +* the next process. +*/ +static inline void arch_vtime_task_switch (struct task_struct *prev) +{ +struct cpu_accounting_data *acct =get_accounting (current); +struct cpu_accounting_data *acct0 =get_accounting (prev); + + acct->starttime = acct0->starttime; +} +#endif +/* * account_cpu_user_entry/exit runs "unreconciled", so can't trace, * can't use use get_paca()
@@ -52,35 +70,21 @@ static inline void arch_vtime_task_switch(struct task_struct *tsk) { } static notrace inline void account_cpu_user_entry(void) {unsigned long tb =mftb (); -struct cpu_accounting_data *acct = &local_paca->accounting; +struct cpu_accounting_data *acct =raw_get_accounting (current); acct->utime += (tb - acct->starttime_user); acct->starttime = tb; } + static notrace inline void account_cpu_user_exit(void) {unsigned long tb =mftb (); -struct cpu_accounting_data *acct = &local_paca->accounting; +struct cpu_accounting_data *acct =raw_get_accounting (current); acct->stime += (tb - acct->starttime); acct->starttime_user = tb; } -#else -#define get_accounting (tsk) (&task_thread_info(tsk)->accounting) -/* -* Called from the context switch with interrupts disabled, to charge all -* accumulated times to the current process, and to prepare accounting on -* the next process. -*/ -static inline void arch_vtime_task_switch (struct task_struct *prev) -{ -struct cpu_accounting_data *acct =get_accounting (current); -struct cpu_accounting_data *acct0 =get_accounting (prev); - - acct->starttime = acct0->starttime; -} -#endif #endif /* __KERNEL__ */ #else /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */
Signature · 1 line
2.23.0
Nicholas Piggin
reviewerPATCH 2/2 Fix 2 "[v3, 28/32] powerpc/64s: interrupt implement exit logic in C"
This completes the move of the stray hunk. Also fixes an irq tracer bug, returning to irqs-disabled context should not trace_hardirqs_on().
Signed-off-by Nicholas Piggin <[email protected]>
--- arch/powerpc/include/asm/asm-prototypes.h | 2 ++ arch/powerpc/kernel/syscall_64.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/asm-prototypes.h +2 -0
@@ -99,6 +99,8 @@ void __init machine_init(u64 dt_ptr);#endif long system_call_exception (long r3,long r4,long r5,long r6,long r7,long r8,unsigned long r0,struct pt_regs *regs);notrace unsigned long syscall_exit_prepare (unsigned long r3,struct pt_regs *regs); +notrace unsigned long interrupt_exit_user_prepare (struct pt_regs *regs,unsigned long msr); +notrace unsigned long interrupt_exit_kernel_prepare (struct pt_regs *regs,unsigned long msr);long ppc_fadvise64_64 (int fd,int advice,u32 offset_high,u32 offset_low,u32 len_high,u32 len_low);
arch/powerpc/kernel/syscall_64.c +0 -1
@@ -355,7 +355,6 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs, unsignirq_soft_mask_set (IRQS_ENABLED ); }else {/* Returning to a kernel context with local irqs disabled. */ -trace_hardirqs_on ();__hard_EE_RI_disable ();if (regs->msr &MSR_EE ) local_paca->irq_happened &= ~PACA_IRQ_HARD_DIS ;
Signature · 1 line
2.23.0