Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78e18063 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-4.18' of git://git.infradead.org/nvme into for-linus 

Pull NVMe fixes from Christoph:

"Two small fixes each for the FC code and the target."

* 'nvme-4.18' of git://git.infradead.org/nvme:
  nvmet: only check for filebacking on -ENOTBLK
  nvmet: fixup crash on NULL device path
  nvme: if_ready checks to fail io to deleting controller
  nvmet-fc: fix target sgl list on large transfers
parents 065990bd 405a7519

drivers/nvme/host/fabrics.c

+7 −3
Original line number Diff line number Diff line
@@ -539,14 +539,18 @@ static struct nvmf_transport_ops *nvmf_lookup_transport( 
/*

 * For something we're not in a state to send to the device the default action

 * is to busy it and retry it after the controller state is recovered.  However,

 * anything marked for failfast or nvme multipath is immediately failed.

 * if the controller is deleting or if anything is marked for failfast or

 * nvme multipath it is immediately failed.

 *

 * Note: commands used to initialize the controller will be marked for failfast.

 * Note: nvme cli/ioctl commands are marked for failfast.

 */

blk_status_t nvmf_fail_nonready_command(struct request *rq)

blk_status_t nvmf_fail_nonready_command(struct nvme_ctrl *ctrl,

		struct request *rq)

{

	if (!blk_noretry_request(rq) && !(rq->cmd_flags & REQ_NVME_MPATH))

	if (ctrl->state != NVME_CTRL_DELETING &&

	    ctrl->state != NVME_CTRL_DEAD &&

	    !blk_noretry_request(rq) && !(rq->cmd_flags & REQ_NVME_MPATH))

		return BLK_STS_RESOURCE;

	nvme_req(rq)->status = NVME_SC_ABORT_REQ;

	return BLK_STS_IOERR;

drivers/nvme/host/fabrics.h

+2 −1
Original line number Diff line number Diff line
@@ -162,7 +162,8 @@ void nvmf_unregister_transport(struct nvmf_transport_ops *ops); 
void nvmf_free_options(struct nvmf_ctrl_options *opts);

int nvmf_get_address(struct nvme_ctrl *ctrl, char *buf, int size);

bool nvmf_should_reconnect(struct nvme_ctrl *ctrl);

blk_status_t nvmf_fail_nonready_command(struct request *rq);

blk_status_t nvmf_fail_nonready_command(struct nvme_ctrl *ctrl,

		struct request *rq);

bool __nvmf_check_ready(struct nvme_ctrl *ctrl, struct request *rq,

		bool queue_live);

drivers/nvme/host/fc.c

+1 −1
Original line number Diff line number Diff line
@@ -2272,7 +2272,7 @@ nvme_fc_queue_rq(struct blk_mq_hw_ctx *hctx, 


	if (ctrl->rport->remoteport.port_state != FC_OBJSTATE_ONLINE ||

	    !nvmf_check_ready(&queue->ctrl->ctrl, rq, queue_ready))

		return nvmf_fail_nonready_command(rq);

		return nvmf_fail_nonready_command(&queue->ctrl->ctrl, rq);



	ret = nvme_setup_cmd(ns, rq, sqe);

	if (ret)

drivers/nvme/host/rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -1639,7 +1639,7 @@ static blk_status_t nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx, 
	WARN_ON_ONCE(rq->tag < 0);



	if (!nvmf_check_ready(&queue->ctrl->ctrl, rq, queue_ready))

		return nvmf_fail_nonready_command(rq);

		return nvmf_fail_nonready_command(&queue->ctrl->ctrl, rq);



	dev = queue->device->dev;

	ib_dma_sync_single_for_cpu(dev, sqe->dma,

drivers/nvme/target/configfs.c

+7 −2
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ static ssize_t nvmet_ns_device_path_store(struct config_item *item, 
{

	struct nvmet_ns *ns = to_nvmet_ns(item);

	struct nvmet_subsys *subsys = ns->subsys;

	size_t len;

	int ret;



	mutex_lock(&subsys->lock);
@@ -289,10 +290,14 @@ static ssize_t nvmet_ns_device_path_store(struct config_item *item, 
	if (ns->enabled)

		goto out_unlock;



	kfree(ns->device_path);

	ret = -EINVAL;

	len = strcspn(page, "\n");

	if (!len)

		goto out_unlock;



	kfree(ns->device_path);

	ret = -ENOMEM;

	ns->device_path = kstrndup(page, strcspn(page, "\n"), GFP_KERNEL);

	ns->device_path = kstrndup(page, len, GFP_KERNEL);

	if (!ns->device_path)

		goto out_unlock;