public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jiaxing Wang <hello.wjx@gmail.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-kernel@vger.kernel.org, Jiaxing Wang <hello.wjx@gmail.com>
Subject: [PATCH] tracing: Make tracing work when debugfs is not configured in
Date: Fri,  6 Nov 2015 16:04:16 +0800	[thread overview]
Message-ID: <1446797056-11683-1-git-send-email-hello.wjx@gmail.com> (raw)
In-Reply-To: <20151105105432.3c0c9e3e@gandalf.local.home>

Currently tracing_init_dentry() returns -ENODEV when debugfs is not
configured in, 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 if debugfs is not
configured in and can manually mount tracefs. But return -ENODEV
if debugfs is configured in but not initialized or failed to create
automount point as that would break backward compatibility with older
tools.

Signed-off-by: Jiaxing Wang <hello.wjx@gmail.com>
---
 kernel/trace/trace.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 6e79408..c89296f 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -6721,7 +6721,9 @@ struct dentry *tracing_init_dentry(void)
 	if (tr->dir)
 		return NULL;
 
-	if (WARN_ON(!debugfs_initialized()))
+	if (WARN_ON(!tracefs_initialized()) ||
+		(IS_ENABLED(CONFIG_DEBUG_FS) &&
+		 WARN_ON(!debugfs_initialized())))
 		return ERR_PTR(-ENODEV);
 
 	/*
-- 
2.1.4


  parent reply	other threads:[~2015-11-06  8:04 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
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               ` Jiaxing Wang [this message]
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=1446797056-11683-1-git-send-email-hello.wjx@gmail.com \
    --to=hello.wjx@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rostedt@goodmis.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