sched: use task_current() instead of 'rq->curr == p'
PATCH 1/1 sched: use task_current() instead of 'rq->curr == p'
We have supplied the macro: 'task_current()', and we should all use task_current() instaed of 'rq->curr == p', which is more readable.
No functional change.
--- kernel/sched/deadline.c | 2 +- kernel/sched/debug.c | 2 +- kernel/sched/fair.c | 6 +++--- kernel/sched/rt.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
kernel/sched/deadline.c +1 -1
@@ -2474,7 +2474,7 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p)static void prio_changed_dl (struct rq *rq,struct task_struct *p,int oldprio) { -if (task_on_rq_queued (p) || rq->curr == p) { +if (task_on_rq_queued (p) ||task_current (rq, p)) {#ifdef CONFIG_SMP /* * This might be too much, but unfortunately
kernel/sched/debug.c +1 -1
@@ -486,7 +486,7 @@ static char *task_group_path(struct task_group *tg)static void print_task (struct seq_file *m,struct rq *rq,struct task_struct *p) { -if (rq->curr == p) +if (task_current (rq, p))SEQ_printf (m,">R" );else SEQ_printf (m," %c" ,task_state_to_char (p));
kernel/sched/fair.c +3 -3
@@ -5399,7 +5399,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p)s64 delta = slice - ran;if (delta <0 ) { -if (rq->curr == p) +if (task_current (rq, p))resched_curr (rq);return ; }
@@ -10740,7 +10740,7 @@ prio_changed_fair(struct rq *rq, struct task_struct *p, int oldprio)* our priority decreased, or if we are not currently running on * this runqueue and our priority is higher than the current's */ -if (rq->curr == p) { +if (task_current (rq, p)) {if (p->prio > oldprio)resched_curr (rq); }else
@@ -10873,7 +10873,7 @@ static void switched_to_fair(struct rq *rq, struct task_struct *p)* kick off the schedule if running, otherwise just see * if we can still preempt the current task. */ -if (rq->curr == p) +if (task_current (rq, p))resched_curr (rq);else check_preempt_curr (rq, p,0 );
kernel/sched/rt.c +1 -1
@@ -2317,7 +2317,7 @@ prio_changed_rt(struct rq *rq, struct task_struct *p, int oldprio)if (!task_on_rq_queued (p))return ; -if (rq->curr == p) { +if (task_current (rq, p)) {#ifdef CONFIG_SMP /* * If our priority decreases while running, we
Signature · 1 line
2.29.0
Peter,
This is a simple clean up patch that makes sense to me. Want to take it?
-- Steve
Quoted 84 lines · On Sat, 31 Oct 2020 01:32:23 +0800 Hui Su <[email protected]> wrote:
We have supplied the macro: '
task_current()', and we should all usetask_current()instaed of 'rq->curr== p', which is more readable.No functional change.
Signed-off-by Hui Su <[email protected]>--- kernel/sched/deadline.c | 2 +- kernel/sched/debug.c | 2 +- kernel/sched/fair.c | 6 +++--- kernel/sched/rt.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)kernel/sched/deadline.c +1
-1@@ -2474,7 +2474,7 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p)static void prio_changed_dl (struct rq *rq,struct task_struct *p,int oldprio) { -if (task_on_rq_queued (p) || rq->curr == p) { +if (task_on_rq_queued (p) ||task_current (rq, p)) {#ifdef CONFIG_SMP /* * This might be too much, but unfortunately kernel/sched/debug.c +1
-1@@ -486,7 +486,7 @@ static char *task_group_path(struct task_group *tg)static void print_task (struct seq_file *m,struct rq *rq,struct task_struct *p) { -if (rq->curr == p) +if (task_current (rq, p))SEQ_printf (m,">R" );else SEQ_printf (m," %c" ,task_state_to_char (p));kernel/sched/fair.c +3
-3@@ -5399,7 +5399,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p)s64 delta = slice - ran;if (delta <0 ) { -if (rq->curr == p) +if (task_current (rq, p))resched_curr (rq);return ; }@@ -10740,7 +10740,7 @@ prio_changed_fair(struct rq *rq, struct task_struct *p, int oldprio)* our priority decreased, or if we are not currently running on * this runqueue and our priority is higher than the current's */ -if (rq->curr == p) { +if (task_current (rq, p)) {if (p->prio > oldprio)resched_curr (rq); }else @@ -10873,7 +10873,7 @@ static void switched_to_fair(struct rq *rq, struct task_struct *p)* kick off the schedule if running, otherwise just see * if we can still preempt the current task. */ -if (rq->curr == p) +if (task_current (rq, p))resched_curr (rq);else check_preempt_curr (rq, p,0 );kernel/sched/rt.c +1
-1@@ -2317,7 +2317,7 @@ prio_changed_rt(struct rq *rq, struct task_struct *p, int oldprio)if (!task_on_rq_queued (p))return ; -if (rq->curr == p) { +if (task_current (rq, p)) {#ifdef CONFIG_SMP /* * If our priority decreases while running, we
Peter Zijlstra
maintainerQuoted 6 lines · Steven Rostedt
Peter,
This is a simple clean up patch that makes sense to me. Want to take it?
Reviewed-by Steven Rostedt (VMware) <[email protected]>
Might as well I suppose.. Thanks!
[tip: sched/core] sched: Use task_current() instead of 'rq->curr == p'
In reply to Hui SuThe following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 65bcf072e20ed7597caa902f170f293662b0af3c Gitweb: https://git.kernel.org/tip/65bcf072e20ed7597caa902f170f293662b0af3c Author: Hui Su <[email protected]> AuthorDate: Sat, 31 Oct 2020 01:32:23 +08:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 14 Jan 2021 11:20:11 +01:00
sched: Use task_current() instead of 'rq->curr == p'
Use the task_current() function where appropriate.
No functional change.
--- kernel/sched/deadline.c | 2 +- kernel/sched/debug.c | 2 +- kernel/sched/fair.c | 6 +++--- kernel/sched/rt.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
kernel/sched/deadline.c +1 -1
@@ -2514,7 +2514,7 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p)static void prio_changed_dl (struct rq *rq,struct task_struct *p,int oldprio) { -if (task_on_rq_queued (p) || rq->curr == p) { +if (task_on_rq_queued (p) ||task_current (rq, p)) {#ifdef CONFIG_SMP /* * This might be too much, but unfortunately
kernel/sched/debug.c +1 -1
@@ -486,7 +486,7 @@ static char *task_group_path(struct task_group *tg)static void print_task (struct seq_file *m,struct rq *rq,struct task_struct *p) { -if (rq->curr == p) +if (task_current (rq, p))SEQ_printf (m,">R" );else SEQ_printf (m," %c" ,task_state_to_char (p));
kernel/sched/fair.c +3 -3
@@ -5430,7 +5430,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p)s64 delta = slice - ran;if (delta <0 ) { -if (rq->curr == p) +if (task_current (rq, p))resched_curr (rq);return ; }
@@ -10829,7 +10829,7 @@ prio_changed_fair(struct rq *rq, struct task_struct *p, int oldprio)* our priority decreased, or if we are not currently running on * this runqueue and our priority is higher than the current's */ -if (rq->curr == p) { +if (task_current (rq, p)) {if (p->prio > oldprio)resched_curr (rq); }else
@@ -10962,7 +10962,7 @@ static void switched_to_fair(struct rq *rq, struct task_struct *p)* kick off the schedule if running, otherwise just see * if we can still preempt the current task. */ -if (rq->curr == p) +if (task_current (rq, p))resched_curr (rq);else check_preempt_curr (rq, p,0 );
kernel/sched/rt.c +1 -1
@@ -2357,7 +2357,7 @@ prio_changed_rt(struct rq *rq, struct task_struct *p, int oldprio)if (!task_on_rq_queued (p))return ; -if (rq->curr == p) { +if (task_current (rq, p)) {#ifdef CONFIG_SMP /* * If our priority decreases while running, we