Skip to contentSkip to conversation

sched/core: Fix reset-on-fork from RT with uclamp

PATCH Applied Quentin Perret 4 participants 4 messages Apr 16, 2020 – Apr 22, 2020 Scheduler

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 sched/core: Fix reset-on-fork from RT with uclamp

uclamp_fork() resets the uclamp values to their default when the reset-on-fork flag is set. It also checks whether the task has a RT policy, and sets its uclamp.min to 1024 accordingly. However, during reset-on-fork, the task's policy is lowered to SCHED_NORMAL right after, hence leading to an erroneous uclamp.min setting for the new task if it was forked from RT.

Fix this by removing the unnecessary check on rt_task() in uclamp_fork() as this doesn't make sense if the reset-on-fork flag is set.

Fixes 1a00d999971c ("sched/uclamp: Set default clamps for RT tasks")

---
Changes in v2:
- Added missing 'Fixes:' tag (Patrick)
- Removed unnecessary local variable (Doug, Patrick)

---
 kernel/sched/core.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
kernel/sched/core.c +2 -7
index 3a61a3b8eaa9..9a2fbf98fd6f 100644
@@ -1232,13 +1232,8 @@ static void uclamp_fork(struct task_struct *p)
 		return;
 
 	for_each_clamp_id(clamp_id) {
-		unsigned int clamp_value = uclamp_none(clamp_id);
-
-		/* By default, RT tasks always get 100% boost */
-		if (unlikely(rt_task(p) && clamp_id == UCLAMP_MIN))
-			clamp_value = uclamp_none(UCLAMP_MAX);
-
-		uclamp_se_set(&p->uclamp_req[clamp_id], clamp_value, false);
+		uclamp_se_set(&p->uclamp_req[clamp_id],
+			      uclamp_none(clamp_id), false);
 	}
 }
 
Signature · 1 line
2.26.1.301.g55bc3eb7cb9-goog
reviewer Reviewed-by on v2 1/1
#1 lore raw
Quoted 32 lines · Quentin Perret

uclamp_fork() resets the uclamp values to their default when the reset-on-fork flag is set. It also checks whether the task has a RT policy, and sets its uclamp.min to 1024 accordingly. However, during reset-on-fork, the task's policy is lowered to SCHED_NORMAL right after, hence leading to an erroneous uclamp.min setting for the new task if it was forked from RT.

Fix this by removing the unnecessary check on rt_task() in uclamp_fork() as this doesn't make sense if the reset-on-fork flag is set.

Fixes 1a00d999971c ("sched/uclamp: Set default clamps for RT tasks")

---
Changes in v2:
- Added missing 'Fixes:' tag (Patrick)
- Removed unnecessary local variable (Doug, Patrick)

---
 kernel/sched/core.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
kernel/sched/core.c +0 -1
index 3a61a3b8eaa9..9a2fbf98fd6f 100644
@@ -1232,13 +1232,8 @@ static void uclamp_fork(struct task_struct *p)
 		return;
 
 	for_each_clamp_id(clamp_id) {
-		unsigned int clamp_value = uclamp_none(clamp_id);

kernel/sched/core.c static void uclamp_fork(struct task_struct *p) · line 1238

Quoted 10 lines
kernel/sched/core.c +2 -6
-
-		/* By default, RT tasks always get 100% boost */
-		if (unlikely(rt_task(p) && clamp_id == UCLAMP_MIN))
-			clamp_value = uclamp_none(UCLAMP_MAX);
-
-		uclamp_se_set(&p->uclamp_req[clamp_id], clamp_value, false);
+		uclamp_se_set(&p->uclamp_req[clamp_id],
+			      uclamp_none(clamp_id), false);
 	}
 }

LGTM.

maintainer
#2 lore raw
Quoted 46 lines · Dietmar Eggemann
Quoted 32 lines · Quentin Perret

uclamp_fork() resets the uclamp values to their default when the reset-on-fork flag is set. It also checks whether the task has a RT policy, and sets its uclamp.min to 1024 accordingly. However, during reset-on-fork, the task's policy is lowered to SCHED_NORMAL right after, hence leading to an erroneous uclamp.min setting for the new task if it was forked from RT.

Fix this by removing the unnecessary check on rt_task() in uclamp_fork() as this doesn't make sense if the reset-on-fork flag is set.

Fixes 1a00d999971c ("sched/uclamp: Set default clamps for RT tasks")

---
Changes in v2:
- Added missing 'Fixes:' tag (Patrick)
- Removed unnecessary local variable (Doug, Patrick)

---
 kernel/sched/core.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
kernel/sched/core.c +0 -1
index 3a61a3b8eaa9..9a2fbf98fd6f 100644
@@ -1232,13 +1232,8 @@ static void uclamp_fork(struct task_struct *p)
 		return;
 
 	for_each_clamp_id(clamp_id) {
-		unsigned int clamp_value = uclamp_none(clamp_id);

kernel/sched/core.c static void uclamp_fork(struct task_struct *p) · line 1238

Quoted 10 lines
kernel/sched/core.c +2 -6
-
-		/* By default, RT tasks always get 100% boost */
-		if (unlikely(rt_task(p) && clamp_id == UCLAMP_MIN))
-			clamp_value = uclamp_none(UCLAMP_MAX);
-
-		uclamp_se_set(&p->uclamp_req[clamp_id], clamp_value, false);
+		uclamp_se_set(&p->uclamp_req[clamp_id],
+			      uclamp_none(clamp_id), false);
 	}
 }

LGTM.

Quoted 1 line

Thanks guys!

merge bot Applied
#3 lore raw
In reply to Quentin Perret
The following commit has been merged into the sched/urgent branch of tip:

The following commit has been merged into the sched/urgent branch of tip:

Commit-ID:     eaf5a92ebde5bca3bb2565616115bd6d579486cd
Gitweb:        https://git.kernel.org/tip/eaf5a92ebde5bca3bb2565616115bd6d579486cd
Author:        Quentin Perret <[email protected]>
AuthorDate:    Thu, 16 Apr 2020 09:59:56 +01:00
Committer:     Peter Zijlstra <[email protected]>
CommitterDate: Wed, 22 Apr 2020 23:10:13 +02:00

sched/core: Fix reset-on-fork from RT with uclamp

uclamp_fork() resets the uclamp values to their default when the reset-on-fork flag is set. It also checks whether the task has a RT policy, and sets its uclamp.min to 1024 accordingly. However, during reset-on-fork, the task's policy is lowered to SCHED_NORMAL right after, hence leading to an erroneous uclamp.min setting for the new task if it was forked from RT.

Fix this by removing the unnecessary check on rt_task() in uclamp_fork() as this doesn't make sense if the reset-on-fork flag is set.

---
 kernel/sched/core.c |  9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
kernel/sched/core.c +2 -7
index 3a61a3b..9a2fbf9 100644
@@ -1232,13 +1232,8 @@ static void uclamp_fork(struct task_struct *p)
 		return;
 
 	for_each_clamp_id(clamp_id) {
-		unsigned int clamp_value = uclamp_none(clamp_id);
-
-		/* By default, RT tasks always get 100% boost */
-		if (unlikely(rt_task(p) && clamp_id == UCLAMP_MIN))
-			clamp_value = uclamp_none(UCLAMP_MAX);
-
-		uclamp_se_set(&p->uclamp_req[clamp_id], clamp_value, false);
+		uclamp_se_set(&p->uclamp_req[clamp_id],
+			      uclamp_none(clamp_id), false);
 	}
 }