Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1966aaf7 authored by Li Zefan's avatar Li Zefan Committed by Ingo Molnar
Browse files

sched/cpuacct: Add cpuacct_acount_field() 



So we can remove open-coded cpuacct code in cputime.c.

Signed-off-by: default avatarLi Zefan <lizefan@huawei.com>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/51553692.9060008@huawei.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent dbe4b41f

kernel/sched/cpuacct.c

+23 −0
Original line number Diff line number Diff line
@@ -218,6 +218,29 @@ void cpuacct_charge(struct task_struct *tsk, u64 cputime) 
	rcu_read_unlock();

}



/*

 * Add user/system time to cpuacct.

 *

 * Note: it's the caller that updates the account of the root cgroup.

 */

void cpuacct_account_field(struct task_struct *p, int index, u64 val)

{

	struct kernel_cpustat *kcpustat;

	struct cpuacct *ca;



	if (unlikely(!cpuacct_subsys.active))

		return;



	rcu_read_lock();

	ca = task_ca(p);

	while (ca && (ca != &root_cpuacct)) {

		kcpustat = this_cpu_ptr(ca->cpustat);

		kcpustat->cpustat[index] += val;

		ca = parent_ca(ca);

	}

	rcu_read_unlock();

}



void __init cpuacct_init(void)

{

	root_cpuacct.cpustat = &kernel_cpustat;

kernel/sched/cpuacct.h

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ static inline struct cpuacct *parent_ca(struct cpuacct *ca) 


extern void cpuacct_init(void);

extern void cpuacct_charge(struct task_struct *tsk, u64 cputime);

extern void cpuacct_account_field(struct task_struct *p, int index, u64 val);



#else
@@ -54,4 +55,9 @@ static inline void cpuacct_charge(struct task_struct *tsk, u64 cputime) 
{

}



static inline void

cpuacct_account_field(struct task_struct *p, int index, u64 val)

{

}



#endif

kernel/sched/cputime.c

+1 −17
Original line number Diff line number Diff line
@@ -115,10 +115,6 @@ static int irqtime_account_si_update(void) 
static inline void task_group_account_field(struct task_struct *p, int index,

					    u64 tmp)

{

#ifdef CONFIG_CGROUP_CPUACCT

	struct kernel_cpustat *kcpustat;

	struct cpuacct *ca;

#endif

	/*

	 * Since all updates are sure to touch the root cgroup, we

	 * get ourselves ahead and touch it first. If the root cgroup
@@ -127,19 +123,7 @@ static inline void task_group_account_field(struct task_struct *p, int index, 
	 */

	__get_cpu_var(kernel_cpustat).cpustat[index] += tmp;



#ifdef CONFIG_CGROUP_CPUACCT

	if (unlikely(!cpuacct_subsys.active))

		return;



	rcu_read_lock();

	ca = task_ca(p);

	while (ca && (ca != &root_cpuacct)) {

		kcpustat = this_cpu_ptr(ca->cpustat);

		kcpustat->cpustat[index] += tmp;

		ca = parent_ca(ca);

	}

	rcu_read_unlock();

#endif

	cpuacct_account_field(p, index, tmp);

}



/*