pstore: Avoid duplicate call of persistent_ram_zap()
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 58 lines · On Sat, Oct 27, 2018 at 2:08 PM, Peng15 Wang 王鹏 <[email protected]> wrote:
When initialing prz with invalid data in
buffer(no PERSISTENT_RAM_SIG), function call path is like this:
ramoops_init_prz->| |-> persistent_ram_new -> persistent_ram_post_init -> persistent_ram_zap | |-> persistent_ram_zapAs we can see,
persistent_ram_zap()is called twice.
We can avoid this by adding an option topersistent_ram_new(), and only callpersistent_ram_zap()when it is needed.Signed-off-by Peng Wang <[email protected]>--- fs/pstore/ram.c | 5 +++-- fs/pstore/ram_core.c | 11 +++++++---- include/linux/pstore_ram.h | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-)fs/pstore/ram.c +3
-2@@ -596,7 +596,8 @@ static int ramoops_init_przs(const char *name, name, i, *cnt - 1); prz_ar[i] =persistent_ram_new (*paddr, zone_sz, sig, &cxt->ecc_info, - cxt->memtype, flags, label); + cxt->memtype, flags, + label, true);if (IS_ERR (prz_ar[i])) { err =PTR_ERR (prz_ar[i]); dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n",@@ -640,7 +641,7 @@ static int ramoops_init_prz(const char *name, label =kasprintf (GFP_KERNEL ,"ramoops:%s" , name); *prz =persistent_ram_new (*paddr, sz, sig, &cxt->ecc_info, - cxt->memtype,0 , label); + cxt->memtype,0 , label, false);if (IS_ERR (*prz)) {int err =PTR_ERR (*prz);fs/pstore/ram_core.c +2
-1@@ -486,7 +486,8 @@ static int persistent_ram_buffer_map(phys_addr_t start, phys_addr_t size, }static int persistent_ram_post_init (struct persistent_ram_zone *prz,u32 sig, -struct persistent_ram_ecc_info *ecc_info) +struct persistent_ram_ecc_info *ecc_info, +bool zap_option) {int ret;
fs/pstore/ram_core.c static int persistent_ram_post_init(struct persistent_ram_zone *prz, u32 sig, · line 519
Quoted 6 lines
fs/pstore/ram_core.c +2
-1@@ -514,7 +515,8 @@ static int persistent_ram_post_init(struct persistent_ram_zone *prz, u32 sig,/* Rewind missing or invalid memory area. */ prz->buffer->sig = sig; -persistent_ram_zap (prz); +if (zap_option) +persistent_ram_zap (prz);
This part of persistent_ram_post_init() handles the "invalid buffer" case, which should always zap. The question is whether or not to zap in the case of a valid buffer (the "return 0" earlier in the function). I think you v2 patch needs similar changes found in your
v1: the v2 patch also needs to remove the "return 0" and replace it with "zap_option = true;" and to remove the zap call from ramoops_init_prz(). Then I think all the paths will be consolidated.
-Kees
Quoted 38 lines
fs/pstore/ram_core.c +3
-2return 0 ; }@@ -548,7 +550,8 @@ void persistent_ram_free(struct persistent_ram_zone *prz)struct persistent_ram_zone *persistent_ram_new (phys_addr_t start,size_t size,u32 sig,struct persistent_ram_ecc_info *ecc_info, -unsigned int memtype,u32 flags,char *label) +unsigned int memtype,u32 flags,char *label, +bool zap_option) {struct persistent_ram_zone *prz;int ret = -ENOMEM ;@@ -568,7 +571,7 @@ struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size,if (ret) goto err; - ret =persistent_ram_post_init (prz, sig, ecc_info); + ret =persistent_ram_post_init (prz, sig, ecc_info, zap_option);if (ret) goto err;include/linux/pstore_ram.h +2
-2@@ -66,7 +66,8 @@ struct persistent_ram_zone {struct persistent_ram_zone *persistent_ram_new (phys_addr_t start,size_t size,u32 sig,struct persistent_ram_ecc_info *ecc_info, -unsigned int memtype,u32 flags,char *label); +unsigned int memtype,u32 flags,char *label, +bool zap_option);void persistent_ram_free (struct persistent_ram_zone *prz);void persistent_ram_zap (struct persistent_ram_zone *prz); --2.19.1
Signature · 1 line
Kees Cook
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 82 lines · On Mon, Oct 29, 2018 at 06:37:53AM +0000, Peng15 Wang 王鹏 wrote:
________________________________________
Quoted 66 lines
From: Kees Cook <[email protected]>
Sent: Monday, October 29, 2018 0:03
To: Peng15 Wang 王鹏
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Joel Fernandes
Subject: Re: [PATCH v2] pstore: Avoid duplicate call ofpersistent_ram_zap()Quoted 59 lines · On Sat, Oct 27, 2018 at 2:08 PM, Peng15 Wang 王鹏 <[email protected]> wrote:
When initialing prz with invalid data in
buffer(no PERSISTENT_RAM_SIG), function call path is like this:
ramoops_init_prz->| |-> persistent_ram_new -> persistent_ram_post_init -> persistent_ram_zap | |-> persistent_ram_zapAs we can see,
persistent_ram_zap()is called twice.
We can avoid this by adding an option topersistent_ram_new(), and only callpersistent_ram_zap()when it is needed.Signed-off-by Peng Wang <[email protected]>--- fs/pstore/ram.c | 5 +++-- fs/pstore/ram_core.c | 11 +++++++---- include/linux/pstore_ram.h | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-)fs/pstore/ram.c +3
-2@@ -596,7 +596,8 @@ static int ramoops_init_przs(const char *name, name, i, *cnt - 1); prz_ar[i] =persistent_ram_new (*paddr, zone_sz, sig, &cxt->ecc_info, - cxt->memtype, flags, label); + cxt->memtype, flags, + label, true);if (IS_ERR (prz_ar[i])) { err =PTR_ERR (prz_ar[i]); dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n",@@ -640,7 +641,7 @@ static int ramoops_init_prz(const char *name, label =kasprintf (GFP_KERNEL ,"ramoops:%s" , name); *prz =persistent_ram_new (*paddr, sz, sig, &cxt->ecc_info, - cxt->memtype,0 , label); + cxt->memtype,0 , label, false);if (IS_ERR (*prz)) {int err =PTR_ERR (*prz);fs/pstore/ram_core.c +2
-1@@ -486,7 +486,8 @@ static int persistent_ram_buffer_map(phys_addr_t start, phys_addr_t size, }static int persistent_ram_post_init (struct persistent_ram_zone *prz,u32 sig, -struct persistent_ram_ecc_info *ecc_info) +struct persistent_ram_ecc_info *ecc_info, +bool zap_option) {int ret;@@ -514,7 +515,8 @@ static int persistent_ram_post_init(struct persistent_ram_zone *prz, u32 >sig,Quoted 13 lines
fs/pstore/ram_core.c static int persistent_ram_post_init(struct persistent_ram_zone *prz, u32 >sig, · line 519
Quoted 5 lines
fs/pstore/ram_core.c +2
-1/* Rewind missing or invalid memory area. */ prz->buffer->sig = sig; -persistent_ram_zap (prz); +if (zap_option) +persistent_ram_zap (prz);This part of
persistent_ram_post_init()handles the "invalid buffer" case, which should always zap. The question is whether or not to zap in the case of a valid buffer (the "return 0" earlier in the function). I think you v2 patch needs similar changes found in your
v1: the v2 patch also needs to remove the "return 0" and replace it with "zap_option= true;" and to remove the zap call fromramoops_init_prz(). Then I think all the paths will be consolidated.
Quoted 8 lines
Thank you so much for the tips!
Furthermore, we can make "
zap_option" stand for whether its caller want to zap in case of a valid buffer. Soramoops_init_przs()would say "false", andramoops_init_prz()would say "true".In
persistent_ram_post_init(), ifzap_optionsays "false", we return immediately afterpersistent_ram_save_old(), otherwisepersistent_ram_zapwould be called at the end.
Can you not just add it to the flags, something like PRZ_ZAP_NEW, and set that flag before calling ramoops_init_prz*, then check the flag in persistent_ram_new? We are already passing flags to persistent_ram_new.
That way no new function arguments are needed and its simple.
- Joel