Skip to contentSkip to conversation

sched/core: uclamp: fix rq.uclamp memory size of initialization

PATCH Applied Li Guanglei 4 participants 4 messages Dec 25, 2019 – Jan 17, 2020 Scheduler

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sched/core: uclamp: fix rq.uclamp memory size of initialization

From: Li Guanglei <[email protected]>

uclamp_rq for each clamp id(UCLAMP_CNT) should be initialized when call init_uclamp.

---
 kernel/sched/core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/sched/core.c +2 -1
index 44123b4..05f870b 100644
@@ -1252,7 +1252,8 @@ static void __init init_uclamp(void)
 	mutex_init(&uclamp_mutex);
 
 	for_each_possible_cpu(cpu) {
-		memset(&cpu_rq(cpu)->uclamp, 0, sizeof(struct uclamp_rq));
+		memset(&cpu_rq(cpu)->uclamp, 0,
+				sizeof(struct uclamp_rq)*UCLAMP_CNT);
 		cpu_rq(cpu)->uclamp_flags = 0;
 	}
 
Signature · 1 line
2.7.4
Reviewed-by on v1 1/1
#1 lore raw
Quoted 3 lines · Li Guanglei

From: Li Guanglei <[email protected]>

uclamp_rq for each clamp id(UCLAMP_CNT) should be initialized when call

s/clamp id(UCLAMP_CNT)/UCLAMP_CNT/

Quoted 3 lines

init_uclamp.

This need fixes tag

Fixes 69842cba9ace ("sched/uclamp: Add CPU's clamp buckets refcountinga")

Otherwise this looks good to me.

Thanks

--
Qais Yousef

Quoted 21 lines
---
 kernel/sched/core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/sched/core.c +2 -1
index 44123b4..05f870b 100644
@@ -1252,7 +1252,8 @@ static void __init init_uclamp(void)
 	mutex_init(&uclamp_mutex);
 
 	for_each_possible_cpu(cpu) {
-		memset(&cpu_rq(cpu)->uclamp, 0, sizeof(struct uclamp_rq));
+		memset(&cpu_rq(cpu)->uclamp, 0,
+				sizeof(struct uclamp_rq)*UCLAMP_CNT);
 		cpu_rq(cpu)->uclamp_flags = 0;
 	}
 
Signature · 1 line
2.7.4
maintainer Reviewed-by Qais Yousef
#2 lore raw
Quoted 11 lines · Qais Yousef
Quoted 3 lines · Li Guanglei

From: Li Guanglei <[email protected]>

uclamp_rq for each clamp id(UCLAMP_CNT) should be initialized when call

s/clamp id(UCLAMP_CNT)/UCLAMP_CNT/

Quoted 3 lines

init_uclamp.

Quoted 7 lines

This need fixes tag

Fixes 69842cba9ace ("sched/uclamp: Add CPU's clamp buckets refcountinga")

Otherwise this looks good to me.

Thanks! It now looks something like so:

---
Subject: sched/core: Fix size of rq::uclamp initialization
From: Li Guanglei <[email protected]>
Date: Wed, 25 Dec 2019 15:44:04 +0800

rq::uclamp is an array of struct uclamp_rq, make sure we clear the whole thing.

Fixes 69842cba9ace ("sched/uclamp: Add CPU's clamp buckets refcountinga")
---
 kernel/sched/core.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/sched/core.c +2 -1
@@ -1253,7 +1253,8 @@ static void __init init_uclamp(void)
 	mutex_init(&uclamp_mutex);
 
 	for_each_possible_cpu(cpu) {
-		memset(&cpu_rq(cpu)->uclamp, 0, sizeof(struct uclamp_rq));
+		memset(&cpu_rq(cpu)->uclamp, 0,
+				sizeof(struct uclamp_rq)*UCLAMP_CNT);
 		cpu_rq(cpu)->uclamp_flags = 0;
 	}
 
merge bot Applied
#3 lore raw

[tip: sched/core] sched/core: Fix size of rq::uclamp initialization

In reply to Li Guanglei
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:     dcd6dffb0a75741471297724640733fa4e958d72
Gitweb:        https://git.kernel.org/tip/dcd6dffb0a75741471297724640733fa4e958d72
Author:        Li Guanglei <[email protected]>
AuthorDate:    Wed, 25 Dec 2019 15:44:04 +08:00
Committer:     Peter Zijlstra <[email protected]>
CommitterDate: Fri, 17 Jan 2020 10:19:20 +01:00

sched/core: Fix size of rq::uclamp initialization

rq::uclamp is an array of struct uclamp_rq, make sure we clear the whole thing.

Fixes 69842cba9ace ("sched/uclamp: Add CPU's clamp buckets refcountinga")
---
 kernel/sched/core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/sched/core.c +2 -1
index d0270b1..fc1dfc0 100644
@@ -1253,7 +1253,8 @@ static void __init init_uclamp(void)
 	mutex_init(&uclamp_mutex);
 
 	for_each_possible_cpu(cpu) {
-		memset(&cpu_rq(cpu)->uclamp, 0, sizeof(struct uclamp_rq));
+		memset(&cpu_rq(cpu)->uclamp, 0,
+				sizeof(struct uclamp_rq)*UCLAMP_CNT);
 		cpu_rq(cpu)->uclamp_flags = 0;
 	}