Commit 7a82e5f52a35 ("sched/fair: Merge for each idle cpu loop of ILB")
has been merged. The parameter idle of _nohz_idle_balance()
is not used anymore so we can remove it.
Signed-off-by: Hao Jia <[email protected]>
Reviewed-by: Vincent Guittot <[email protected]>
---
v2:
- Modify the commit format, suggested by Vincent Guittot.
---
---
kernel/sched/fair.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 914096c5b1ae..42f5b078d839 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -10916,8 +10916,7 @@ static bool update_nohz_stats(struct rq *rq)
* can be a simple update of blocked load or a complete load balance with
* tasks movement depending of flags.
*/
-static void _nohz_idle_balance(struct rq *this_rq, unsigned int flags,
- enum cpu_idle_type idle)
+static void _nohz_idle_balance(struct rq *this_rq, unsigned int flags)
{
/* Earliest time when we have to do rebalance again */
unsigned long now = jiffies;
@@ -11032,7 +11031,7 @@ static bool nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle)
if (idle != CPU_IDLE)
return false;
- _nohz_idle_balance(this_rq, flags, idle);
+ _nohz_idle_balance(this_rq, flags);
return true;
}
@@ -11052,7 +11051,7 @@ void nohz_run_idle_balance(int cpu)
* (ie NOHZ_STATS_KICK set) and will do the same.
*/
if ((flags == NOHZ_NEWILB_KICK) && !need_resched())
- _nohz_idle_balance(cpu_rq(cpu), NOHZ_STATS_KICK, CPU_IDLE);
+ _nohz_idle_balance(cpu_rq(cpu), NOHZ_STATS_KICK);
}
static void nohz_newidle_balance(struct rq *this_rq)
--
2.32.0
The following commit has been merged into the sched/core branch of tip:
Commit-ID: d985ee9f449aafe45397ae1cf8887e9ac91d2f95
Gitweb: https://git.kernel.org/tip/d985ee9f449aafe45397ae1cf8887e9ac91d2f95
Author: Hao Jia <[email protected]>
AuthorDate: Wed, 03 Aug 2022 21:02:23 +08:00
Committer: Ingo Molnar <[email protected]>
CommitterDate: Wed, 03 Aug 2022 18:54:26 +02:00
sched/fair: Remove unused parameter idle of _nohz_idle_balance()
After commit 7a82e5f52a35 ("sched/fair: Merge for each idle cpu loop of ILB"),
_nohz_idle_balance()'s 'idle' parameter is not used anymore, so we can remove it.
Signed-off-by: Hao Jia <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Reviewed-by: Vincent Guittot <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
kernel/sched/fair.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 41486d9..d22c5e8 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -10916,8 +10916,7 @@ static bool update_nohz_stats(struct rq *rq)
* can be a simple update of blocked load or a complete load balance with
* tasks movement depending of flags.
*/
-static void _nohz_idle_balance(struct rq *this_rq, unsigned int flags,
- enum cpu_idle_type idle)
+static void _nohz_idle_balance(struct rq *this_rq, unsigned int flags)
{
/* Earliest time when we have to do rebalance again */
unsigned long now = jiffies;
@@ -11032,7 +11031,7 @@ static bool nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle)
if (idle != CPU_IDLE)
return false;
- _nohz_idle_balance(this_rq, flags, idle);
+ _nohz_idle_balance(this_rq, flags);
return true;
}
@@ -11052,7 +11051,7 @@ void nohz_run_idle_balance(int cpu)
* (ie NOHZ_STATS_KICK set) and will do the same.
*/
if ((flags == NOHZ_NEWILB_KICK) && !need_resched())
- _nohz_idle_balance(cpu_rq(cpu), NOHZ_STATS_KICK, CPU_IDLE);
+ _nohz_idle_balance(cpu_rq(cpu), NOHZ_STATS_KICK);
}
static void nohz_newidle_balance(struct rq *this_rq)
On Wed, Aug 03, 2022 at 09:02:23PM +0800, Hao Jia wrote:
> Commit 7a82e5f52a35 ("sched/fair: Merge for each idle cpu loop of ILB")
> has been merged. The parameter idle of _nohz_idle_balance()
> is not used anymore so we can remove it.
>
> Signed-off-by: Hao Jia <[email protected]>
> Reviewed-by: Vincent Guittot <[email protected]>
Acked-by: Mel Gorman <[email protected]>
Just note that with the merge window open, this may not be picked up
quickly and you may need to send a v3 when the merge window closes.
--
Mel Gorman
SUSE Labs
* Mel Gorman <[email protected]> wrote:
> On Wed, Aug 03, 2022 at 09:02:23PM +0800, Hao Jia wrote:
> > Commit 7a82e5f52a35 ("sched/fair: Merge for each idle cpu loop of ILB")
> > has been merged. The parameter idle of _nohz_idle_balance()
> > is not used anymore so we can remove it.
> >
> > Signed-off-by: Hao Jia <[email protected]>
> > Reviewed-by: Vincent Guittot <[email protected]>
>
> Acked-by: Mel Gorman <[email protected]>
>
> Just note that with the merge window open, this may not be picked up
> quickly and you may need to send a v3 when the merge window closes.
It's already in tip:sched/core. :-)
Thanks,
Ingo