From: Steven Rostedt <rostedt@goodmis.org>
To: Anton Vorontsov <anton.vorontsov@linaro.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kees Cook <keescook@chromium.org>,
Colin Cross <ccross@android.com>, Tony Luck <tony.luck@intel.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@redhat.com>, Arnd Bergmann <arnd@arndb.de>,
John Stultz <john.stultz@linaro.org>,
Shuah Khan <shuahkhan@gmail.com>,
arve@android.com, Rebecca Schultz Zavin <rebecca@android.com>,
Jesper Juhl <jj@chaosbits.net>,
Randy Dunlap <rdunlap@xenotime.net>,
Stephen Boyd <sboyd@codeaurora.org>,
Thomas Meyer <thomas@m3y3r.de>,
Andrew Morton <akpm@linux-foundation.org>,
Marco Stornelli <marco.stornelli@gmail.com>,
WANG Cong <xiyou.wangcong@gmail.com>,
linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
linaro-kernel@lists.linaro.org, patches@linaro.org,
kernel-team@android.com
Subject: Re: [PATCH] pstore/ftrace: Convert to its own enable/disable debugfs knob
Date: Wed, 18 Jul 2012 09:10:21 -0400 [thread overview]
Message-ID: <1342617021.11900.3.camel@gandalf.stny.rr.com> (raw)
In-Reply-To: <20120718034722.GA18081@lizard>
On Tue, 2012-07-17 at 20:47 -0700, Anton Vorontsov wrote:
> diff --git a/Documentation/ramoops.txt b/Documentation/ramoops.txt
> index 197ad59..69b3cac 100644
> --- a/Documentation/ramoops.txt
> +++ b/Documentation/ramoops.txt
> @@ -102,9 +102,7 @@ related hangs. The functions call chain log is stored in a "ftrace-ramoops"
> file. Here is an example of usage:
>
> # mount -t debugfs debugfs /sys/kernel/debug/
> - # cd /sys/kernel/debug/tracing
> - # echo function > current_tracer
> - # echo 1 > options/func_pstore
> + # echo 1 > /sys/kernel/debug/pstore/record_ftrace
> # reboot -f
> [...]
> # mount -t pstore pstore /mnt/
> diff --git a/fs/pstore/Kconfig b/fs/pstore/Kconfig
> index d39bb5c..ca71db6 100644
> --- a/fs/pstore/Kconfig
> +++ b/fs/pstore/Kconfig
> @@ -23,6 +23,7 @@ config PSTORE_FTRACE
> bool "Persistent function tracer"
> depends on PSTORE
> depends on FUNCTION_TRACER
> + depends on DEBUG_FS
> help
> With this option kernel traces function calls into a persistent
> ram buffer that can be decoded and dumped after reboot through
> diff --git a/fs/pstore/ftrace.c b/fs/pstore/ftrace.c
> index a130d48..824be81 100644
> --- a/fs/pstore/ftrace.c
> +++ b/fs/pstore/ftrace.c
> @@ -17,19 +17,111 @@
> #include <linux/percpu.h>
> #include <linux/smp.h>
> #include <linux/atomic.h>
> +#include <linux/types.h>
> +#include <linux/mutex.h>
> +#include <linux/ftrace.h>
> +#include <linux/fs.h>
> +#include <linux/debugfs.h>
> +#include <linux/err.h>
> #include <asm/barrier.h>
> #include "internal.h"
>
> -void notrace pstore_ftrace_call(unsigned long ip, unsigned long parent_ip)
> +static void notrace pstore_ftrace_call(unsigned long ip,
> + unsigned long parent_ip)
> {
> + unsigned long flags;
> struct pstore_ftrace_record rec = {};
>
> + if (unlikely(!ftrace_enabled))
> + return;
You don't need this check. The ftrace_enabled is internal to ftrace and
the users shouldn't care. If we disable ftrace, the callback shouldn't
be executed. If it is, that's our fault ;-)
> if (unlikely(oops_in_progress))
> return;
>
> + local_irq_save(flags);
> +
> rec.ip = ip;
> rec.parent_ip = parent_ip;
> pstore_ftrace_encode_cpu(&rec, raw_smp_processor_id());
> psinfo->write_buf(PSTORE_TYPE_FTRACE, 0, NULL, 0, (void *)&rec,
> sizeof(rec), psinfo);
> +
> + local_irq_restore(flags);
> +}
> +
> +static struct ftrace_ops pstore_ftrace_ops __read_mostly = {
> + .func = pstore_ftrace_call,
> +};
> +
> +static DEFINE_MUTEX(pstore_ftrace_lock);
> +static bool pstore_ftrace_enabled;
> +
> +static ssize_t pstore_ftrace_knob_write(struct file *f, const char __user *buf,
> + size_t count, loff_t *ppos)
> +{
> + u8 on;
> + int err;
> +
> + err = kstrtou8_from_user(buf, count, 2, &on);
> + if (err)
> + return err;
> +
> + mutex_lock(&pstore_ftrace_lock);
> +
> + if (!on ^ pstore_ftrace_enabled)
> + goto out;
> + pstore_ftrace_enabled = on;
> +
> + if (on)
> + register_ftrace_function(&pstore_ftrace_ops);
You might want to check the return value of this.
-- Steve
> + else
> + unregister_ftrace_function(&pstore_ftrace_ops);
> +out:
> + mutex_unlock(&pstore_ftrace_lock);
> +
> + return count;
> +}
> +
> +static ssize_t pstore_ftrace_knob_read(struct file *f, char __user *buf,
> + size_t count, loff_t *ppos)
> +{
> + char val[] = { '0' + pstore_ftrace_enabled, '\n' };
> +
> + return simple_read_from_buffer(buf, count, ppos, val, sizeof(val));
> +}
> +
> +static const struct file_operations pstore_knob_fops = {
> + .open = simple_open,
> + .read = pstore_ftrace_knob_read,
> + .write = pstore_ftrace_knob_write,
> +};
> +
> +void pstore_register_ftrace(void)
> +{
> + struct dentry *dir;
> + struct dentry *file;
> + int err;
> +
> + if (!psinfo->write_buf)
> + return;
> +
> + dir = debugfs_create_dir("pstore", NULL);
> + if (IS_ERR_OR_NULL(dir)) {
> + err = PTR_ERR(dir);
> + pr_err("%s: unable to create pstore debugfs: %d\n",
> + __func__, err);
> + return;
> + }
> +
> + file = debugfs_create_file("record_ftrace", 0600, dir, NULL,
> + &pstore_knob_fops);
> + if (IS_ERR_OR_NULL(file)) {
> + err = PTR_ERR(file);
> + pr_err("%s: unable to create pstore/ftrace file: %d\n",
> + __func__, err);
> + goto err_file;
> + }
> +
> + return;
> +err_file:
> + debugfs_remove(dir);
> }
next prev parent reply other threads:[~2012-07-18 13:10 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-10 0:10 [PATCH v4 0/8] Function tracing support for pstore Anton Vorontsov
2012-07-10 0:10 ` [PATCH 1/8] tracing: Fix initialization failure path in tracing_set_tracer() Anton Vorontsov
2012-07-10 0:10 ` [PATCH 2/8] pstore: Introduce write_buf backend callback Anton Vorontsov
2012-07-10 0:10 ` [PATCH 3/8] pstore: Add persistent function tracing Anton Vorontsov
2012-07-17 19:38 ` Steven Rostedt
2012-07-17 20:01 ` Anton Vorontsov
2012-07-17 21:38 ` Steven Rostedt
2012-07-17 22:06 ` Anton Vorontsov
2012-07-18 3:47 ` [PATCH] pstore/ftrace: Convert to its own enable/disable debugfs knob Anton Vorontsov
2012-07-18 7:26 ` Anton Vorontsov
2012-07-18 13:13 ` Steven Rostedt
2012-07-18 13:10 ` Steven Rostedt [this message]
2012-07-18 18:24 ` [PATCH v2] " Anton Vorontsov
2012-07-18 17:12 ` [PATCH] " Stephen Boyd
2012-07-18 18:50 ` Anton Vorontsov
2012-07-18 18:59 ` Stephen Boyd
2012-07-18 19:30 ` [PATCH v3] " Anton Vorontsov
2012-08-21 1:46 ` Anton Vorontsov
2012-08-22 1:07 ` Steven Rostedt
2012-08-22 2:10 ` Anton Vorontsov
2012-08-22 2:25 ` Steven Rostedt
2012-07-10 0:10 ` [PATCH 4/8] tracing/function: Introduce persistent trace option Anton Vorontsov
2012-07-10 12:58 ` Steven Rostedt
2012-07-10 0:10 ` [PATCH 5/8] pstore/ram: Convert to write_buf callback Anton Vorontsov
2012-07-10 0:10 ` [PATCH 6/8] pstore/ram: Add ftrace messages handling Anton Vorontsov
2012-07-10 0:10 ` [PATCH 7/8] pstore/ram: Make tracing log versioned Anton Vorontsov
2012-07-17 16:56 ` Greg Kroah-Hartman
2012-07-17 17:09 ` Anton Vorontsov
2012-07-17 18:09 ` Anton Vorontsov
2012-07-17 18:13 ` [PATCH] pstore: Headers should include all stuff they use Anton Vorontsov
2012-07-17 18:19 ` Greg Kroah-Hartman
2012-07-17 18:37 ` Anton Vorontsov
2012-07-17 19:15 ` Greg Kroah-Hartman
2012-07-17 18:18 ` [PATCH 7/8] pstore/ram: Make tracing log versioned Greg Kroah-Hartman
2012-07-17 19:11 ` [PATCH fixed] " Anton Vorontsov
2012-07-10 0:10 ` [PATCH 8/8] tracing/function: Convert func_set_flag() to a switch statement Anton Vorontsov
2012-07-10 12:01 ` [PATCH v4 0/8] Function tracing support for pstore Arnd Bergmann
2012-07-10 13:00 ` Steven Rostedt
2012-07-16 7:14 ` Anton Vorontsov
2012-07-16 14:53 ` Greg Kroah-Hartman
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=1342617021.11900.3.camel@gandalf.stny.rr.com \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=anton.vorontsov@linaro.org \
--cc=arnd@arndb.de \
--cc=arve@android.com \
--cc=ccross@android.com \
--cc=devel@driverdev.osuosl.org \
--cc=fweisbec@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jj@chaosbits.net \
--cc=john.stultz@linaro.org \
--cc=keescook@chromium.org \
--cc=kernel-team@android.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marco.stornelli@gmail.com \
--cc=mingo@redhat.com \
--cc=patches@linaro.org \
--cc=rdunlap@xenotime.net \
--cc=rebecca@android.com \
--cc=sboyd@codeaurora.org \
--cc=shuahkhan@gmail.com \
--cc=thomas@m3y3r.de \
--cc=tony.luck@intel.com \
--cc=xiyou.wangcong@gmail.com \
/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®