korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 00:04:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

libnvdimm, pfn, convert nd_pfn_probe() to devm

Browse Source 
Pass the device performing the probe so we can use a devm allocation for
the pfn superblock.

Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2016-03-17 18:16:15 -07:00
parent 298f2bc5db
commit bd032943b5
3 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/nvdimm/nd.h
View File

@ -219,12 +219,14 @@ static inline struct device *nd_btt_create(struct nd_region *nd_region)
struct nd_pfn *to_nd_pfn(struct device *dev); struct nd_pfn *to_nd_pfn(struct device *dev);
#if IS_ENABLED(CONFIG_NVDIMM_PFN) #if IS_ENABLED(CONFIG_NVDIMM_PFN)
int nd_pfn_probe(struct nd_namespace_common *ndns, void *drvdata); int nd_pfn_probe(struct device *dev, struct nd_namespace_common *ndns,
void *drvdata);
bool is_nd_pfn(struct device *dev); bool is_nd_pfn(struct device *dev);
struct device *nd_pfn_create(struct nd_region *nd_region); struct device *nd_pfn_create(struct nd_region *nd_region);
int nd_pfn_validate(struct nd_pfn *nd_pfn); int nd_pfn_validate(struct nd_pfn *nd_pfn);
#else #else
static inline int nd_pfn_probe(struct nd_namespace_common *ndns, void *drvdata) static inline int nd_pfn_probe(struct device *dev, struct nd_namespace_common *ndns,
void *drvdata)
{ {
return -ENODEV; return -ENODEV;
} }

27
drivers/nvdimm/pfn_devs.c
View File

@ -410,11 +410,12 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn)
} }
EXPORT_SYMBOL(nd_pfn_validate); EXPORT_SYMBOL(nd_pfn_validate);
int nd_pfn_probe(struct nd_namespace_common *ndns, void *drvdata) int nd_pfn_probe(struct device *dev, struct nd_namespace_common *ndns,
void *drvdata)
{ {
int rc; int rc;
struct device *dev;
struct nd_pfn *nd_pfn; struct nd_pfn *nd_pfn;
struct device *pfn_dev;
struct nd_pfn_sb *pfn_sb; struct nd_pfn_sb *pfn_sb;
struct nd_region *nd_region = to_nd_region(ndns->dev.parent); struct nd_region *nd_region = to_nd_region(ndns->dev.parent);
@ -422,24 +423,22 @@ int nd_pfn_probe(struct nd_namespace_common *ndns, void *drvdata)
return -ENODEV; return -ENODEV;
nvdimm_bus_lock(&ndns->dev); nvdimm_bus_lock(&ndns->dev);
dev = __nd_pfn_create(nd_region, ndns); pfn_dev = __nd_pfn_create(nd_region, ndns);
nvdimm_bus_unlock(&ndns->dev); nvdimm_bus_unlock(&ndns->dev);
if (!dev) if (!pfn_dev)
return -ENOMEM; return -ENOMEM;
dev_set_drvdata(dev, drvdata); dev_set_drvdata(pfn_dev, drvdata);
pfn_sb = kzalloc(sizeof(*pfn_sb), GFP_KERNEL); pfn_sb = devm_kzalloc(dev, sizeof(*pfn_sb), GFP_KERNEL);
nd_pfn = to_nd_pfn(dev); nd_pfn = to_nd_pfn(pfn_dev);
nd_pfn->pfn_sb = pfn_sb; nd_pfn->pfn_sb = pfn_sb;
rc = nd_pfn_validate(nd_pfn); rc = nd_pfn_validate(nd_pfn);
nd_pfn->pfn_sb = NULL; dev_dbg(dev, "%s: pfn: %s\n", __func__,
kfree(pfn_sb); rc == 0 ? dev_name(pfn_dev) : "<none>");
dev_dbg(&ndns->dev, "%s: pfn: %s\n", __func__,
rc == 0 ? dev_name(dev) : "<none>");
if (rc < 0) { if (rc < 0) {
__nd_detach_ndns(dev, &nd_pfn->ndns); __nd_detach_ndns(pfn_dev, &nd_pfn->ndns);
put_device(dev); put_device(pfn_dev);
} else } else
__nd_device_register(&nd_pfn->dev); __nd_device_register(pfn_dev);
return rc; return rc;
} }

30
drivers/nvdimm/pmem.c
View File

@ -330,18 +330,19 @@ static int pmem_rw_bytes(struct nd_namespace_common *ndns,
static int nd_pfn_init(struct nd_pfn *nd_pfn) static int nd_pfn_init(struct nd_pfn *nd_pfn)
{ {
struct nd_pfn_sb *pfn_sb = kzalloc(sizeof(*pfn_sb), GFP_KERNEL);
struct pmem_device *pmem = dev_get_drvdata(&nd_pfn->dev); struct pmem_device *pmem = dev_get_drvdata(&nd_pfn->dev);
struct nd_namespace_common *ndns = nd_pfn->ndns; struct nd_namespace_common *ndns = nd_pfn->ndns;
u32 start_pad = 0, end_trunc = 0; u32 start_pad = 0, end_trunc = 0;
resource_size_t start, size; resource_size_t start, size;
struct nd_namespace_io *nsio; struct nd_namespace_io *nsio;
struct nd_region *nd_region; struct nd_region *nd_region;
struct nd_pfn_sb *pfn_sb;
unsigned long npfns; unsigned long npfns;
phys_addr_t offset; phys_addr_t offset;
u64 checksum; u64 checksum;
int rc; int rc;
pfn_sb = devm_kzalloc(&nd_pfn->dev, sizeof(*pfn_sb), GFP_KERNEL);
if (!pfn_sb) if (!pfn_sb)
return -ENOMEM; return -ENOMEM;
@ -357,7 +358,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)
dev_info(&nd_pfn->dev, dev_info(&nd_pfn->dev,
"%s is read-only, unable to init metadata\n", "%s is read-only, unable to init metadata\n",
dev_name(&nd_region->dev)); dev_name(&nd_region->dev));
goto err; return -ENXIO;
} }
memset(pfn_sb, 0, sizeof(*pfn_sb)); memset(pfn_sb, 0, sizeof(*pfn_sb));
@ -402,12 +403,12 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)
else if (nd_pfn->mode == PFN_MODE_RAM) else if (nd_pfn->mode == PFN_MODE_RAM)
offset = ALIGN(start + SZ_8K, nd_pfn->align) - start; offset = ALIGN(start + SZ_8K, nd_pfn->align) - start;
else else
goto err; return -ENXIO;
if (offset + start_pad + end_trunc >= pmem->size) { if (offset + start_pad + end_trunc >= pmem->size) {
dev_err(&nd_pfn->dev, "%s unable to satisfy requested alignment\n", dev_err(&nd_pfn->dev, "%s unable to satisfy requested alignment\n",
dev_name(&ndns->dev)); dev_name(&ndns->dev));
goto err; return -ENXIO;
} }
npfns = (pmem->size - offset - start_pad - end_trunc) / SZ_4K; npfns = (pmem->size - offset - start_pad - end_trunc) / SZ_4K;
@ -424,30 +425,16 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)
checksum = nd_sb_checksum((struct nd_gen_sb *) pfn_sb); checksum = nd_sb_checksum((struct nd_gen_sb *) pfn_sb);
pfn_sb->checksum = cpu_to_le64(checksum); pfn_sb->checksum = cpu_to_le64(checksum);
rc = nvdimm_write_bytes(ndns, SZ_4K, pfn_sb, sizeof(*pfn_sb)); return nvdimm_write_bytes(ndns, SZ_4K, pfn_sb, sizeof(*pfn_sb));
if (rc)
goto err;
return 0;
err:
nd_pfn->pfn_sb = NULL;
kfree(pfn_sb);
return -ENXIO;
} }
static int nvdimm_namespace_detach_pfn(struct nd_pfn *nd_pfn) static void nvdimm_namespace_detach_pfn(struct nd_pfn *nd_pfn)
{ {
struct pmem_device *pmem; struct pmem_device *pmem;
/* free pmem disk */ /* free pmem disk */
pmem = dev_get_drvdata(&nd_pfn->dev); pmem = dev_get_drvdata(&nd_pfn->dev);
pmem_detach_disk(pmem); pmem_detach_disk(pmem);
/* release nd_pfn resources */
kfree(nd_pfn->pfn_sb);
nd_pfn->pfn_sb = NULL;
return 0;
} }
/* /*
@ -587,7 +574,8 @@ static int nd_pmem_probe(struct device *dev)
if (is_nd_pfn(dev)) if (is_nd_pfn(dev))
return nvdimm_namespace_attach_pfn(ndns); return nvdimm_namespace_attach_pfn(ndns);
if (nd_btt_probe(ndns, pmem) == 0 || nd_pfn_probe(ndns, pmem) == 0) { if (nd_btt_probe(ndns, pmem) == 0
|| nd_pfn_probe(dev, ndns, pmem) == 0) {
/* /*
* We'll come back as either btt-pmem, or pfn-pmem, so * We'll come back as either btt-pmem, or pfn-pmem, so
* drop the queue allocation for now. * drop the queue allocation for now.