Commit 5f63a493 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-6.8-2023-02-08' of git://git.infradead.org/nvme into block-6.8 

Pull NVMe fixes from Keith:

"nvme fixes for Linux 6.8

 - Update a potentially stale firmware attribute (Maurizio)
 - Fixes for the recent verbose error logging (Keith, Chaitanya)
 - Protection information payload size fix for passthrough (Francis)"

* tag 'nvme-6.8-2023-02-08' of git://git.infradead.org/nvme:
  nvme: use ns->head->pi_size instead of t10_pi_tuple structure size
  nvme-core: fix comment to reflect right functions
  nvme: move passthrough logging attribute to head
  nvme-host: fix the updating of the firmware version
parents 4ce6e2db 40547052

drivers/nvme/host/core.c

+8 −6
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ void nvme_init_request(struct request *req, struct nvme_command *cmd) 
	if (req->q->queuedata) {

		struct nvme_ns *ns = req->q->disk->private_data;



		logging_enabled = ns->passthru_err_log_enabled;

		logging_enabled = ns->head->passthru_err_log_enabled;

		req->timeout = NVME_IO_TIMEOUT;

	} else { /* no queuedata implies admin queue */

		logging_enabled = nr->ctrl->passthru_err_log_enabled;
@@ -3696,7 +3696,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, struct nvme_ns_info *info) 


	ns->disk = disk;

	ns->queue = disk->queue;

	ns->passthru_err_log_enabled = false;



	if (ctrl->opts && ctrl->opts->data_digest)

		blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, ns->queue);
@@ -3762,8 +3761,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, struct nvme_ns_info *info) 


	/*

	 * Set ns->disk->device->driver_data to ns so we can access

	 * ns->logging_enabled in nvme_passthru_err_log_enabled_store() and

	 * nvme_passthru_err_log_enabled_show().

	 * ns->head->passthru_err_log_enabled in

	 * nvme_io_passthru_err_log_enabled_[store | show]().

	 */

	dev_set_drvdata(disk_to_dev(ns->disk), ns);
@@ -4191,6 +4190,7 @@ static bool nvme_ctrl_pp_status(struct nvme_ctrl *ctrl) 
static void nvme_get_fw_slot_info(struct nvme_ctrl *ctrl)

{

	struct nvme_fw_slot_info_log *log;

	u8 next_fw_slot, cur_fw_slot;



	log = kmalloc(sizeof(*log), GFP_KERNEL);

	if (!log)
@@ -4202,13 +4202,15 @@ static void nvme_get_fw_slot_info(struct nvme_ctrl *ctrl) 
		goto out_free_log;

	}



	if (log->afi & 0x70 || !(log->afi & 0x7)) {

	cur_fw_slot = log->afi & 0x7;

	next_fw_slot = (log->afi & 0x70) >> 4;

	if (!cur_fw_slot || (next_fw_slot && (cur_fw_slot != next_fw_slot))) {

		dev_info(ctrl->device,

			 "Firmware is activated after next Controller Level Reset\n");

		goto out_free_log;

	}



	memcpy(ctrl->subsys->firmware_rev, &log->frs[(log->afi & 0x7) - 1],

	memcpy(ctrl->subsys->firmware_rev, &log->frs[cur_fw_slot - 1],

		sizeof(ctrl->subsys->firmware_rev));



out_free_log:

drivers/nvme/host/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) 
	length = (io.nblocks + 1) << ns->head->lba_shift;



	if ((io.control & NVME_RW_PRINFO_PRACT) &&

	    ns->head->ms == sizeof(struct t10_pi_tuple)) {

	    (ns->head->ms == ns->head->pi_size)) {

		/*

		 * Protection information is stripped/inserted by the

		 * controller.

drivers/nvme/host/nvme.h

+1 −1
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ struct nvme_ns_head { 
	struct list_head	entry;

	struct kref		ref;

	bool			shared;

	bool			passthru_err_log_enabled;

	int			instance;

	struct nvme_effects_log *effects;

	u64			nuse;
@@ -523,7 +524,6 @@ struct nvme_ns { 
	struct device		cdev_device;



	struct nvme_fault_inject fault_inject;

	bool			passthru_err_log_enabled;

};



/* NVMe ns supports metadata actions by the controller (generate/strip) */

drivers/nvme/host/sysfs.c

+15 −15
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ static ssize_t nvme_adm_passthru_err_log_enabled_store(struct device *dev, 
		struct device_attribute *attr, const char *buf, size_t count)

{

	struct nvme_ctrl *ctrl = dev_get_drvdata(dev);

	int err;

	bool passthru_err_log_enabled;

	int err;



	err = kstrtobool(buf, &passthru_err_log_enabled);

	if (err)
@@ -60,25 +60,34 @@ static ssize_t nvme_adm_passthru_err_log_enabled_store(struct device *dev, 
	return count;

}



static inline struct nvme_ns_head *dev_to_ns_head(struct device *dev)

{

	struct gendisk *disk = dev_to_disk(dev);



	if (nvme_disk_is_ns_head(disk))

		return disk->private_data;

	return nvme_get_ns_from_dev(dev)->head;

}



static ssize_t nvme_io_passthru_err_log_enabled_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct nvme_ns *n = dev_get_drvdata(dev);

	struct nvme_ns_head *head = dev_to_ns_head(dev);



	return sysfs_emit(buf, n->passthru_err_log_enabled ? "on\n" : "off\n");

	return sysfs_emit(buf, head->passthru_err_log_enabled ? "on\n" : "off\n");

}



static ssize_t nvme_io_passthru_err_log_enabled_store(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t count)

{

	struct nvme_ns *ns = dev_get_drvdata(dev);

	int err;

	struct nvme_ns_head *head = dev_to_ns_head(dev);

	bool passthru_err_log_enabled;

	int err;



	err = kstrtobool(buf, &passthru_err_log_enabled);

	if (err)

		return -EINVAL;

	ns->passthru_err_log_enabled = passthru_err_log_enabled;

	head->passthru_err_log_enabled = passthru_err_log_enabled;



	return count;

}
@@ -91,15 +100,6 @@ static struct device_attribute dev_attr_io_passthru_err_log_enabled = \ 
	__ATTR(passthru_err_log_enabled, S_IRUGO | S_IWUSR, \

	nvme_io_passthru_err_log_enabled_show, nvme_io_passthru_err_log_enabled_store);



static inline struct nvme_ns_head *dev_to_ns_head(struct device *dev)

{

	struct gendisk *disk = dev_to_disk(dev);



	if (nvme_disk_is_ns_head(disk))

		return disk->private_data;

	return nvme_get_ns_from_dev(dev)->head;

}



static ssize_t wwid_show(struct device *dev, struct device_attribute *attr,

		char *buf)

{