sched/vtime: vtime.h headers cleanup
Subsystems (4)
Alexander Gordeev
maintainerv2 cover sched/vtime: vtime.h headers cleanup
Hi All,
There are no changes since the last post, just a re-send.
v2:
- patch 4: commit message reworded (Heiko)
- patch 5: vtime.h is removed from Kbuild scripts (PowerPC only) (Heiko)
v1:
Please find a small cleanup to vtime_task_switch() wiring. I split it into smaller patches to allow separate PowerPC vs s390 reviews. Otherwise patches 2+3 and 4+5 could have been merged.
I tested it on s390 and compile-tested it on 32- and 64-bit PowerPC and few other major architectures only, but it is only of concern for CONFIG_VIRT_CPU_ACCOUNTING_NATIVE-capable ones (AFAICT).
Thanks!
Alexander Gordeev (5):
sched/vtime: remove confusing arch_vtime_task_switch() declaration sched/vtime: get rid of generic vtime_task_switch() implementation s390/vtime: remove unused __ARCH_HAS_VTIME_TASK_SWITCH leftover s390/irq,nmi: include <asm/vtime.h> header directly sched/vtime: do not include <asm/vtime.h> header
arch/powerpc/include/asm/Kbuild | 1 - arch/powerpc/include/asm/cputime.h | 13 ------------- arch/powerpc/kernel/time.c | 22 ++++++++++++++++++++++ arch/s390/include/asm/vtime.h | 2 -- arch/s390/kernel/irq.c | 1 + arch/s390/kernel/nmi.c | 1 + include/asm-generic/vtime.h | 1 - include/linux/vtime.h | 5 ----- kernel/sched/cputime.c | 13 ------------- 9 files changed, 24 insertions(+), 35 deletions(-) delete mode 100644 include/asm-generic/vtime.h
Signature · 1 line
2.40.1
Alexander Gordeev
maintainerPATCH RESEND v2 1/5 sched/vtime: remove confusing arch_vtime_task_switch() declaration
Callback arch_vtime_task_switch() is only defined when CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is selected. Yet, the function prototype forward declaration is present for CONFIG_VIRT_CPU_ACCOUNTING_GEN variant. Remove it.
--- include/linux/vtime.h | 1 - 1 file changed, 1 deletion(-)
include/linux/vtime.h +0 -1
@@ -18,7 +18,6 @@ extern void vtime_account_idle(struct task_struct *tsk);#endif /* !CONFIG_VIRT_CPU_ACCOUNTING */ #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN -extern void arch_vtime_task_switch (struct task_struct *tsk);extern void vtime_user_enter (struct task_struct *tsk);extern void vtime_user_exit (struct task_struct *tsk);extern void vtime_guest_enter (struct task_struct *tsk);
Signature · 1 line
2.40.1
Alexander Gordeev
maintainerPATCH RESEND v2 2/5 sched/vtime: get rid of generic vtime_task_switch() implementation
In reply to Alexander GordeevThe generic vtime_task_switch() implementation gets built only if __ARCH_HAS_VTIME_TASK_SWITCH is not defined, but requires an architecture to implement arch_vtime_task_switch() callback at the same time, which is confusing.
Further, arch_vtime_task_switch() is implemented for 32-bit PowerPC architecture only and vtime_task_switch() generic variant is rather superfluous.
Simplify the whole vtime_task_switch() wiring by moving the existing generic implementation to PowerPC.
--- arch/powerpc/include/asm/cputime.h | 13 ------------- arch/powerpc/kernel/time.c | 22 ++++++++++++++++++++++ kernel/sched/cputime.c | 13 ------------- 3 files changed, 22 insertions(+), 26 deletions(-)
arch/powerpc/include/asm/cputime.h +0 -13
@@ -32,23 +32,10 @@#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 /*
arch/powerpc/kernel/time.c +22 -0
@@ -354,6 +354,28 @@ void vtime_flush(struct task_struct *tsk) acct->hardirq_time =0 ; acct->softirq_time = 0; } + +/* +* 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. +*/ +void vtime_task_switch (struct task_struct *prev) +{ +if (is_idle_task (prev)) +vtime_account_idle (prev); +else +vtime_account_kernel (prev); + +vtime_flush (prev); + +if (!IS_ENABLED (CONFIG_PPC64 )) { +struct cpu_accounting_data *acct =get_accounting (current); +struct cpu_accounting_data *acct0 =get_accounting (prev); + + acct->starttime = acct0->starttime; + } +}#endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */ void __no_kcsan __delay(unsigned long loops)
kernel/sched/cputime.c +0 -13
@@ -424,19 +424,6 @@ static inline void irqtime_account_process_tick(struct task_struct *p, int user_*/ #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE -# ifndef __ARCH_HAS_VTIME_TASK_SWITCH -void vtime_task_switch (struct task_struct *prev) -{ -if (is_idle_task (prev)) -vtime_account_idle (prev); -else -vtime_account_kernel (prev); - -vtime_flush (prev); -arch_vtime_task_switch (prev); -} -# endif -void vtime_account_irq (struct task_struct *tsk,unsigned int offset) {unsigned int pc =irq_count () - offset;
Signature · 1 line
2.40.1
Alexander Gordeev
maintainerPATCH RESEND v2 3/5 s390/vtime: remove unused __ARCH_HAS_VTIME_TASK_SWITCH leftover
In reply to Alexander Gordeev__ARCH_HAS_VTIME_TASK_SWITCH macro is not used anymore.
--- arch/s390/include/asm/vtime.h | 2 -- 1 file changed, 2 deletions(-)
arch/s390/include/asm/vtime.h +0 -2
@@ -2,8 +2,6 @@#ifndef _S390_VTIME_H#define _S390_VTIME_H -#define __ARCH_HAS_VTIME_TASK_SWITCH -static inline void update_timer_sys (void ) { S390_lowcore.system_timer += S390_lowcore.last_update_timer - S390_lowcore.exit_timer;
Signature · 1 line
2.40.1
Alexander Gordeev
maintainerPATCH RESEND v2 4/5 s390/irq,nmi: include <asm/vtime.h> header directly
In reply to Alexander Gordeevupdate_timer_sys() and update_timer_mcck() are inlines used for CPU time accounting from the interrupt and machine-check handlers. These routines are specific to s390 architecture, but included via <linux/vtime.h> header implicitly. Avoid the extra loop and include <asm/vtime.h> header directly.
--- arch/s390/kernel/irq.c | 1 + arch/s390/kernel/nmi.c | 1 + 2 files changed, 2 insertions(+)
arch/s390/kernel/irq.c +1 -0
@@ -29,6 +29,7 @@#include <asm/hw_irq.h> #include <asm/stacktrace.h> #include <asm/softirq_stack.h> +#include <asm/vtime.h> #include "entry.h" DEFINE_PER_CPU_SHARED_ALIGNED(struct irq_stat, irq_stat);
arch/s390/kernel/nmi.c +1 -0
@@ -31,6 +31,7 @@#include <asm/crw.h> #include <asm/asm-offsets.h> #include <asm/pai.h> +#include <asm/vtime.h> struct mcck_struct {unsigned int kill_task :1 ;
Signature · 1 line
2.40.1
Alexander Gordeev
maintainerPATCH RESEND v2 5/5 sched/vtime: do not include <asm/vtime.h> header
In reply to Alexander GordeevThere is no architecture-specific code or data left that generic <linux/vtime.h> needs to know about. Thus, avoid the inclusion of <asm/vtime.h> header.
--- arch/powerpc/include/asm/Kbuild | 1 - include/asm-generic/vtime.h | 1 - include/linux/vtime.h | 4 ---- 3 files changed, 6 deletions(-) delete mode 100644 include/asm-generic/vtime.h
arch/powerpc/include/asm/Kbuild +0 -1
@@ -6,5 +6,4 @@ generic-y += agp.h generic-y += kvm_types.h generic-y += mcs_spinlock.h generic-y += qrwlock.h -generic-y += vtime.h generic-y += early_ioremap.h
include/asm-generic/vtime.h deleted +0 -1
@@ -1 +0,0 @@ -/* no content, but patch(1) dislikes empty files */
include/linux/vtime.h +0 -4
@@ -5,10 +5,6 @@#include <linux/context_tracking_state.h> #include <linux/sched.h> -#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE -#include <asm/vtime.h> -#endif -/* * Common vtime APIs */
Signature · 1 line
2.40.1
Quoted 14 lines · Alexander Gordeev
Hi All,
There are no changes since the last post, just a re-send.
v2:
- patch 4: commit message reworded (Heiko)
- patch 5:vtime.his removed fromKbuildscripts (PowerPC only) (Heiko)v1:
Please find a small cleanup tovtime_task_switch()wiring. I split it into smaller patches to allow separate PowerPC vs s390 reviews. Otherwise patches 2+3 and 4+5 could have been merged.
Quoted 6 lines
I tested it on s390 and compile-tested it on 32- and 64-bit PowerPC and few other major architectures only, but it is only of concern for CONFIG_VIRT_CPU_ACCOUNTING_NATIVE-capable ones (AFAICT).
Thanks!
It probably makes sense to apply the whole series to the scheduler tree. Does any powerpc or s390 maintainer oppose to that?
Thanks.
Quoted 24 lines
Alexander Gordeev (5):
sched/vtime: remove confusingarch_vtime_task_switch()declaration sched/vtime: get rid of genericvtime_task_switch()implementation s390/vtime: remove unused__ARCH_HAS_VTIME_TASK_SWITCHleftover s390/irq,nmi: include <asm/vtime.h> header directly sched/vtime: do not include <asm/vtime.h> headerarch/powerpc/include/asm/Kbuild | 1 - arch/powerpc/include/asm/cputime.h | 13 ------------- arch/powerpc/kernel/time.c | 22 ++++++++++++++++++++++ arch/s390/include/asm/vtime.h | 2 -- arch/s390/kernel/irq.c | 1 + arch/s390/kernel/nmi.c | 1 + include/asm-generic/vtime.h | 1 - include/linux/vtime.h | 5 ----- kernel/sched/cputime.c | 13 ------------- 9 files changed, 24 insertions(+), 35 deletions(-) delete mode 100644 include/asm-generic/vtime.hSignature · 1 line
2.40.1
Michael Ellerman
reviewerQuoted 20 lines · Frederic Weisbecker
Quoted 19 lines · Alexander Gordeev
Hi All,
There are no changes since the last post, just a re-send.
v2:
- patch 4: commit message reworded (Heiko)
- patch 5:vtime.his removed fromKbuildscripts (PowerPC only) (Heiko)v1:
Please find a small cleanup tovtime_task_switch()wiring. I split it into smaller patches to allow separate PowerPC vs s390 reviews. Otherwise patches 2+3 and 4+5 could have been merged.I tested it on s390 and compile-tested it on 32- and 64-bit PowerPC and few other major architectures only, but it is only of concern for CONFIG_VIRT_CPU_ACCOUNTING_NATIVE-capable ones (AFAICT).
Quoted 4 lines
Quoted 1 line
Thanks!
It probably makes sense to apply the whole series to the scheduler tree. Does any powerpc or s390 maintainer oppose to that?
No objection. It has acks and reviews from powerpc.
cheers