Commit 08c521a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.12/post-merge' of git://git.kernel.dk/linux-block 

Pull second round of block layer updates from Jens Axboe:

 - Further fixups to the NVMe APST code, from Andy.

 - Various fixes for (mostly) nvme-fc, from Christoph and James.

 - NVMe scsi fixes from Jon and Christoph.

* 'for-4.12/post-merge' of git://git.kernel.dk/linux-block: (39 commits)
  nvme-scsi: remove nvme_trans_security_protocol
  nvme-lightnvm: add missing endianess conversion in nvme_nvm_end_io
  nvme-scsi: Consider LBA format in IO splitting calculation
  nvme-fc: avoid memory corruption caused by calling nvmf_free_options() twice
  lpfc: Fix memory corruption of the lpfc_ncmd->list pointers
  nvme: Add nvme_core.force_apst to ignore the NO_APST quirk
  nvme: Display raw APST configuration via DYNAMIC_DEBUG
  nvme: Fix APST comment
  lpfc revison 11.2.0.12
  Fix Express lane queue creation.
  Update ABORT processing for NVMET.
  Fix implicit logo and RSCN handling for NVMET
  Add Fabric assigned WWN support.
  Fix max_sgl_segments settings for NVME / NVMET
  Fix crash after issuing lip reset
  Fix driver load issues when MRQ=8
  Remove hba lock from NVMET issue WQE.
  Fix nvme initiator handling when not enabled.
  Fix driver usage of 128B WQEs when WQ_CREATE is V1.
  Fix driver unload/reload operation.
  ...
parents 69475292 b06e13c3

drivers/nvme/host/core.c

+36 −2
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@ module_param(default_ps_max_latency_us, ulong, 0644); 
MODULE_PARM_DESC(default_ps_max_latency_us,

		 "max power saving latency for new devices; use PM QOS to change per device");



static bool force_apst;

module_param(force_apst, bool, 0644);

MODULE_PARM_DESC(force_apst, "allow APST for newly enumerated devices even if quirked off");



static LIST_HEAD(nvme_ctrl_list);

static DEFINE_SPINLOCK(dev_list_lock);
@@ -1325,7 +1329,7 @@ static void nvme_configure_apst(struct nvme_ctrl *ctrl) 
	 * heuristic: we are willing to spend at most 2% of the time

	 * transitioning between power states.  Therefore, when running

	 * in any given state, we will enter the next lower-power

	 * non-operational state after waiting 100 * (enlat + exlat)

	 * non-operational state after waiting 50 * (enlat + exlat)

	 * microseconds, as long as that state's total latency is under

	 * the requested maximum latency.

	 *
@@ -1336,6 +1340,8 @@ static void nvme_configure_apst(struct nvme_ctrl *ctrl) 


	unsigned apste;

	struct nvme_feat_auto_pst *table;

	u64 max_lat_us = 0;

	int max_ps = -1;

	int ret;



	/*
@@ -1357,6 +1363,7 @@ static void nvme_configure_apst(struct nvme_ctrl *ctrl) 
	if (ctrl->ps_max_latency_us == 0) {

		/* Turn off APST. */

		apste = 0;

		dev_dbg(ctrl->device, "APST disabled\n");

	} else {

		__le64 target = cpu_to_le64(0);

		int state;
@@ -1406,9 +1413,22 @@ static void nvme_configure_apst(struct nvme_ctrl *ctrl) 


			target = cpu_to_le64((state << 3) |

					     (transition_ms << 8));



			if (max_ps == -1)

				max_ps = state;



			if (total_latency_us > max_lat_us)

				max_lat_us = total_latency_us;

		}



		apste = 1;



		if (max_ps == -1) {

			dev_dbg(ctrl->device, "APST enabled but no non-operational states are available\n");

		} else {

			dev_dbg(ctrl->device, "APST enabled: max PS = %d, max round-trip latency = %lluus, table = %*phN\n",

				max_ps, max_lat_us, (int)sizeof(*table), table);

		}

	}



	ret = nvme_set_features(ctrl, NVME_FEAT_AUTO_PST, apste,
@@ -1546,6 +1566,11 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) 
		}

	}



	if (force_apst && (ctrl->quirks & NVME_QUIRK_NO_DEEPEST_PS)) {

		dev_warn(ctrl->dev, "forcibly allowing all power states due to nvme_core.force_apst -- use at your own risk\n");

		ctrl->quirks &= ~NVME_QUIRK_NO_DEEPEST_PS;

	}



	ctrl->oacs = le16_to_cpu(id->oacs);

	ctrl->vid = le16_to_cpu(id->vid);

	ctrl->oncs = le16_to_cpup(&id->oncs);
@@ -1568,7 +1593,16 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) 


	ctrl->npss = id->npss;

	prev_apsta = ctrl->apsta;

	ctrl->apsta = (ctrl->quirks & NVME_QUIRK_NO_APST) ? 0 : id->apsta;

	if (ctrl->quirks & NVME_QUIRK_NO_APST) {

		if (force_apst && id->apsta) {

			dev_warn(ctrl->dev, "forcibly allowing APST due to nvme_core.force_apst -- use at your own risk\n");

			ctrl->apsta = 1;

		} else {

			ctrl->apsta = 0;

		}

	} else {

		ctrl->apsta = id->apsta;

	}

	memcpy(ctrl->psd, id->psd, sizeof(ctrl->psd));



	if (ctrl->ops->is_fabrics) {

drivers/nvme/host/fc.c

+782 −391

File changed.

Preview size limit exceeded, changes collapsed.

drivers/nvme/host/lightnvm.c

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static void nvme_nvm_end_io(struct request *rq, int error) 
{

	struct nvm_rq *rqd = rq->end_io_data;



	rqd->ppa_status = nvme_req(rq)->result.u64;

	rqd->ppa_status = le64_to_cpu(nvme_req(rq)->result.u64);

	rqd->error = nvme_req(rq)->status;

	nvm_end_io(rqd);

drivers/nvme/host/scsi.c

+1 −14
Original line number Diff line number Diff line
@@ -1609,7 +1609,7 @@ static int nvme_trans_do_nvme_io(struct nvme_ns *ns, struct sg_io_hdr *hdr, 
	struct nvme_command c;

	u8 opcode = (is_write ? nvme_cmd_write : nvme_cmd_read);

	u16 control;

	u32 max_blocks = queue_max_hw_sectors(ns->queue);

	u32 max_blocks = queue_max_hw_sectors(ns->queue) >> (ns->lba_shift - 9);



	num_cmds = nvme_trans_io_get_num_cmds(hdr, cdb_info, max_blocks);
@@ -2138,15 +2138,6 @@ static int nvme_trans_request_sense(struct nvme_ns *ns, struct sg_io_hdr *hdr, 
	return res;

}



static int nvme_trans_security_protocol(struct nvme_ns *ns,

					struct sg_io_hdr *hdr,

					u8 *cmd)

{

	return nvme_trans_completion(hdr, SAM_STAT_CHECK_CONDITION,

				ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_COMMAND,

				SCSI_ASCQ_CAUSE_NOT_REPORTABLE);

}



static int nvme_trans_synchronize_cache(struct nvme_ns *ns,

					struct sg_io_hdr *hdr)

{
@@ -2414,10 +2405,6 @@ static int nvme_scsi_translate(struct nvme_ns *ns, struct sg_io_hdr *hdr) 
	case REQUEST_SENSE:

		retcode = nvme_trans_request_sense(ns, hdr, cmd);

		break;

	case SECURITY_PROTOCOL_IN:

	case SECURITY_PROTOCOL_OUT:

		retcode = nvme_trans_security_protocol(ns, hdr, cmd);

		break;

	case SYNCHRONIZE_CACHE:

		retcode = nvme_trans_synchronize_cache(ns, hdr);

		break;

drivers/nvme/target/fc.c

+4 −4
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ struct nvmet_fc_tgt_queue { 
	u16				qid;

	u16				sqsize;

	u16				ersp_ratio;

	u16				sqhd;

	__le16				sqhd;

	int				cpu;

	atomic_t			connected;

	atomic_t			sqtail;
@@ -1058,7 +1058,7 @@ EXPORT_SYMBOL_GPL(nvmet_fc_unregister_targetport); 




static void

nvmet_fc_format_rsp_hdr(void *buf, u8 ls_cmd, u32 desc_len, u8 rqst_ls_cmd)

nvmet_fc_format_rsp_hdr(void *buf, u8 ls_cmd, __be32 desc_len, u8 rqst_ls_cmd)

{

	struct fcnvme_ls_acc_hdr *acc = buf;
@@ -1700,7 +1700,7 @@ nvmet_fc_prep_fcp_rsp(struct nvmet_fc_tgtport *tgtport, 
	    xfr_length != fod->total_length ||

	    (le16_to_cpu(cqe->status) & 0xFFFE) || cqewd[0] || cqewd[1] ||

	    (sqe->flags & (NVME_CMD_FUSE_FIRST | NVME_CMD_FUSE_SECOND)) ||

	    queue_90percent_full(fod->queue, cqe->sq_head))

	    queue_90percent_full(fod->queue, le16_to_cpu(cqe->sq_head)))

		send_ersp = true;



	/* re-set the fields */
@@ -2055,7 +2055,7 @@ nvmet_fc_fcp_nvme_cmd_done(struct nvmet_req *nvme_req) 
/*

 * Actual processing routine for received FC-NVME LS Requests from the LLD

 */

void

static void

nvmet_fc_handle_fcp_rqst(struct nvmet_fc_tgtport *tgtport,

			struct nvmet_fc_fcp_iod *fod)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE