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

Commit 22944e99 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: move nvme_setup_flush and nvme_setup_rw to common code 



And mark them inline so that we don't slow down the I/O submission path by
having to turn it into a forced out of line call.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 15a190f7

drivers/nvme/host/nvme.h

+51 −0
Original line number Diff line number Diff line
@@ -85,6 +85,57 @@ static inline u64 nvme_block_nr(struct nvme_ns *ns, sector_t sector) 
	return (sector >> (ns->lba_shift - 9));

}



static inline void nvme_setup_flush(struct nvme_ns *ns,

		struct nvme_command *cmnd)

{

	memset(cmnd, 0, sizeof(*cmnd));

	cmnd->common.opcode = nvme_cmd_flush;

	cmnd->common.nsid = cpu_to_le32(ns->ns_id);

}



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

		struct nvme_command *cmnd)

{

	u16 control = 0;

	u32 dsmgmt = 0;



	if (req->cmd_flags & REQ_FUA)

		control |= NVME_RW_FUA;

	if (req->cmd_flags & (REQ_FAILFAST_DEV | REQ_RAHEAD))

		control |= NVME_RW_LR;



	if (req->cmd_flags & REQ_RAHEAD)

		dsmgmt |= NVME_RW_DSM_FREQ_PREFETCH;



	memset(cmnd, 0, sizeof(*cmnd));

	cmnd->rw.opcode = (rq_data_dir(req) ? nvme_cmd_write : nvme_cmd_read);

	cmnd->rw.command_id = req->tag;

	cmnd->rw.nsid = cpu_to_le32(ns->ns_id);

	cmnd->rw.slba = cpu_to_le64(nvme_block_nr(ns, blk_rq_pos(req)));

	cmnd->rw.length = cpu_to_le16((blk_rq_bytes(req) >> ns->lba_shift) - 1);



	if (ns->ms) {

		switch (ns->pi_type) {

		case NVME_NS_DPS_PI_TYPE3:

			control |= NVME_RW_PRINFO_PRCHK_GUARD;

			break;

		case NVME_NS_DPS_PI_TYPE1:

		case NVME_NS_DPS_PI_TYPE2:

			control |= NVME_RW_PRINFO_PRCHK_GUARD |

					NVME_RW_PRINFO_PRCHK_REF;

			cmnd->rw.reftag = cpu_to_le32(

					nvme_block_nr(ns, blk_rq_pos(req)));

			break;

		}

		if (!blk_integrity_rq(req))

			control |= NVME_RW_PRINFO_PRACT;

	}



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

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

}





static inline int nvme_error_status(u16 status)

{

	switch (status & 0x7ff) {

drivers/nvme/host/pci.c

+0 −49
Original line number Diff line number Diff line
@@ -863,55 +863,6 @@ static int nvme_setup_discard(struct nvme_queue *nvmeq, struct nvme_ns *ns, 
	return BLK_MQ_RQ_QUEUE_OK;

}



static void nvme_setup_flush(struct nvme_ns *ns, struct nvme_command *cmnd)

{

	memset(cmnd, 0, sizeof(*cmnd));

	cmnd->common.opcode = nvme_cmd_flush;

	cmnd->common.nsid = cpu_to_le32(ns->ns_id);

}



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

		struct nvme_command *cmnd)

{

	u16 control = 0;

	u32 dsmgmt = 0;



	if (req->cmd_flags & REQ_FUA)

		control |= NVME_RW_FUA;

	if (req->cmd_flags & (REQ_FAILFAST_DEV | REQ_RAHEAD))

		control |= NVME_RW_LR;



	if (req->cmd_flags & REQ_RAHEAD)

		dsmgmt |= NVME_RW_DSM_FREQ_PREFETCH;



	memset(cmnd, 0, sizeof(*cmnd));

	cmnd->rw.opcode = (rq_data_dir(req) ? nvme_cmd_write : nvme_cmd_read);

	cmnd->rw.command_id = req->tag;

	cmnd->rw.nsid = cpu_to_le32(ns->ns_id);

	cmnd->rw.slba = cpu_to_le64(nvme_block_nr(ns, blk_rq_pos(req)));

	cmnd->rw.length = cpu_to_le16((blk_rq_bytes(req) >> ns->lba_shift) - 1);



	if (ns->ms) {

		switch (ns->pi_type) {

		case NVME_NS_DPS_PI_TYPE3:

			control |= NVME_RW_PRINFO_PRCHK_GUARD;

			break;

		case NVME_NS_DPS_PI_TYPE1:

		case NVME_NS_DPS_PI_TYPE2:

			control |= NVME_RW_PRINFO_PRCHK_GUARD |

					NVME_RW_PRINFO_PRCHK_REF;

			cmnd->rw.reftag = cpu_to_le32(

					nvme_block_nr(ns, blk_rq_pos(req)));

			break;

		}

		if (!blk_integrity_rq(req))

			control |= NVME_RW_PRINFO_PRACT;

	}



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

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

}



/*

 * NOTE: ns is NULL when called on the admin queue.

 */