linux-next: proc tree build failure

public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

* linux-next: proc tree build failure
@ 2008-11-10  5:29 Stephen Rothwell
  2008-11-10  5:53 ` Alexey Dobriyan
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2008-11-10  5:29 UTC (permalink / raw)
  To: Alexey Dobriyan; +Cc: linux-next, Ken Chen, Ingo Molnar

Hi Alexey,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

fs/proc/base.c:2547: error: 'pid_stack' undeclared here (not in a function)

Caused by an interaction of commits
078e9901c02d4899db5b24f708b8dfbca8935891 ("stacktrace:
add /proc/<pid>/stack to dump task's stack trace") and
35f0b5fd7fab907a1119eaa614d9b24e5e225755 ("stacktrace:
convert /proc/<pid>/stack to seqfiles") from the tip-core tree with commit
5d8880e3e0fb96459c652ac5e1504b90c949b3b9 ("proc: remove '##' usage") from
the proc tree.

The former added a new usage of INF (which the second converted to a
ONE).  I added the following patch to the merge of the proc tree and can
carry it.
-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 10 Nov 2008 16:25:29 +1100
Subject: [PATCH] proc: merge fix 1

Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
 fs/proc/base.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 20e7752..f025953 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2544,7 +2544,7 @@ static const struct pid_entry tgid_base_stuff[] = {
 	INF("wchan",      S_IRUGO, proc_pid_wchan),
 #endif
 #ifdef CONFIG_STACKTRACE
-	ONE("stack",      S_IRUSR, pid_stack),
+	ONE("stack",      S_IRUSR, proc_pid_stack),
 #endif
 #ifdef CONFIG_SCHEDSTATS
 	INF("schedstat",  S_IRUGO, proc_pid_schedstat),
-- 
1.5.6.5

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: linux-next: proc tree build failure
  2008-11-10  5:29 linux-next: proc tree build failure Stephen Rothwell
@ 2008-11-10  5:53 ` Alexey Dobriyan
  2008-11-10  7:36   ` Ingo Molnar
  0 siblings, 1 reply; 5+ messages in thread
From: Alexey Dobriyan @ 2008-11-10  5:53 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, Ken Chen, Ingo Molnar

On Mon, Nov 10, 2008 at 04:29:41PM +1100, Stephen Rothwell wrote:
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> fs/proc/base.c:2547: error: 'pid_stack' undeclared here (not in a function)
> 
> Caused by an interaction of commits
> 078e9901c02d4899db5b24f708b8dfbca8935891 ("stacktrace:
> add /proc/<pid>/stack to dump task's stack trace") and
> 35f0b5fd7fab907a1119eaa614d9b24e5e225755 ("stacktrace:
> convert /proc/<pid>/stack to seqfiles") from the tip-core tree with commit
> 5d8880e3e0fb96459c652ac5e1504b90c949b3b9 ("proc: remove '##' usage") from
> the proc tree.
> 
> The former added a new usage of INF (which the second converted to a
> ONE).  I added the following patch to the merge of the proc tree and can
> carry it.

Time to steal this /proc/*/stack from Ingo. :-)

> --- a/fs/proc/base.c
> +++ b/fs/proc/base.c
> @@ -2544,7 +2544,7 @@ static const struct pid_entry tgid_base_stuff[] = {
>  	INF("wchan",      S_IRUGO, proc_pid_wchan),
>  #endif
>  #ifdef CONFIG_STACKTRACE
> -	ONE("stack",      S_IRUSR, pid_stack),
> +	ONE("stack",      S_IRUSR, proc_pid_stack),

correct

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: linux-next: proc tree build failure
  2008-11-10  5:53 ` Alexey Dobriyan
@ 2008-11-10  7:36   ` Ingo Molnar
  2008-11-10  8:42     ` [PATCH v42] proc: add /proc/*/stack (was Re: linux-next: proc tree build failure) Alexey Dobriyan
  0 siblings, 1 reply; 5+ messages in thread
From: Ingo Molnar @ 2008-11-10  7:36 UTC (permalink / raw)
  To: Alexey Dobriyan; +Cc: Stephen Rothwell, linux-next, Ken Chen


* Alexey Dobriyan <adobriyan@gmail•com> wrote:

> On Mon, Nov 10, 2008 at 04:29:41PM +1100, Stephen Rothwell wrote:
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> > 
> > fs/proc/base.c:2547: error: 'pid_stack' undeclared here (not in a function)
> > 
> > Caused by an interaction of commits
> > 078e9901c02d4899db5b24f708b8dfbca8935891 ("stacktrace:
> > add /proc/<pid>/stack to dump task's stack trace") and
> > 35f0b5fd7fab907a1119eaa614d9b24e5e225755 ("stacktrace:
> > convert /proc/<pid>/stack to seqfiles") from the tip-core tree with commit
> > 5d8880e3e0fb96459c652ac5e1504b90c949b3b9 ("proc: remove '##' usage") from
> > the proc tree.
> > 
> > The former added a new usage of INF (which the second converted to a
> > ONE).  I added the following patch to the merge of the proc tree and can
> > carry it.
> 
> Time to steal this /proc/*/stack from Ingo. :-)

Alexey, would you like to carry them for v2.6.29? They are in a 
separate tree here, the pull coordinates are below.

Please preserve the sha1's (do not rebase/cherry-pick, etc.) so that i 
can carry it too without causing confusion.

	Ingo

------------------->

The core/stacktrace git tree can be pulled from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core/stacktrace

 Thanks,

	Ingo

------------------>
Ken Chen (2):
      stacktrace: add /proc/<pid>/stack to dump task's stack trace
      stacktrace: convert /proc/<pid>/stack to seqfiles


 Documentation/filesystems/proc.txt |    1 +
 fs/proc/base.c                     |   50 ++++++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index bcceb99..11f5b75 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -139,6 +139,7 @@ Table 1-1: Process specific entries in /proc
  statm		Process memory status information
  status		Process status in human readable form
  wchan		If CONFIG_KALLSYMS is set, a pre-decoded wchan
+ stack		Report full stack trace, enable via CONFIG_STACKTRACE
  smaps		Extension based on maps, the rss size for each mapped file
 ..............................................................................
 
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 486cf3f..6d294a4 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -65,6 +65,7 @@
 #include <linux/mm.h>
 #include <linux/rcupdate.h>
 #include <linux/kallsyms.h>
+#include <linux/stacktrace.h>
 #include <linux/resource.h>
 #include <linux/module.h>
 #include <linux/mount.h>
@@ -130,6 +131,12 @@ struct pid_entry {
 		{ .proc_show = &proc_##OTYPE } )
 
 /*
+ * buffer size used for proc read.  See proc_info_read().
+ * 4K page size but our output routines use some slack for overruns
+ */
+#define PROC_BLOCK_SIZE	(3*1024)
+
+/*
  * Count the number of hardlinks for the pid_entry table, excluding the .
  * and .. links.
  */
@@ -340,6 +347,44 @@ static int proc_pid_wchan(struct task_struct *task, char *buffer)
 }
 #endif /* CONFIG_KALLSYMS */
 
+#ifdef CONFIG_STACKTRACE
+
+#define MAX_STACK_TRACE_DEPTH	64
+
+static int proc_pid_stack(struct seq_file *m, struct pid_namespace *ns,
+			  struct pid *pid, struct task_struct *task)
+{
+	struct stack_trace trace;
+	unsigned long *entries;
+	int i;
+
+	entries = kmalloc(sizeof(*entries)*MAX_STACK_TRACE_DEPTH, GFP_KERNEL);
+	if (!entries)
+		return -ENOMEM;
+
+	trace.nr_entries	= 0;
+	trace.max_entries	= MAX_STACK_TRACE_DEPTH;
+	trace.entries		= entries;
+	trace.skip		= 0;
+
+	/*
+	 * Protect against the task exiting (and deallocating its
+	 * stack, etc.) while we save its backtrace:
+	 */
+	read_lock(&tasklist_lock);
+	save_stack_trace_tsk(task, &trace);
+	read_unlock(&tasklist_lock);
+
+	for (i = 0; i < trace.nr_entries; i++) {
+		seq_printf(m, "[<%p>] %pS\n",
+			   (void *)entries[i], (void *)entries[i]);
+	}
+	kfree(entries);
+
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_SCHEDSTATS
 /*
  * Provides /proc/PID/schedstat
@@ -688,8 +733,6 @@ static const struct file_operations proc_mountstats_operations = {
 	.release	= mounts_release,
 };
 
-#define PROC_BLOCK_SIZE	(3*1024)		/* 4K page size but our output routines use some slack for overruns */
-
 static ssize_t proc_info_read(struct file * file, char __user * buf,
 			  size_t count, loff_t *ppos)
 {
@@ -2491,6 +2534,9 @@ static const struct pid_entry tgid_base_stuff[] = {
 #ifdef CONFIG_KALLSYMS
 	INF("wchan",      S_IRUGO, pid_wchan),
 #endif
+#ifdef CONFIG_STACKTRACE
+	ONE("stack",      S_IRUSR, pid_stack),
+#endif
 #ifdef CONFIG_SCHEDSTATS
 	INF("schedstat",  S_IRUGO, pid_schedstat),
 #endif

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH v42] proc: add /proc/*/stack (was Re: linux-next: proc tree build failure)
  2008-11-10  7:36   ` Ingo Molnar
@ 2008-11-10  8:42     ` Alexey Dobriyan
  2008-11-10  8:49       ` Ingo Molnar
  0 siblings, 1 reply; 5+ messages in thread
From: Alexey Dobriyan @ 2008-11-10  8:42 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Stephen Rothwell, linux-next, Ken Chen, linux-kernel, linux-api

On Mon, Nov 10, 2008 at 08:36:23AM +0100, Ingo Molnar wrote:
> 
> * Alexey Dobriyan <adobriyan@gmail•com> wrote:
> 
> > On Mon, Nov 10, 2008 at 04:29:41PM +1100, Stephen Rothwell wrote:
> > > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> > > 
> > > fs/proc/base.c:2547: error: 'pid_stack' undeclared here (not in a function)
> > > 
> > > Caused by an interaction of commits
> > > 078e9901c02d4899db5b24f708b8dfbca8935891 ("stacktrace:
> > > add /proc/<pid>/stack to dump task's stack trace") and
> > > 35f0b5fd7fab907a1119eaa614d9b24e5e225755 ("stacktrace:
> > > convert /proc/<pid>/stack to seqfiles") from the tip-core tree with commit
> > > 5d8880e3e0fb96459c652ac5e1504b90c949b3b9 ("proc: remove '##' usage") from
> > > the proc tree.
> > > 
> > > The former added a new usage of INF (which the second converted to a
> > > ONE).  I added the following patch to the merge of the proc tree and can
> > > carry it.
> > 
> > Time to steal this /proc/*/stack from Ingo. :-)
> 
> Alexey, would you like to carry them for v2.6.29? They are in a 
> separate tree here, the pull coordinates are below.
> 
> Please preserve the sha1's (do not rebase/cherry-pick, etc.) so that i 
> can carry it too without causing confusion.

Sorry, I can't.

It's two commits, PROC_BLOCK_SIZE moving chunk is now unneeded, because
seqfiles are in use, grabbing tasklist_lock for protection from task
dissapearing is unneeded -- proc_single_show() pins task_struct, entry
is added only to tgid table.

So, here is final version:


commit 12bf5a00732a5f9512081291097d0e4a3224e8a3
Author: Ken Chen <kenchen@google•com>
Date:   Mon Nov 10 11:26:08 2008 +0300

    proc: add /proc/*/stack
    
    /proc/*/stack adds the ability to query a task's stack trace. It is more
    useful than /proc/*/wchan as it provides full stack trace instead of single
    depth. Example output:
    
    	$ cat /proc/self/stack
    	[<c010a271>] save_stack_trace_tsk+0x17/0x35
    	[<c01827b4>] proc_pid_stack+0x4a/0x76
    	[<c018312d>] proc_single_show+0x4a/0x5e
    	[<c016bdec>] seq_read+0xf3/0x29f
    	[<c015a004>] vfs_read+0x6d/0x91
    	[<c015a0c1>] sys_read+0x3b/0x60
    	[<c0102eda>] syscall_call+0x7/0xb
    	[<ffffffff>] 0xffffffff
    
    Signed-off-by: Ken Chen <kenchen@google•com>
    Signed-off-by: Ingo Molnar <mingo@elte•hu>
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail•com>

diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index bcceb99..11f5b75 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -139,6 +139,7 @@ Table 1-1: Process specific entries in /proc
  statm		Process memory status information
  status		Process status in human readable form
  wchan		If CONFIG_KALLSYMS is set, a pre-decoded wchan
+ stack		Report full stack trace, enable via CONFIG_STACKTRACE
  smaps		Extension based on maps, the rss size for each mapped file
 ..............................................................................
 
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 6e850e9..738ea78 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -65,6 +65,7 @@
 #include <linux/mm.h>
 #include <linux/rcupdate.h>
 #include <linux/kallsyms.h>
+#include <linux/stacktrace.h>
 #include <linux/resource.h>
 #include <linux/module.h>
 #include <linux/mount.h>
@@ -337,6 +338,37 @@ static int proc_pid_wchan(struct task_struct *task, char *buffer)
 }
 #endif /* CONFIG_KALLSYMS */
 
+#ifdef CONFIG_STACKTRACE
+
+#define MAX_STACK_TRACE_DEPTH	64
+
+static int proc_pid_stack(struct seq_file *m, struct pid_namespace *ns,
+			  struct pid *pid, struct task_struct *task)
+{
+	struct stack_trace trace;
+	unsigned long *entries;
+	int i;
+
+	entries = kmalloc(MAX_STACK_TRACE_DEPTH * sizeof(*entries), GFP_KERNEL);
+	if (!entries)
+		return -ENOMEM;
+
+	trace.nr_entries	= 0;
+	trace.max_entries	= MAX_STACK_TRACE_DEPTH;
+	trace.entries		= entries;
+	trace.skip		= 0;
+	save_stack_trace_tsk(task, &trace);
+
+	for (i = 0; i < trace.nr_entries; i++) {
+		seq_printf(m, "[<%p>] %pS\n",
+			   (void *)entries[i], (void *)entries[i]);
+	}
+	kfree(entries);
+
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_SCHEDSTATS
 /*
  * Provides /proc/PID/schedstat
@@ -2484,6 +2516,9 @@ static const struct pid_entry tgid_base_stuff[] = {
 #ifdef CONFIG_KALLSYMS
 	INF("wchan",      S_IRUGO, proc_pid_wchan),
 #endif
+#ifdef CONFIG_STACKTRACE
+	ONE("stack",      S_IRUSR, proc_pid_stack),
+#endif
 #ifdef CONFIG_SCHEDSTATS
 	INF("schedstat",  S_IRUGO, proc_pid_schedstat),
 #endif
@@ -2819,6 +2854,9 @@ static const struct pid_entry tid_base_stuff[] = {
 #ifdef CONFIG_KALLSYMS
 	INF("wchan",     S_IRUGO, proc_pid_wchan),
 #endif
+#ifdef CONFIG_STACKTRACE
+	ONE("stack",      S_IRUSR, proc_pid_stack),
+#endif
 #ifdef CONFIG_SCHEDSTATS
 	INF("schedstat", S_IRUGO, proc_pid_schedstat),
 #endif

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH v42] proc: add /proc/*/stack (was Re: linux-next: proc tree build failure)
  2008-11-10  8:42     ` [PATCH v42] proc: add /proc/*/stack (was Re: linux-next: proc tree build failure) Alexey Dobriyan
@ 2008-11-10  8:49       ` Ingo Molnar
  0 siblings, 0 replies; 5+ messages in thread
From: Ingo Molnar @ 2008-11-10  8:49 UTC (permalink / raw)
  To: Alexey Dobriyan
  Cc: Stephen Rothwell, linux-next, Ken Chen, linux-kernel, linux-api

* Alexey Dobriyan <adobriyan@gmail•com> wrote:

> > Alexey, would you like to carry them for v2.6.29? They are in a 
> > separate tree here, the pull coordinates are below.
> > 
> > Please preserve the sha1's (do not rebase/cherry-pick, etc.) so 
> > that i can carry it too without causing confusion.
> 
> Sorry, I can't.

hm, git pull did not work?

> It's two commits, PROC_BLOCK_SIZE moving chunk is now unneeded, 
> because seqfiles are in use, grabbing tasklist_lock for protection 
> from task dissapearing is unneeded -- proc_single_show() pins 
> task_struct, entry is added only to tgid table.

hm, but these are small differences that do not impact bisectability, 
you could have done it ontop of what we have, instead of a rebase? Oh 
well.

> So, here is final version:

thanks!

I've rebased tip/core/stacktrace and zapped the history of the old 
commits from that branch. Would have been really nice to preserve the 
sha1 space and not force a rebase, like Linus is requesting it so 
frequently.

Had you done a git pull from me i could have carried this feature too 
without creating conflicts, instead of it disappearing in your tree 
for months and being hidden up until v2.6.29. This whole 'distributed 
development' stuff that's all the rage ;-)

i also regenerated tip-core, so it should now be conflict-free in 
Stephen's tree too. (Stephen, please holler if you still get 
conflicts)

	Ingo

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2008-11-10  8:49 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-10  5:29 linux-next: proc tree build failure Stephen Rothwell
2008-11-10  5:53 ` Alexey Dobriyan
2008-11-10  7:36   ` Ingo Molnar
2008-11-10  8:42     ` [PATCH v42] proc: add /proc/*/stack (was Re: linux-next: proc tree build failure) Alexey Dobriyan
2008-11-10  8:49       ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox