Commit d4b64fd7 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-5.12-2021-03-12' of git://git.infradead.org/nvme into block-5.12 

Pull NVMe fixes from Christoph:

"nvme fixes for 5.12:

 - one more quirk (Dmitry Monakhov)
 - fix max_zone_append_sectors initialization (Chaitanya Kulkarni)
 - nvme-fc reset/create race fix (James Smart)
 - fix status code on aborts/resets (Hannes Reinecke)
 - fix the CSS check for ZNS namespaces (Chaitanya Kulkarni)
 - fix a use after free in a debug printk in nvme-rdma (Lv Yunlong)"

* tag 'nvme-5.12-2021-03-12' of git://git.infradead.org/nvme:
  nvme-pci: add the DISABLE_WRITE_ZEROES quirk for a Samsung PM1725a
  nvme-rdma: Fix a use after free in nvmet_rdma_write_data_done
  nvme-core: check ctrl css before setting up zns
  nvme-fc: fix racing controller reset and create association
  nvme-fc: return NVME_SC_HOST_ABORTED_CMD when a command has been aborted
  nvme-fc: set NVME_REQ_CANCELLED in nvme_fc_terminate_exchange()
  nvme: add NVME_REQ_CANCELLED flag in nvme_cancel_request()
  nvme: simplify error logic in nvme_validate_ns()
  nvme: set max_zone_append_sectors nvme_revalidate_zones
parents e5113505 abbb5f59

drivers/nvme/host/core.c

+11 −4
Original line number Diff line number Diff line
@@ -380,6 +380,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved) 
		return true;



	nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD;

	nvme_req(req)->flags |= NVME_REQ_CANCELLED;

	blk_mq_complete_request(req);

	return true;

}
@@ -1440,7 +1441,7 @@ static int nvme_identify_ns(struct nvme_ctrl *ctrl, unsigned nsid, 
		goto out_free_id;

	}



	error = -ENODEV;

	error = NVME_SC_INVALID_NS | NVME_SC_DNR;

	if ((*id)->ncap == 0) /* namespace not allocated or attached */

		goto out_free_id;
@@ -4038,7 +4039,7 @@ static void nvme_ns_remove_by_nsid(struct nvme_ctrl *ctrl, u32 nsid) 
static void nvme_validate_ns(struct nvme_ns *ns, struct nvme_ns_ids *ids)

{

	struct nvme_id_ns *id;

	int ret = -ENODEV;

	int ret = NVME_SC_INVALID_NS | NVME_SC_DNR;



	if (test_bit(NVME_NS_DEAD, &ns->flags))

		goto out;
@@ -4047,7 +4048,7 @@ static void nvme_validate_ns(struct nvme_ns *ns, struct nvme_ns_ids *ids) 
	if (ret)

		goto out;



	ret = -ENODEV;

	ret = NVME_SC_INVALID_NS | NVME_SC_DNR;

	if (!nvme_ns_ids_equal(&ns->head->ids, ids)) {

		dev_err(ns->ctrl->device,

			"identifiers changed for nsid %d\n", ns->head->ns_id);
@@ -4065,7 +4066,7 @@ static void nvme_validate_ns(struct nvme_ns *ns, struct nvme_ns_ids *ids) 
	 *

	 * TODO: we should probably schedule a delayed retry here.

	 */

	if (ret && ret != -ENOMEM && !(ret > 0 && !(ret & NVME_SC_DNR)))

	if (ret > 0 && (ret & NVME_SC_DNR))

		nvme_ns_remove(ns);

}
@@ -4095,6 +4096,12 @@ static void nvme_validate_or_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) 
				nsid);

			break;

		}

		if (!nvme_multi_css(ctrl)) {

			dev_warn(ctrl->device,

				"command set not reported for nsid: %d\n",

				ns->head->ns_id);

			break;

		}

		nvme_alloc_ns(ctrl, nsid, &ids);

		break;

	default:

drivers/nvme/host/fc.c

+3 −2
Original line number Diff line number Diff line
@@ -1956,7 +1956,7 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) 
				sizeof(op->rsp_iu), DMA_FROM_DEVICE);



	if (opstate == FCPOP_STATE_ABORTED)

		status = cpu_to_le16(NVME_SC_HOST_PATH_ERROR << 1);

		status = cpu_to_le16(NVME_SC_HOST_ABORTED_CMD << 1);

	else if (freq->status) {

		status = cpu_to_le16(NVME_SC_HOST_PATH_ERROR << 1);

		dev_info(ctrl->ctrl.device,
@@ -2055,7 +2055,7 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) 
		nvme_fc_complete_rq(rq);



check_error:

	if (terminate_assoc)

	if (terminate_assoc && ctrl->ctrl.state != NVME_CTRL_RESETTING)

		queue_work(nvme_reset_wq, &ctrl->ioerr_work);

}
@@ -2443,6 +2443,7 @@ nvme_fc_terminate_exchange(struct request *req, void *data, bool reserved) 
	struct nvme_fc_ctrl *ctrl = to_fc_ctrl(nctrl);

	struct nvme_fc_fcp_op *op = blk_mq_rq_to_pdu(req);



	op->nreq.flags |= NVME_REQ_CANCELLED;

	__nvme_fc_abort_op(ctrl, op);

	return true;

}

drivers/nvme/host/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -3246,6 +3246,7 @@ static const struct pci_device_id nvme_id_table[] = { 
		.driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, },

	{ PCI_DEVICE(0x144d, 0xa822),   /* Samsung PM1725a */

		.driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY |

				NVME_QUIRK_DISABLE_WRITE_ZEROES|

				NVME_QUIRK_IGNORE_DEV_SUBNQN, },

	{ PCI_DEVICE(0x1987, 0x5016),	/* Phison E16 */

		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, },

drivers/nvme/host/zns.c

+7 −2
Original line number Diff line number Diff line
@@ -9,7 +9,13 @@ 


int nvme_revalidate_zones(struct nvme_ns *ns)

{

	return blk_revalidate_disk_zones(ns->disk, NULL);

	struct request_queue *q = ns->queue;

	int ret;



	ret = blk_revalidate_disk_zones(ns->disk, NULL);

	if (!ret)

		blk_queue_max_zone_append_sectors(q, ns->ctrl->max_zone_append);

	return ret;

}



static int nvme_set_max_append(struct nvme_ctrl *ctrl)
@@ -107,7 +113,6 @@ int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) 
	blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q);

	blk_queue_max_open_zones(q, le32_to_cpu(id->mor) + 1);

	blk_queue_max_active_zones(q, le32_to_cpu(id->mar) + 1);

	blk_queue_max_zone_append_sectors(q, ns->ctrl->max_zone_append);

free_data:

	kfree(id);

	return status;

drivers/nvme/target/rdma.c

+2 −3
Original line number Diff line number Diff line
@@ -802,9 +802,8 @@ static void nvmet_rdma_write_data_done(struct ib_cq *cq, struct ib_wc *wc) 
		nvmet_req_uninit(&rsp->req);

		nvmet_rdma_release_rsp(rsp);

		if (wc->status != IB_WC_WR_FLUSH_ERR) {

			pr_info("RDMA WRITE for CQE 0x%p failed with status %s (%d).\n",

				wc->wr_cqe, ib_wc_status_msg(wc->status),

				wc->status);

			pr_info("RDMA WRITE for CQE failed with status %s (%d).\n",

				ib_wc_status_msg(wc->status), wc->status);

			nvmet_rdma_error_comp(queue);

		}

		return;