cputime: remove duplicate code in account_process_tick
PATCH v3 1/2 cputime: remove duplicate code in account_process_tick
The irqtime_account_process_tick path was introduced for precise ns irq time account from commit abb74cefa9c6 ("sched: Export ns irqtimes through /proc/stat") while account_process_tick still use jiffes. This divide isn't necessary especially now both paths are ns precison.
Move out the irqtime_account_process_tick func from IRQ_TIME_ACCOUNTING. So it do generally same things as account_process_tick whenever if IRQ_TIME_ACCOUNTING set or if sched_clock_irqtime enabled.
--- kernel/sched/cputime.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-)
kernel/sched/cputime.c +2 -23
@@ -332,7 +332,6 @@ void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times)rcu_read_unlock (); } -#ifdef CONFIG_IRQ_TIME_ACCOUNTING /* * Account a tick to a process and cpustat * @p: the process that the CPU time gets accounted to
@@ -390,6 +389,7 @@ static void irqtime_account_process_tick(struct task_struct *p, int user_tick, } } +#ifdef CONFIG_IRQ_TIME_ACCOUNTING static void irqtime_account_idle_ticks (int ticks) {struct rq *rq =this_rq ();
@@ -398,8 +398,6 @@ static void irqtime_account_idle_ticks(int ticks) }#else /* CONFIG_IRQ_TIME_ACCOUNTING */ static inline void irqtime_account_idle_ticks (int ticks) { } -static inline void irqtime_account_process_tick (struct task_struct *p,int user_tick, -struct rq *rq,int nr_ticks) { }#endif /* CONFIG_IRQ_TIME_ACCOUNTING */ /*
@@ -474,31 +472,12 @@ void thread_group_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st)*/ void account_process_tick (struct task_struct *p,int user_tick) { -u64 cputime, steal;struct rq *rq =this_rq ();if (vtime_accounting_cpu_enabled ())return ; -if (sched_clock_irqtime) { -irqtime_account_process_tick (p, user_tick, rq,1 ); -return ; - } - - cputime =TICK_NSEC ; - steal =steal_account_process_time (ULONG_MAX ); - -if (steal >= cputime) -return ; - - cputime -= steal; - -if (user_tick) -account_user_time (p, cputime); -else if ((p != rq->idle) || (irq_count () !=HARDIRQ_OFFSET )) -account_system_time (p,HARDIRQ_OFFSET , cputime); -else -account_idle_time (cputime); +irqtime_account_process_tick (p, user_tick, rq,1 ); }/*
Signature · 1 line
2.19.1.856.g8858448bb
PATCH v3 2/2 cputime: remove rq parameter from irqtime_account_process_tick func
Using the per cpu rq in function internal is better and meaningful, don't need get and pass it from outside as a parameter.
It also reduce the object size. with defconfig + CONFIG_IRQ_TIME_ACCOUNTING
base with this patch
cputime.o 10632 bytes 10568 bytes
--- kernel/sched/cputime.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
kernel/sched/cputime.c +5 -7
@@ -354,9 +354,10 @@ void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times)* softirq as those do not count in task exec_runtime any more. */ static void irqtime_account_process_tick (struct task_struct *p,int user_tick, -struct rq *rq,int ticks) +int ticks) {u64 other, cputime =TICK_NSEC * ticks; +struct rq *rq;/* * When returning from idle, many ticks can get accounted at
@@ -370,6 +371,7 @@ static void irqtime_account_process_tick(struct task_struct *p, int user_tick,return ; cputime -= other; + rq =this_rq ();if (this_cpu_ksoftirqd () == p) {/*
@@ -392,9 +394,7 @@ static void irqtime_account_process_tick(struct task_struct *p, int user_tick,#ifdef CONFIG_IRQ_TIME_ACCOUNTING static void irqtime_account_idle_ticks (int ticks) { -struct rq *rq =this_rq (); - -irqtime_account_process_tick (current,0 , rq, ticks); +irqtime_account_process_tick (current,0 , ticks); }#else /* CONFIG_IRQ_TIME_ACCOUNTING */ static inline void irqtime_account_idle_ticks (int ticks) { }
@@ -472,12 +472,10 @@ void thread_group_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st)*/ void account_process_tick (struct task_struct *p,int user_tick) { -struct rq *rq =this_rq (); -if (vtime_accounting_cpu_enabled ())return ; -irqtime_account_process_tick (p, user_tick, rq,1 ); +irqtime_account_process_tick (p, user_tick,1 ); }/*
Signature · 1 line
2.19.1.856.g8858448bb
Forget this patchset. I sent out a new 3 patches.
Thanks
Alex
Quoted 8 lines · Alex Shi
The
irqtime_account_process_tickpath was introduced for precise ns irq time account from commitabb74cefa9c6("sched: Export ns irqtimes through/proc/stat") whileaccount_process_tickstill use jiffes. This divide isn't necessary especially now both paths are ns precison.Move out the
irqtime_account_process_tickfunc fromIRQ_TIME_ACCOUNTING. So it do generally same things asaccount_process_tickwhenever ifIRQ_TIME_ACCOUNTINGset or ifsched_clock_irqtimeenabled.