reduce stack usage of node_read_meminfo()
in [Kernel]
|
Prev: BUG: Securityfs and bind mounts (2.6.34)
Next: parport/serial: add support for Timedia/SUNIX cards to parport_serial
From: KOSAKI Motohiro on 8 Jul 2010 06:50 Grr, I did sent old ver. right patch is here ;-) sorry. ================================================ Subject: [PATCH] reduce stack usage of node_read_meminfo() Now, cmpilation node_read_meminfo() output following warning. Because it has very large sprintf() argument. drivers/base/node.c: In function 'node_read_meminfo': drivers/base/node.c:139: warning: the frame size of 848 bytes is larger than 512 bytes This patch fixes it by splitting sprintf() in three parts. This also reduce CONFIG_HIGHMEM mess a bit. Signed-off-by: KOSAKI Motohiro <kosaki.motohiro(a)jp.fujitsu.com> --- drivers/base/node.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index 2bdd8a9..2872e86 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -66,8 +66,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, struct sysinfo i; si_meminfo_node(&i, nid); - - n = sprintf(buf, "\n" + n = sprintf(buf, "Node %d MemTotal: %8lu kB\n" "Node %d MemFree: %8lu kB\n" "Node %d MemUsed: %8lu kB\n" @@ -78,13 +77,33 @@ static ssize_t node_read_meminfo(struct sys_device * dev, "Node %d Active(file): %8lu kB\n" "Node %d Inactive(file): %8lu kB\n" "Node %d Unevictable: %8lu kB\n" - "Node %d Mlocked: %8lu kB\n" + "Node %d Mlocked: %8lu kB\n", + nid, K(i.totalram), + nid, K(i.freeram), + nid, K(i.totalram - i.freeram), + nid, K(node_page_state(nid, NR_ACTIVE_ANON) + + node_page_state(nid, NR_ACTIVE_FILE)), + nid, K(node_page_state(nid, NR_INACTIVE_ANON) + + node_page_state(nid, NR_INACTIVE_FILE)), + nid, K(node_page_state(nid, NR_ACTIVE_ANON)), + nid, K(node_page_state(nid, NR_INACTIVE_ANON)), + nid, K(node_page_state(nid, NR_ACTIVE_FILE)), + nid, K(node_page_state(nid, NR_INACTIVE_FILE)), + nid, K(node_page_state(nid, NR_UNEVICTABLE)), + nid, K(node_page_state(nid, NR_MLOCK))); + #ifdef CONFIG_HIGHMEM + n += sprintf(buf + n, "Node %d HighTotal: %8lu kB\n" "Node %d HighFree: %8lu kB\n" "Node %d LowTotal: %8lu kB\n" - "Node %d LowFree: %8lu kB\n" + "Node %d LowFree: %8lu kB\n", + nid, K(i.totalhigh), + nid, K(i.freehigh), + nid, K(i.totalram - i.totalhigh), + nid, K(i.freeram - i.freehigh)); #endif + n += sprintf(buf + n, "Node %d Dirty: %8lu kB\n" "Node %d Writeback: %8lu kB\n" "Node %d FilePages: %8lu kB\n" @@ -99,25 +118,6 @@ static ssize_t node_read_meminfo(struct sys_device * dev, "Node %d Slab: %8lu kB\n" "Node %d SReclaimable: %8lu kB\n" "Node %d SUnreclaim: %8lu kB\n", - nid, K(i.totalram), - nid, K(i.freeram), - nid, K(i.totalram - i.freeram), - nid, K(node_page_state(nid, NR_ACTIVE_ANON) + - node_page_state(nid, NR_ACTIVE_FILE)), - nid, K(node_page_state(nid, NR_INACTIVE_ANON) + - node_page_state(nid, NR_INACTIVE_FILE)), - nid, K(node_page_state(nid, NR_ACTIVE_ANON)), - nid, K(node_page_state(nid, NR_INACTIVE_ANON)), - nid, K(node_page_state(nid, NR_ACTIVE_FILE)), - nid, K(node_page_state(nid, NR_INACTIVE_FILE)), - nid, K(node_page_state(nid, NR_UNEVICTABLE)), - nid, K(node_page_state(nid, NR_MLOCK)), -#ifdef CONFIG_HIGHMEM - nid, K(i.totalhigh), - nid, K(i.freehigh), - nid, K(i.totalram - i.totalhigh), - nid, K(i.freeram - i.freehigh), -#endif nid, K(node_page_state(nid, NR_FILE_DIRTY)), nid, K(node_page_state(nid, NR_WRITEBACK)), nid, K(node_page_state(nid, NR_FILE_PAGES)), -- 1.6.5.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Andrew Morton on 8 Jul 2010 17:00 On Thu, 8 Jul 2010 19:41:57 +0900 (JST) KOSAKI Motohiro <kosaki.motohiro(a)jp.fujitsu.com> wrote: > Grr, I did sent old ver. right patch is here ;-) > sorry. oop, there it is. Did you check the output carefully? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: KOSAKI Motohiro on 8 Jul 2010 20:20
> On Thu, 8 Jul 2010 18:20:14 +0900 (JST) > KOSAKI Motohiro <kosaki.motohiro(a)jp.fujitsu.com> wrote: > > > > > Now, cmpilation node_read_meminfo() output following warning. Because > > it has very large sprintf() argument. > > > > drivers/base/node.c: In function 'node_read_meminfo': > > drivers/base/node.c:139: warning: the frame size of 848 bytes is > > larger than 512 bytes > > hm, I'm surprised it's that much. me too. > > > --- a/drivers/base/node.c > > +++ b/drivers/base/node.c > > @@ -66,8 +66,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, > > struct sysinfo i; > > > > si_meminfo_node(&i, nid); > > - > > - n = sprintf(buf, "\n" > > + n = sprintf(buf, > > "Node %d MemTotal: %8lu kB\n" > > "Node %d MemFree: %8lu kB\n" > > "Node %d MemUsed: %8lu kB\n" > > @@ -78,13 +77,33 @@ static ssize_t node_read_meminfo(struct sys_device * dev, > > "Node %d Active(file): %8lu kB\n" > > "Node %d Inactive(file): %8lu kB\n" > > "Node %d Unevictable: %8lu kB\n" > > - "Node %d Mlocked: %8lu kB\n" > > + "Node %d Mlocked: %8lu kB\n", > > + nid, K(i.totalram), > > + nid, K(i.freeram), > > + nid, K(i.totalram - i.freeram), > > + nid, K(node_page_state(nid, NR_ACTIVE_ANON) + > > + node_page_state(nid, NR_ACTIVE_FILE)), > > Why the heck did we decide to print the same node-id 10000 times? dunno. but I don't want to make behavior change for only stack reducing. > > > + n += sprintf(buf, > > You just got caught sending untested patches. > > --- a/drivers/base/node.c~drivers-base-nodec-reduce-stack-usage-of-node_read_meminfo-fix > +++ a/drivers/base/node.c > @@ -93,7 +93,7 @@ static ssize_t node_read_meminfo(struct > nid, K(node_page_state(nid, NR_MLOCK))); > > #ifdef CONFIG_HIGHMEM > - n += sprintf(buf, > + n += sprintf(buf + n, > "Node %d HighTotal: %8lu kB\n" > "Node %d HighFree: %8lu kB\n" > "Node %d LowTotal: %8lu kB\n" > @@ -103,7 +103,7 @@ static ssize_t node_read_meminfo(struct > nid, K(i.totalram - i.totalhigh), > nid, K(i.freeram - i.freehigh)); > #endif > - n += sprintf(buf, > + n += sprintf(buf + n, > "Node %d Dirty: %8lu kB\n" > "Node %d Writeback: %8lu kB\n" > "Node %d FilePages: %8lu kB\n" > _ > > > Please, run the code and check that we didn't muck up the output. 100% my fault. I ran it, but I forgot to merge two patches ;) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |