Skip to contentSkip to conversation

pstore: add pmsg

PATCH In review Mark Salyzyn 4 participants 8 messages Jan 14, 2015 – Feb 4, 2015 1 message not in the archive Pstore filesystem

lore
Share & tools
lore
#0 lore raw

PATCH v4 4/5 pstore: add pmsg

A secured user-space accessible pstore object. Writes to /dev/pmsg0 are appended to the buffer, on reboot the persistent contents are available in /sys/fs/pstore/pmsg-ramoops-[ID].

One possible use is syslogd, or other daemon, can write messages, then on reboot provides a means to triage user-space activities leading up to a panic as a companion to the pstore dmesg or console logs.

---
v2: switch from snprintf to scnprintf
v3: split out prz_ok checking into PATCH 3/5
replace pmsg_lseek with noop_llseek
use pr_fmt() macro
make write atomic and use a vmalloc'd bounce buffer
v4: use mutex_lock instead of of spin_lock.

 fs/pstore/Kconfig          |  10 ++++
 fs/pstore/Makefile         |   2 +
 fs/pstore/inode.c          |   3 ++
 fs/pstore/internal.h       |   6 +++
 fs/pstore/platform.c       |   1 +
 fs/pstore/pmsg.c           | 114 +++++++++++++++++++++++++++++++++++++++++++++
 fs/pstore/ram.c            |  34 +++++++++++++-
 include/linux/pstore.h     |   1 +
 include/linux/pstore_ram.h |   1 +
 9 files changed, 170 insertions(+), 2 deletions(-)
 create mode 100644 fs/pstore/pmsg.c
fs/pstore/Kconfig +10 -0
index 983d951..916b8e2 100644
@@ -21,6 +21,16 @@ config PSTORE_CONSOLE
 	  When the option is enabled, pstore will log all kernel
 	  messages, even if no oops or panic happened.
 
+config PSTORE_PMSG
+	bool "Log user space messages"
+	depends on PSTORE
+	help
+	  When the option is enabled, pstore will export a character
+	  interface /dev/pmsg0 to log user space messages. On reboot
+	  data can be retrieved from /sys/fs/pstore/pmsg-ramoops-[ID].
+
+	  If unsure, say N.
+
 config PSTORE_FTRACE
 	bool "Persistent function tracer"
 	depends on PSTORE
fs/pstore/Makefile +2 -0
index 4c9095c..e647d8e 100644
@@ -7,5 +7,7 @@ obj-y += pstore.o
 pstore-objs += inode.o platform.o
 obj-$(CONFIG_PSTORE_FTRACE)	+= ftrace.o
 
+obj-$(CONFIG_PSTORE_PMSG)	+= pmsg.o
+
 ramoops-objs += ram.o ram_core.o
 obj-$(CONFIG_PSTORE_RAM)	+= ramoops.o
fs/pstore/inode.c +3 -0
index d69586f..b32ce53 100644
@@ -361,6 +361,9 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count,
 		scnprintf(name, sizeof(name), "powerpc-common-%s-%lld",
 			  psname, id);
 		break;
+	case PSTORE_TYPE_PMSG:
+		scnprintf(name, sizeof(name), "pmsg-%s-%lld", psname, id);
+		break;
 	case PSTORE_TYPE_UNKNOWN:
 		scnprintf(name, sizeof(name), "unknown-%s-%lld", psname, id);
 		break;
fs/pstore/internal.h +6 -0
index 3b3d305..c36ba2c 100644
@@ -45,6 +45,12 @@ extern void pstore_register_ftrace(void);
 static inline void pstore_register_ftrace(void) {}
 #endif
 
+#ifdef CONFIG_PSTORE_PMSG
+extern void pstore_register_pmsg(void);
+#else
+static inline void pstore_register_pmsg(void) {}
+#endif
+
 extern struct pstore_info *psinfo;
 
 extern void	pstore_set_kmsg_bytes(int);
fs/pstore/platform.c +1 -0
index 0a9b72c..15ee78c 100644
@@ -447,6 +447,7 @@ int pstore_register(struct pstore_info *psi)
 	if ((psi->flags & PSTORE_FLAGS_FRAGILE) == 0) {
 		pstore_register_console();
 		pstore_register_ftrace();
+		pstore_register_pmsg();
 	}
 
 	if (pstore_update_ms >= 0) {
fs/pstore/pmsg.c new file +114 -0

114 lines not on this page · raw message

fs/pstore/ram.c +32 -2
index 6150e54..39d1373 100644
@@ -51,6 +51,10 @@ static ulong ramoops_ftrace_size = MIN_MEM_SIZE;
 module_param_named(ftrace_size, ramoops_ftrace_size, ulong, 0400);
 MODULE_PARM_DESC(ftrace_size, "size of ftrace log");
 
+static ulong ramoops_pmsg_size = MIN_MEM_SIZE;
+module_param_named(pmsg_size, ramoops_pmsg_size, ulong, 0400);
+MODULE_PARM_DESC(pmsg_size, "size of user space message log");
+
 static ulong mem_address;
 module_param(mem_address, ulong, 0400);
 MODULE_PARM_DESC(mem_address,
@@ -82,12 +86,14 @@ struct ramoops_context {
 	struct persistent_ram_zone **przs;
 	struct persistent_ram_zone *cprz;
 	struct persistent_ram_zone *fprz;
+	struct persistent_ram_zone *mprz;
 	phys_addr_t phys_addr;
 	unsigned long size;
 	unsigned int memtype;
 	size_t record_size;
 	size_t console_size;
 	size_t ftrace_size;
+	size_t pmsg_size;
 	int dump_oops;
 	struct persistent_ram_ecc_info ecc_info;
 	unsigned int max_dump_cnt;
@@ -96,6 +102,7 @@ struct ramoops_context {
 	unsigned int dump_read_cnt;
 	unsigned int console_read_cnt;
 	unsigned int ftrace_read_cnt;
+	unsigned int pmsg_read_cnt;
 	struct pstore_info pstore;
 };
 
@@ -109,6 +116,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->pmsg_read_cnt = 0;
 	return 0;
 }
 
@@ -191,6 +199,9 @@ 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_ok(prz))
+		prz = ramoops_get_next_prz(&cxt->mprz, &cxt->pmsg_read_cnt,
+					   1, id, type, PSTORE_TYPE_PMSG, 0);
+	if (!prz_ok(prz))
 		return 0;
 
 	if (!persistent_ram_old(prz))
@@ -258,6 +269,11 @@ static int notrace ramoops_pstore_write_buf(enum pstore_type_id type,
 			return -ENOMEM;
 		persistent_ram_write(cxt->fprz, buf, size);
 		return 0;
+	} else if (type == PSTORE_TYPE_PMSG) {
+		if (!cxt->mprz)
+			return -ENOMEM;
+		persistent_ram_write(cxt->mprz, buf, size);
+		return 0;
 	}
 
 	if (type != PSTORE_TYPE_DMESG)
@@ -315,6 +331,9 @@ 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_PMSG:
+		prz = cxt->mprz;
+		break;
 	default:
 		return -EINVAL;
 	}
@@ -441,7 +460,7 @@ static int ramoops_probe(struct platform_device *pdev)
 		goto fail_out;
 
 	if (!pdata->mem_size || (!pdata->record_size && !pdata->console_size &&
-			!pdata->ftrace_size)) {
+			!pdata->ftrace_size && !pdata->pmsg_size)) {
 		pr_err("The memory size and the record/console size must be "
 			"non-zero\n");
 		goto fail_out;
@@ -453,6 +472,8 @@ static int ramoops_probe(struct platform_device *pdev)
 		pdata->console_size = rounddown_pow_of_two(pdata->console_size);
 	if (pdata->ftrace_size && !is_power_of_2(pdata->ftrace_size))
 		pdata->ftrace_size = rounddown_pow_of_two(pdata->ftrace_size);
+	if (pdata->pmsg_size && !is_power_of_2(pdata->pmsg_size))
+		pdata->pmsg_size = rounddown_pow_of_two(pdata->pmsg_size);
 
 	cxt->size = pdata->mem_size;
 	cxt->phys_addr = pdata->mem_address;
@@ -460,12 +481,14 @@ static int ramoops_probe(struct platform_device *pdev)
 	cxt->record_size = pdata->record_size;
 	cxt->console_size = pdata->console_size;
 	cxt->ftrace_size = pdata->ftrace_size;
+	cxt->pmsg_size = pdata->pmsg_size;
 	cxt->dump_oops = pdata->dump_oops;
 	cxt->ecc_info = pdata->ecc_info;
 
 	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
+			- cxt->pmsg_size;
 	err = ramoops_init_przs(dev, cxt, &paddr, dump_mem_sz);
 	if (err)
 		goto fail_out;
@@ -480,6 +503,10 @@ static int ramoops_probe(struct platform_device *pdev)
 	if (err)
 		goto fail_init_fprz;
 
+	err = ramoops_init_prz(dev, cxt, &cxt->mprz, &paddr, cxt->pmsg_size, 0);
+	if (err)
+		goto fail_init_mprz;
+
 	cxt->pstore.data = cxt;
 	/*
 	 * Console can handle any buffer size, so prefer LOG_LINE_MAX. If we
@@ -523,6 +550,8 @@ fail_buf:
 	kfree(cxt->pstore.buf);
 fail_clear:
 	cxt->pstore.bufsize = 0;
+	kfree(cxt->mprz);
+fail_init_mprz:
 	kfree(cxt->fprz);
 fail_init_fprz:
 	kfree(cxt->cprz);
@@ -580,6 +609,7 @@ static void ramoops_register_dummy(void)
 	dummy_data->record_size = record_size;
 	dummy_data->console_size = ramoops_console_size;
 	dummy_data->ftrace_size = ramoops_ftrace_size;
+	dummy_data->pmsg_size = ramoops_pmsg_size;
 	dummy_data->dump_oops = dump_oops;
 	/*
 	 * For backwards compatibility ramoops.ecc=1 means 16 bytes ECC
include/linux/pstore.h +1 -0
index ece0c6b..8884f6e 100644
@@ -39,6 +39,7 @@ enum pstore_type_id {
 	PSTORE_TYPE_PPC_RTAS	= 4,
 	PSTORE_TYPE_PPC_OF	= 5,
 	PSTORE_TYPE_PPC_COMMON	= 6,
+	PSTORE_TYPE_PMSG	= 7,
 	PSTORE_TYPE_UNKNOWN	= 255
 };
 
include/linux/pstore_ram.h +1 -0
index 4af3fdc..9c9d6c1 100644
@@ -81,6 +81,7 @@ struct ramoops_platform_data {
 	unsigned long	record_size;
 	unsigned long	console_size;
 	unsigned long	ftrace_size;
+	unsigned long	pmsg_size;
 	int		dump_oops;
 	struct persistent_ram_ecc_info ecc_info;
 };
Signature · 1 line
2.2.0.rc0.207.ga3a616c
Acked-by on v4 4/5
#1 lore raw
Quoted 10 lines · Mark Salyzyn

A secured user-space accessible pstore object. Writes to /dev/pmsg0 are appended to the buffer, on reboot the persistent contents are available in /sys/fs/pstore/pmsg-ramoops-[ID].

One possible use is syslogd, or other daemon, can write messages, then on reboot provides a means to triage user-space activities leading up to a panic as a companion to the pstore dmesg or console logs.

Quoted 8 lines

---
v2: switch from snprintf to scnprintf
v3: split out prz_ok checking into PATCH 3/5
replace pmsg_lseek with noop_llseek
use pr_fmt() macro
make write atomic and use a vmalloc'd bounce buffer
v4: use mutex_lock instead of of spin_lock.

Cool, seems reasonable to me. Thanks for the respins!

-Kees

Quoted 376 lines
 fs/pstore/Kconfig          |  10 ++++
 fs/pstore/Makefile         |   2 +
 fs/pstore/inode.c          |   3 ++
 fs/pstore/internal.h       |   6 +++
 fs/pstore/platform.c       |   1 +
 fs/pstore/pmsg.c           | 114 +++++++++++++++++++++++++++++++++++++++++++++
 fs/pstore/ram.c            |  34 +++++++++++++-
 include/linux/pstore.h     |   1 +
 include/linux/pstore_ram.h |   1 +
 9 files changed, 170 insertions(+), 2 deletions(-)
 create mode 100644 fs/pstore/pmsg.c
fs/pstore/Kconfig +10 -0
index 983d951..916b8e2 100644
@@ -21,6 +21,16 @@ config PSTORE_CONSOLE
          When the option is enabled, pstore will log all kernel
          messages, even if no oops or panic happened.
 
+config PSTORE_PMSG
+       bool "Log user space messages"
+       depends on PSTORE
+       help
+         When the option is enabled, pstore will export a character
+         interface /dev/pmsg0 to log user space messages. On reboot
+         data can be retrieved from /sys/fs/pstore/pmsg-ramoops-[ID].
+
+         If unsure, say N.
+
 config PSTORE_FTRACE
        bool "Persistent function tracer"
        depends on PSTORE
fs/pstore/Makefile +2 -0
index 4c9095c..e647d8e 100644
@@ -7,5 +7,7 @@ obj-y += pstore.o
 pstore-objs += inode.o platform.o
 obj-$(CONFIG_PSTORE_FTRACE)    += ftrace.o
 
+obj-$(CONFIG_PSTORE_PMSG)      += pmsg.o
+
 ramoops-objs += ram.o ram_core.o
 obj-$(CONFIG_PSTORE_RAM)       += ramoops.o
fs/pstore/inode.c +3 -0
index d69586f..b32ce53 100644
@@ -361,6 +361,9 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count,
                scnprintf(name, sizeof(name), "powerpc-common-%s-%lld",
                          psname, id);
                break;
+       case PSTORE_TYPE_PMSG:
+               scnprintf(name, sizeof(name), "pmsg-%s-%lld", psname, id);
+               break;
        case PSTORE_TYPE_UNKNOWN:
                scnprintf(name, sizeof(name), "unknown-%s-%lld", psname, id);
                break;
fs/pstore/internal.h +6 -0
index 3b3d305..c36ba2c 100644
@@ -45,6 +45,12 @@ extern void pstore_register_ftrace(void);
 static inline void pstore_register_ftrace(void) {}
 #endif
 
+#ifdef CONFIG_PSTORE_PMSG
+extern void pstore_register_pmsg(void);
+#else
+static inline void pstore_register_pmsg(void) {}
+#endif
+
 extern struct pstore_info *psinfo;
 
 extern void    pstore_set_kmsg_bytes(int);
fs/pstore/platform.c +1 -0
index 0a9b72c..15ee78c 100644
@@ -447,6 +447,7 @@ int pstore_register(struct pstore_info *psi)
        if ((psi->flags & PSTORE_FLAGS_FRAGILE) == 0) {
                pstore_register_console();
                pstore_register_ftrace();
+               pstore_register_pmsg();
        }
 
        if (pstore_update_ms >= 0) {
fs/pstore/pmsg.c new file +114 -0
new file mode 100644
index 0000000..feb5dd2
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2014  Google, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/cdev.h>
+#include <linux/device.h>
+#include <linux/fs.h>
+#include <linux/uaccess.h>
+#include <linux/vmalloc.h>
+#include "internal.h"
+
+static DEFINE_MUTEX(pmsg_lock);
+#define PMSG_MAX_BOUNCE_BUFFER_SIZE (2*PAGE_SIZE)
+
+static ssize_t write_pmsg(struct file *file, const char __user *buf,
+                         size_t count, loff_t *ppos)
+{
+       size_t i, buffer_size;
+       char *buffer;
+
+       if (!count)
+               return 0;
+
+       if (!access_ok(VERIFY_READ, buf, count))
+               return -EFAULT;
+
+       buffer_size = count;
+       if (buffer_size > PMSG_MAX_BOUNCE_BUFFER_SIZE)
+               buffer_size = PMSG_MAX_BOUNCE_BUFFER_SIZE;
+       buffer = vmalloc(buffer_size);
+
+       mutex_lock(&pmsg_lock);
+       for (i = 0; i < count; ) {
+               size_t c = min(count - i, buffer_size);
+               u64 id;
+               long ret;
+
+               ret = __copy_from_user(buffer, buf + i, c);
+               if (unlikely(ret != 0)) {
+                       mutex_unlock(&pmsg_lock);
+                       vfree(buffer);
+                       return -EFAULT;
+               }
+               psinfo->write_buf(PSTORE_TYPE_PMSG, 0, &id, 0, buffer, 0, c,
+                                 psinfo);
+
+               i += c;
+       }
+
+       mutex_unlock(&pmsg_lock);
+       vfree(buffer);
+       return count;
+}
+
+static const struct file_operations pmsg_fops = {
+       .owner          = THIS_MODULE,
+       .llseek         = noop_llseek,
+       .write          = write_pmsg,
+};
+
+static struct class *pmsg_class;
+static int pmsg_major;
+#define PMSG_NAME "pmsg"
+#undef pr_fmt
+#define pr_fmt(fmt) PMSG_NAME ": " fmt
+
+static char *pmsg_devnode(struct device *dev, umode_t *mode)
+{
+       if (mode)
+               *mode = 0220;
+       return NULL;
+}
+
+void pstore_register_pmsg(void)
+{
+       struct device *pmsg_device;
+
+       pmsg_major = register_chrdev(0, PMSG_NAME, &pmsg_fops);
+       if (pmsg_major < 0) {
+               pr_err("register_chrdev failed\n");
+               goto err;
+       }
+
+       pmsg_class = class_create(THIS_MODULE, PMSG_NAME);
+       if (IS_ERR(pmsg_class)) {
+               pr_err("device class file already in use\n");
+               goto err_class;
+       }
+       pmsg_class->devnode = pmsg_devnode;
+
+       pmsg_device = device_create(pmsg_class, NULL, MKDEV(pmsg_major, 0),
+                                       NULL, "%s%d", PMSG_NAME, 0);
+       if (IS_ERR(pmsg_device)) {
+               pr_err("failed to create device\n");
+               goto err_device;
+       }
+       return;
+
+err_device:
+       class_destroy(pmsg_class);
+err_class:
+       unregister_chrdev(pmsg_major, PMSG_NAME);
+err:
+       return;
+}
fs/pstore/ram.c +32 -2
index 6150e54..39d1373 100644
@@ -51,6 +51,10 @@ static ulong ramoops_ftrace_size = MIN_MEM_SIZE;
 module_param_named(ftrace_size, ramoops_ftrace_size, ulong, 0400);
 MODULE_PARM_DESC(ftrace_size, "size of ftrace log");
 
+static ulong ramoops_pmsg_size = MIN_MEM_SIZE;
+module_param_named(pmsg_size, ramoops_pmsg_size, ulong, 0400);
+MODULE_PARM_DESC(pmsg_size, "size of user space message log");
+
 static ulong mem_address;
 module_param(mem_address, ulong, 0400);
 MODULE_PARM_DESC(mem_address,
@@ -82,12 +86,14 @@ struct ramoops_context {
        struct persistent_ram_zone **przs;
        struct persistent_ram_zone *cprz;
        struct persistent_ram_zone *fprz;
+       struct persistent_ram_zone *mprz;
        phys_addr_t phys_addr;
        unsigned long size;
        unsigned int memtype;
        size_t record_size;
        size_t console_size;
        size_t ftrace_size;
+       size_t pmsg_size;
        int dump_oops;
        struct persistent_ram_ecc_info ecc_info;
        unsigned int max_dump_cnt;
@@ -96,6 +102,7 @@ struct ramoops_context {
        unsigned int dump_read_cnt;
        unsigned int console_read_cnt;
        unsigned int ftrace_read_cnt;
+       unsigned int pmsg_read_cnt;
        struct pstore_info pstore;
 };
 
@@ -109,6 +116,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->pmsg_read_cnt = 0;
        return 0;
 }
 
@@ -191,6 +199,9 @@ 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_ok(prz))
+               prz = ramoops_get_next_prz(&cxt->mprz, &cxt->pmsg_read_cnt,
+                                          1, id, type, PSTORE_TYPE_PMSG, 0);
+       if (!prz_ok(prz))
                return 0;
 
        if (!persistent_ram_old(prz))
@@ -258,6 +269,11 @@ static int notrace ramoops_pstore_write_buf(enum pstore_type_id type,
                        return -ENOMEM;
                persistent_ram_write(cxt->fprz, buf, size);
                return 0;
+       } else if (type == PSTORE_TYPE_PMSG) {
+               if (!cxt->mprz)
+                       return -ENOMEM;
+               persistent_ram_write(cxt->mprz, buf, size);
+               return 0;
        }
 
        if (type != PSTORE_TYPE_DMESG)
@@ -315,6 +331,9 @@ 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_PMSG:
+               prz = cxt->mprz;
+               break;
        default:
                return -EINVAL;
        }
@@ -441,7 +460,7 @@ static int ramoops_probe(struct platform_device *pdev)
                goto fail_out;
 
        if (!pdata->mem_size || (!pdata->record_size && !pdata->console_size &&
-                       !pdata->ftrace_size)) {
+                       !pdata->ftrace_size && !pdata->pmsg_size)) {
                pr_err("The memory size and the record/console size must be "
                        "non-zero\n");
                goto fail_out;
@@ -453,6 +472,8 @@ static int ramoops_probe(struct platform_device *pdev)
                pdata->console_size = rounddown_pow_of_two(pdata->console_size);
        if (pdata->ftrace_size && !is_power_of_2(pdata->ftrace_size))
                pdata->ftrace_size = rounddown_pow_of_two(pdata->ftrace_size);
+       if (pdata->pmsg_size && !is_power_of_2(pdata->pmsg_size))
+               pdata->pmsg_size = rounddown_pow_of_two(pdata->pmsg_size);
 
        cxt->size = pdata->mem_size;
        cxt->phys_addr = pdata->mem_address;
@@ -460,12 +481,14 @@ static int ramoops_probe(struct platform_device *pdev)
        cxt->record_size = pdata->record_size;
        cxt->console_size = pdata->console_size;
        cxt->ftrace_size = pdata->ftrace_size;
+       cxt->pmsg_size = pdata->pmsg_size;
        cxt->dump_oops = pdata->dump_oops;
        cxt->ecc_info = pdata->ecc_info;
 
        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
+                       - cxt->pmsg_size;
        err = ramoops_init_przs(dev, cxt, &paddr, dump_mem_sz);
        if (err)
                goto fail_out;
@@ -480,6 +503,10 @@ static int ramoops_probe(struct platform_device *pdev)
        if (err)
                goto fail_init_fprz;
 
+       err = ramoops_init_prz(dev, cxt, &cxt->mprz, &paddr, cxt->pmsg_size, 0);
+       if (err)
+               goto fail_init_mprz;
+
        cxt->pstore.data = cxt;
        /*
         * Console can handle any buffer size, so prefer LOG_LINE_MAX. If we
@@ -523,6 +550,8 @@ fail_buf:
        kfree(cxt->pstore.buf);
 fail_clear:
        cxt->pstore.bufsize = 0;
+       kfree(cxt->mprz);
+fail_init_mprz:
        kfree(cxt->fprz);
 fail_init_fprz:
        kfree(cxt->cprz);
@@ -580,6 +609,7 @@ static void ramoops_register_dummy(void)
        dummy_data->record_size = record_size;
        dummy_data->console_size = ramoops_console_size;
        dummy_data->ftrace_size = ramoops_ftrace_size;
+       dummy_data->pmsg_size = ramoops_pmsg_size;
        dummy_data->dump_oops = dump_oops;
        /*
         * For backwards compatibility ramoops.ecc=1 means 16 bytes ECC
include/linux/pstore.h +1 -0
index ece0c6b..8884f6e 100644
@@ -39,6 +39,7 @@ enum pstore_type_id {
        PSTORE_TYPE_PPC_RTAS    = 4,
        PSTORE_TYPE_PPC_OF      = 5,
        PSTORE_TYPE_PPC_COMMON  = 6,
+       PSTORE_TYPE_PMSG        = 7,
        PSTORE_TYPE_UNKNOWN     = 255
 };
 
include/linux/pstore_ram.h +1 -1
index 4af3fdc..9c9d6c1 100644
@@ -81,6 +81,7 @@ struct ramoops_platform_data {
        unsigned long   record_size;
        unsigned long   console_size;
        unsigned long   ftrace_size;
+       unsigned long   pmsg_size;
        int             dump_oops;
        struct persistent_ram_ecc_info ecc_info;
 };
--

2.2.0.rc0.207.ga3a616c

Signature · 2 lines
Kees Cook
Chrome OS Security
reviewer
#2 lore raw
Quoted 1 line

Cool, seems reasonable to me. Thanks for the respins!

I've applied it - but I have a nagging worry about it being user accessible. We've limited access to some pstore features on platforms that only support backend drivers that write to limited lifetime flash storage - efivars & erst. Should we do that for this too?

-Tony ���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m���� ������?�I�

A message that is not in the archive (sent off-list or not yet received): 871tmfz06r.fsf%[email protected]

#4 lore raw
Quoted 12 lines · Łukasz Stelmach
Quoted 5 lines

A secured user-space accessible pstore object. Writes to /dev/pmsg0 are appended to the buffer, on reboot the persistent contents are available in /sys/fs/pstore/pmsg-ramoops-[ID].

Quoted 7 lines

One possible use is syslogd, or other daemon, can write messages, then on reboot provides a means to triage user-space activities leading up to a panic as a companion to the pstore dmesg or console logs.

---

Quoted 7 lines

I am not an expert but this smells like duplicating /dev/kmsg. If I remember correctly since about Linux 3.5 /dev/kmsg is writable for the user-space and every single process (modulo MAC/DAC) can log there. The messages from user-space are preserved accross reboots as a part of the kmsg/printk buffer anyway.

What is the advantege of pmsg0 over /dev/kmsg?

- Precious little user-space content goes to kmsg (otherwise you can ask why is there a syslogd?), there is a reason for this, user space is notorious for containing Personal Identifiable Information whereas kernel information does not.
- pmsg0 can take a lot of content (with a ramoops backend) and will not disrupt/DOS the kernel logs.
- State, Binary or packetized content can go to /dev/pmsg0 and not interfere with the text content in kmsg
- /dev/pmsg0 write is atomic
- /dev/pmsg0 is write only, there is no access to the live content _unless_ there is a reboot.
- Personal identification which abounds in user space could be placed into /dev/pmsg0, and there is no way except a reboot in order to extract the content, and then /sys/fs/pstore/pmsg-ramoops-0 can be deleted, or heavily MAC and DAC controlled to enforce protection (doing so to kmsg would be unlivable)

Sincerely -- Mark Salyzyn

#5 lore raw
Quoted 19 lines · Mark Salyzyn
Quoted 18 lines · Łukasz Stelmach
Quoted 5 lines

A secured user-space accessible pstore object. Writes to /dev/pmsg0 are appended to the buffer, on reboot the persistent contents are available in /sys/fs/pstore/pmsg-ramoops-[ID].

Quoted 7 lines

One possible use is syslogd, or other daemon, can write messages, then on reboot provides a means to triage user-space activities leading up to a panic as a companion to the pstore dmesg or console logs.

---

I am not an expert but this smells like duplicating /dev/kmsg. If I remember correctly since about Linux 3.5 /dev/kmsg is writable for the user-space and every single process (modulo MAC/DAC) can log there. The messages from user-space are preserved accross reboots as a part of the kmsg/printk buffer anyway.

Quoted 6 lines
Quoted 1 line

What is the advantege of pmsg0 over /dev/kmsg?

- Precious little user-space content goes to kmsg (otherwise you can ask why is there a syslogd?), there is a reason for this, user space is notorious for containing Personal Identifiable Information whereas kernel information does not.

Sure it does too: MAC addresses, UUIDs, serial numbers. With mobile devices these are actually PII.

Quoted 2 lines

- pmsg0 can take a lot of content (with a ramoops backend) and will not disrupt/DOS the kernel logs.

Documentation/ramoops.txt says it is for logging kernel oopses and panics not user logs.

Quoted 2 lines

- State, Binary or packetized content can go to /dev/pmsg0 and not interfere with the text content in kmsg

Indeed kmsg can't store arbitrary binary data. However it can, store key/value pairs next to text and there is base64 too. Yes, this one seems a little bit better than kmsg.

Quoted 1 line

- /dev/pmsg0 write is atomic

devkmsg_write + vprintk_emit are atomic too.

Quoted 2 lines

- /dev/pmsg0 is write only, there is no access to the live content _unless_ there is a reboot.

Why do you consider this an advantage?

Quoted 5 lines

- Personal identification which abounds in user space could be placed into /dev/pmsg0, and there is no way except a reboot in order to extract the content, and then /sys/fs/pstore/pmsg-ramoops-0 can be deleted, or heavily MAC and DAC controlled to enforce protection (doing so to kmsg would be unlivable)

Read access to /dev/kmsg can be limited too.

I think that the goals you present can be met with less code. You could try adding support for multiple /dev/kmsg instances for example. How about that?

Signature · 1 line
Było mi bardzo miło.                   Twoje oczy lubią mnie
Quoted 1 line

Łukasz< i to mnie zgubi (c)SNL

#6 lore raw

Thanks for your response.

Quoted 7 lines · Lukasz Stelmach
Quoted 4 lines · Mark Salyzyn

- Precious little user-space content goes to kmsg (otherwise you can ask why is there a syslogd?), there is a reason for this, user space is notorious for containing Personal Identifiable Information whereas kernel information does not.

Sure it does too: MAC addresses, UUIDs, serial numbers. With mobile devices these are actually PII.

:-)

Names, Passwords, credit card number, addresses. Personal Identifiable Information, lawsuits are never lodged against MAC addresses UUIDs or serial numbers.

Quoted 4 lines
Quoted 2 lines

- pmsg0 can take a lot of content (with a ramoops backend) and will not disrupt/DOS the kernel logs.

Documentation/ramoops.txt says it is for logging kernel oopses and panics not user logs.

I probably should have changed the ramoops.txt content with the addition of pmsg :-)

Quoted 3 lines

- /dev/pmsg0 write is atomic
devkmsg_write + vprintk_emit are atomic too.

Hmmm, I managed to get content corrupted

Quoted 3 lines
Quoted 2 lines

- /dev/pmsg0 is write only, there is no access to the live content _unless_ there is a reboot.

Why do you consider this an advantage?

It is more serendipity than design, once this feature was highlighted, it became a must-have for the security concerns. The current boot instance contains an environment of files, programs and state information that combined would be useful for cracking a large amount of PII. Once a kernel panics what remains is a trace of user-space activities that can be correlated with kernel activities in order to replay or triage what lead up to the kernel panic. Yet crippled enough to not be as useful as a vector.

Quoted 6 lines
Quoted 5 lines

- Personal identification which abounds in user space could be placed into /dev/pmsg0, and there is no way except a reboot in order to extract the content, and then /sys/fs/pstore/pmsg-ramoops-0 can be deleted, or heavily MAC and DAC controlled to enforce protection (doing so to kmsg would be unlivable)

Read access to /dev/kmsg can be limited too.

When you delete /sys/fs/pstore/pmsg-ramoops-0 after moving it to secure storage, it is gone. Same is separately true for /sys/fs/pstore/console-ramoops-0, so yes, similar characteristics. The issue is separation. The issue is also no ability to read the live content of the user space data until it becomes relevant (kernel panic triage).

Quoted 4 lines

I think that the goals you present can be met with less code. You could try adding support for multiple /dev/kmsg instances for example. How about that?

Not a bad idea. But with multiple kmsg instances, you also get to add code in pstore to divide it up along with a device tree that decides how much storage is provided for each instance. I would wager a desire will be expressed to make sure the live co There is a vacuum.ntent be accessible with a netlink socket and a new flag in dmesg which would be counter to our security concerns.

pstore is all about persistence. kmsg is not, until pstore supports it. A user-space persistent storehouse felt appropriate to support at the bottom layer.

Sincerely -- Mark Salyzyn

#7 lore raw
Quoted 74 lines · Mark Salyzyn

Thanks for your response.

Quoted 10 lines · Lukasz Stelmach
Quoted 5 lines · Mark Salyzyn

- Precious little user-space content goes to kmsg (otherwise you can ask why is there a syslogd?), there is a reason for this, user space is notorious for containing Personal Identifiable Information whereas kernel information does not.

Sure it does too: MAC addresses, UUIDs, serial numbers. With mobile devices these are actually PII.

:-)

Names, Passwords, credit card number, addresses. Personal Identifiable Information, lawsuits are never lodged against MAC addresses UUIDs or serial numbers.

Quoted 6 lines
Quoted 3 lines

- pmsg0 can take a lot of content (with a ramoops backend) and will not disrupt/DOS the kernel logs.

Documentation/ramoops.txt says it is for logging kernel oopses and panics not user logs.

I probably should have changed the ramoops.txt content with the addition of pmsg :-)

Quoted 4 lines

- /dev/pmsg0 write is atomic
devkmsg_write + vprintk_emit are atomic too.

Hmmm, I managed to get content corrupted

Quoted 5 lines
Quoted 3 lines

- /dev/pmsg0 is write only, there is no access to the live content _unless_ there is a reboot.

Why do you consider this an advantage?

It is more serendipity than design, once this feature was highlighted, it became a must-have for the security concerns. The current boot instance contains an environment of files, programs and state information that combined would be useful for cracking a large amount of PII. Once a kernel panics what remains is a trace of user-space activities that can be correlated with kernel activities in order to replay or triage what lead up to the kernel panic. Yet crippled enough to not be as useful as a vector.

Quoted 8 lines
Quoted 6 lines

- Personal identification which abounds in user space could be placed into /dev/pmsg0, and there is no way except a reboot in order to extract the content, and then /sys/fs/pstore/pmsg-ramoops-0 can be deleted, or heavily MAC and DAC controlled to enforce protection (doing so to kmsg would be unlivable)

Read access to /dev/kmsg can be limited too.

When you delete /sys/fs/pstore/pmsg-ramoops-0 after moving it to secure storage, it is gone. Same is separately true for /sys/fs/pstore/console-ramoops-0, so yes, similar characteristics. The issue is separation. The issue is also no ability to read the live content of the user space data until it becomes relevant (kernel panic triage).

Quoted 5 lines

I think that the goals you present can be met with less code. You could try adding support for multiple /dev/kmsg instances for example. How about that?

Not a bad idea. But with multiple kmsg instances, you also get to add code in pstore to divide it up along with a device tree that decides how much storage is provided for each instance. I would wager a desire will be expressed to make sure the live co There is a vacuum.ntent be accessible with a netlink socket and a new flag in dmesg which would be counter to our security concerns.

Quoted 4 lines

pstore is all about persistence. kmsg is not, until pstore supports it. A user-space persistent storehouse felt appropriate to support at the bottom layer.

FWIW, I prefer keeping "pmsg" separate from "kmsg". They do feel similar, but given the persistence backing, I think it justifies the separation. I'm not sure it's right to change the semantics of kmsg.

-Kees

Quoted 1 line

Sincerely -- Mark Salyzyn

Signature · 2 lines
Kees Cook
Chrome OS Security
#8 lore raw
In reply to Mark Salyzyn
Quoted 1 line · Mark Salyzyn

Thanks for your response.

[...]

Quoted 3 lines

pstore is all about persistence. kmsg is not, until pstore supports it. A user-space persistent storehouse felt appropriate to support at the bottom layer.

OK. Thanks, for the additional information. Like I said, I am no expert but juste felt an urge to ask a few questions.

:-)

Signature · 1 line
Było mi bardzo miło.                   Twoje oczy lubią mnie
Quoted 1 line

Łukasz< i to mnie zgubi (c)SNL