cleanups for pstore and ramoops
v2 cover cleanups for pstore and ramoops
Here are some simple cleanups and fixes for ramoops in pstore. Let me know what you think, thanks.
Joel Fernandes (Google) (3):
pstore: map pstore types to names
pstore: simplify ramoops_get_next_prz arguments
pstore: donot treat empty buffers as valid
fs/pstore/inode.c | 53 +++++--------------------------------- fs/pstore/ram.c | 52 +++++++++++++++---------------------- fs/pstore/ram_core.c | 2 +- include/linux/pstore.h | 37 ++++++++++++++++++++++++++ include/linux/pstore_ram.h | 2 ++ 5 files changed, 67 insertions(+), 79 deletions(-)
--
2.19.1.930.g4563a0d9d0-goog
RFC PATCH v2 1/3 pstore: map pstore types to names
In later patches we will need to map types to names, so create a table for that which can also be used and reused in different parts of old and new code. Also use it to save the type in the PRZ which will be useful in later patches.
--- fs/pstore/inode.c | 53 +++++--------------------------------- fs/pstore/ram.c | 4 ++- include/linux/pstore.h | 37 ++++++++++++++++++++++++++ include/linux/pstore_ram.h | 2 ++ 4 files changed, 48 insertions(+), 48 deletions(-)
fs/pstore/inode.c +6 -47
@@ -304,6 +304,7 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)struct dentry *dentry;struct inode *inode;int rc =0 ; +enum pstore_type_id type;char name[PSTORE_NAMELEN ];struct pstore_private *private, *pos;unsigned long flags;
@@ -335,53 +336,11 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record) goto fail_alloc; private->record = record; -switch (record->type) { -case PSTORE_TYPE_DMESG : -scnprintf (name,sizeof (name),"dmesg-%s-%llu%s" , - record->psi->name, record->id, - record->compressed ?".enc.z" :"" ); -break ; -case PSTORE_TYPE_CONSOLE : -scnprintf (name,sizeof (name),"console-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_FTRACE : -scnprintf (name,sizeof (name),"ftrace-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_MCE : -scnprintf (name,sizeof (name),"mce-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_PPC_RTAS : -scnprintf (name,sizeof (name),"rtas-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_PPC_OF : -scnprintf (name,sizeof (name),"powerpc-ofw-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_PPC_COMMON : -scnprintf (name,sizeof (name),"powerpc-common-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_PMSG : -scnprintf (name,sizeof (name),"pmsg-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_PPC_OPAL : -scnprintf (name,sizeof (name),"powerpc-opal-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_UNKNOWN : -scnprintf (name,sizeof (name),"unknown-%s-%llu" , - record->psi->name, record->id); -break ; -default : -scnprintf (name,sizeof (name),"type%d-%s-%llu" , - record->type, record->psi->name, record->id); -break ; - } +scnprintf (name,sizeof (name),"%s-%s-%llu%s" , +pstore_type_to_name (record->type), + record->psi->name, record->id, + (record->type ==PSTORE_TYPE_DMESG + && record->compressed) ?".enc.z" :"" ); dentry =d_alloc_name (root, name);if (!dentry)
fs/pstore/ram.c +3 -1
@@ -611,6 +611,7 @@ static int ramoops_init_przs(const char *name, goto fail; } *paddr += zone_sz; + prz_ar[i]->type =pstore_name_to_type (name); } *przs = prz_ar;
@@ -650,6 +651,7 @@ static int ramoops_init_prz(const char *name, } *paddr += sz; + (*prz)->type =pstore_name_to_type (name);return 0 ; }
@@ -785,7 +787,7 @@ static int ramoops_probe(struct platform_device *pdev) dump_mem_sz = cxt->size - cxt->console_size - cxt->ftrace_size - cxt->pmsg_size; - err =ramoops_init_przs ("dump" , dev, cxt, &cxt->dprzs, &paddr, + err =ramoops_init_przs ("dmesg" , dev, cxt, &cxt->dprzs, &paddr, dump_mem_sz, cxt->record_size, &cxt->max_dump_cnt,0 ,0 );if (err)
include/linux/pstore.h +37 -0
@@ -44,9 +44,46 @@ enum pstore_type_id {PSTORE_TYPE_PPC_COMMON =6 ,PSTORE_TYPE_PMSG =7 ,PSTORE_TYPE_PPC_OPAL =8 , +PSTORE_TYPE_MAX =9 , +/* UNKNOWN returned from pstore_name_to_type if no type found */ PSTORE_TYPE_UNKNOWN =255 }; +/* names should be in the same order as the above table */ +static const char __maybe_unused *__pstore_type_names[] = { +"dmesg" , +"mce" , +"console" , +"ftrace" , +"rtas" , +"powerpc-ofw" , +"powerpc-common" , +"pmsg" , +"powerpc-opal" , +"event" , +}; + +static const char *pstore_type_to_name (enum pstore_type_id type) +{ +if (WARN_ON_ONCE (type >=PSTORE_TYPE_MAX )) +return "unknown" ; + +return __pstore_type_names[type]; +} + +static inline enum pstore_type_id pstore_name_to_type (const char *name) +{ +int i; + +for (i =0 ; i <PSTORE_TYPE_MAX ; i++) { +const char *str =pstore_type_to_name (i); +if (!strcmp (str, name)) +return i; + } + +return PSTORE_TYPE_UNKNOWN ; +} +struct pstore_info ;/** * struct pstore_record - details of a pstore record entry
include/linux/pstore_ram.h +2 -0
@@ -22,6 +22,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/list.h> +#include <linux/pstore.h> #include <linux/types.h> /*
@@ -92,6 +93,7 @@ struct persistent_ram_zone {raw_spinlock_t buffer_lock;struct persistent_ram_buffer *buffer; +enum pstore_type_id type;size_t buffer_size;char *par_buffer;
Signature · 1 line
2.19.1.930.g4563a0d9d0-goog
Re: [PATCH RFC v2 1/3] pstore: map pstore types to names
Quoted 5 lines · Joel Fernandes (Google)
In later patches we will need to map types to names, so create a table for that which can also be used and reused in different parts of old and new code. Also use it to save the type in the PRZ which will be useful in later patches.
Quoted 7 lines
Signed-off-by Joel Fernandes (Google) <[email protected]>--- fs/pstore/inode.c | 53 +++++--------------------------------- fs/pstore/ram.c | 4 ++- include/linux/pstore.h | 37 ++++++++++++++++++++++++++ include/linux/pstore_ram.h | 2 ++ 4 files changed, 48 insertions(+), 48 deletions(-)
The original patch had an unused variable warning, below is the updated one. Sorry about that and thanks!
---8<-----------------------
From de981d893c5c09c62c7c6d5fc9fe73cfd99ffa48 Mon Sep 17 00:00:00 2001
From: "Joel Fernandes (Google)" <[email protected]>
Date: Sat, 3 Nov 2018 16:10:12 -0700
Subject: [PATCH RFC v3 1/3] pstore: map pstore types to names
In later patches we will need to map types to names, so create a table for that which can also be used and reused in different parts of old and new code. Also use it to save the type in the PRZ which will be useful in later patches.
--- fs/pstore/inode.c | 52 ++++---------------------------------- fs/pstore/ram.c | 4 ++- include/linux/pstore.h | 37 +++++++++++++++++++++++++++ include/linux/pstore_ram.h | 2 ++ 4 files changed, 47 insertions(+), 48 deletions(-)
fs/pstore/inode.c +5 -47
@@ -335,53 +335,11 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record) goto fail_alloc; private->record = record; -switch (record->type) { -case PSTORE_TYPE_DMESG : -scnprintf (name,sizeof (name),"dmesg-%s-%llu%s" , - record->psi->name, record->id, - record->compressed ?".enc.z" :"" ); -break ; -case PSTORE_TYPE_CONSOLE : -scnprintf (name,sizeof (name),"console-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_FTRACE : -scnprintf (name,sizeof (name),"ftrace-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_MCE : -scnprintf (name,sizeof (name),"mce-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_PPC_RTAS : -scnprintf (name,sizeof (name),"rtas-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_PPC_OF : -scnprintf (name,sizeof (name),"powerpc-ofw-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_PPC_COMMON : -scnprintf (name,sizeof (name),"powerpc-common-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_PMSG : -scnprintf (name,sizeof (name),"pmsg-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_PPC_OPAL : -scnprintf (name,sizeof (name),"powerpc-opal-%s-%llu" , - record->psi->name, record->id); -break ; -case PSTORE_TYPE_UNKNOWN : -scnprintf (name,sizeof (name),"unknown-%s-%llu" , - record->psi->name, record->id); -break ; -default : -scnprintf (name,sizeof (name),"type%d-%s-%llu" , - record->type, record->psi->name, record->id); -break ; - } +scnprintf (name,sizeof (name),"%s-%s-%llu%s" , +pstore_type_to_name (record->type), + record->psi->name, record->id, + (record->type ==PSTORE_TYPE_DMESG + && record->compressed) ?".enc.z" :"" ); dentry =d_alloc_name (root, name);if (!dentry)
fs/pstore/ram.c +3 -1
@@ -611,6 +611,7 @@ static int ramoops_init_przs(const char *name, goto fail; } *paddr += zone_sz; + prz_ar[i]->type =pstore_name_to_type (name); } *przs = prz_ar;
@@ -650,6 +651,7 @@ static int ramoops_init_prz(const char *name, } *paddr += sz; + (*prz)->type =pstore_name_to_type (name);return 0 ; }
@@ -785,7 +787,7 @@ static int ramoops_probe(struct platform_device *pdev) dump_mem_sz = cxt->size - cxt->console_size - cxt->ftrace_size - cxt->pmsg_size; - err =ramoops_init_przs ("dump" , dev, cxt, &cxt->dprzs, &paddr, + err =ramoops_init_przs ("dmesg" , dev, cxt, &cxt->dprzs, &paddr, dump_mem_sz, cxt->record_size, &cxt->max_dump_cnt,0 ,0 );if (err)
include/linux/pstore.h +37 -0
@@ -44,9 +44,46 @@ enum pstore_type_id {PSTORE_TYPE_PPC_COMMON =6 ,PSTORE_TYPE_PMSG =7 ,PSTORE_TYPE_PPC_OPAL =8 , +PSTORE_TYPE_MAX =9 , +/* UNKNOWN returned from pstore_name_to_type if no type found */ PSTORE_TYPE_UNKNOWN =255 }; +/* names should be in the same order as the above table */ +static const char __maybe_unused *__pstore_type_names[] = { +"dmesg" , +"mce" , +"console" , +"ftrace" , +"rtas" , +"powerpc-ofw" , +"powerpc-common" , +"pmsg" , +"powerpc-opal" , +"event" , +}; + +static const char *pstore_type_to_name (enum pstore_type_id type) +{ +if (WARN_ON_ONCE (type >=PSTORE_TYPE_MAX )) +return "unknown" ; + +return __pstore_type_names[type]; +} + +static inline enum pstore_type_id pstore_name_to_type (const char *name) +{ +int i; + +for (i =0 ; i <PSTORE_TYPE_MAX ; i++) { +const char *str =pstore_type_to_name (i); +if (!strcmp (str, name)) +return i; + } + +return PSTORE_TYPE_UNKNOWN ; +} +struct pstore_info ;/** * struct pstore_record - details of a pstore record entry
include/linux/pstore_ram.h +2 -0
@@ -22,6 +22,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/list.h> +#include <linux/pstore.h> #include <linux/types.h> /*
@@ -92,6 +93,7 @@ struct persistent_ram_zone {raw_spinlock_t buffer_lock;struct persistent_ram_buffer *buffer; +enum pstore_type_id type;size_t buffer_size;char *par_buffer;
Signature · 1 line
2.19.1.930.g4563a0d9d0-goog
RFC PATCH v2 2/3 pstore: simplify ramoops_get_next_prz arguments
In reply to Joel Fernandes (Google)(1) remove type argument from ramoops_get_next_prz
Since we store the type of the prz when we initialize it, we no longer need to pass it again in ramoops_get_next_prz since we can just use that to setup the pstore record. So lets remove it from the argument list.
(2) remove max argument from ramoops_get_next_prz
From the code flow, the 'max' checks are already being done on the prz passed to ramoops_get_next_prz. Lets remove it to simplify this function and reduce its arguments.
(3) further reduce ramoops_get_next_prz arguments by passing record
Both the id and type fields of a pstore_record are set by ramoops_get_next_prz. So we can just pass a pointer to the pstore_record instead of passing individual elements. This results in cleaner more readable code and fewer lines.
In addition lets also remove the 'update' argument since we can detect that. Changes are squashed into a single patch to reduce fixup conflicts.
--- fs/pstore/ram.c | 48 ++++++++++++++++++------------------------------ 1 file changed, 18 insertions(+), 30 deletions(-)
fs/pstore/ram.c +18 -30
@@ -124,19 +124,17 @@ static int ramoops_pstore_open(struct pstore_info *psi) }static struct persistent_ram_zone * -ramoops_get_next_prz (struct persistent_ram_zone *przs[],uint *c,uint max, -u64 *id, -enum pstore_type_id *typep,enum pstore_type_id type, -bool update) +ramoops_get_next_prz (struct persistent_ram_zone *przs[],int id, +struct pstore_record *record) {struct persistent_ram_zone *prz; -int i = (*c)++; +bool update = (record->type ==PSTORE_TYPE_DMESG );/* Give up if we never existed or have hit the end. */ -if (!przs || i >= max) +if (!przs)return NULL ; - prz = przs[i]; + prz = przs[id];if (!prz)return NULL ;
@@ -147,8 +145,8 @@ ramoops_get_next_prz(struct persistent_ram_zone *przs[], uint *c, uint max,if (!persistent_ram_old_size (prz))return NULL ; - *typep = type; - *id = i; + record->type = prz->type; + record->id = id;return prz; }
@@ -255,10 +253,8 @@ static ssize_t ramoops_pstore_read(struct pstore_record *record)/* Find the next valid persistent_ram_zone for DMESG */ while (cxt->dump_read_cnt < cxt->max_dump_cnt && !prz) { - prz =ramoops_get_next_prz (cxt->dprzs, &cxt->dump_read_cnt, - cxt->max_dump_cnt, &record->id, - &record->type, -PSTORE_TYPE_DMESG ,1 ); + prz =ramoops_get_next_prz (cxt->dprzs, cxt->dump_read_cnt++, + record);if (!prz_ok (prz))continue ; header_length = ramoops_read_kmsg_hdr(persistent_ram_old(prz),
@@ -272,22 +268,18 @@ static ssize_t ramoops_pstore_read(struct pstore_record *record) } } -if (!prz_ok (prz)) - prz =ramoops_get_next_prz (&cxt->cprz, &cxt->console_read_cnt, -1 , &record->id, &record->type, -PSTORE_TYPE_CONSOLE ,0 ); +if (!prz_ok (prz) && !cxt->console_read_cnt++) + prz =ramoops_get_next_prz (&cxt->cprz,0 /* single */ , record); -if (!prz_ok (prz)) - prz =ramoops_get_next_prz (&cxt->mprz, &cxt->pmsg_read_cnt, -1 , &record->id, &record->type, -PSTORE_TYPE_PMSG ,0 ); +if (!prz_ok (prz) && !cxt->pmsg_read_cnt++) + prz =ramoops_get_next_prz (&cxt->mprz,0 /* single */ , record);/* ftrace is last since it may want to dynamically allocate memory. */ if (!prz_ok (prz)) { -if (!(cxt->flags &RAMOOPS_FLAG_FTRACE_PER_CPU )) { - prz =ramoops_get_next_prz (cxt->fprzs, - &cxt->ftrace_read_cnt,1 , &record->id, - &record->type,PSTORE_TYPE_FTRACE ,0 ); +if (!(cxt->flags &RAMOOPS_FLAG_FTRACE_PER_CPU ) && + !cxt->ftrace_read_cnt++) { + prz =ramoops_get_next_prz (cxt->fprzs,0 /* single */ , + record); }else {/* * Build a new dummy record which combines all the
@@ -303,11 +295,7 @@ static ssize_t ramoops_pstore_read(struct pstore_record *record)while (cxt->ftrace_read_cnt < cxt->max_ftrace_cnt) { prz_next =ramoops_get_next_prz (cxt->fprzs, - &cxt->ftrace_read_cnt, - cxt->max_ftrace_cnt, - &record->id, - &record->type, -PSTORE_TYPE_FTRACE ,0 ); + cxt->ftrace_read_cnt++, record);if (!prz_ok (prz_next))continue ;
Signature · 1 line
2.19.1.930.g4563a0d9d0-goog
RFC PATCH v2 3/3 pstore: donot treat empty buffers as valid
In reply to Joel Fernandes (Google)pstore currently calls persistent_ram_save_old even if a buffer is empty. While this appears to work, it is does not seem like the right thing to do and could lead to future bugs so lets avoid that. It also prevent misleading prints in the logs which claim the buffer is valid.
I got something like:
found existing buffer, size 0, start 0
When I was expecting:
no valid data in buffer (sig = ...)
---
Note that if you feel this patch is not necessary, then feel free to drop it. I would say it is harmless and is a good clean up.
fs/pstore/ram_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/pstore/ram_core.c +1 -1
@@ -510,7 +510,7 @@ static int persistent_ram_post_init(struct persistent_ram_zone *prz, u32 sig, sig ^=PERSISTENT_RAM_SIG ; -if (prz->buffer->sig == sig) { +if (prz->buffer->sig == sig &&buffer_size (prz)) {if (buffer_size (prz) > prz->buffer_size ||buffer_start (prz) >buffer_size (prz)) { pr_info("found existing invalid buffer, size %zu, start %zu\n",
Signature · 1 line
2.19.1.930.g4563a0d9d0-goog
Quoted 2 lines · Joel Fernandes (Google)
Here are some simple cleanups and fixes for ramoops in pstore. Let me know what you think, thanks.
I took these and slightly tweaked code locations for the first one. I'll send out the series for review when I'm back from Plumber's.
-Kees
Quoted 16 lines
Joel Fernandes (Google) (3):
pstore: map pstore types to names
pstore: simplifyramoops_get_next_przarguments
pstore: donot treat empty buffers as validfs/pstore/inode.c | 53 +++++--------------------------------- fs/pstore/ram.c | 52 +++++++++++++++---------------------- fs/pstore/ram_core.c | 2 +- include/linux/pstore.h | 37 ++++++++++++++++++++++++++ include/linux/pstore_ram.h | 2 ++ 5 files changed, 67 insertions(+), 79 deletions(-)--
2.19.1.930.g4563a0d9d0-goog
Signature · 1 line
Kees Cook
Quoted 7 lines · Kees Cook
Quoted 2 lines · Joel Fernandes (Google)
Here are some simple cleanups and fixes for ramoops in pstore. Let me know what you think, thanks.
I took these and slightly tweaked code locations for the first one. I'll send out the series for review when I'm back from Plumber's.
Cool, thanks!
- Joel