scheduler fix
Subsystems (2)
Linus,
Please pull the latest sched-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-for-linus
# HEAD: c96f5471ce7d2aefd0dda560cc23f08ab00bc65d delayacct: Account blkio completion on the correct task
A delayacct statistics correctness fix.
Thanks,
Ingo
------------------>
Josh Snyder (1):
delayacct: Account blkio completion on the correct task
include/linux/delayacct.h | 8 ++++---- kernel/delayacct.c | 42 ++++++++++++++++++++++++++---------------- kernel/sched/core.c | 6 +++--- 3 files changed, 33 insertions(+), 23 deletions(-)
include/linux/delayacct.h +4 -4
@@ -71,7 +71,7 @@ extern void delayacct_init(void);extern void __delayacct_tsk_init (struct task_struct *);extern void __delayacct_tsk_exit (struct task_struct *);extern void __delayacct_blkio_start (void ); -extern void __delayacct_blkio_end (void ); +extern void __delayacct_blkio_end (struct task_struct *);extern int __delayacct_add_tsk (struct taskstats *,struct task_struct *);extern __u64 __delayacct_blkio_ticks (struct task_struct *);extern void __delayacct_freepages_start (void );
@@ -122,10 +122,10 @@ static inline void delayacct_blkio_start(void)__delayacct_blkio_start (); } -static inline void delayacct_blkio_end (void ) +static inline void delayacct_blkio_end (struct task_struct *p) {if (current->delays) -__delayacct_blkio_end (); +__delayacct_blkio_end (p);delayacct_clear_flag (DELAYACCT_PF_BLKIO ); }
@@ -169,7 +169,7 @@ static inline void delayacct_tsk_free(struct task_struct *tsk) {}static inline void delayacct_blkio_start (void ) {} -static inline void delayacct_blkio_end (void ) +static inline void delayacct_blkio_end (struct task_struct *p) {}static inline int delayacct_add_tsk (struct taskstats *d,struct task_struct *tsk)
kernel/delayacct.c +26 -16
67 lines not on this page · raw message
kernel/sched/core.c +3 -3
@@ -2056,7 +2056,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) p->state =TASK_WAKING ;if (p->in_iowait) { -delayacct_blkio_end (); +delayacct_blkio_end (p);atomic_dec (&task_rq (p)->nr_iowait); }
@@ -2069,7 +2069,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)#else /* CONFIG_SMP */ if (p->in_iowait) { -delayacct_blkio_end (); +delayacct_blkio_end (p);atomic_dec (&task_rq (p)->nr_iowait); }
@@ -2122,7 +2122,7 @@ static void try_to_wake_up_local(struct task_struct *p, struct rq_flags *rf)if (!task_on_rq_queued (p)) {if (p->in_iowait) { -delayacct_blkio_end (); +delayacct_blkio_end (p);atomic_dec (&rq->nr_iowait); }ttwu_activate (rq, p,ENQUEUE_WAKEUP |ENQUEUE_NOCLOCK );