[PATCH] libnvdimm, pfn: not allocate nd_pfn->pfn_sb if already allocated

[Wei Yang]

In current implementation, we might re-allocate nd_pfn->pfn_sb.

For example:

    nd_dax_probe()
        nd_pfn->pfn_sb = devm_kzalloc()

    dax_pmem_probe()
        nvdimm_setup_pfn()
            nd_pfn_init()
                nd_pfn->pfn_sb = devm_kzalloc()

This patch checks nd_pfn->pfn_sb before allocating it in nd_pfn_init().

Signed-off-by: Wei Yang <richardw.y...@linux.intel.com>
---
 drivers/nvdimm/pfn_devs.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c
index 6f22272e8d80..1f4f07007483 100644
--- a/drivers/nvdimm/pfn_devs.c
+++ b/drivers/nvdimm/pfn_devs.c
@@ -687,21 +687,25 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)
        u32 dax_label_reserve = is_nd_dax(&nd_pfn->dev) ? SZ_128K : 0;
        struct nd_namespace_common *ndns = nd_pfn->ndns;
        struct nd_namespace_io *nsio = to_nd_namespace_io(&ndns->dev);
+       struct nd_pfn_sb *pfn_sb = nd_pfn->pfn_sb;
        resource_size_t start, size;
        struct nd_region *nd_region;
        u32 start_pad, end_trunc;
-       struct nd_pfn_sb *pfn_sb;
        unsigned long npfns;
        phys_addr_t offset;
        const char *sig;
        u64 checksum;
        int rc;
 
-       pfn_sb = devm_kzalloc(&nd_pfn->dev, sizeof(*pfn_sb), GFP_KERNEL);
-       if (!pfn_sb)
-               return -ENOMEM;
+       if (!pfn_sb) {
+               pfn_sb = devm_kzalloc(&nd_pfn->dev,
+                                     sizeof(*pfn_sb), GFP_KERNEL);
+               if (!pfn_sb)
+                       return -ENOMEM;
+
+               nd_pfn->pfn_sb = pfn_sb;
+       }
 
-       nd_pfn->pfn_sb = pfn_sb;
        if (is_nd_dax(&nd_pfn->dev))
                sig = DAX_SIG;
        else
-- 
2.19.1

_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm