Commit ebe6d874 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: move protection information check into nvme_setup_rw 



It only applies to read/write commands, and this way non-PCIe drivers
get the check as well instead of having to duplicate it when adding
metadata support.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent b3b1b0b0

drivers/nvme/host/core.c

+13 −3
Original line number Diff line number Diff line
@@ -325,12 +325,21 @@ static blk_status_t nvme_setup_discard(struct nvme_ns *ns, struct request *req, 
	return BLK_STS_OK;

}



static inline void nvme_setup_rw(struct nvme_ns *ns, struct request *req,

		struct nvme_command *cmnd)

static inline blk_status_t nvme_setup_rw(struct nvme_ns *ns,

		struct request *req, struct nvme_command *cmnd)

{

	u16 control = 0;

	u32 dsmgmt = 0;



	/*

	 * If formated with metadata, require the block layer provide a buffer

	 * unless this namespace is formated such that the metadata can be

	 * stripped/generated by the controller with PRACT=1.

	 */

	if (ns && ns->ms && (!ns->pi_type || ns->ms != 8) &&

	    !blk_integrity_rq(req) && !blk_rq_is_passthrough(req))

		return BLK_STS_NOTSUPP;



	if (req->cmd_flags & REQ_FUA)

		control |= NVME_RW_FUA;

	if (req->cmd_flags & (REQ_FAILFAST_DEV | REQ_RAHEAD))
@@ -364,6 +373,7 @@ static inline void nvme_setup_rw(struct nvme_ns *ns, struct request *req, 


	cmnd->rw.control = cpu_to_le16(control);

	cmnd->rw.dsmgmt = cpu_to_le32(dsmgmt);

	return 0;

}



blk_status_t nvme_setup_cmd(struct nvme_ns *ns, struct request *req,
@@ -392,7 +402,7 @@ blk_status_t nvme_setup_cmd(struct nvme_ns *ns, struct request *req, 
		break;

	case REQ_OP_READ:

	case REQ_OP_WRITE:

		nvme_setup_rw(ns, req, cmd);

		ret = nvme_setup_rw(ns, req, cmd);

		break;

	default:

		WARN_ON_ONCE(1);

drivers/nvme/host/pci.c

+1 −12
Original line number Diff line number Diff line
@@ -694,18 +694,7 @@ static blk_status_t nvme_queue_rq(struct blk_mq_hw_ctx *hctx, 
	struct nvme_dev *dev = nvmeq->dev;

	struct request *req = bd->rq;

	struct nvme_command cmnd;

	blk_status_t ret = BLK_STS_OK;



	/*

	 * If formated with metadata, require the block layer provide a buffer

	 * unless this namespace is formated such that the metadata can be

	 * stripped/generated by the controller with PRACT=1.

	 */

	if (ns && ns->ms && !blk_integrity_rq(req)) {

		if (!(ns->pi_type && ns->ms == 8) &&

		    !blk_rq_is_passthrough(req))

			return BLK_STS_NOTSUPP;

	}

	blk_status_t ret;



	ret = nvme_setup_cmd(ns, req, &cmnd);

	if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE