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

Commit 44e44b29 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: move the retries count to struct nvme_request 



The way NVMe uses this field is entirely different from the older
SCSI/BLOCK_PC usage, so move it into struct nvme_request.

Also reduce the size of the file to a unsigned char so that we leave
space for additional smaller fields that will appear soon.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 83f3aeb3

drivers/nvme/host/core.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -49,8 +49,8 @@ unsigned char shutdown_timeout = 5; 
module_param(shutdown_timeout, byte, 0644);

module_param(shutdown_timeout, byte, 0644);

MODULE_PARM_DESC(shutdown_timeout, "timeout in seconds for controller shutdown");

MODULE_PARM_DESC(shutdown_timeout, "timeout in seconds for controller shutdown");





static unsigned int nvme_max_retries = 5;

static u8 nvme_max_retries = 5;

module_param_named(max_retries, nvme_max_retries, uint, 0644);

module_param_named(max_retries, nvme_max_retries, byte, 0644);

MODULE_PARM_DESC(max_retries, "max number of retries a command may have");

MODULE_PARM_DESC(max_retries, "max number of retries a command may have");





static int nvme_char_major;

static int nvme_char_major;
@@ -74,7 +74,7 @@ static inline bool nvme_req_needs_retry(struct request *req) 
		return false;

		return false;

	if (jiffies - req->start_time >= req->timeout)

	if (jiffies - req->start_time >= req->timeout)

		return false;

		return false;

	if (req->retries >= nvme_max_retries)

	if (nvme_req(req)->retries >= nvme_max_retries)

		return false;

		return false;

	return true;

	return true;

}

}
@@ -85,7 +85,7 @@ void nvme_complete_rq(struct request *req) 




	if (unlikely(req->errors)) {

	if (unlikely(req->errors)) {

		if (nvme_req_needs_retry(req)) {

		if (nvme_req_needs_retry(req)) {

			req->retries++;

			nvme_req(req)->retries++;

			blk_mq_requeue_request(req,

			blk_mq_requeue_request(req,

					!blk_mq_queue_stopped(req->q));

					!blk_mq_queue_stopped(req->q));

			return;

			return;
@@ -356,7 +356,7 @@ int nvme_setup_cmd(struct nvme_ns *ns, struct request *req, 
	int ret = BLK_MQ_RQ_QUEUE_OK;

	int ret = BLK_MQ_RQ_QUEUE_OK;





	if (!(req->rq_flags & RQF_DONTPREP)) {

	if (!(req->rq_flags & RQF_DONTPREP)) {

		req->retries = 0;

		nvme_req(req)->retries = 0;

		req->rq_flags |= RQF_DONTPREP;

		req->rq_flags |= RQF_DONTPREP;

	}

	}

drivers/nvme/host/nvme.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -90,6 +90,7 @@ enum nvme_quirks { 
struct nvme_request {

struct nvme_request {

	struct nvme_command	*cmd;

	struct nvme_command	*cmd;

	union nvme_result	result;

	union nvme_result	result;

	u8			retries;

};

};





static inline struct nvme_request *nvme_req(struct request *req)

static inline struct nvme_request *nvme_req(struct request *req)