pstore: pass reason to backend write callback
This allows a backend to filter on the dmesg reason as well as the pstore reason. When ramoops is switched to pstore, this is needed since it has no interest in storing non-crash dmesg details. Drop pstore_write() as it has no users, and handling the "reason" here has no obviously correct value. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
parent
f6f8285132
commit
3d6d8d20ec
|
@ -934,7 +934,8 @@ static int erst_close_pstore(struct pstore_info *psi);
|
||||||
static ssize_t erst_reader(u64 *id, enum pstore_type_id *type,
|
static ssize_t erst_reader(u64 *id, enum pstore_type_id *type,
|
||||||
struct timespec *time, char **buf,
|
struct timespec *time, char **buf,
|
||||||
struct pstore_info *psi);
|
struct pstore_info *psi);
|
||||||
static int erst_writer(enum pstore_type_id type, u64 *id, unsigned int part,
|
static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,
|
||||||
|
u64 *id, unsigned int part,
|
||||||
size_t size, struct pstore_info *psi);
|
size_t size, struct pstore_info *psi);
|
||||||
static int erst_clearer(enum pstore_type_id type, u64 id,
|
static int erst_clearer(enum pstore_type_id type, u64 id,
|
||||||
struct pstore_info *psi);
|
struct pstore_info *psi);
|
||||||
|
@ -1053,7 +1054,8 @@ out:
|
||||||
return (rc < 0) ? rc : (len - sizeof(*rcd));
|
return (rc < 0) ? rc : (len - sizeof(*rcd));
|
||||||
}
|
}
|
||||||
|
|
||||||
static int erst_writer(enum pstore_type_id type, u64 *id, unsigned int part,
|
static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,
|
||||||
|
u64 *id, unsigned int part,
|
||||||
size_t size, struct pstore_info *psi)
|
size_t size, struct pstore_info *psi)
|
||||||
{
|
{
|
||||||
struct cper_pstore_record *rcd = (struct cper_pstore_record *)
|
struct cper_pstore_record *rcd = (struct cper_pstore_record *)
|
||||||
|
|
|
@ -495,7 +495,8 @@ static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int efi_pstore_write(enum pstore_type_id type, u64 *id,
|
static int efi_pstore_write(enum pstore_type_id type,
|
||||||
|
enum kmsg_dump_reason reason, u64 *id,
|
||||||
unsigned int part, size_t size, struct pstore_info *psi)
|
unsigned int part, size_t size, struct pstore_info *psi)
|
||||||
{
|
{
|
||||||
char name[DUMP_NAME_LEN];
|
char name[DUMP_NAME_LEN];
|
||||||
|
@ -565,7 +566,7 @@ static int efi_pstore_write(enum pstore_type_id type, u64 *id,
|
||||||
static int efi_pstore_erase(enum pstore_type_id type, u64 id,
|
static int efi_pstore_erase(enum pstore_type_id type, u64 id,
|
||||||
struct pstore_info *psi)
|
struct pstore_info *psi)
|
||||||
{
|
{
|
||||||
efi_pstore_write(type, &id, (unsigned int)id, 0, psi);
|
efi_pstore_write(type, 0, &id, (unsigned int)id, 0, psi);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -586,7 +587,8 @@ static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type,
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int efi_pstore_write(enum pstore_type_id type, u64 *id,
|
static int efi_pstore_write(enum pstore_type_id type,
|
||||||
|
enum kmsg_dump_reason reason, u64 *id,
|
||||||
unsigned int part, size_t size, struct pstore_info *psi)
|
unsigned int part, size_t size, struct pstore_info *psi)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -122,7 +122,7 @@ static void pstore_dump(struct kmsg_dumper *dumper,
|
||||||
memcpy(dst, s1 + s1_start, l1_cpy);
|
memcpy(dst, s1 + s1_start, l1_cpy);
|
||||||
memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy);
|
memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy);
|
||||||
|
|
||||||
ret = psinfo->write(PSTORE_TYPE_DMESG, &id, part,
|
ret = psinfo->write(PSTORE_TYPE_DMESG, reason, &id, part,
|
||||||
hsize + l1_cpy + l2_cpy, psinfo);
|
hsize + l1_cpy + l2_cpy, psinfo);
|
||||||
if (ret == 0 && reason == KMSG_DUMP_OOPS && pstore_is_mounted())
|
if (ret == 0 && reason == KMSG_DUMP_OOPS && pstore_is_mounted())
|
||||||
pstore_new_entry = 1;
|
pstore_new_entry = 1;
|
||||||
|
@ -243,33 +243,5 @@ static void pstore_timefunc(unsigned long dummy)
|
||||||
mod_timer(&pstore_timer, jiffies + PSTORE_INTERVAL);
|
mod_timer(&pstore_timer, jiffies + PSTORE_INTERVAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Call platform driver to write a record to the
|
|
||||||
* persistent store.
|
|
||||||
*/
|
|
||||||
int pstore_write(enum pstore_type_id type, char *buf, size_t size)
|
|
||||||
{
|
|
||||||
u64 id;
|
|
||||||
int ret;
|
|
||||||
unsigned long flags;
|
|
||||||
|
|
||||||
if (!psinfo)
|
|
||||||
return -ENODEV;
|
|
||||||
|
|
||||||
if (size > psinfo->bufsize)
|
|
||||||
return -EFBIG;
|
|
||||||
|
|
||||||
spin_lock_irqsave(&psinfo->buf_lock, flags);
|
|
||||||
memcpy(psinfo->buf, buf, size);
|
|
||||||
ret = psinfo->write(type, &id, 0, size, psinfo);
|
|
||||||
if (ret == 0 && pstore_is_mounted())
|
|
||||||
pstore_mkfile(PSTORE_TYPE_DMESG, psinfo->name, id, psinfo->buf,
|
|
||||||
size, CURRENT_TIME, psinfo);
|
|
||||||
spin_unlock_irqrestore(&psinfo->buf_lock, flags);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(pstore_write);
|
|
||||||
|
|
||||||
module_param(backend, charp, 0444);
|
module_param(backend, charp, 0444);
|
||||||
MODULE_PARM_DESC(backend, "Pstore backend to use");
|
MODULE_PARM_DESC(backend, "Pstore backend to use");
|
||||||
|
|
|
@ -22,6 +22,9 @@
|
||||||
#ifndef _LINUX_PSTORE_H
|
#ifndef _LINUX_PSTORE_H
|
||||||
#define _LINUX_PSTORE_H
|
#define _LINUX_PSTORE_H
|
||||||
|
|
||||||
|
#include <linux/time.h>
|
||||||
|
#include <linux/kmsg_dump.h>
|
||||||
|
|
||||||
/* types */
|
/* types */
|
||||||
enum pstore_type_id {
|
enum pstore_type_id {
|
||||||
PSTORE_TYPE_DMESG = 0,
|
PSTORE_TYPE_DMESG = 0,
|
||||||
|
@ -41,7 +44,8 @@ struct pstore_info {
|
||||||
ssize_t (*read)(u64 *id, enum pstore_type_id *type,
|
ssize_t (*read)(u64 *id, enum pstore_type_id *type,
|
||||||
struct timespec *time, char **buf,
|
struct timespec *time, char **buf,
|
||||||
struct pstore_info *psi);
|
struct pstore_info *psi);
|
||||||
int (*write)(enum pstore_type_id type, u64 *id,
|
int (*write)(enum pstore_type_id type,
|
||||||
|
enum kmsg_dump_reason reason, u64 *id,
|
||||||
unsigned int part, size_t size, struct pstore_info *psi);
|
unsigned int part, size_t size, struct pstore_info *psi);
|
||||||
int (*erase)(enum pstore_type_id type, u64 id,
|
int (*erase)(enum pstore_type_id type, u64 id,
|
||||||
struct pstore_info *psi);
|
struct pstore_info *psi);
|
||||||
|
@ -50,18 +54,12 @@ struct pstore_info {
|
||||||
|
|
||||||
#ifdef CONFIG_PSTORE
|
#ifdef CONFIG_PSTORE
|
||||||
extern int pstore_register(struct pstore_info *);
|
extern int pstore_register(struct pstore_info *);
|
||||||
extern int pstore_write(enum pstore_type_id type, char *buf, size_t size);
|
|
||||||
#else
|
#else
|
||||||
static inline int
|
static inline int
|
||||||
pstore_register(struct pstore_info *psi)
|
pstore_register(struct pstore_info *psi)
|
||||||
{
|
{
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
static inline int
|
|
||||||
pstore_write(enum pstore_type_id type, char *buf, size_t size)
|
|
||||||
{
|
|
||||||
return -ENODEV;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /*_LINUX_PSTORE_H*/
|
#endif /*_LINUX_PSTORE_H*/
|
||||||
|
|
Loading…
Reference in a new issue