Commit 6bdf2fbc authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-5.13-2021-05-13' of git://git.infradead.org/nvme into block-5.13 

Pull NVMe fixes from Christoph:

"nvme fix for Linux 5.13

 - correct the check for using the inline bio in nvmet
   (Chaitanya Kulkarni)
 - demote unsupported command warnings (Chaitanya Kulkarni)
 - fix corruption due to double initializing ANA state (me, Hou Pu)
 - reset ns->file when open fails (Daniel Wagner)
 - fix a NULL deref when SEND is completed with error in nvmet-rdma
   (Michal Kalderon)"

* tag 'nvme-5.13-2021-05-13' of git://git.infradead.org/nvme:
  nvmet: use new ana_log_size instead the old one
  nvmet: seset ns->file when open fails
  nvmet: demote fabrics cmd parse err msg to debug
  nvmet: use helper to remove the duplicate code
  nvmet: demote discovery cmd parse err msg to debug
  nvmet-rdma: Fix NULL deref when SEND is completed with error
  nvmet: fix inline bio check for passthru
  nvmet: fix inline bio check for bdev-ns
  nvme-multipath: fix double initialization of ANA state
parents bedf78c4 e181811b

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -2901,7 +2901,7 @@ static int nvme_init_identify(struct nvme_ctrl *ctrl) 
		ctrl->hmmaxd = le16_to_cpu(id->hmmaxd);

	}



	ret = nvme_mpath_init(ctrl, id);

	ret = nvme_mpath_init_identify(ctrl, id);

	if (ret < 0)

		goto out_free;
@@ -4364,6 +4364,7 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, 
		min(default_ps_max_latency_us, (unsigned long)S32_MAX));



	nvme_fault_inject_init(&ctrl->fault_inject, dev_name(ctrl->device));

	nvme_mpath_init_ctrl(ctrl);



	return 0;

out_free_name:

drivers/nvme/host/multipath.c

+29 −26
Original line number Diff line number Diff line
@@ -781,9 +781,18 @@ void nvme_mpath_remove_disk(struct nvme_ns_head *head) 
	put_disk(head->disk);

}



int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)

void nvme_mpath_init_ctrl(struct nvme_ctrl *ctrl)

{

	int error;

	mutex_init(&ctrl->ana_lock);

	timer_setup(&ctrl->anatt_timer, nvme_anatt_timeout, 0);

	INIT_WORK(&ctrl->ana_work, nvme_ana_work);

}



int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)

{

	size_t max_transfer_size = ctrl->max_hw_sectors << SECTOR_SHIFT;

	size_t ana_log_size;

	int error = 0;



	/* check if multipath is enabled and we have the capability */

	if (!multipath || !ctrl->subsys ||
@@ -795,37 +804,31 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) 
	ctrl->nanagrpid = le32_to_cpu(id->nanagrpid);

	ctrl->anagrpmax = le32_to_cpu(id->anagrpmax);



	mutex_init(&ctrl->ana_lock);

	timer_setup(&ctrl->anatt_timer, nvme_anatt_timeout, 0);

	ctrl->ana_log_size = sizeof(struct nvme_ana_rsp_hdr) +

		ctrl->nanagrpid * sizeof(struct nvme_ana_group_desc);

	ctrl->ana_log_size += ctrl->max_namespaces * sizeof(__le32);



	if (ctrl->ana_log_size > ctrl->max_hw_sectors << SECTOR_SHIFT) {

	ana_log_size = sizeof(struct nvme_ana_rsp_hdr) +

		ctrl->nanagrpid * sizeof(struct nvme_ana_group_desc) +

		ctrl->max_namespaces * sizeof(__le32);

	if (ana_log_size > max_transfer_size) {

		dev_err(ctrl->device,

			"ANA log page size (%zd) larger than MDTS (%d).\n",

			ctrl->ana_log_size,

			ctrl->max_hw_sectors << SECTOR_SHIFT);

			"ANA log page size (%zd) larger than MDTS (%zd).\n",

			ana_log_size, max_transfer_size);

		dev_err(ctrl->device, "disabling ANA support.\n");

		return 0;

		goto out_uninit;

	}



	INIT_WORK(&ctrl->ana_work, nvme_ana_work);

	if (ana_log_size > ctrl->ana_log_size) {

		nvme_mpath_stop(ctrl);

		kfree(ctrl->ana_log_buf);

	ctrl->ana_log_buf = kmalloc(ctrl->ana_log_size, GFP_KERNEL);

	if (!ctrl->ana_log_buf) {

		error = -ENOMEM;

		goto out;

		ctrl->ana_log_buf = kmalloc(ana_log_size, GFP_KERNEL);

		if (!ctrl->ana_log_buf)

			return -ENOMEM;

	}



	ctrl->ana_log_size = ana_log_size;

	error = nvme_read_ana_log(ctrl);

	if (error)

		goto out_free_ana_log_buf;

		goto out_uninit;

	return 0;

out_free_ana_log_buf:

	kfree(ctrl->ana_log_buf);

	ctrl->ana_log_buf = NULL;

out:



out_uninit:

	nvme_mpath_uninit(ctrl);

	return error;

}

drivers/nvme/host/nvme.h

+6 −2
Original line number Diff line number Diff line
@@ -712,7 +712,8 @@ void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); 
int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head);

void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id);

void nvme_mpath_remove_disk(struct nvme_ns_head *head);

int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id);

int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id);

void nvme_mpath_init_ctrl(struct nvme_ctrl *ctrl);

void nvme_mpath_uninit(struct nvme_ctrl *ctrl);

void nvme_mpath_stop(struct nvme_ctrl *ctrl);

bool nvme_mpath_clear_current_path(struct nvme_ns *ns);
@@ -780,7 +781,10 @@ static inline void nvme_mpath_check_last_path(struct nvme_ns *ns) 
static inline void nvme_trace_bio_complete(struct request *req)

{

}

static inline int nvme_mpath_init(struct nvme_ctrl *ctrl,

static inline void nvme_mpath_init_ctrl(struct nvme_ctrl *ctrl)

{

}

static inline int nvme_mpath_init_identify(struct nvme_ctrl *ctrl,

		struct nvme_id_ctrl *id)

{

	if (ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA)

drivers/nvme/target/admin-cmd.c

+2 −5
Original line number Diff line number Diff line
@@ -975,10 +975,7 @@ u16 nvmet_parse_admin_cmd(struct nvmet_req *req) 
	case nvme_admin_keep_alive:

		req->execute = nvmet_execute_keep_alive;

		return 0;

	default:

		return nvmet_report_invalid_opcode(req);

	}



	pr_debug("unhandled cmd %d on qid %d\n", cmd->common.opcode,

	       req->sq->qid);

	req->error_loc = offsetof(struct nvme_common_command, opcode);

	return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;

}

drivers/nvme/target/discovery.c

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ u16 nvmet_parse_discovery_cmd(struct nvmet_req *req) 
		req->execute = nvmet_execute_disc_identify;

		return 0;

	default:

		pr_err("unhandled cmd %d\n", cmd->common.opcode);

		pr_debug("unhandled cmd %d\n", cmd->common.opcode);

		req->error_loc = offsetof(struct nvme_common_command, opcode);

		return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;

	}