Commit 0020839b authored by Dave Jiang's avatar Dave Jiang Committed by Ira Weiny
Browse files

nvdimm: Introduce guard() for nvdimm_bus_lock 

Converting nvdimm_bus_lock/unlock to guard() to clean up usage
of gotos for error handling and avoid future mistakes of missed
unlock on error paths.

Link: https://lore.kernel.org/linux-cxl/20250917163623.00004a3c@huawei.com/


Suggested-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
parent d1a599a8

drivers/nvdimm/badrange.c

+1 −2
Original line number Diff line number Diff line
@@ -278,8 +278,7 @@ void nvdimm_badblocks_populate(struct nd_region *nd_region, 
	}

	nvdimm_bus = walk_to_nvdimm_bus(&nd_region->dev);



	nvdimm_bus_lock(&nvdimm_bus->dev);

	guard(nvdimm_bus)(&nvdimm_bus->dev);

	badblocks_populate(&nvdimm_bus->badrange, bb, range);

	nvdimm_bus_unlock(&nvdimm_bus->dev);

}

EXPORT_SYMBOL_GPL(nvdimm_badblocks_populate);

drivers/nvdimm/btt_devs.c

+8 −16
Original line number Diff line number Diff line
@@ -50,14 +50,12 @@ static ssize_t sector_size_store(struct device *dev, 
	struct nd_btt *nd_btt = to_nd_btt(dev);

	ssize_t rc;



	device_lock(dev);

	nvdimm_bus_lock(dev);

	guard(device)(dev);

	guard(nvdimm_bus)(dev);

	rc = nd_size_select_store(dev, buf, &nd_btt->lbasize,

			btt_lbasize_supported);

	dev_dbg(dev, "result: %zd wrote: %s%s", rc, buf,

			buf[len - 1] == '\n' ? "" : "\n");

	nvdimm_bus_unlock(dev);

	device_unlock(dev);



	return rc ? rc : len;

}
@@ -93,13 +91,10 @@ static ssize_t namespace_show(struct device *dev, 
		struct device_attribute *attr, char *buf)

{

	struct nd_btt *nd_btt = to_nd_btt(dev);

	ssize_t rc;



	nvdimm_bus_lock(dev);

	rc = sprintf(buf, "%s\n", nd_btt->ndns

	guard(nvdimm_bus)(dev);

	return sprintf(buf, "%s\n", nd_btt->ndns

			? dev_name(&nd_btt->ndns->dev) : "");

	nvdimm_bus_unlock(dev);

	return rc;

}



static ssize_t namespace_store(struct device *dev,
@@ -108,13 +103,11 @@ static ssize_t namespace_store(struct device *dev, 
	struct nd_btt *nd_btt = to_nd_btt(dev);

	ssize_t rc;



	device_lock(dev);

	nvdimm_bus_lock(dev);

	guard(device)(dev);

	guard(nvdimm_bus)(dev);

	rc = nd_namespace_store(dev, &nd_btt->ndns, buf, len);

	dev_dbg(dev, "result: %zd wrote: %s%s", rc, buf,

			buf[len - 1] == '\n' ? "" : "\n");

	nvdimm_bus_unlock(dev);

	device_unlock(dev);



	return rc;

}
@@ -351,9 +344,8 @@ int nd_btt_probe(struct device *dev, struct nd_namespace_common *ndns) 
		return -ENODEV;

	}



	nvdimm_bus_lock(&ndns->dev);

	scoped_guard(nvdimm_bus, &ndns->dev)

		btt_dev = __nd_btt_create(nd_region, 0, NULL, ndns);

	nvdimm_bus_unlock(&ndns->dev);

	if (!btt_dev)

		return -ENOMEM;

	btt_sb = devm_kzalloc(dev, sizeof(*btt_sb), GFP_KERNEL);

drivers/nvdimm/bus.c

+2 −4
Original line number Diff line number Diff line
@@ -64,17 +64,15 @@ static struct module *to_bus_provider(struct device *dev) 


static void nvdimm_bus_probe_start(struct nvdimm_bus *nvdimm_bus)

{

	nvdimm_bus_lock(&nvdimm_bus->dev);

	guard(nvdimm_bus)(&nvdimm_bus->dev);

	nvdimm_bus->probe_active++;

	nvdimm_bus_unlock(&nvdimm_bus->dev);

}



static void nvdimm_bus_probe_end(struct nvdimm_bus *nvdimm_bus)

{

	nvdimm_bus_lock(&nvdimm_bus->dev);

	guard(nvdimm_bus)(&nvdimm_bus->dev);

	if (--nvdimm_bus->probe_active == 0)

		wake_up(&nvdimm_bus->wait);

	nvdimm_bus_unlock(&nvdimm_bus->dev);

}



static int nvdimm_bus_probe(struct device *dev)

drivers/nvdimm/claim.c

+3 −4
Original line number Diff line number Diff line
@@ -34,11 +34,10 @@ void nd_detach_ndns(struct device *dev, 


	if (!ndns)

		return;

	get_device(&ndns->dev);

	nvdimm_bus_lock(&ndns->dev);



	struct device *ndev __free(put_device) = get_device(&ndns->dev);

	guard(nvdimm_bus)(ndev);

	__nd_detach_ndns(dev, _ndns);

	nvdimm_bus_unlock(&ndns->dev);

	put_device(&ndns->dev);

}



bool __nd_attach_ndns(struct device *dev, struct nd_namespace_common *attach,

drivers/nvdimm/core.c

+8 −9
Original line number Diff line number Diff line
@@ -141,9 +141,8 @@ static void nvdimm_map_put(void *data) 
	struct nvdimm_map *nvdimm_map = data;

	struct nvdimm_bus *nvdimm_bus = nvdimm_map->nvdimm_bus;



	nvdimm_bus_lock(&nvdimm_bus->dev);

	guard(nvdimm_bus)(&nvdimm_bus->dev);

	kref_put(&nvdimm_map->kref, nvdimm_map_release);

	nvdimm_bus_unlock(&nvdimm_bus->dev);

}



/**
@@ -158,13 +157,13 @@ void *devm_nvdimm_memremap(struct device *dev, resource_size_t offset, 
{

	struct nvdimm_map *nvdimm_map;



	nvdimm_bus_lock(dev);

	scoped_guard(nvdimm_bus, dev) {

		nvdimm_map = find_nvdimm_map(dev, offset);

		if (!nvdimm_map)

			nvdimm_map = alloc_nvdimm_map(dev, offset, size, flags);

		else

			kref_get(&nvdimm_map->kref);

	nvdimm_bus_unlock(dev);

	}



	if (!nvdimm_map)

		return NULL;