Patch "sched/cputime: Rename vtime fields" has been added to the 4.12-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
sched/cputime: Rename vtime fields
to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sched-cputime-rename-vtime-fields.patch
and it can be found in the queue-4.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
60a9ce57e7c5ac1df3a39fb941022bbfa40c0862Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <[email protected]>
Date: Thu, 29 Jun 2017 19:15:09 +0200
Subject: sched/cputime: Rename vtime fields
From: Frederic Weisbecker <[email protected]>
commit 60a9ce57e7c5ac1df3a39fb941022bbfa40c0862 upstream.
The current "snapshot" based naming on vtime fields suggests we record some past event but that's a low level picture of their actual purpose which comes out blurry. The real point of these fields is to run a basic state machine that tracks down cputime entry while switching between contexts.
So lets reflect that with more meaningful names.
--- include/linux/init_task.h | 4 ++-- include/linux/sched.h | 4 ++-- kernel/fork.c | 4 ++-- kernel/sched/cputime.c | 30 +++++++++++++++--------------- 4 files changed, 21 insertions(+), 21 deletions(-)
include/linux/init_task.h +2 -2
@@ -171,8 +171,8 @@ extern struct cred init_cred;#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN # define INIT_VTIME (tsk) \ .vtime_seqcount = SEQCNT_ZERO(tsk.vtime_seqcount), \ - .vtime_snap = 0, \ - .vtime_snap_whence = VTIME_SYS, + .vtime_starttime = 0, \ + .vtime_state = VTIME_SYS,#else # define INIT_VTIME (tsk)#endif
include/linux/sched.h +2 -2
@@ -671,7 +671,7 @@ struct task_struct {struct prev_cputime prev_cputime;#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN seqcount_t vtime_seqcount; -unsigned long long vtime_snap; +unsigned long long vtime_starttime;enum {/* Task is sleeping or running in a CPU with VTIME inactive: */ VTIME_INACTIVE = 0,
@@ -679,7 +679,7 @@ struct task_struct {VTIME_USER ,/* Task runs in kernelspace in a CPU with VTIME active: */ VTIME_SYS , - } vtime_snap_whence; + } vtime_state;#endif #ifdef CONFIG_NO_HZ_FULL
kernel/fork.c +2 -2
@@ -1638,8 +1638,8 @@ static __latent_entropy struct task_stru#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN seqcount_init (&p->vtime_seqcount); - p->vtime_snap =0 ; - p->vtime_snap_whence =VTIME_INACTIVE ; + p->vtime_starttime =0 ; + p->vtime_state =VTIME_INACTIVE ;#endif #if defined(SPLIT_RSS_COUNTING )
kernel/sched/cputime.c +15 -15
@@ -683,10 +683,10 @@ static u64 vtime_delta(struct task_struc {unsigned long now =READ_ONCE (jiffies); -if (time_before (now, (unsigned long )tsk->vtime_snap)) +if (time_before (now, (unsigned long )tsk->vtime_starttime))return 0 ; -return jiffies_to_nsecs (now - tsk->vtime_snap); +return jiffies_to_nsecs (now - tsk->vtime_starttime); }static u64 get_vtime_delta (struct task_struct *tsk)
@@ -701,10 +701,10 @@ static u64 get_vtime_delta(struct task_s* elapsed time. Limit account_other_time to prevent rounding * errors from causing elapsed vtime to go negative. */ - delta =jiffies_to_nsecs (now - tsk->vtime_snap); + delta =jiffies_to_nsecs (now - tsk->vtime_starttime); other =account_other_time (delta); -WARN_ON_ONCE (tsk->vtime_snap_whence ==VTIME_INACTIVE ); - tsk->vtime_snap = now; +WARN_ON_ONCE (tsk->vtime_state ==VTIME_INACTIVE ); + tsk->vtime_starttime = now;return delta - other; }
@@ -746,7 +746,7 @@ void vtime_guest_enter(struct task_struc {/* * The flags must be updated under the lock with -* the vtime_snap flush and update. +* the vtime_starttime flush and update. * That enforces a right ordering and update sequence * synchronization against the reader (task_gtime()) * that can thus safely catch up with a tickless delta.
@@ -776,12 +776,12 @@ void vtime_account_idle(struct task_struvoid arch_vtime_task_switch (struct task_struct *prev) {write_seqcount_begin (&prev->vtime_seqcount); - prev->vtime_snap_whence =VTIME_INACTIVE ; + prev->vtime_state =VTIME_INACTIVE ;write_seqcount_end (&prev->vtime_seqcount);write_seqcount_begin (¤t->vtime_seqcount); - current->vtime_snap_whence =VTIME_SYS ; - current->vtime_snap = jiffies; + current->vtime_state =VTIME_SYS ; + current->vtime_starttime = jiffies;write_seqcount_end (¤t->vtime_seqcount); }
@@ -791,8 +791,8 @@ void vtime_init_idle(struct task_structlocal_irq_save (flags);write_seqcount_begin (&t->vtime_seqcount); - t->vtime_snap_whence =VTIME_SYS ; - t->vtime_snap = jiffies; + t->vtime_state =VTIME_SYS ; + t->vtime_starttime = jiffies;write_seqcount_end (&t->vtime_seqcount);local_irq_restore (flags); }
@@ -809,7 +809,7 @@ u64 task_gtime(struct task_struct *t) seq =read_seqcount_begin (&t->vtime_seqcount); gtime = t->gtime; -if (t->vtime_snap_whence ==VTIME_SYS && t->flags &PF_VCPU ) +if (t->vtime_state ==VTIME_SYS && t->flags &PF_VCPU ) gtime +=vtime_delta (t); }while (read_seqcount_retry (&t->vtime_seqcount, seq));
@@ -840,7 +840,7 @@ void task_cputime(struct task_struct *t, *stime = t->stime;/* Task is sleeping, nothing to add */ -if (t->vtime_snap_whence ==VTIME_INACTIVE ||is_idle_task (t)) +if (t->vtime_state ==VTIME_INACTIVE ||is_idle_task (t))continue ; delta =vtime_delta (t);
@@ -849,9 +849,9 @@ void task_cputime(struct task_struct *t,* Task runs either in user or kernel space, add pending nohz time to * the right place. */ -if (t->vtime_snap_whence ==VTIME_USER || t->flags &PF_VCPU ) +if (t->vtime_state ==VTIME_USER || t->flags &PF_VCPU ) *utime += delta; -else if (t->vtime_snap_whence ==VTIME_SYS ) +else if (t->vtime_state ==VTIME_SYS ) *stime += delta; }while (read_seqcount_retry (&t->vtime_seqcount, seq)); }
Patches currently in stable-queue which might be from [email protected] are
queue-4.12/sched-cputime-rename-vtime-fields.patch queue-4.12/vtime-sched-cputime-remove-vtime_account_user.patch queue-4.12/sched-cputime-accumulate-vtime-on-top-of-nsec-clocksource.patch queue-4.12/sched-cputime-move-the-vtime-task-fields-to-their-own-struct.patch queue-4.12/sched-cputime-always-set-tsk-vtime_snap_whence-after-accounting-vtime.patch