linux-kernel - [PATCH] sched: fair: fix error statement in check_schedstat

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:   Fri, 15 Mar 2019 15:31:45 +0800
From:   Yafang Shao <laoar.shao@...il.com>
To:     peterz@...radead.org
Cc:     linux-kernel@...r.kernel.org, shaoyafang@...iglobal.com,
        Yafang Shao <laoar.shao@...il.com>
Subject: [PATCH] sched: fair: fix error statement in check_schedstat_required()

sched_stat_runtime doesn't require CONFIG_SCHEDSTATS currently,
not to mention kernel parameter schedstats=enable or
kernel.sched_schedstats=1.

I think that is okay for sched_stat_runtime, because the information
reported in sched_stat_runtime isn't related with CONFIG_SCHEDSTATS.
So I remove the statement about sched_stat_runtime in
check_schedstat_required().

Some other minor changes in this patch,
- stat_wait is missed in the print log before.
- CONFIG_SCHEDSTATS is unnecessary as schedstat_enabled() is used.

Signed-off-by: Yafang Shao <laoar.shao@...il.com>
---
 kernel/sched/fair.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 8213ff6..dc0d7ef 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -3831,7 +3831,6 @@ static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se)
 
 static inline void check_schedstat_required(void)
 {
-#ifdef CONFIG_SCHEDSTATS
 	if (schedstat_enabled())
 		return;
 
@@ -3839,14 +3838,12 @@ static inline void check_schedstat_required(void)
 	if (trace_sched_stat_wait_enabled()    ||
 			trace_sched_stat_sleep_enabled()   ||
 			trace_sched_stat_iowait_enabled()  ||
-			trace_sched_stat_blocked_enabled() ||
-			trace_sched_stat_runtime_enabled())  {
+			trace_sched_stat_blocked_enabled()) {
 		printk_deferred_once("Scheduler tracepoints stat_sleep, stat_iowait, "
-			     "stat_blocked and stat_runtime require the "
+			     "stat_blocked and stat_wait require the "
 			     "kernel parameter schedstats=enable or "
 			     "kernel.sched_schedstats=1\n");
 	}
-#endif
 }
 
 
-- 
1.8.3.1