Commit ba9dac98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libnvdimm-for-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm 

Pull libnvdimm updates from Ira Weiny:
 "Primarily bug fixes. Dave introduced the usage of cleanup.h a bit late
  in the cycle to help with the new label work required within CXL [1]

  nvdimm:
   - Return -ENOMEM if devm_kcalloc() fails in ndtest_probe()
   - Clean up __nd_ioctl() and remove gotos
   - Remove duplicate linux/slab.h header
   - Introduce guard() for nvdimm_bus_lock
   - Use str_plural() to simplify the code

  ACPI:
   - NFIT: Fix incorrect ndr_desc being reportedin dev_err message"

Link: https://lore.kernel.org/all/20250917134116.1623730-1-s.neeraj@samsung.com/ [1]

* tag 'libnvdimm-for-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  nvdimm: Remove duplicate linux/slab.h header
  nvdimm: ndtest: Return -ENOMEM if devm_kcalloc() fails in ndtest_probe()
  nvdimm: Clean up __nd_ioctl() and remove gotos
  nvdimm: Introduce guard() for nvdimm_bus_lock
  ACPI: NFIT: Fix incorrect ndr_desc being reportedin dev_err message
  nvdimm: Use str_plural() to simplify the code
parents 169c9d06 5c34f2b6

drivers/acpi/nfit/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2637,7 +2637,7 @@ static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc, 
	if (ndr_desc->target_node == NUMA_NO_NODE) {

		ndr_desc->target_node = phys_to_target_node(spa->address);

		dev_info(acpi_desc->dev, "changing target node from %d to %d for nfit region [%pa-%pa]",

			NUMA_NO_NODE, ndr_desc->numa_node, &res.start, &res.end);

			NUMA_NO_NODE, ndr_desc->target_node, &res.start, &res.end);

	}



	/*

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

+24 −48
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/libnvdimm.h>

#include <linux/sched/mm.h>

#include <linux/vmalloc.h>

#include <linux/slab.h>

#include <linux/uaccess.h>

#include <linux/module.h>

#include <linux/blkdev.h>
@@ -13,7 +13,6 @@ 
#include <linux/async.h>

#include <linux/ndctl.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/cpu.h>

#include <linux/fs.h>

#include <linux/io.h>
@@ -64,17 +63,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)
@@ -1031,14 +1028,12 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, 
	unsigned int cmd = _IOC_NR(ioctl_cmd);

	struct device *dev = &nvdimm_bus->dev;

	void __user *p = (void __user *) arg;

	char *out_env = NULL, *in_env = NULL;

	const char *cmd_name, *dimm_name;

	u32 in_len = 0, out_len = 0;

	unsigned int func = cmd;

	unsigned long cmd_mask;

	struct nd_cmd_pkg pkg;

	int rc, i, cmd_rc;

	void *buf = NULL;

	u64 buf_len = 0;



	if (nvdimm) {
@@ -1097,7 +1092,7 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, 
		}



	/* process an input envelope */

	in_env = kzalloc(ND_CMD_MAX_ENVELOPE, GFP_KERNEL);

	char *in_env __free(kfree) = kzalloc(ND_CMD_MAX_ENVELOPE, GFP_KERNEL);

	if (!in_env)

		return -ENOMEM;

	for (i = 0; i < desc->in_num; i++) {
@@ -1107,17 +1102,14 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, 
		if (in_size == UINT_MAX) {

			dev_err(dev, "%s:%s unknown input size cmd: %s field: %d\n",

					__func__, dimm_name, cmd_name, i);

			rc = -ENXIO;

			goto out;

			return -ENXIO;

		}

		if (in_len < ND_CMD_MAX_ENVELOPE)

			copy = min_t(u32, ND_CMD_MAX_ENVELOPE - in_len, in_size);

		else

			copy = 0;

		if (copy && copy_from_user(&in_env[in_len], p + in_len, copy)) {

			rc = -EFAULT;

			goto out;

		}

		if (copy && copy_from_user(&in_env[in_len], p + in_len, copy))

			return -EFAULT;

		in_len += in_size;

	}
@@ -1129,11 +1121,9 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, 
	}



	/* process an output envelope */

	out_env = kzalloc(ND_CMD_MAX_ENVELOPE, GFP_KERNEL);

	if (!out_env) {

		rc = -ENOMEM;

		goto out;

	}

	char *out_env __free(kfree) = kzalloc(ND_CMD_MAX_ENVELOPE, GFP_KERNEL);

	if (!out_env)

		return -ENOMEM;



	for (i = 0; i < desc->out_num; i++) {

		u32 out_size = nd_cmd_out_size(nvdimm, cmd, desc, i,
@@ -1143,8 +1133,7 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, 
		if (out_size == UINT_MAX) {

			dev_dbg(dev, "%s unknown output size cmd: %s field: %d\n",

					dimm_name, cmd_name, i);

			rc = -EFAULT;

			goto out;

			return -EFAULT;

		}

		if (out_len < ND_CMD_MAX_ENVELOPE)

			copy = min_t(u32, ND_CMD_MAX_ENVELOPE - out_len, out_size);
@@ -1152,8 +1141,7 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, 
			copy = 0;

		if (copy && copy_from_user(&out_env[out_len],

					p + in_len + out_len, copy)) {

			rc = -EFAULT;

			goto out;

			return -EFAULT;

		}

		out_len += out_size;

	}
@@ -1162,30 +1150,25 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, 
	if (buf_len > ND_IOCTL_MAX_BUFLEN) {

		dev_dbg(dev, "%s cmd: %s buf_len: %llu > %d\n", dimm_name,

				cmd_name, buf_len, ND_IOCTL_MAX_BUFLEN);

		rc = -EINVAL;

		goto out;

		return -EINVAL;

	}



	buf = vmalloc(buf_len);

	if (!buf) {

		rc = -ENOMEM;

		goto out;

	}

	void *buf __free(kvfree) = kvzalloc(buf_len, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;



	if (copy_from_user(buf, p, buf_len)) {

		rc = -EFAULT;

		goto out;

	}

	if (copy_from_user(buf, p, buf_len))

		return -EFAULT;



	device_lock(dev);

	nvdimm_bus_lock(dev);

	guard(device)(dev);

	guard(nvdimm_bus)(dev);

	rc = nd_cmd_clear_to_send(nvdimm_bus, nvdimm, func, buf);

	if (rc)

		goto out_unlock;

		return rc;



	rc = nd_desc->ndctl(nd_desc, nvdimm, cmd, buf, buf_len, &cmd_rc);

	if (rc < 0)

		goto out_unlock;

		return rc;



	if (!nvdimm && cmd == ND_CMD_CLEAR_ERROR && cmd_rc >= 0) {

		struct nd_cmd_clear_error *clear_err = buf;
@@ -1195,16 +1178,9 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, 
	}



	if (copy_to_user(p, buf, buf_len))

		rc = -EFAULT;

		return -EFAULT;



out_unlock:

	nvdimm_bus_unlock(dev);

	device_unlock(dev);

out:

	kfree(in_env);

	kfree(out_env);

	vfree(buf);

	return rc;

	return 0;

}



enum nd_ioctl_mode {

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,