sched/deadline: only set free_cpus for online runqueues
PATCH v2 1/1 sched/deadline: only set free_cpus for online runqueues
Commit 16b269436b72 ("sched/deadline: Modify cpudl::free_cpus to reflect rd->online") introduced the cpudl_set/clear_freecpu functions to allow the cpu_dl::free_cpus mask to be manipulated by the deadline scheduler class rq_on/offline callbacks so the mask would also reflect this state.
Commit 9659e1eeee28 ("sched/deadline: Remove cpu_active_mask from cpudl_find()") removed the check of the cpu_active_mask to save some processing on the premise that the cpudl::free_cpus mask already reflected the runqueue online state.
Unfortunately, there are cases where it is possible for the cpudl_clear function to set the free_cpus bit for a CPU when the deadline runqueue is offline. When this occurs while a CPU is connected to the default root domain the flag may retain the bad state after the CPU has been unplugged. Later, a different CPU that is transitioning through the default root domain may push a deadline task to the powered down CPU when cpudl_find sees its free_cpus bit is set. If this happens the task will not have the opportunity to run.
One example is outlined here:
https://lore.kernel.org/lkml/[email protected]
Another occurs when the last deadline task is migrated from a CPU that has an offlined runqueue. The dequeue_task member of the deadline scheduler class will eventually call cpudl_clear and set the free_cpus bit for the CPU.
This commit modifies the cpudl_clear function to be aware of the online state of the deadline runqueue so that the free_cpus mask can be updated appropriately.
It is no longer necessary to manage the mask outside of the cpudl_set/clear functions so the cpudl_set/clear_freecpu functions are removed. In addition, since the free_cpus mask is now only updated under the cpudl lock the code was changed to use the non-atomic __cpumask functions.
---
Change in v2:
Inverted the logic of the online check in cpudl_clear.
kernel/sched/cpudeadline.c | 34 +++++++++------------------------- kernel/sched/cpudeadline.h | 4 +--- kernel/sched/deadline.c | 8 ++++---- 3 files changed, 14 insertions(+), 32 deletions(-)
kernel/sched/cpudeadline.c +9 -25
@@ -166,12 +166,13 @@ int cpudl_find(struct cpudl *cp, struct task_struct *p,* cpudl_clear - remove a CPU from the cpudl max-heap * @cp: the cpudl max-heap context * @cpu: the target CPU +* @online: the online state of the deadline runqueue * * Notes: assumes cpu_rq(cpu)->lock is locked * * Returns: (void) */ -void cpudl_clear (struct cpudl *cp,int cpu) +void cpudl_clear (struct cpudl *cp,int cpu,bool online) {int old_idx, new_cpu;unsigned long flags;
@@ -184,7 +185,7 @@ void cpudl_clear(struct cpudl *cp, int cpu)if (old_idx ==IDX_INVALID ) {/* * Nothing to remove if old_idx was invalid. -* This could happen if a rq_offline_dl is +* This could happen if rq_online_dl or rq_offline_dl is * called for a CPU without -dl tasks running. */ }else {
@@ -195,9 +196,12 @@ void cpudl_clear(struct cpudl *cp, int cpu) cp->elements[new_cpu].idx = old_idx; cp->elements[cpu].idx =IDX_INVALID ;cpudl_heapify (cp, old_idx); - -cpumask_set_cpu (cpu, cp->free_cpus); } +if (likely (online)) +__cpumask_set_cpu (cpu, cp->free_cpus); +else +__cpumask_clear_cpu (cpu, cp->free_cpus); +raw_spin_unlock_irqrestore (&cp->lock, flags); }
@@ -228,7 +232,7 @@ void cpudl_set(struct cpudl *cp, int cpu, u64 dl) cp->elements[new_idx].cpu = cpu; cp->elements[cpu].idx = new_idx;cpudl_heapify_up (cp, new_idx); -cpumask_clear_cpu (cpu, cp->free_cpus); +__cpumask_clear_cpu (cpu, cp->free_cpus); }else { cp->elements[old_idx].dl = dl;cpudl_heapify (cp, old_idx);
@@ -237,26 +241,6 @@ void cpudl_set(struct cpudl *cp, int cpu, u64 dl)raw_spin_unlock_irqrestore (&cp->lock, flags); } -/* -* cpudl_set_freecpu - Set the cpudl.free_cpus -* @cp: the cpudl max-heap context -* @cpu: rd attached CPU -*/ -void cpudl_set_freecpu (struct cpudl *cp,int cpu) -{ -cpumask_set_cpu (cpu, cp->free_cpus); -} - -/* -* cpudl_clear_freecpu - Clear the cpudl.free_cpus -* @cp: the cpudl max-heap context -* @cpu: rd attached CPU -*/ -void cpudl_clear_freecpu (struct cpudl *cp,int cpu) -{ -cpumask_clear_cpu (cpu, cp->free_cpus); -} -/* * cpudl_init - initialize the cpudl structure * @cp: the cpudl max-heap context
kernel/sched/cpudeadline.h +1 -3
@@ -19,8 +19,6 @@ struct cpudl {int cpudl_find (struct cpudl *cp,struct task_struct *p,struct cpumask *later_mask);void cpudl_set (struct cpudl *cp,int cpu,u64 dl); -void cpudl_clear (struct cpudl *cp,int cpu); +void cpudl_clear (struct cpudl *cp,int cpu,bool online);int cpudl_init (struct cpudl *cp); -void cpudl_set_freecpu (struct cpudl *cp,int cpu); -void cpudl_clear_freecpu (struct cpudl *cp,int cpu);void cpudl_cleanup (struct cpudl *cp);
kernel/sched/deadline.c +4 -4
@@ -1832,7 +1832,7 @@ static void dec_dl_deadline(struct dl_rq *dl_rq, u64 deadline)if (!dl_rq->dl_nr_running) { dl_rq->earliest_dl.curr =0 ; dl_rq->earliest_dl.next =0 ; -cpudl_clear (&rq->rd->cpudl, rq->cpu); +cpudl_clear (&rq->rd->cpudl, rq->cpu, rq->online);cpupri_set (&rq->rd->cpupri, rq->cpu, rq->rt.highest_prio.curr); }else {struct rb_node *leftmost =rb_first_cached (&dl_rq->root);
@@ -2878,9 +2878,10 @@ static void rq_online_dl(struct rq *rq)if (rq->dl.overloaded)dl_set_overload (rq); -cpudl_set_freecpu (&rq->rd->cpudl, rq->cpu);if (rq->dl.dl_nr_running >0 )cpudl_set (&rq->rd->cpudl, rq->cpu, rq->dl.earliest_dl.curr); +else +cpudl_clear (&rq->rd->cpudl, rq->cpu, true); }/* Assumes rq->lock is held */
@@ -2889,8 +2890,7 @@ static void rq_offline_dl(struct rq *rq)if (rq->dl.overloaded)dl_clear_overload (rq); -cpudl_clear (&rq->rd->cpudl, rq->cpu); -cpudl_clear_freecpu (&rq->rd->cpudl, rq->cpu); +cpudl_clear (&rq->rd->cpudl, rq->cpu, false); }void __init init_sched_dl_class (void )
Signature · 1 line
2.34.1
Hello,
Quoted 33 lines · Doug Berger
Commit
16b269436b72("sched/deadline: Modifycpudl::free_cpusto reflectrd->online") introduced the cpudl_set/clear_freecpu functions to allow thecpu_dl::free_cpusmask to be manipulated by the deadline scheduler class rq_on/offline callbacks so the mask would also reflect this state.Commit
9659e1eeee28("sched/deadline: Removecpu_active_maskfromcpudl_find()") removed the check of thecpu_active_maskto save some processing on the premise that thecpudl::free_cpusmask already reflected the runqueue online state.Unfortunately, there are cases where it is possible for the
cpudl_clearfunction to set thefree_cpusbit for a CPU when the deadline runqueue is offline. When this occurs while a CPU is connected to the default root domain the flag may retain the bad state after the CPU has been unplugged. Later, a different CPU that is transitioning through the default root domain may push a deadline task to the powered down CPU whencpudl_findsees itsfree_cpusbit is set. If this happens the task will not have the opportunity to run.One example is outlined here:
https://lore.kernel.org/lkml/[email protected]Another occurs when the last deadline task is migrated from a CPU that has an offlined runqueue. The
dequeue_taskmember of the deadline scheduler class will eventually callcpudl_clearand set thefree_cpusbit for the CPU.This commit modifies the
cpudl_clearfunction to be aware of the online state of the deadline runqueue so that thefree_cpusmask can be updated appropriately.
Quoted 8 lines
It is no longer necessary to manage the mask outside of the cpudl_set/clear functions so the cpudl_set/clear_freecpu functions are removed. In addition, since the
free_cpusmask is now only updated under the cpudl lock the code was changed to use the non-atomic__cpumaskfunctions.Signed-off-by Doug Berger <[email protected]>---
This looks now good to me.
Thanks,
Juri
Quoted 42 lines · Juri Lelli
Hello,
Quoted 39 lines · Doug Berger
Commit
16b269436b72("sched/deadline: Modifycpudl::free_cpusto reflectrd->online") introduced the cpudl_set/clear_freecpu functions to allow thecpu_dl::free_cpusmask to be manipulated by the deadline scheduler class rq_on/offline callbacks so the mask would also reflect this state.Commit
9659e1eeee28("sched/deadline: Removecpu_active_maskfromcpudl_find()") removed the check of thecpu_active_maskto save some processing on the premise that thecpudl::free_cpusmask already reflected the runqueue online state.Unfortunately, there are cases where it is possible for the
cpudl_clearfunction to set thefree_cpusbit for a CPU when the deadline runqueue is offline. When this occurs while a CPU is connected to the default root domain the flag may retain the bad state after the CPU has been unplugged. Later, a different CPU that is transitioning through the default root domain may push a deadline task to the powered down CPU whencpudl_findsees itsfree_cpusbit is set. If this happens the task will not have the opportunity to run.One example is outlined here:
https://lore.kernel.org/lkml/[email protected]Another occurs when the last deadline task is migrated from a CPU that has an offlined runqueue. The
dequeue_taskmember of the deadline scheduler class will eventually callcpudl_clearand set thefree_cpusbit for the CPU.This commit modifies the
cpudl_clearfunction to be aware of the online state of the deadline runqueue so that thefree_cpusmask can be updated appropriately.It is no longer necessary to manage the mask outside of the cpudl_set/clear functions so the cpudl_set/clear_freecpu functions are removed. In addition, since the
free_cpusmask is now only updated under the cpudl lock the code was changed to use the non-atomic__cpumaskfunctions.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Doug Berger <[email protected]>---
This looks now good to me.
Acked-by Juri Lelli <[email protected]>
Thanks Juri, can we apply it?
Signature · 1 line
Florian
Peter Zijlstra
maintainerQuoted 42 lines · Juri Lelli
Hello,
Quoted 39 lines · Doug Berger
Commit
16b269436b72("sched/deadline: Modifycpudl::free_cpusto reflectrd->online") introduced the cpudl_set/clear_freecpu functions to allow thecpu_dl::free_cpusmask to be manipulated by the deadline scheduler class rq_on/offline callbacks so the mask would also reflect this state.Commit
9659e1eeee28("sched/deadline: Removecpu_active_maskfromcpudl_find()") removed the check of thecpu_active_maskto save some processing on the premise that thecpudl::free_cpusmask already reflected the runqueue online state.Unfortunately, there are cases where it is possible for the
cpudl_clearfunction to set thefree_cpusbit for a CPU when the deadline runqueue is offline. When this occurs while a CPU is connected to the default root domain the flag may retain the bad state after the CPU has been unplugged. Later, a different CPU that is transitioning through the default root domain may push a deadline task to the powered down CPU whencpudl_findsees itsfree_cpusbit is set. If this happens the task will not have the opportunity to run.One example is outlined here:
https://lore.kernel.org/lkml/[email protected]Another occurs when the last deadline task is migrated from a CPU that has an offlined runqueue. The
dequeue_taskmember of the deadline scheduler class will eventually callcpudl_clearand set thefree_cpusbit for the CPU.This commit modifies the
cpudl_clearfunction to be aware of the online state of the deadline runqueue so that thefree_cpusmask can be updated appropriately.It is no longer necessary to manage the mask outside of the cpudl_set/clear functions so the cpudl_set/clear_freecpu functions are removed. In addition, since the
free_cpusmask is now only updated under the cpudl lock the code was changed to use the non-atomic__cpumaskfunctions.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Doug Berger <[email protected]>---
This looks now good to me.
Acked-by Juri Lelli <[email protected]>
So I just had a look at said patch because Juri here poked me; and I came away with the feeling that cpudl_clear() is now a misnomen, seeing how it is called from rq_online_dl().
Would cpudl_update() be a better name?
Quoted 48 lines · Peter Zijlstra
Quoted 47 lines · Juri Lelli
Hello,
Quoted 33 lines · Doug Berger
Commit
16b269436b72("sched/deadline: Modifycpudl::free_cpusto reflectrd->online") introduced the cpudl_set/clear_freecpu functions to allow thecpu_dl::free_cpusmask to be manipulated by the deadline scheduler class rq_on/offline callbacks so the mask would also reflect this state.Commit
9659e1eeee28("sched/deadline: Removecpu_active_maskfromcpudl_find()") removed the check of thecpu_active_maskto save some processing on the premise that thecpudl::free_cpusmask already reflected the runqueue online state.Unfortunately, there are cases where it is possible for the
cpudl_clearfunction to set thefree_cpusbit for a CPU when the deadline runqueue is offline. When this occurs while a CPU is connected to the default root domain the flag may retain the bad state after the CPU has been unplugged. Later, a different CPU that is transitioning through the default root domain may push a deadline task to the powered down CPU whencpudl_findsees itsfree_cpusbit is set. If this happens the task will not have the opportunity to run.One example is outlined here:
https://lore.kernel.org/lkml/[email protected]Another occurs when the last deadline task is migrated from a CPU that has an offlined runqueue. The
dequeue_taskmember of the deadline scheduler class will eventually callcpudl_clearand set thefree_cpusbit for the CPU.This commit modifies the
cpudl_clearfunction to be aware of the online state of the deadline runqueue so that thefree_cpusmask can be updated appropriately.Quoted 8 lines
It is no longer necessary to manage the mask outside of the cpudl_set/clear functions so the cpudl_set/clear_freecpu functions are removed. In addition, since the
free_cpusmask is now only updated under the cpudl lock the code was changed to use the non-atomic__cpumaskfunctions.Signed-off-by Doug Berger <[email protected]>---
This looks now good to me.
Quoted 7 lines
Quoted 1 line
Acked-by Juri Lelli <[email protected]>So I just had a look at said patch because Juri here poked me; and I came away with the feeling that
cpudl_clear()is now a misnomen, seeing how it is called fromrq_online_dl().Would
cpudl_update()be a better name?
Thanks for taking a look.
I don't really have a dog in any fights over naming here, but it seems to me that cpudl_clear and cpudl_set are intended to be complementary functions and the naming reflects that. It would appear that these are primarily intended to maintain the cpudl max-heap entries which is what are being set and cleared.
rq_online_dl() would now call one or the other based on whether any deadline tasks are running on the queue when it is onlined to ensure that the max-heap is valid. This either clears a stale entry that may occur from scenarios like the ones I'm running into or set the entry to the current deadline. In this context the names seem appropriate to me.
Renaming cpudl_clear to cpudl_update may be more confusing since the comment for cpudl_set reads "cpudl_set - update the cpudl max-heap".
I don't feel that the name change is relevant to my patch, but if we want to do it concurrently maybe cpudl_clear_max_heap() and cpudl_set_max_heap() would be more meaningful.
Please let me know how you would like to proceed,
Doug
Quoted 60 lines · Doug Berger
Quoted 48 lines · Peter Zijlstra
Quoted 47 lines · Juri Lelli
Hello,
Quoted 33 lines · Doug Berger
Commit
16b269436b72("sched/deadline: Modifycpudl::free_cpusto reflectrd->online") introduced the cpudl_set/clear_freecpu functions to allow thecpu_dl::free_cpusmask to be manipulated by the deadline scheduler class rq_on/offline callbacks so the mask would also reflect this state.Commit
9659e1eeee28("sched/deadline: Removecpu_active_maskfromcpudl_find()") removed the check of thecpu_active_maskto save some processing on the premise that thecpudl::free_cpusmask already reflected the runqueue online state.Unfortunately, there are cases where it is possible for the
cpudl_clearfunction to set thefree_cpusbit for a CPU when the deadline runqueue is offline. When this occurs while a CPU is connected to the default root domain the flag may retain the bad state after the CPU has been unplugged. Later, a different CPU that is transitioning through the default root domain may push a deadline task to the powered down CPU whencpudl_findsees itsfree_cpusbit is set. If this happens the task will not have the opportunity to run.One example is outlined here:
https://lore.kernel.org/lkml/[email protected]Another occurs when the last deadline task is migrated from a CPU that has an offlined runqueue. The
dequeue_taskmember of the deadline scheduler class will eventually callcpudl_clearand set thefree_cpusbit for the CPU.This commit modifies the
cpudl_clearfunction to be aware of the online state of the deadline runqueue so that thefree_cpusmask can be updated appropriately.Quoted 8 lines
It is no longer necessary to manage the mask outside of the cpudl_set/clear functions so the cpudl_set/clear_freecpu functions are removed. In addition, since the
free_cpusmask is now only updated under the cpudl lock the code was changed to use the non-atomic__cpumaskfunctions.Signed-off-by Doug Berger <[email protected]>---
This looks now good to me.
Quoted 7 lines
Quoted 1 line
Acked-by Juri Lelli <[email protected]>So I just had a look at said patch because Juri here poked me; and I came away with the feeling that
cpudl_clear()is now a misnomen, seeing how it is called fromrq_online_dl().Would
cpudl_update()be a better name?Thanks for taking a look.
I don't really have a dog in any fights over naming here, but it seems to me that
cpudl_clearandcpudl_setare intended to be complementary functions and the naming reflects that. It would appear that these are primarily intended to maintain the cpudl max-heap entries which is what are being set and cleared.
Quoted 8 lines
rq_online_dl()would now call one or the other based on whether any deadline tasks are running on the queue when it is onlined to ensure that the max-heap is valid. This either clears a stale entry that may occur from scenarios like the ones I'm running into or set the entry to the current deadline. In this context the names seem appropriate to me.Renaming
cpudl_cleartocpudl_updatemay be more confusing since the comment forcpudl_setreads "cpudl_set- update the cpudl max-heap".I don't feel that the name change is relevant to my patch, but if we want to do it concurrently maybe
cpudl_clear_max_heap()andcpudl_set_max_heap()would be more meaningful.Please let me know how you would like to proceed,
Doug
Is there any way I can help to move this patch forward?
Thanks,
Doug
Quoted 63 lines · Doug Berger
Quoted 62 lines · Doug Berger
Quoted 48 lines · Peter Zijlstra
Quoted 47 lines · Juri Lelli
Hello,
Quoted 33 lines · Doug Berger
Commit
16b269436b72("sched/deadline: Modifycpudl::free_cpusto reflectrd->online") introduced the cpudl_set/clear_freecpu functions to allow thecpu_dl::free_cpusmask to be manipulated by the deadline scheduler class rq_on/offline callbacks so the mask would also reflect this state.Commit
9659e1eeee28("sched/deadline: Removecpu_active_maskfromcpudl_find()") removed the check of thecpu_active_maskto save some processing on the premise that thecpudl::free_cpusmask already reflected the runqueue online state.Unfortunately, there are cases where it is possible for the
cpudl_clearfunction to set thefree_cpusbit for a CPU when the deadline runqueue is offline. When this occurs while a CPU is connected to the default root domain the flag may retain the bad state after the CPU has been unplugged. Later, a different CPU that is transitioning through the default root domain may push a deadline task to the powered down CPU whencpudl_findsees itsfree_cpusbit is set. If this happens the task will not have the opportunity to run.One example is outlined here:
https://lore.kernel.org/lkml/20250110233010.2339521-1- [email protected]Another occurs when the last deadline task is migrated from a CPU that has an offlined runqueue. The
dequeue_taskmember of the deadline scheduler class will eventually callcpudl_clearand set thefree_cpusbit for the CPU.This commit modifies the
cpudl_clearfunction to be aware of the online state of the deadline runqueue so that thefree_cpusmask can be updated appropriately.Quoted 8 lines
It is no longer necessary to manage the mask outside of the cpudl_set/clear functions so the cpudl_set/clear_freecpu functions are removed. In addition, since the
free_cpusmask is now only updated under the cpudl lock the code was changed to use the non-atomic__cpumaskfunctions.Signed-off-by Doug Berger <[email protected]>---
This looks now good to me.
Quoted 7 lines
Quoted 1 line
Acked-by Juri Lelli <[email protected]>So I just had a look at said patch because Juri here poked me; and I came away with the feeling that
cpudl_clear()is now a misnomen, seeing how it is called fromrq_online_dl().Would
cpudl_update()be a better name?Thanks for taking a look.
I don't really have a dog in any fights over naming here, but it seems to me that
cpudl_clearandcpudl_setare intended to be complementary functions and the naming reflects that. It would appear that these are primarily intended to maintain the cpudl max-heap entries which is what are being set and cleared.
rq_online_dl()would now call one or the other based on whether any deadline tasks are running on the queue when it is onlined to ensure that the max-heap is valid. This either clears a stale entry that may occur from scenarios like the ones I'm running into or set the entry to the current deadline. In this context the names seem appropriate to me.
Quoted 8 lines
Quoted 6 lines
Renaming
cpudl_cleartocpudl_updatemay be more confusing since the comment forcpudl_setreads "cpudl_set- update the cpudl max-heap".I don't feel that the name change is relevant to my patch, but if we want to do it concurrently maybe
cpudl_clear_max_heap()andcpudl_set_max_heap()would be more meaningful.Please let me know how you would like to proceed,
DougIs there any way I can help to move this patch forward?
OK, so we are all busy and whatnot but the response time on this patch seems to be completely abysmal, and reminder that it fixes an actual bug that we have been running into on production systems. Can we just get it applied and move on?
Signature · 1 line
Florian
Peter Zijlstra
maintainerQuoted 2 lines · Doug Berger
Is there any way I can help to move this patch forward?
Let me just apply it before it gets lost again. Sorry; sometimes the amount of email is turning me into a goldfish with ADD :/
Quoted 7 lines · Peter Zijlstra
Quoted 2 lines · Doug Berger
Is there any way I can help to move this patch forward?
Let me just apply it before it gets lost again. Sorry; sometimes the amount of email is turning me into a goldfish with ADD :/
Should we be able to see that patch in linux-next by now?
Signature · 1 line
Florian
Peter Zijlstra
maintainerQuoted 10 lines · Florian Fainelli
Quoted 7 lines · Peter Zijlstra
Quoted 2 lines · Doug Berger
Is there any way I can help to move this patch forward?
Let me just apply it before it gets lost again. Sorry; sometimes the amount of email is turning me into a goldfish with ADD :/
Should we be able to see that patch in linux-next by now?
Should be in queue.git as of today, once the robot reports success I'll push it towards tip.git, at which point it'll show up in -next.
The 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: 382748c05e58a9f1935f5a653c352422375566ea Gitweb: https://git.kernel.org/tip/382748c05e58a9f1935f5a653c352422375566ea Author: Doug Berger <[email protected]> AuthorDate: Thu, 14 Aug 2025 18:22:36 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 16 Oct 2025 11:13:49 +02:00
sched/deadline: only set free_cpus for online runqueues
Commit 16b269436b72 ("sched/deadline: Modify cpudl::free_cpus to reflect rd->online") introduced the cpudl_set/clear_freecpu functions to allow the cpu_dl::free_cpus mask to be manipulated by the deadline scheduler class rq_on/offline callbacks so the mask would also reflect this state.
Commit 9659e1eeee28 ("sched/deadline: Remove cpu_active_mask from cpudl_find()") removed the check of the cpu_active_mask to save some processing on the premise that the cpudl::free_cpus mask already reflected the runqueue online state.
Unfortunately, there are cases where it is possible for the cpudl_clear function to set the free_cpus bit for a CPU when the deadline runqueue is offline. When this occurs while a CPU is connected to the default root domain the flag may retain the bad state after the CPU has been unplugged. Later, a different CPU that is transitioning through the default root domain may push a deadline task to the powered down CPU when cpudl_find sees its free_cpus bit is set. If this happens the task will not have the opportunity to run.
One example is outlined here:
https://lore.kernel.org/lkml/[email protected]
Another occurs when the last deadline task is migrated from a CPU that has an offlined runqueue. The dequeue_task member of the deadline scheduler class will eventually call cpudl_clear and set the free_cpus bit for the CPU.
This commit modifies the cpudl_clear function to be aware of the online state of the deadline runqueue so that the free_cpus mask can be updated appropriately.
It is no longer necessary to manage the mask outside of the cpudl_set/clear functions so the cpudl_set/clear_freecpu functions are removed. In addition, since the free_cpus mask is now only updated under the cpudl lock the code was changed to use the non-atomic __cpumask functions.
--- kernel/sched/cpudeadline.c | 34 +++++++++------------------------- kernel/sched/cpudeadline.h | 4 +--- kernel/sched/deadline.c | 8 ++++---- 3 files changed, 14 insertions(+), 32 deletions(-)
kernel/sched/cpudeadline.c +9 -25
@@ -166,12 +166,13 @@ int cpudl_find(struct cpudl *cp, struct task_struct *p,* cpudl_clear - remove a CPU from the cpudl max-heap * @cp: the cpudl max-heap context * @cpu: the target CPU +* @online: the online state of the deadline runqueue * * Notes: assumes cpu_rq(cpu)->lock is locked * * Returns: (void) */ -void cpudl_clear (struct cpudl *cp,int cpu) +void cpudl_clear (struct cpudl *cp,int cpu,bool online) {int old_idx, new_cpu;unsigned long flags;
@@ -184,7 +185,7 @@ void cpudl_clear(struct cpudl *cp, int cpu)if (old_idx ==IDX_INVALID ) {/* * Nothing to remove if old_idx was invalid. -* This could happen if a rq_offline_dl is +* This could happen if rq_online_dl or rq_offline_dl is * called for a CPU without -dl tasks running. */ }else {
@@ -195,9 +196,12 @@ void cpudl_clear(struct cpudl *cp, int cpu) cp->elements[new_cpu].idx = old_idx; cp->elements[cpu].idx =IDX_INVALID ;cpudl_heapify (cp, old_idx); - -cpumask_set_cpu (cpu, cp->free_cpus); } +if (likely (online)) +__cpumask_set_cpu (cpu, cp->free_cpus); +else +__cpumask_clear_cpu (cpu, cp->free_cpus); +raw_spin_unlock_irqrestore (&cp->lock, flags); }
@@ -228,7 +232,7 @@ void cpudl_set(struct cpudl *cp, int cpu, u64 dl) cp->elements[new_idx].cpu = cpu; cp->elements[cpu].idx = new_idx;cpudl_heapify_up (cp, new_idx); -cpumask_clear_cpu (cpu, cp->free_cpus); +__cpumask_clear_cpu (cpu, cp->free_cpus); }else { cp->elements[old_idx].dl = dl;cpudl_heapify (cp, old_idx);
@@ -238,26 +242,6 @@ void cpudl_set(struct cpudl *cp, int cpu, u64 dl) }/* -* cpudl_set_freecpu - Set the cpudl.free_cpus -* @cp: the cpudl max-heap context -* @cpu: rd attached CPU -*/ -void cpudl_set_freecpu (struct cpudl *cp,int cpu) -{ -cpumask_set_cpu (cpu, cp->free_cpus); -} - -/* -* cpudl_clear_freecpu - Clear the cpudl.free_cpus -* @cp: the cpudl max-heap context -* @cpu: rd attached CPU -*/ -void cpudl_clear_freecpu (struct cpudl *cp,int cpu) -{ -cpumask_clear_cpu (cpu, cp->free_cpus); -} - -/* * cpudl_init - initialize the cpudl structure * @cp: the cpudl max-heap context */
kernel/sched/cpudeadline.h +1 -3
@@ -19,8 +19,6 @@ struct cpudl {int cpudl_find (struct cpudl *cp,struct task_struct *p,struct cpumask *later_mask);void cpudl_set (struct cpudl *cp,int cpu,u64 dl); -void cpudl_clear (struct cpudl *cp,int cpu); +void cpudl_clear (struct cpudl *cp,int cpu,bool online);int cpudl_init (struct cpudl *cp); -void cpudl_set_freecpu (struct cpudl *cp,int cpu); -void cpudl_clear_freecpu (struct cpudl *cp,int cpu);void cpudl_cleanup (struct cpudl *cp);
kernel/sched/deadline.c +4 -4
@@ -1808,7 +1808,7 @@ static void dec_dl_deadline(struct dl_rq *dl_rq, u64 deadline)if (!dl_rq->dl_nr_running) { dl_rq->earliest_dl.curr =0 ; dl_rq->earliest_dl.next =0 ; -cpudl_clear (&rq->rd->cpudl, rq->cpu); +cpudl_clear (&rq->rd->cpudl, rq->cpu, rq->online);cpupri_set (&rq->rd->cpupri, rq->cpu, rq->rt.highest_prio.curr); }else {struct rb_node *leftmost =rb_first_cached (&dl_rq->root);
@@ -2880,9 +2880,10 @@ static void rq_online_dl(struct rq *rq)if (rq->dl.overloaded)dl_set_overload (rq); -cpudl_set_freecpu (&rq->rd->cpudl, rq->cpu);if (rq->dl.dl_nr_running >0 )cpudl_set (&rq->rd->cpudl, rq->cpu, rq->dl.earliest_dl.curr); +else +cpudl_clear (&rq->rd->cpudl, rq->cpu, true); }/* Assumes rq->lock is held */
@@ -2891,8 +2892,7 @@ static void rq_offline_dl(struct rq *rq)if (rq->dl.overloaded)dl_clear_overload (rq); -cpudl_clear (&rq->rd->cpudl, rq->cpu); -cpudl_clear_freecpu (&rq->rd->cpudl, rq->cpu); +cpudl_clear (&rq->rd->cpudl, rq->cpu, false); }void __init init_sched_dl_class (void )