sched/headers: Move cputime functionality from <linux/sched.h> and <linux/cputime.h> into <linux/sched/cputime.h>
Move cputime related functionality out of <linux/sched.h>, as most code that includes <linux/sched.h> does not use that functionality. Move data types that are not included in task_struct directly to the signal definitions, into <linux/sched/signal.h>. Also merge the (small) existing <linux/cputime.h> header into <linux/sched/cputime.h>. Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -164,114 +164,3 @@ sched_info_switch(struct rq *rq,
|
||||
#define sched_info_arrive(rq, next) do { } while (0)
|
||||
#define sched_info_switch(rq, t, next) do { } while (0)
|
||||
#endif /* CONFIG_SCHED_INFO */
|
||||
|
||||
/*
|
||||
* The following are functions that support scheduler-internal time accounting.
|
||||
* These functions are generally called at the timer tick. None of this depends
|
||||
* on CONFIG_SCHEDSTATS.
|
||||
*/
|
||||
|
||||
/**
|
||||
* get_running_cputimer - return &tsk->signal->cputimer if cputimer is running
|
||||
*
|
||||
* @tsk: Pointer to target task.
|
||||
*/
|
||||
#ifdef CONFIG_POSIX_TIMERS
|
||||
static inline
|
||||
struct thread_group_cputimer *get_running_cputimer(struct task_struct *tsk)
|
||||
{
|
||||
struct thread_group_cputimer *cputimer = &tsk->signal->cputimer;
|
||||
|
||||
/* Check if cputimer isn't running. This is accessed without locking. */
|
||||
if (!READ_ONCE(cputimer->running))
|
||||
return NULL;
|
||||
|
||||
/*
|
||||
* After we flush the task's sum_exec_runtime to sig->sum_sched_runtime
|
||||
* in __exit_signal(), we won't account to the signal struct further
|
||||
* cputime consumed by that task, even though the task can still be
|
||||
* ticking after __exit_signal().
|
||||
*
|
||||
* In order to keep a consistent behaviour between thread group cputime
|
||||
* and thread group cputimer accounting, lets also ignore the cputime
|
||||
* elapsing after __exit_signal() in any thread group timer running.
|
||||
*
|
||||
* This makes sure that POSIX CPU clocks and timers are synchronized, so
|
||||
* that a POSIX CPU timer won't expire while the corresponding POSIX CPU
|
||||
* clock delta is behind the expiring timer value.
|
||||
*/
|
||||
if (unlikely(!tsk->sighand))
|
||||
return NULL;
|
||||
|
||||
return cputimer;
|
||||
}
|
||||
#else
|
||||
static inline
|
||||
struct thread_group_cputimer *get_running_cputimer(struct task_struct *tsk)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* account_group_user_time - Maintain utime for a thread group.
|
||||
*
|
||||
* @tsk: Pointer to task structure.
|
||||
* @cputime: Time value by which to increment the utime field of the
|
||||
* thread_group_cputime structure.
|
||||
*
|
||||
* If thread group time is being maintained, get the structure for the
|
||||
* running CPU and update the utime field there.
|
||||
*/
|
||||
static inline void account_group_user_time(struct task_struct *tsk,
|
||||
u64 cputime)
|
||||
{
|
||||
struct thread_group_cputimer *cputimer = get_running_cputimer(tsk);
|
||||
|
||||
if (!cputimer)
|
||||
return;
|
||||
|
||||
atomic64_add(cputime, &cputimer->cputime_atomic.utime);
|
||||
}
|
||||
|
||||
/**
|
||||
* account_group_system_time - Maintain stime for a thread group.
|
||||
*
|
||||
* @tsk: Pointer to task structure.
|
||||
* @cputime: Time value by which to increment the stime field of the
|
||||
* thread_group_cputime structure.
|
||||
*
|
||||
* If thread group time is being maintained, get the structure for the
|
||||
* running CPU and update the stime field there.
|
||||
*/
|
||||
static inline void account_group_system_time(struct task_struct *tsk,
|
||||
u64 cputime)
|
||||
{
|
||||
struct thread_group_cputimer *cputimer = get_running_cputimer(tsk);
|
||||
|
||||
if (!cputimer)
|
||||
return;
|
||||
|
||||
atomic64_add(cputime, &cputimer->cputime_atomic.stime);
|
||||
}
|
||||
|
||||
/**
|
||||
* account_group_exec_runtime - Maintain exec runtime for a thread group.
|
||||
*
|
||||
* @tsk: Pointer to task structure.
|
||||
* @ns: Time value by which to increment the sum_exec_runtime field
|
||||
* of the thread_group_cputime structure.
|
||||
*
|
||||
* If thread group time is being maintained, get the structure for the
|
||||
* running CPU and update the sum_exec_runtime field there.
|
||||
*/
|
||||
static inline void account_group_exec_runtime(struct task_struct *tsk,
|
||||
unsigned long long ns)
|
||||
{
|
||||
struct thread_group_cputimer *cputimer = get_running_cputimer(tsk);
|
||||
|
||||
if (!cputimer)
|
||||
return;
|
||||
|
||||
atomic64_add(ns, &cputimer->cputime_atomic.sum_exec_runtime);
|
||||
}
|
||||
|
Reference in New Issue
Block a user