linux-next: build failure after merge of the ia64 tree

linux-next: build failure after merge of the ia64 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 447 bytes --]

Hi all,

After merging the ia64 tree, today's linux-next build (x86_64
allmodconfig) failed like this:

fs/built-in.o: In function `pstore_file_open':
inode.c:(.text+0xa29e9): undefined reference to `persistent_ram_size'

Caused by commit f5d7e81eda59 ("pstore: Support current records dump in ramoops").

I have used the ia64 tree from next-20140328 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

RE: linux-next: build failure after merge of the ia64 tree

[Zhang, Yanmin]

Sorry. We would fix it ASAP.

Yanmin

-----Original Message-----
From: Stephen Rothwell [mailto:sfr@canb.auug.org.au] 
Sent: Monday, March 31, 2014 8:08 AM
To: Luck, Tony
Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Liu, ShuoX; Zhang, Yanmin
Subject: linux-next: build failure after merge of the ia64 tree

Hi all,

After merging the ia64 tree, today's linux-next build (x86_64
allmodconfig) failed like this:

fs/built-in.o: In function `pstore_file_open':
inode.c:(.text+0xa29e9): undefined reference to `persistent_ram_size'

Caused by commit f5d7e81eda59 ("pstore: Support current records dump in ramoops").

I have used the ia64 tree from next-20140328 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[PATCH v2 1/3] pstore: restructure ramoops to support more trace

[Liu ShuoX]

On Mon 31.Mar'14 at 11:07:56 +1100, Stephen Rothwell wrote:
>Hi all,
>
>After merging the ia64 tree, today's linux-next build (x86_64
>allmodconfig) failed like this:
>
>fs/built-in.o: In function `pstore_file_open':
>inode.c:(.text+0xa29e9): undefined reference to `persistent_ram_size'
>
>Caused by commit f5d7e81eda59 ("pstore: Support current records dump in ramoops").
>
>I have used the ia64 tree from next-20140328 for today.
Sorry for the compiling failure and thanks for Tony, Fengguang and Stephen Rothwell.
We updated the serial patches and i also updated this email's subject.
Changelog v2:
   1) Fix compiling errors when CONFIG_PSTORE_RAM is disabled.
   2) Add some protection in the code in case we disable CONFIG_PSTORE_RAM.

Below are the v2 patches.
---
From: Zhang Yanmin <yanmin.zhang@intel.com>

The patch restructure ramoops of pstore a little to support more user-defined
tracers through ramoops. Here is reason we enhance ramoops:
pstore ramoops is a very import debug feature for mobile development. At present,
ramoops has supported kdump, console and ftrace tracer. Sometimes, we need some
special tracers such as recording cmd and data when driver send/receive. But now,
it's hard to add new tracers into ramoops without touching the pstore core codes.
So we restructure ramoops to let it more flexiable, more eailier to extend.

With this, we split the pstore codes and new tracers which are based on ramoops.
Developer could add a new tracer based on ramoops standalone and pstore detects
it automatically.

Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Signed-off-by: Liu ShuoX <shuox.liu@intel.com>
---
  Documentation/ramoops.txt                 |  70 ++++++++++++++-
  arch/x86/kernel/vmlinux.lds.S             |   9 ++
  drivers/platform/chrome/chromeos_pstore.c |   2 +-
  fs/pstore/inode.c                         |  85 +++++++++++++++++-
  fs/pstore/internal.h                      |   1 +
  fs/pstore/ram.c                           | 145 +++++++++++++++++++++++-------
  fs/pstore/ram_core.c                      |  20 +++++
  include/linux/pstore.h                    |   2 +
  include/linux/pstore_ram.h                |  21 ++---
  include/linux/pstore_ramoops.h            |  65 ++++++++++++++
  10 files changed, 371 insertions(+), 49 deletions(-)
  create mode 100644 include/linux/pstore_ramoops.h

diff --git a/Documentation/ramoops.txt b/Documentation/ramoops.txt
index 69b3cac..243ce5f 100644
--- a/Documentation/ramoops.txt
+++ b/Documentation/ramoops.txt
@@ -49,7 +49,7 @@ Setting the ramoops parameters can be done in 2 different manners:
   2. Use a platform device and set the platform data. The parameters can then
   be set through that platform data. An example of doing that is:
  
-#include <linux/pstore_ram.h>
+#include <linux/pstore_ramoops.h>
  [...]
  
  static struct ramoops_platform_data ramoops_data = {
@@ -117,3 +117,71 @@ file. Here is an example of usage:
   0 ffffffff811d9c54  ffffffff8101a7a0  __const_udelay <- native_machine_emergency_restart+0x110/0x1e0
   0 ffffffff811d9c34  ffffffff811d9c80  __delay <- __const_udelay+0x30/0x40
   0 ffffffff811d9d14  ffffffff811d9c3f  delay_tsc <- __delay+0xf/0x20
+
+6. Persistent record tracing
+
+Persistent record tracing might be useful for debugging software of hardware
+related hangs. It has flexible usage allows developer to trace self-defined
+record structure at self-defined tracepoint. After reboot, the record log is
+stored in a "NAME-ramoops" file. Here is an example of usage:
+
+#include <linux/pstore_ramoops.h>
+[...]
+
+struct norm_zone_test_record {
+	unsigned long val;
+	char str[32];
+};
+
+static void print_record(struct seq_file *s, void *rec)
+{
+	struct norm_zone_test_record *record = rec;
+	seq_printf(s, "%s: %ld\n",
+		record->str, record->val);
+}
+
+DEFINE_PSTORE_RAMZONE(test_zone) = {
+	.size = 4096,
+	.name = "test_zone",
+	.item_size = sizeof(struct norm_zone_test_record),
+	.print_record = print_record,
+};
+
+static void add_test_record(char *str, unsigned long val)
+{
+	struct norm_zone_test_record *record;
+	record = persistent_ram_new_record(test_zone.prz);
+	if (record) {
+		record->val = val;
+		strcpy(record->str, str);
+	}
+}
+
+static int test_cpufreq_transition(struct notifier_block *nb,
+		unsigned long event, void *data)
+{
+	add_test_record("cpufreq transition", event);
+	return 0;
+}
+
+static struct notifier_block freq_transition = {
+	.notifier_call = test_cpufreq_transition,
+};
+
+static int __init norm_zone_test_init(void)
+{
+	cpufreq_register_notifier(&freq_transition,
+			CPUFREQ_TRANSITION_NOTIFIER);
+	return 0;
+}
+module_init(norm_zone_test_init);
+
+Record trace use the reserved memory by ramoops. For the most compatibility,
+user could use Chapter 2's methods to define the ramoops paramters, then
+enlarge the defined mem_size with ramoops_norm_zones_size(), e.g.:
+
+#include <linux/memblock.h>
+#include <linux/pstore_ramoops.h>
+
+memblock_reserve(ramoops_data.mem_address, ramoops_data.mem_size +
+					ramoops_norm_zones_size(NULL));
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 49edf2d..a37d5e3 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -304,6 +304,15 @@ SECTIONS
  		NOSAVE_DATA
  	}
  #endif
+#ifdef CONFIG_PSTORE_RAM
+	/* ramoops zone */
+	. = ALIGN(8);
+	.ram_zone : AT(ADDR(.ram_zone) - LOAD_OFFSET) {
+		__ramoops_zone_start = .;
+		*(.ram_zone)
+		__ramoops_zone_end = .;
+	}
+#endif
  
  	/* BSS */
  	. = ALIGN(PAGE_SIZE);
diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
index e0e0e65..59e102f 100644
--- a/drivers/platform/chrome/chromeos_pstore.c
+++ b/drivers/platform/chrome/chromeos_pstore.c
@@ -11,7 +11,7 @@
  #include <linux/dmi.h>
  #include <linux/module.h>
  #include <linux/platform_device.h>
-#include <linux/pstore_ram.h>
+#include <linux/pstore_ramoops.h>
  
  static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
  	{
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index 192297b..d463481 100644
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -54,6 +54,78 @@ struct pstore_private {
  	char	data[];
  };
  
+struct pstore_seq_data {
+	size_t off;
+};
+
+static void *pstore_seq_start(struct seq_file *s, loff_t *pos)
+{
+	struct pstore_private *ps = s->private;
+	struct ramoops_context *cxt = ps->psi->data;
+	struct ramoops_zone    *zones = cxt->zones;
+	int size = zones[ps->id].item_size;
+	struct pstore_seq_data *data;
+
+	data = kzalloc(sizeof(*data), GFP_KERNEL);
+	if (!data)
+		return NULL;
+
+	data->off = 0;
+	data->off += *pos * size;
+	if (data->off + size > ps->size) {
+		kfree(data);
+		return NULL;
+	}
+
+	return data;
+}
+
+static void pstore_seq_stop(struct seq_file *s, void *v)
+{
+	kfree(v);
+}
+
+static void *pstore_seq_next(struct seq_file *s, void *v, loff_t *pos)
+{
+	struct pstore_private *ps = s->private;
+	struct pstore_seq_data *data = v;
+	struct ramoops_context *cxt = ps->psi->data;
+	struct ramoops_zone    *zones = cxt->zones;
+	int size = zones[ps->id].item_size;
+
+	data->off += size;
+	if (data->off + size > ps->size)
+		return NULL;
+
+	(*pos)++;
+	return data;
+}
+
+static int pstore_seq_show(struct seq_file *s, void *v)
+{
+	struct pstore_private *ps = s->private;
+	struct pstore_seq_data *data = v;
+	void *record = (void *)(ps->data + data->off);
+	struct ramoops_context *cxt = ps->psi->data;
+	struct ramoops_zone    *zones = cxt->zones;
+
+	if (zones[ps->id].print_record)
+		zones[ps->id].print_record(s, record);
+	else {
+		seq_printf(s, "zone %s doesn't support print_record\n",
+			zones[ps->id].name);
+	}
+
+	return 0;
+}
+
+static const struct seq_operations pstore_seq_ops = {
+	.start	= pstore_seq_start,
+	.next	= pstore_seq_next,
+	.stop	= pstore_seq_stop,
+	.show	= pstore_seq_show,
+};
+
  struct pstore_ftrace_seq_data {
  	const void *ptr;
  	size_t off;
@@ -126,7 +198,8 @@ static ssize_t pstore_file_read(struct file *file, char __user *userbuf,
  	struct seq_file *sf = file->private_data;
  	struct pstore_private *ps = sf->private;
  
-	if (ps->type == PSTORE_TYPE_FTRACE)
+	if (ps->type == PSTORE_TYPE_FTRACE ||
+		ps->type == PSTORE_TYPE_NORM)
  		return seq_read(file, userbuf, count, ppos);
  	return simple_read_from_buffer(userbuf, count, ppos, ps->data, ps->size);
  }
@@ -140,6 +213,8 @@ static int pstore_file_open(struct inode *inode, struct file *file)
  
  	if (ps->type == PSTORE_TYPE_FTRACE)
  		sops = &pstore_ftrace_seq_ops;
+	if (ps->type == PSTORE_TYPE_NORM)
+		sops = &pstore_seq_ops;
  
  	err = seq_open(file, sops);
  	if (err < 0)
@@ -286,6 +361,8 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count,
  	char			name[PSTORE_NAMELEN];
  	struct pstore_private	*private, *pos;
  	unsigned long		flags;
+	struct ramoops_context	*cxt = psi->data;
+	struct ramoops_zone	*zones = cxt ? cxt->zones : NULL;
  
  	spin_lock_irqsave(&allpstore_lock, flags);
  	list_for_each_entry(pos, &allpstore, list) {
@@ -337,6 +414,12 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count,
  	case PSTORE_TYPE_PPC_COMMON:
  		sprintf(name, "powerpc-common-%s-%lld", psname, id);
  		break;
+	case PSTORE_TYPE_NORM:
+		/* if zones NULL, it's unknown */
+		if (zones) {
+			sprintf(name, "%s-%s", zones[id].name, psname);
+			break;
+		}
  	case PSTORE_TYPE_UNKNOWN:
  		sprintf(name, "unknown-%s-%lld", psname, id);
  		break;
diff --git a/fs/pstore/internal.h b/fs/pstore/internal.h
index 3b3d305..86623ee 100644
--- a/fs/pstore/internal.h
+++ b/fs/pstore/internal.h
@@ -4,6 +4,7 @@
  #include <linux/types.h>
  #include <linux/time.h>
  #include <linux/pstore.h>
+#include <linux/pstore_ramoops.h>
  
  #if NR_CPUS <= 2 && defined(CONFIG_ARM_THUMB)
  #define PSTORE_CPU_IN_IP 0x1
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 3b57443..e1f2adc 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -33,7 +33,7 @@
  #include <linux/platform_device.h>
  #include <linux/slab.h>
  #include <linux/compiler.h>
-#include <linux/pstore_ram.h>
+#include <linux/pstore_ramoops.h>
  
  #define RAMOOPS_KERNMSG_HDR "===="
  #define MIN_MEM_SIZE 4096UL
@@ -73,29 +73,13 @@ MODULE_PARM_DESC(ramoops_ecc,
  		"ECC buffer size in bytes (1 is a special value, means 16 "
  		"bytes ECC)");
  
-struct ramoops_context {
-	struct persistent_ram_zone **przs;
-	struct persistent_ram_zone *cprz;
-	struct persistent_ram_zone *fprz;
-	phys_addr_t phys_addr;
-	unsigned long size;
-	size_t record_size;
-	size_t console_size;
-	size_t ftrace_size;
-	int dump_oops;
-	struct persistent_ram_ecc_info ecc_info;
-	unsigned int max_dump_cnt;
-	unsigned int dump_write_cnt;
-	/* _read_cnt need clear on ramoops_pstore_open */
-	unsigned int dump_read_cnt;
-	unsigned int console_read_cnt;
-	unsigned int ftrace_read_cnt;
-	struct pstore_info pstore;
-};
-
  static struct platform_device *dummy;
  static struct ramoops_platform_data *dummy_data;
  
+/* Below data need be defined in vmlinux.lds.S */
+void *__ramoops_zone_start __weak;
+void *__ramoops_zone_end __weak;
+
  static int ramoops_pstore_open(struct pstore_info *psi)
  {
  	struct ramoops_context *cxt = psi->data;
@@ -103,6 +87,7 @@ static int ramoops_pstore_open(struct pstore_info *psi)
  	cxt->dump_read_cnt = 0;
  	cxt->console_read_cnt = 0;
  	cxt->ftrace_read_cnt = 0;
+	cxt->norm_read_cnt = 0;
  	return 0;
  }
  
@@ -176,6 +161,14 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
  		prz = ramoops_get_next_prz(&cxt->fprz, &cxt->ftrace_read_cnt,
  					   1, id, type, PSTORE_TYPE_FTRACE, 0);
  	if (!prz)
+		while (cxt->norm_read_cnt < cxt->norm_num) {
+			prz = ramoops_get_next_prz(cxt->norm_przs,
+					&cxt->norm_read_cnt, cxt->norm_num,
+					id, type, PSTORE_TYPE_NORM, 0);
+			if (!prz)
+				continue;
+		}
+	if (!prz)
  		return 0;
  
  	size = persistent_ram_old_size(prz);
@@ -295,6 +288,11 @@ static int ramoops_pstore_erase(enum pstore_type_id type, u64 id, int count,
  	case PSTORE_TYPE_FTRACE:
  		prz = cxt->fprz;
  		break;
+	case PSTORE_TYPE_NORM:
+		if (id >= cxt->norm_num)
+			return -EINVAL;
+		prz = cxt->norm_przs[id];
+		break;
  	default:
  		return -EINVAL;
  	}
@@ -329,6 +327,20 @@ static void ramoops_free_przs(struct ramoops_context *cxt)
  	kfree(cxt->przs);
  }
  
+static void ramoops_free_norm_przs(struct ramoops_context *cxt)
+{
+	int i;
+
+	cxt->norm_num = 0;
+	if (!cxt->norm_przs)
+		return;
+
+	for (i = 0; i < cxt->norm_num &&
+			!IS_ERR_OR_NULL(cxt->norm_przs[i]); i++)
+		persistent_ram_free(cxt->norm_przs[i]);
+	kfree(cxt->norm_przs);
+}
+
  static int ramoops_init_przs(struct device *dev, struct ramoops_context *cxt,
  			     phys_addr_t *paddr, size_t dump_mem_sz)
  {
@@ -376,7 +388,7 @@ fail_prz:
  
  static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt,
  			    struct persistent_ram_zone **prz,
-			    phys_addr_t *paddr, size_t sz, u32 sig)
+			    phys_addr_t *paddr, size_t sz, u32 sig, bool ecc)
  {
  	if (!sz)
  		return 0;
@@ -388,7 +400,7 @@ static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt,
  		return -ENOMEM;
  	}
  
-	*prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info);
+	*prz = persistent_ram_new(*paddr, sz, sig, ecc ? &cxt->ecc_info : NULL);
  	if (IS_ERR(*prz)) {
  		int err = PTR_ERR(*prz);
  
@@ -404,12 +416,46 @@ static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt,
  	return 0;
  }
  
+static int ramoops_init_norm_przs(struct device *dev,
+			struct ramoops_context *cxt,
+			phys_addr_t *paddr)
+{
+	int err = -ENOMEM;
+	struct ramoops_zone *zones = cxt->zones;
+	int i;
+
+	cxt->norm_przs = kzalloc(sizeof(*cxt->przs) * cxt->norm_num,
+			GFP_KERNEL);
+	if (!cxt->norm_przs) {
+		dev_err(dev, "failed to initialize a prz array for dumps\n");
+		goto fail_prz;
+	}
+
+	for (i = 0; i < cxt->norm_num; i++) {
+		err = ramoops_init_prz(dev, cxt, &zones[i].prz,
+				paddr, zones[i].size, 0, false);
+		if (err)
+			goto fail_prz;
+		persistent_ram_set_record_size(zones[i].prz,
+						zones[i].item_size);
+		zones[i].prz->buffer_size -=
+			(zones[i].prz->buffer_size % zones[i].item_size);
+		cxt->norm_przs[i] = zones[i].prz;
+	}
+
+	return 0;
+fail_prz:
+	ramoops_free_norm_przs(cxt);
+	return err;
+}
+
  static int ramoops_probe(struct platform_device *pdev)
  {
  	struct device *dev = &pdev->dev;
  	struct ramoops_platform_data *pdata = pdev->dev.platform_data;
  	struct ramoops_context *cxt = &oops_cxt;
  	size_t dump_mem_sz;
+	size_t norm_mem_size;
  	phys_addr_t paddr;
  	int err = -EINVAL;
  
@@ -419,8 +465,11 @@ static int ramoops_probe(struct platform_device *pdev)
  	if (cxt->max_dump_cnt)
  		goto fail_out;
  
+	cxt->norm_zone_size = norm_mem_size =
+		ramoops_norm_zones_size(&cxt->norm_num);
+
  	if (!pdata->mem_size || (!pdata->record_size && !pdata->console_size &&
-			!pdata->ftrace_size)) {
+			!pdata->ftrace_size && !norm_mem_size)) {
  		pr_err("The memory size and the record/console size must be "
  			"non-zero\n");
  		goto fail_out;
@@ -433,6 +482,8 @@ static int ramoops_probe(struct platform_device *pdev)
  	if (pdata->ftrace_size && !is_power_of_2(pdata->ftrace_size))
  		pdata->ftrace_size = rounddown_pow_of_two(pdata->ftrace_size);
  
+	if (cxt->norm_num)
+		cxt->zones = (struct ramoops_zone *)&__ramoops_zone_start;
  	cxt->size = pdata->mem_size;
  	cxt->phys_addr = pdata->mem_address;
  	cxt->record_size = pdata->record_size;
@@ -443,25 +494,29 @@ static int ramoops_probe(struct platform_device *pdev)
  
  	paddr = cxt->phys_addr;
  
-	dump_mem_sz = cxt->size - cxt->console_size - cxt->ftrace_size;
+	dump_mem_sz = cxt->size - cxt->console_size -
+		cxt->ftrace_size - norm_mem_size;
  	err = ramoops_init_przs(dev, cxt, &paddr, dump_mem_sz);
  	if (err)
  		goto fail_out;
+	err = ramoops_init_norm_przs(dev, cxt, &paddr);
+	if (err)
+		goto fail_norm_przs;
  
  	err = ramoops_init_prz(dev, cxt, &cxt->cprz, &paddr,
-			       cxt->console_size, 0);
+			       cxt->console_size, 0, true);
  	if (err)
  		goto fail_init_cprz;
  
-	err = ramoops_init_prz(dev, cxt, &cxt->fprz, &paddr, cxt->ftrace_size,
-			       LINUX_VERSION_CODE);
+	err = ramoops_init_prz(dev, cxt, &cxt->fprz, &paddr,
+				cxt->ftrace_size, 0, true);
  	if (err)
  		goto fail_init_fprz;
  
-	if (!cxt->przs && !cxt->cprz && !cxt->fprz) {
+	if (!cxt->przs && !cxt->cprz && !cxt->fprz && !cxt->norm_przs) {
  		pr_err("memory size too small, minimum is %zu\n",
  			cxt->console_size + cxt->record_size +
-			cxt->ftrace_size);
+			cxt->ftrace_size + cxt->norm_zone_size);
  		err = -EINVAL;
  		goto fail_cnt;
  	}
@@ -514,6 +569,8 @@ fail_cnt:
  fail_init_fprz:
  	kfree(cxt->cprz);
  fail_init_cprz:
+	ramoops_free_norm_przs(cxt);
+fail_norm_przs:
  	ramoops_free_przs(cxt);
  fail_out:
  	return err;
@@ -582,6 +639,34 @@ static void ramoops_register_dummy(void)
  	}
  }
  
+/* calculate norm zone number and size */
+unsigned long ramoops_norm_zones_size(int *zone_count)
+{
+	unsigned long mem_size = 0;
+	struct ramoops_zone *zones;
+	struct ramoops_zone *zone_end;
+	int i;
+	int count;
+
+	zones = (struct ramoops_zone *)&__ramoops_zone_start;
+	zone_end = (struct ramoops_zone *)&__ramoops_zone_end;
+
+	count = zone_end - zones;
+	if (zone_count)
+		*zone_count = count > 0 ? count : 0;
+	if (count <= 0)
+		return 0;
+
+	for (i = 0; i < count; i++) {
+		/*Roundup in case buffer is overflown*/
+		if (zones[i].size && !is_power_of_2(zones[i].size))
+			zones[i].size = roundup_pow_of_two(zones[i].size);
+		mem_size += zones[i].size;
+	}
+
+	return mem_size;
+}
+
  static int __init ramoops_init(void)
  {
  	ramoops_register_dummy();
diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c
index ff7e3d4..9c25a0f 100644
--- a/fs/pstore/ram_core.c
+++ b/fs/pstore/ram_core.c
@@ -30,6 +30,7 @@ struct persistent_ram_buffer {
  	uint32_t    sig;
  	atomic_t    start;
  	atomic_t    size;
+	uint32_t    record_size;
  	uint8_t     data[0];
  };
  
@@ -356,6 +357,19 @@ int notrace persistent_ram_write(struct persistent_ram_zone *prz,
  	return count;
  }
  
+notrace void *persistent_ram_new_record(struct persistent_ram_zone *prz)
+{
+	size_t record_size;
+
+	if (!prz)
+		return NULL;
+
+	record_size = prz->buffer->record_size;
+	buffer_size_add(prz, record_size);
+	return (void *)(prz->buffer->data +
+			buffer_start_add(prz, record_size));
+}
+
  size_t persistent_ram_old_size(struct persistent_ram_zone *prz)
  {
  	return prz->old_log_size;
@@ -380,6 +394,12 @@ void persistent_ram_zap(struct persistent_ram_zone *prz)
  	persistent_ram_update_header_ecc(prz);
  }
  
+void persistent_ram_set_record_size(struct persistent_ram_zone *prz,
+			uint32_t record_size)
+{
+	prz->buffer->record_size = record_size;
+}
+
  static void *persistent_ram_vmap(phys_addr_t start, size_t size)
  {
  	struct page **pages;
diff --git a/include/linux/pstore.h b/include/linux/pstore.h
index ece0c6b..9936859 100644
--- a/include/linux/pstore.h
+++ b/include/linux/pstore.h
@@ -39,6 +39,8 @@ enum pstore_type_id {
  	PSTORE_TYPE_PPC_RTAS	= 4,
  	PSTORE_TYPE_PPC_OF	= 5,
  	PSTORE_TYPE_PPC_COMMON	= 6,
+	/* normal ram zones */
+	PSTORE_TYPE_NORM	= 7,
  	PSTORE_TYPE_UNKNOWN	= 255
  };
  
diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h
index 9974975..d7d0b7a 100644
--- a/include/linux/pstore_ram.h
+++ b/include/linux/pstore_ram.h
@@ -22,6 +22,7 @@
  #include <linux/list.h>
  #include <linux/types.h>
  #include <linux/init.h>
+#include <linux/pstore.h>
  
  struct persistent_ram_buffer;
  struct rs_control;
@@ -59,6 +60,10 @@ void persistent_ram_zap(struct persistent_ram_zone *prz);
  
  int persistent_ram_write(struct persistent_ram_zone *prz, const void *s,
  	unsigned int count);
+void persistent_ram_set_record_size(struct persistent_ram_zone *prz,
+		uint32_t record_size);
+
+void *persistent_ram_new_record(struct persistent_ram_zone *prz);
  
  void persistent_ram_save_old(struct persistent_ram_zone *prz);
  size_t persistent_ram_old_size(struct persistent_ram_zone *prz);
@@ -67,20 +72,4 @@ void persistent_ram_free_old(struct persistent_ram_zone *prz);
  ssize_t persistent_ram_ecc_string(struct persistent_ram_zone *prz,
  	char *str, size_t len);
  
-/*
- * Ramoops platform data
- * @mem_size	memory size for ramoops
- * @mem_address	physical memory address to contain ramoops
- */
-
-struct ramoops_platform_data {
-	unsigned long	mem_size;
-	unsigned long	mem_address;
-	unsigned long	record_size;
-	unsigned long	console_size;
-	unsigned long	ftrace_size;
-	int		dump_oops;
-	struct persistent_ram_ecc_info ecc_info;
-};
-
  #endif
diff --git a/include/linux/pstore_ramoops.h b/include/linux/pstore_ramoops.h
new file mode 100644
index 0000000..7c0a64b
--- /dev/null
+++ b/include/linux/pstore_ramoops.h
@@ -0,0 +1,65 @@
+#ifndef __LINUX_PSTORE_RAMOOPS_H__
+#define __LINUX_PSTORE_RAMOOPS_H__
+#include <linux/pstore_ram.h>
+
+struct ramoops_context {
+	struct persistent_ram_zone **przs;
+	struct persistent_ram_zone *cprz;
+	struct persistent_ram_zone *fprz;
+	phys_addr_t phys_addr;
+	unsigned long size;
+	size_t record_size;
+	size_t console_size;
+	size_t ftrace_size;
+	int dump_oops;
+	struct persistent_ram_ecc_info ecc_info;
+	unsigned int max_dump_cnt;
+	unsigned int dump_write_cnt;
+	unsigned int dump_read_cnt;
+	unsigned int console_read_cnt;
+	unsigned int ftrace_read_cnt;
+	struct pstore_info pstore;
+	struct ramoops_zone *zones;
+	struct persistent_ram_zone **norm_przs;
+	size_t norm_zone_size;
+	unsigned int norm_num;
+	unsigned int norm_read_cnt;
+};
+
+struct ramoops_zone {
+	char		name[16];
+	unsigned long	size;
+	struct persistent_ram_zone *prz;
+	int		item_size;
+	void (*print_record)(struct seq_file *s, void *record);
+};
+
+/*
+ * Ramoops platform data
+ * @mem_size	memory size for ramoops
+ * @mem_address	physical memory address to contain ramoops
+ */
+
+struct ramoops_platform_data {
+	unsigned long	mem_size;
+	unsigned long	mem_address;
+	unsigned long	record_size;
+	unsigned long	console_size;
+	unsigned long	ftrace_size;
+	int		dump_oops;
+	struct persistent_ram_ecc_info ecc_info;
+};
+
+/*
+ * define a ram_zone for ramoops
+ * Refer to Documentation/ramoops.txt
+ */
+#define DEFINE_PSTORE_RAMZONE(zone) \
+	struct ramoops_zone zone \
+	__attribute__((__section__(".ram_zone"))) \
+	__aligned(sizeof(void *))
+
+/* calculate norm zone number and size */
+unsigned long ramoops_norm_zones_size(int *zone_count);
+
+#endif
-- 
1.8.3.2

[PATCH v2 2/3] pstore: add seq_ops for norm zone

[Liu ShuoX]

From: Liu ShuoX <shuox.liu@intel.com>

Some developers want to output the pstore record trace flexible.
So add seq_ops into ramoops_zone in case users would make private output
format.

Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Signed-off-by: Liu ShuoX <shuox.liu@intel.com>
---
  fs/pstore/inode.c              | 10 ++++++++--
  include/linux/pstore_ramoops.h |  1 +
  2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index d463481..a9c9782 100644
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -207,14 +207,20 @@ static ssize_t pstore_file_read(struct file *file, char __user *userbuf,
  static int pstore_file_open(struct inode *inode, struct file *file)
  {
  	struct pstore_private *ps = inode->i_private;
+	struct ramoops_context *cxt = ps->psi->data;
+	struct ramoops_zone    *zones = cxt ? cxt->zones : NULL;
  	struct seq_file *sf;
  	int err;
  	const struct seq_operations *sops = NULL;
  
  	if (ps->type == PSTORE_TYPE_FTRACE)
  		sops = &pstore_ftrace_seq_ops;
-	if (ps->type == PSTORE_TYPE_NORM)
-		sops = &pstore_seq_ops;
+	if (ps->type == PSTORE_TYPE_NORM && zones) {
+		if (zones[ps->id].seq_ops)
+			sops = zones[ps->id].seq_ops;
+		else
+			sops = &pstore_seq_ops;
+	}
  
  	err = seq_open(file, sops);
  	if (err < 0)
diff --git a/include/linux/pstore_ramoops.h b/include/linux/pstore_ramoops.h
index 7c0a64b..9a5a224 100644
--- a/include/linux/pstore_ramoops.h
+++ b/include/linux/pstore_ramoops.h
@@ -32,6 +32,7 @@ struct ramoops_zone {
  	struct persistent_ram_zone *prz;
  	int		item_size;
  	void (*print_record)(struct seq_file *s, void *record);
+	struct seq_operations *seq_ops;
  };
  
  /*
-- 
1.8.3.2

[PATCH v2 3/3] pstore: support current records dump in ramoops

[Liu ShuoX]

From: Liu ShuoX <shuox.liu@intel.com>

dump the records in runtime is useful sometime. We could check the
records and understand driver's and device's status.

Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Signed-off-by: Liu ShuoX <shuox.liu@intel.com>
---
  fs/pstore/inode.c          | 32 ++++++++++++++++++++++++++------
  fs/pstore/internal.h       |  3 ++-
  fs/pstore/platform.c       | 39 ++++++++++++++++++++++++++++++---------
  fs/pstore/ram.c            | 18 ++++++++++++++++++
  fs/pstore/ram_core.c       | 10 ++++++++++
  include/linux/pstore.h     |  2 ++
  include/linux/pstore_ram.h | 15 +++++++++++++++
  7 files changed, 103 insertions(+), 16 deletions(-)

diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index a9c9782..64adfb8 100644
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -48,10 +48,11 @@ struct pstore_private {
  	struct list_head list;
  	struct pstore_info *psi;
  	enum pstore_type_id type;
+	int	curr;
  	u64	id;
  	int	count;
  	ssize_t	size;
-	char	data[];
+	char	*data;
  };
  
  struct pstore_seq_data {
@@ -220,6 +221,14 @@ static int pstore_file_open(struct inode *inode, struct file *file)
  			sops = zones[ps->id].seq_ops;
  		else
  			sops = &pstore_seq_ops;
+		if (ps->curr) {
+			/*
+			 * Update size again as current buffer
+			 * size might be changed.
+			 */
+			inode->i_size = ps->size =
+				persistent_ram_size(cxt->norm_przs[ps->id]);
+		}
  	}
  
  	err = seq_open(file, sops);
@@ -256,12 +265,16 @@ static int pstore_unlink(struct inode *dir, struct dentry *dentry)
  {
  	struct pstore_private *p = dentry->d_inode->i_private;
  
+	if (p->curr)
+		goto unlink;
  	if (p->psi->erase)
  		p->psi->erase(p->type, p->id, p->count,
  			      dentry->d_inode->i_ctime, p->psi);
  	else
  		return -EPERM;
  
+	kfree(p->data);
+unlink:
  	return simple_unlink(dir, dentry);
  }
  
@@ -358,7 +371,7 @@ int pstore_is_mounted(void)
   */
  int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count,
  		  char *data, bool compressed, size_t size,
-		  struct timespec time, struct pstore_info *psi)
+		  struct timespec time, struct pstore_info *psi, bool curr)
  {
  	struct dentry		*root = pstore_sb->s_root;
  	struct dentry		*dentry;
@@ -374,14 +387,15 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count,
  	list_for_each_entry(pos, &allpstore, list) {
  		if (pos->type == type &&
  		    pos->id == id &&
-		    pos->psi == psi) {
+		    pos->psi == psi &&
+		    pos->curr == curr) {
  			rc = -EEXIST;
  			break;
  		}
  	}
  	spin_unlock_irqrestore(&allpstore_lock, flags);
  	if (rc)
-		return rc;
+		goto fail;
  
  	rc = -ENOMEM;
  	inode = pstore_get_inode(pstore_sb);
@@ -389,13 +403,15 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count,
  		goto fail;
  	inode->i_mode = S_IFREG | 0444;
  	inode->i_fop = &pstore_file_operations;
-	private = kmalloc(sizeof *private + size, GFP_KERNEL);
+	private = kmalloc(sizeof(*private), GFP_KERNEL);
  	if (!private)
  		goto fail_alloc;
  	private->type = type;
  	private->id = id;
  	private->count = count;
  	private->psi = psi;
+	private->curr = curr;
+	private->data = data;
  
  	switch (type) {
  	case PSTORE_TYPE_DMESG:
@@ -434,13 +450,15 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count,
  		break;
  	}
  
+	if (curr)
+		strcat(name, "_cur");
+
  	mutex_lock(&root->d_inode->i_mutex);
  
  	dentry = d_alloc_name(root, name);
  	if (!dentry)
  		goto fail_lockedalloc;
  
-	memcpy(private->data, data, size);
  	inode->i_size = private->size = size;
  
  	inode->i_private = private;
@@ -465,6 +483,7 @@ fail_alloc:
  	iput(inode);
  
  fail:
+	kfree(data);
  	return rc;
  }
  
@@ -497,6 +516,7 @@ static int pstore_fill_super(struct super_block *sb, void *data, int silent)
  		return -ENOMEM;
  
  	pstore_get_records(0);
+	pstore_get_cur_records();
  
  	return 0;
  }
diff --git a/fs/pstore/internal.h b/fs/pstore/internal.h
index 86623ee..ccc0f35 100644
--- a/fs/pstore/internal.h
+++ b/fs/pstore/internal.h
@@ -50,10 +50,11 @@ extern struct pstore_info *psinfo;
  
  extern void	pstore_set_kmsg_bytes(int);
  extern void	pstore_get_records(int);
+extern void	pstore_get_cur_records(void);
  extern int	pstore_mkfile(enum pstore_type_id, char *psname, u64 id,
  			      int count, char *data, bool compressed,
  			      size_t size, struct timespec time,
-			      struct pstore_info *psi);
+			      struct pstore_info *psi, bool curr);
  extern int	pstore_is_mounted(void);
  
  #endif
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 46d269e..6a3cbbb 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -439,8 +439,10 @@ int pstore_register(struct pstore_info *psi)
  
  	allocate_buf_for_compression();
  
-	if (pstore_is_mounted())
+	if (pstore_is_mounted()) {
  		pstore_get_records(0);
+		pstore_get_cur_records();
+	}
  
  	kmsg_dump_register(&pstore_dumper);
  
@@ -498,7 +500,13 @@ void pstore_get_records(int quiet)
  
  			if (unzipped_len > 0) {
  				kfree(buf);
-				buf = big_oops_buf;
+				buf = kmalloc(unzipped_len, GFP_KERNEL);
+				if (!buf) {
+					if (!quiet)
+						failed++;
+					continue;
+				}
+				memcpy(buf, big_oops_buf, unzipped_len);
  				size = unzipped_len;
  				compressed = false;
  			} else {
@@ -508,15 +516,10 @@ void pstore_get_records(int quiet)
  			}
  		}
  		rc = pstore_mkfile(type, psi->name, id, count, buf,
-				  compressed, (size_t)size, time, psi);
-		if (unzipped_len < 0) {
-			/* Free buffer other than big oops */
-			kfree(buf);
-			buf = NULL;
-		} else
-			unzipped_len = -1;
+				  compressed, (size_t)size, time, psi, false);
  		if (rc && (rc != -EEXIST || !quiet))
  			failed++;
+		unzipped_len = -1;
  	}
  	if (psi->close)
  		psi->close(psi);
@@ -528,6 +531,24 @@ out:
  		       failed, psi->name);
  }
  
+void pstore_get_cur_records(void)
+{
+	struct pstore_info *psi = psinfo;
+	ssize_t		size;
+	char		*buf = NULL;
+	struct timespec time = {0};
+	u64		id = 0;
+	int		rc;
+
+	if (!psi || !psi->read_curr)
+		return;
+
+	while (size = psi->read_curr(&id, PSTORE_TYPE_NORM, &buf, psi), buf) {
+		rc = pstore_mkfile(PSTORE_TYPE_NORM, psi->name, id - 1, 0, buf,
+				0, (size_t)size, time, psi, true);
+	}
+}
+
  static void pstore_dowork(struct work_struct *work)
  {
  	pstore_get_records(1);
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index e1f2adc..67c9ced 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -141,6 +141,23 @@ static void ramoops_read_kmsg_hdr(char *buffer, struct timespec *time,
  	}
  }
  
+/* only support PSTORE_TYPE_NORM type ram zone */
+static ssize_t ramoops_pstore_read_current(u64 *id, enum pstore_type_id type,
+		char **buf, struct pstore_info *psi)
+{
+	struct ramoops_context *cxt = psi->data;
+	struct persistent_ram_zone *prz;
+
+	if (type != PSTORE_TYPE_NORM || (*id >= cxt->norm_num)) {
+		*buf = NULL;
+		return 0;
+	}
+	prz = cxt->norm_przs[(*id)++];
+	*buf = persistent_ram_buffer(prz);
+
+	return persistent_ram_size(prz);
+}
+
  static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
  				   int *count, struct timespec *time,
  				   char **buf, bool *compressed,
@@ -309,6 +326,7 @@ static struct ramoops_context oops_cxt = {
  		.name	= "ramoops",
  		.open	= ramoops_pstore_open,
  		.read	= ramoops_pstore_read,
+		.read_curr	= ramoops_pstore_read_current,
  		.write_buf	= ramoops_pstore_write_buf,
  		.erase	= ramoops_pstore_erase,
  	},
diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c
index 9c25a0f..72a34b5 100644
--- a/fs/pstore/ram_core.c
+++ b/fs/pstore/ram_core.c
@@ -46,6 +46,11 @@ static inline size_t buffer_start(struct persistent_ram_zone *prz)
  	return atomic_read(&prz->buffer->start);
  }
  
+void *persistent_ram_buffer(struct persistent_ram_zone *prz)
+{
+	return prz->buffer->data;
+}
+
  /* increase and wrap the start pointer, returning the old value */
  static size_t buffer_start_add_atomic(struct persistent_ram_zone *prz, size_t a)
  {
@@ -370,6 +375,11 @@ notrace void *persistent_ram_new_record(struct persistent_ram_zone *prz)
  			buffer_start_add(prz, record_size));
  }
  
+size_t persistent_ram_size(struct persistent_ram_zone *prz)
+{
+	return buffer_size(prz);
+}
+
  size_t persistent_ram_old_size(struct persistent_ram_zone *prz)
  {
  	return prz->old_log_size;
diff --git a/include/linux/pstore.h b/include/linux/pstore.h
index 9936859..31a6ec1 100644
--- a/include/linux/pstore.h
+++ b/include/linux/pstore.h
@@ -59,6 +59,8 @@ struct pstore_info {
  	ssize_t		(*read)(u64 *id, enum pstore_type_id *type,
  			int *count, struct timespec *time, char **buf,
  			bool *compressed, struct pstore_info *psi);
+	ssize_t		(*read_curr)(u64 *id, enum pstore_type_id type,
+			char **buf, struct pstore_info *psi);
  	int		(*write)(enum pstore_type_id type,
  			enum kmsg_dump_reason reason, u64 *id,
  			unsigned int part, int count, bool compressed,
diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h
index d7d0b7a..9134bda 100644
--- a/include/linux/pstore_ram.h
+++ b/include/linux/pstore_ram.h
@@ -72,4 +72,19 @@ void persistent_ram_free_old(struct persistent_ram_zone *prz);
  ssize_t persistent_ram_ecc_string(struct persistent_ram_zone *prz,
  	char *str, size_t len);
  
+#ifdef CONFIG_PSTORE_RAM
+void *persistent_ram_buffer(struct persistent_ram_zone *prz);
+size_t persistent_ram_size(struct persistent_ram_zone *prz);
+#else
+static inline void *persistent_ram_buffer(struct persistent_ram_zone *prz)
+{
+	return NULL;
+}
+
+static inline size_t persistent_ram_size(struct persistent_ram_zone *prz)
+{
+	return 0;
+}
+#endif
+
  #endif
-- 
1.8.3.2

Re: linux-next: build failure after merge of the ia64 tree

[Tony Luck]

On Thu, Jan 10, 2013 at 3:54 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> ERROR: "pstore_cannot_block_path" [drivers/firmware/efivars.ko] undefined!

Should be fixed today (allmodconfig builds for me).  I applied Seiji's
new version
of the patchset that included the missing EXPORT_SYMBOL_GPL.

-Tony

RE: linux-next: build failure after merge of the ia64 tree

[Seiji Aguchi]

Stephen, Tony,

I will take a look at it.

Seiji

> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Thursday, January 10, 2013 6:55 PM
> To: Luck, Tony
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Seiji Aguchi
> Subject: linux-next: build failure after merge of the ia64 tree
> 
> Hi all,
> 
> After merging the ia64 tree, today's linux-next build (x86_64_allmodconfig) failed like this:
> 
> ERROR: "pstore_cannot_block_path" [drivers/firmware/efivars.ko] undefined!
> 
> Caused by commit 1a1df768ea4e ("efi_pstore: Avoid deadlock in non-blocking paths").
> 
> I have used the ia64 tree from next-20130110 for today.
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

linux-next: build failure after merge of the ia64 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 404 bytes --]

Hi all,

After merging the ia64 tree, today's linux-next build (x86_64_allmodconfig)
failed like this:

ERROR: "pstore_cannot_block_path" [drivers/firmware/efivars.ko] undefined!

Caused by commit 1a1df768ea4e ("efi_pstore: Avoid deadlock in
non-blocking paths").

I have used the ia64 tree from next-20130110 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]