linux-kernel - [PATCH] sched: reduce /proc/schedstat access times

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <1328216139.2480.24.camel@edumazet-laptop>
Date:	Thu, 02 Feb 2012 21:55:39 +0100
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	Ingo Molnar <mingo@...e.hu>
Cc:	linux-kernel <linux-kernel@...r.kernel.org>,
	Peter Zijlstra <peterz@...radead.org>
Subject: [PATCH] sched: reduce /proc/schedstat access times

On a 16 cpus NUMA machine, we can have quite a long /proc/schedstat

# wc -c /proc/schedstat 
8355 /proc/schedstat

It appears show_schedstat() is called three times, because initial
seq_file buffer size is underestimated.

seq buffer must be reallocated two times and we spend 3x more time than
needed.

A quick fix is to maintain the maximum length reached in
show_schedstat() instead of guessing.

Also use seq_bitmap() to avoid the mask_str temp variable.

Signed-off-by: Eric Dumazet <eric.dumazet@...il.com>
Cc: Ingo Molnar <mingo@...e.hu>
Cc: Peter Zijlstra <peterz@...radead.org>
---
 kernel/sched/stats.c |   19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/kernel/sched/stats.c b/kernel/sched/stats.c
index 2a581ba..34bb9c8 100644
--- a/kernel/sched/stats.c
+++ b/kernel/sched/stats.c
@@ -11,15 +11,11 @@
  * format, so that tools can adapt (or abort)
  */
 #define SCHEDSTAT_VERSION 15
+static size_t max_schedstat_len = 4096;
 
 static int show_schedstat(struct seq_file *seq, void *v)
 {
 	int cpu;
-	int mask_len = DIV_ROUND_UP(NR_CPUS, 32) * 9;
-	char *mask_str = kmalloc(mask_len, GFP_KERNEL);
-
-	if (mask_str == NULL)
-		return -ENOMEM;
 
 	seq_printf(seq, "version %d\n", SCHEDSTAT_VERSION);
 	seq_printf(seq, "timestamp %lu\n", jiffies);
@@ -47,9 +43,9 @@ static int show_schedstat(struct seq_file *seq, void *v)
 		for_each_domain(cpu, sd) {
 			enum cpu_idle_type itype;
 
-			cpumask_scnprintf(mask_str, mask_len,
-					  sched_domain_span(sd));
-			seq_printf(seq, "domain%d %s", dcount++, mask_str);
+			seq_printf(seq, "domain%d ", dcount++);
+			seq_bitmap(seq, cpumask_bits(sched_domain_span(sd)),
+				   nr_cpumask_bits);
 			for (itype = CPU_IDLE; itype < CPU_MAX_IDLE_TYPES;
 					itype++) {
 				seq_printf(seq, " %u %u %u %u %u %u %u %u",
@@ -73,14 +69,13 @@ static int show_schedstat(struct seq_file *seq, void *v)
 		rcu_read_unlock();
 #endif
 	}
-	kfree(mask_str);
+	max_schedstat_len = max(max_schedstat_len, seq->count);
 	return 0;
 }
 
 static int schedstat_open(struct inode *inode, struct file *file)
 {
-	unsigned int size = PAGE_SIZE * (1 + num_online_cpus() / 32);
-	char *buf = kmalloc(size, GFP_KERNEL);
+	char *buf = kmalloc(max_schedstat_len, GFP_KERNEL);
 	struct seq_file *m;
 	int res;
 
@@ -90,7 +85,7 @@ static int schedstat_open(struct inode *inode, struct file *file)
 	if (!res) {
 		m = file->private_data;
 		m->buf = buf;
-		m->size = size;
+		m->size = ksize(buf);
 	} else
 		kfree(buf);
 	return res;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/