sched/rt: Move sched_rt_entity::back to CONFIG_RT_GROUP_SCHED
cover sched/rt: Move sched_rt_entity::back to CONFIG_RT_GROUP_SCHED
The member back in struct sched_rt_entity only related to RT_GROUP_SCHED, it should not place out of RT_GROUP_SCHED, move back to RT_GROUP_SCHED. It will save a few bytes.
Yajun Deng (2):
sched/rt: Use 'back' only if CONFIG_RT_GROUP_SCHED is enabled sched/headers: Move sched_rt_entity::back to under the
CONFIG_RT_GROUP_SCHED block
include/linux/sched.h | 2 +- kernel/sched/rt.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/2 sched/rt: Use 'back' only if CONFIG_RT_GROUP_SCHED is enabled
The 'back' member in struct sched_rt_entity only related to CONFIG_RT_GROUP_SCHED, so there is no need to init it in dequeue_rt_stack.
Init the 'back' member in init_tg_rt_entry and use it only if CONFIG_RT_GROUP_SCHED is enabled.
--- kernel/sched/rt.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
kernel/sched/rt.c +10 -5
@@ -232,8 +232,10 @@ void init_tg_rt_entry(struct task_group *tg, struct rt_rq *rt_rq,if (!parent) rt_se->rt_rq = &rq->rt; -else +else { rt_se->rt_rq = parent->my_q; + parent->back = rt_se; + } rt_se->my_q = rt_rq; rt_se->parent = parent;
@@ -1428,16 +1430,19 @@ static void dequeue_rt_stack(struct sched_rt_entity *rt_se, unsigned int flags)struct sched_rt_entity *back =NULL ;unsigned int rt_nr_running; -for_each_sched_rt_entity (rt_se) { - rt_se->back = back; +for_each_sched_rt_entity (rt_se) back = rt_se; - } rt_nr_running =rt_rq_of_se (back)->rt_nr_running; -for (rt_se = back; rt_se; rt_se = rt_se->back) { +for (rt_se = back; rt_se; ) {if (on_rt_rq (rt_se))__dequeue_rt_entity (rt_se, flags); +#ifdef CONFIG_RT_GROUP_SCHED + rt_se = rt_se->back; +#else + rt_se =NULL ; +#endif }dequeue_top_rt_rq (rt_rq_of_se (back), rt_nr_running);
Signature · 1 line
2.25.1
Steven Rostedt
reviewerRe: [PATCH 1/2] sched/rt: Use 'back' only if CONFIG_RT_GROUP_SCHED is enabled
Quoted 16 lines · On Mon, 3 Jun 2024 20:50:01 +0800 Yajun Deng <[email protected]> wrote:
The 'back' member in struct
sched_rt_entityonly related toCONFIG_RT_GROUP_SCHED, so there is no need to init it indequeue_rt_stack.Init the 'back' member in
init_tg_rt_entryand use it only ifCONFIG_RT_GROUP_SCHEDis enabled.Signed-off-by Yajun Deng <[email protected]>--- kernel/sched/rt.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)kernel/sched/rt.c +0
-0
kernel/sched/rt.c void init_tg_rt_entry(struct task_group *tg, struct rt_rq *rt_rq, · line 238
Quoted 8 lines
kernel/sched/rt.c +3
-1@@ -232,8 +232,10 @@ void init_tg_rt_entry(struct task_group *tg, struct rt_rq *rt_rq,if (!parent) rt_se->rt_rq = &rq->rt; -else +else { rt_se->rt_rq = parent->my_q; + parent->back = rt_se; + }
If one block of an if/else requires brackets, then both do.
Quoted 14 lines
kernel/sched/rt.c +1
-3rt_se->my_q = rt_rq; rt_se->parent = parent;@@ -1428,16 +1430,19 @@ static void dequeue_rt_stack(struct sched_rt_entity *rt_se, unsigned int flags)struct sched_rt_entity *back =NULL ;unsigned int rt_nr_running; -for_each_sched_rt_entity (rt_se) { - rt_se->back = back; +for_each_sched_rt_entity (rt_se) back = rt_se; - } rt_nr_running =rt_rq_of_se (back)->rt_nr_running;
kernel/sched/rt.c static void dequeue_rt_stack(struct sched_rt_entity *rt_se, unsigned int flags) · line 1445
Quoted 10 lines
kernel/sched/rt.c +6
-1-for (rt_se = back; rt_se; rt_se = rt_se->back) { +for (rt_se = back; rt_se; ) {if (on_rt_rq (rt_se))__dequeue_rt_entity (rt_se, flags); +#ifdef CONFIG_RT_GROUP_SCHED + rt_se = rt_se->back; +#else + rt_se =NULL ; +#endif
Perhaps make a helper function to get rid of the #ifdef in the code here.
for (rt_se = back, rt_se; rt_se = rt_se_back(rt_se)) {Where rt_se_back() above can be defined in the #ifdef blocks for CONFIG_RT_GROUP_SCHED as either:
static struct sched_rt_entity *rt_se_back(struct sched_rt_entity *se)
{
return se->back;
}Or
static inline struct sched_rt_entity *rt_se_back(struct sched_rt_entity *se)
{
return NULL;
}-- Steve
Quoted 3 lines
kernel/sched/rt.c +0
-0}dequeue_top_rt_rq (rt_rq_of_se (back), rt_nr_running);
Re: [PATCH 1/2] sched/rt: Use 'back' only if CONFIG_RT_GROUP_SCHED is enabled
Quoted 48 lines · Steven Rostedt
On Mon, 3 Jun 2024 20:50:01 +0800
Quoted 43 lines · Yajun Deng
The 'back' member in struct
sched_rt_entityonly related to
CONFIG_RT_GROUP_SCHED, so there is no need to init it indequeue_rt_stack.Init the 'back' member in
init_tg_rt_entryand use it only if
CONFIG_RT_GROUP_SCHEDis enabled.Signed-off-by Yajun Deng <[email protected]>---
kernel/sched/rt.c | 15 ++++++++++-----1 file changed, 10 insertions(+), 5 deletions(-)diff --git
a/kernel/sched/rt.cb/kernel/sched/rt.cindex
63e49c8ffc4d..44bb9087cfe5100644---
a/kernel/sched/rt.c+++
b/kernel/sched/rt.c@@ -232,8 +232,10 @@ void init_tg_rt_entry(struct
task_group*tg, structrt_rq*rt_rq,if (!parent)
rt_se->rt_rq=&rq->rt;- else
+ else {
Quoted 9 lines
Quoted 6 lines
rt_se->rt_rq=parent->my_q;+
parent->back=rt_se;+ }
If one block of an if/else requires brackets, then both do.
Got it.
Quoted 66 lines
Quoted 39 lines
rt_se->my_q=rt_rq;
rt_se->parent= parent;@@ -1428,16 +1430,19 @@ static void
dequeue_rt_stack(struct sched_rt_entity *rt_se, unsigned int flags)struct
sched_rt_entity*back = NULL;unsigned int
rt_nr_running;-
for_each_sched_rt_entity(rt_se){-
rt_se->back= back;+
for_each_sched_rt_entity(rt_se)back =
rt_se;- }
rt_nr_running= rt_rq_of_se(back)->rt_nr_running;- for (
rt_se= back;rt_se;rt_se=rt_se->back) {+ for (
rt_se= back;rt_se; ) {if (
on_rt_rq(rt_se))
__dequeue_rt_entity(rt_se, flags);+#ifdef
CONFIG_RT_GROUP_SCHEDQuoted 8 lines
+
rt_se=rt_se->back;+#else
+
rt_se= NULL;+#endif
Perhaps make a helper function to get rid of the #ifdef in the code here.
for (
rt_se= back,rt_se;rt_se=rt_se_back(rt_se)) {Where
rt_se_back()above can be defined in the #ifdef blocks for
CONFIG_RT_GROUP_SCHEDas either:static struct
sched_rt_entity*rt_se_back(structsched_rt_entity*se){
return
se->back;}
Or
Quoted 8 lines
static inline struct
sched_rt_entity*rt_se_back(structsched_rt_entity*se){
return NULL;
}
Okay, thanks.
Quoted 10 lines
-- Steve
Quoted 7 lines
}
dequeue_top_rt_rq(rt_rq_of_se(back), rt_nr_running);
PATCH 2/2 sched/headers: Move sched_rt_entity::back to under the CONFIG_RT_GROUP_SCHED block
In reply to Yajun DengWe already remove the call to the 'back' member when CONFIG_RT_GROUP_SCHED is disabled.
It's safe to move sched_rt_entity::back to under the CONFIG_RT_GROUP_SCHED block, it would save a few bytes.
--- include/linux/sched.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/sched.h +1 -1
@@ -582,8 +582,8 @@ struct sched_rt_entity {unsigned short on_rq;unsigned short on_list; -struct sched_rt_entity *back;#ifdef CONFIG_RT_GROUP_SCHED +struct sched_rt_entity *back;struct sched_rt_entity *parent;/* rq on which this entity is (to be) queued: */ struct rt_rq *rt_rq;
Signature · 1 line
2.25.1