Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f60ba38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore 

Pull pstore changes from Anton Vorontsov:

 1) We no longer ad-hoc to the function tracer "high level"
    infrastructure and no longer use its debugfs knobs.  The change
    slightly touches kernel/trace directory, but it got the needed ack
    from Steven Rostedt:

      http://lkml.org/lkml/2012/8/21/688

 2) Added maintainers entry;

 3) A bunch of fixes, nothing special.

* tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore:
  pstore: Avoid recursive spinlocks in the oops_in_progress case
  pstore/ftrace: Convert to its own enable/disable debugfs knob
  pstore/ram: Add missing platform_device_unregister
  MAINTAINERS: Add pstore maintainers
  pstore/ram: Mark ramoops_pstore_write_buf() as notrace
  pstore/ram: Fix printk format warning
  pstore/ram: Fix possible NULL dereference
parents e665faa4 80c9d03c

Documentation/ramoops.txt

+1 −3
Original line number Diff line number Diff line
@@ -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/

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -5550,6 +5550,18 @@ L: cbe-oss-dev@lists.ozlabs.org 
S:	Maintained

F:	drivers/block/ps3vram.c



PSTORE FILESYSTEM

M:	Anton Vorontsov <cbouatmailru@gmail.com>

M:	Colin Cross <ccross@android.com>

M:	Kees Cook <keescook@chromium.org>

M:	Tony Luck <tony.luck@intel.com>

S:	Maintained

T:	git git://git.infradead.org/users/cbou/linux-pstore.git

F:	fs/pstore/

F:	include/linux/pstore*

F:	drivers/firmware/efivars.c

F:	drivers/acpi/apei/erst.c



PTP HARDWARE CLOCK SUPPORT

M:	Richard Cochran <richardcochran@gmail.com>

S:	Maintained

fs/pstore/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

fs/pstore/ftrace.c

+95 −1
Original line number Diff line number Diff line
@@ -17,19 +17,113 @@ 
#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 <linux/cache.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(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;

	ssize_t ret;



	ret = kstrtou8_from_user(buf, count, 2, &on);

	if (ret)

		return ret;



	mutex_lock(&pstore_ftrace_lock);



	if (!on ^ pstore_ftrace_enabled)

		goto out;



	if (on)

		ret = register_ftrace_function(&pstore_ftrace_ops);

	else

		ret = unregister_ftrace_function(&pstore_ftrace_ops);

	if (ret) {

		pr_err("%s: unable to %sregister ftrace ops: %zd\n",

		       __func__, on ? "" : "un", ret);

		goto err;

	}



	pstore_ftrace_enabled = on;

out:

	ret = count;

err:

	mutex_unlock(&pstore_ftrace_lock);



	return ret;

}



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;



	if (!psinfo->write_buf)

		return;



	dir = debugfs_create_dir("pstore", NULL);

	if (!dir) {

		pr_err("%s: unable to create pstore directory\n", __func__);

		return;

	}



	file = debugfs_create_file("record_ftrace", 0600, dir, NULL,

				   &pstore_knob_fops);

	if (!file) {

		pr_err("%s: unable to create record_ftrace file\n", __func__);

		goto err_file;

	}



	return;

err_file:

	debugfs_remove(dir);

}

fs/pstore/internal.h

+6 −0
Original line number Diff line number Diff line
@@ -39,6 +39,12 @@ pstore_ftrace_decode_cpu(struct pstore_ftrace_record *rec) 
#endif

}



#ifdef CONFIG_PSTORE_FTRACE

extern void pstore_register_ftrace(void);

#else

static inline void pstore_register_ftrace(void) {}

#endif



extern struct pstore_info *psinfo;



extern void	pstore_set_kmsg_bytes(int);