From: Steven Rostedt <rostedt@goodmis.org>
To: Jiaxing Wang <hello.wjx@gmail.com>
Cc: linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: Re: [PATCH RESEND] tracing: Make tracing work when debugfs is not compiled or initialized.
Date: Wed, 4 Nov 2015 10:03:39 -0500 [thread overview]
Message-ID: <20151104100339.583e1bc9@gandalf.local.home> (raw)
In-Reply-To: <1446599478-8723-1-git-send-email-hello.wjx@gmail.com>
On Wed, 4 Nov 2015 09:11:18 +0800
Jiaxing Wang <hello.wjx@gmail.com> wrote:
> Currently tracing_init_dentry() returns -ENODEV when debugfs is not
> initialized, which causes tracefs not populated with tracing files and
> directories, so we will get an empty directory even after we manually
> mount tracefs.
>
> We can make tracing_init_dentry() return NULL as long as tracefs
> is initialized and get a populated tracefs.
>
> We also need to make global_trace.dir not NULL in order to pass the checks
> in tracing_get_dentry() and add_tracer_options().
>
> Also added stub debugfs_create_automount() for when debugfs is not
> configured in.
>
> Signed-off-by: Jiaxing Wang <hello.wjx@gmail.com>
> ---
> include/linux/debugfs.h | 8 ++++++++
> kernel/trace/Kconfig | 1 -
> kernel/trace/trace.c | 29 +++++++++++++++++------------
> 3 files changed, 25 insertions(+), 13 deletions(-)
>
> diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
> index 9beb636..b42ef88 100644
> --- a/include/linux/debugfs.h
> +++ b/include/linux/debugfs.h
> @@ -160,6 +160,14 @@ static inline struct dentry *debugfs_create_symlink(const char *name,
> return ERR_PTR(-ENODEV);
> }
>
> +static inline struct dentry *debugfs_create_automount(const char *name,
> + struct dentry *parent,
> + struct vfsmount *(*f)(void *),
> + void *data)
> +{
> + return ERR_PTR(-ENODEV);
> +}
This part needs an Acked-by from Greg KH.
> +
> static inline void debugfs_remove(struct dentry *dentry)
> { }
>
> diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
> index 1153c43..59f6377f 100644
> --- a/kernel/trace/Kconfig
> +++ b/kernel/trace/Kconfig
> @@ -95,7 +95,6 @@ config RING_BUFFER_ALLOW_SWAP
>
> config TRACING
> bool
> - select DEBUG_FS
> select RING_BUFFER
> select STACKTRACE if STACKTRACE_SUPPORT
> select TRACEPOINTS
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index 6e79408..6dd064e 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -6706,6 +6706,8 @@ static struct vfsmount *trace_automount(void *ingore)
> return mnt;
> }
>
> +#define TRACE_TOP_DIR_ENTRY ((struct dentry *)1)
> +
> /**
> * tracing_init_dentry - initialize top level trace array
> *
> @@ -6716,27 +6718,30 @@ static struct vfsmount *trace_automount(void *ingore)
> struct dentry *tracing_init_dentry(void)
> {
> struct trace_array *tr = &global_trace;
> + struct dentry *traced;
>
> /* The top level trace array uses NULL as parent */
> if (tr->dir)
> return NULL;
>
> - if (WARN_ON(!debugfs_initialized()))
> + if (WARN_ON(!tracefs_initialized()))
> return ERR_PTR(-ENODEV);
>
> - /*
> - * As there may still be users that expect the tracing
> - * files to exist in debugfs/tracing, we must automount
> - * the tracefs file system there, so older tools still
> - * work with the newer kerenl.
> - */
> - tr->dir = debugfs_create_automount("tracing", NULL,
> - trace_automount, NULL);
> - if (!tr->dir) {
> - pr_warn_once("Could not create debugfs directory 'tracing'\n");
> - return ERR_PTR(-ENOMEM);
> + if (debugfs_initialized()) {
> + /*
> + * As there may still be users that expect the tracing
> + * files to exist in debugfs/tracing, we must automount
> + * the tracefs file system there, so older tools still
> + * work with the newer kerenl.
> + */
> + traced = debugfs_create_automount("tracing", NULL,
> + trace_automount, NULL);
> + if (!traced)
> + pr_warn_once("Could not create debugfs directory 'tracing'\n");
This should return a warning, and please keep the tr->dir instead of
this new traced variable.
> }
>
> + tr->dir = TRACE_TOP_DIR_ENTRY;
> +
Also, no need to add this, because if debugfs is not initialize, then
tr->dir would be ERR_PTR(-ENODEV), which still works as tr->dir is not
NULL.
-- Steve
> return NULL;
> }
>
next prev parent reply other threads:[~2015-11-04 15:03 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-18 11:58 [PATCH 0/3] Some tracing fixes Jiaxing Wang
2015-10-18 11:58 ` [PATCH 1/3] tracing: Update instance_rmdir() to use tracefs_remove_recursive Jiaxing Wang
2015-10-18 11:58 ` [PATCH 2/3] tracing: Make tracing work when debugfs is not compiled or initialized Jiaxing Wang
2015-10-18 14:32 ` kbuild test robot
2015-10-19 1:54 ` Jiaxing Wang
2015-11-02 14:16 ` Steven Rostedt
2015-11-04 1:11 ` [PATCH RESEND] " Jiaxing Wang
2015-11-04 15:03 ` Steven Rostedt [this message]
2015-11-04 18:54 ` Greg Kroah-Hartman
2015-11-04 20:32 ` Steven Rostedt
2015-11-05 5:23 ` Jiaxing Wang
2015-11-05 15:54 ` Steven Rostedt
2015-11-06 8:02 ` Jiaxing Wang
2015-11-06 8:04 ` [PATCH] tracing: Make tracing work when debugfs is not configured in Jiaxing Wang
2015-10-18 11:58 ` [PATCH 3/3] tracing: Apply tracer specific options from kernel command line Jiaxing Wang
2015-11-02 19:04 ` Steven Rostedt
2015-11-04 1:14 ` [PATCH v2] " Jiaxing Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151104100339.583e1bc9@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=gregkh@linuxfoundation.org \
--cc=hello.wjx@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®