Commit 9a95e4ef authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

block, nvme: Introduce blk_mq_req_flags_t 



Several block layer and NVMe core functions accept a combination
of BLK_MQ_REQ_* flags through the 'flags' argument but there is
no verification at compile time whether the right type of block
layer flags is passed. Make it possible for sparse to verify this.
This patch does not change any functionality.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Tested-by: default avatarOleksandr Natalenko <oleksandr@natalenko.name>
Cc: linux-nvme@lists.infradead.org
Cc: Christoph Hellwig <hch@lst.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Cc: Ming Lei <ming.lei@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3a0a5299

block/blk-core.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -801,7 +801,7 @@ EXPORT_SYMBOL(blk_alloc_queue); 
 * @q: request queue pointer

 * @q: request queue pointer

 * @flags: BLK_MQ_REQ_NOWAIT and/or BLK_MQ_REQ_PREEMPT

 * @flags: BLK_MQ_REQ_NOWAIT and/or BLK_MQ_REQ_PREEMPT

 */

 */

int blk_queue_enter(struct request_queue *q, unsigned int flags)

int blk_queue_enter(struct request_queue *q, blk_mq_req_flags_t flags)

{

{

	const bool preempt = flags & BLK_MQ_REQ_PREEMPT;

	const bool preempt = flags & BLK_MQ_REQ_PREEMPT;
@@ -1225,7 +1225,7 @@ int blk_update_nr_requests(struct request_queue *q, unsigned int nr) 
 * Returns request pointer on success, with @q->queue_lock *not held*.

 * Returns request pointer on success, with @q->queue_lock *not held*.

 */

 */

static struct request *__get_request(struct request_list *rl, unsigned int op,

static struct request *__get_request(struct request_list *rl, unsigned int op,

				     struct bio *bio, unsigned int flags)

				     struct bio *bio, blk_mq_req_flags_t flags)

{

{

	struct request_queue *q = rl->q;

	struct request_queue *q = rl->q;

	struct request *rq;

	struct request *rq;
@@ -1408,7 +1408,7 @@ rq_starved: 
 * Returns request pointer on success, with @q->queue_lock *not held*.

 * Returns request pointer on success, with @q->queue_lock *not held*.

 */

 */

static struct request *get_request(struct request_queue *q, unsigned int op,

static struct request *get_request(struct request_queue *q, unsigned int op,

				   struct bio *bio, unsigned int flags)

				   struct bio *bio, blk_mq_req_flags_t flags)

{

{

	const bool is_sync = op_is_sync(op);

	const bool is_sync = op_is_sync(op);

	DEFINE_WAIT(wait);

	DEFINE_WAIT(wait);
@@ -1458,7 +1458,7 @@ retry: 




/* flags: BLK_MQ_REQ_PREEMPT and/or BLK_MQ_REQ_NOWAIT. */

/* flags: BLK_MQ_REQ_PREEMPT and/or BLK_MQ_REQ_NOWAIT. */

static struct request *blk_old_get_request(struct request_queue *q,

static struct request *blk_old_get_request(struct request_queue *q,

					   unsigned int op, unsigned int flags)

				unsigned int op, blk_mq_req_flags_t flags)

{

{

	struct request *rq;

	struct request *rq;

	gfp_t gfp_mask = flags & BLK_MQ_REQ_NOWAIT ? GFP_ATOMIC :

	gfp_t gfp_mask = flags & BLK_MQ_REQ_NOWAIT ? GFP_ATOMIC :
@@ -1495,7 +1495,7 @@ static struct request *blk_old_get_request(struct request_queue *q, 
 * @flags: BLK_MQ_REQ_* flags, e.g. BLK_MQ_REQ_NOWAIT.

 * @flags: BLK_MQ_REQ_* flags, e.g. BLK_MQ_REQ_NOWAIT.

 */

 */

struct request *blk_get_request_flags(struct request_queue *q, unsigned int op,

struct request *blk_get_request_flags(struct request_queue *q, unsigned int op,

				      unsigned int flags)

				      blk_mq_req_flags_t flags)

{

{

	struct request *req;

	struct request *req;
@@ -2291,7 +2291,7 @@ blk_qc_t generic_make_request(struct bio *bio) 
	current->bio_list = bio_list_on_stack;

	current->bio_list = bio_list_on_stack;

	do {

	do {

		struct request_queue *q = bio->bi_disk->queue;

		struct request_queue *q = bio->bi_disk->queue;

		unsigned int flags = bio->bi_opf & REQ_NOWAIT ?

		blk_mq_req_flags_t flags = bio->bi_opf & REQ_NOWAIT ?

			BLK_MQ_REQ_NOWAIT : 0;

			BLK_MQ_REQ_NOWAIT : 0;





		if (likely(blk_queue_enter(q, flags) == 0)) {

		if (likely(blk_queue_enter(q, flags) == 0)) {

block/blk-mq.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -383,7 +383,7 @@ static struct request *blk_mq_get_request(struct request_queue *q, 
}

}





struct request *blk_mq_alloc_request(struct request_queue *q, unsigned int op,

struct request *blk_mq_alloc_request(struct request_queue *q, unsigned int op,

		unsigned int flags)

		blk_mq_req_flags_t flags)

{

{

	struct blk_mq_alloc_data alloc_data = { .flags = flags };

	struct blk_mq_alloc_data alloc_data = { .flags = flags };

	struct request *rq;

	struct request *rq;
@@ -409,7 +409,7 @@ struct request *blk_mq_alloc_request(struct request_queue *q, unsigned int op, 
EXPORT_SYMBOL(blk_mq_alloc_request);

EXPORT_SYMBOL(blk_mq_alloc_request);





struct request *blk_mq_alloc_request_hctx(struct request_queue *q,

struct request *blk_mq_alloc_request_hctx(struct request_queue *q,

		unsigned int op, unsigned int flags, unsigned int hctx_idx)

	unsigned int op, blk_mq_req_flags_t flags, unsigned int hctx_idx)

{

{

	struct blk_mq_alloc_data alloc_data = { .flags = flags };

	struct blk_mq_alloc_data alloc_data = { .flags = flags };

	struct request *rq;

	struct request *rq;

block/blk-mq.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -111,7 +111,7 @@ static inline void blk_mq_put_ctx(struct blk_mq_ctx *ctx) 
struct blk_mq_alloc_data {

struct blk_mq_alloc_data {

	/* input parameter */

	/* input parameter */

	struct request_queue *q;

	struct request_queue *q;

	unsigned int flags;

	blk_mq_req_flags_t flags;

	unsigned int shallow_depth;

	unsigned int shallow_depth;





	/* input & output parameter */

	/* input & output parameter */

drivers/nvme/host/core.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -305,7 +305,7 @@ static void nvme_put_ns(struct nvme_ns *ns) 
}

}





struct request *nvme_alloc_request(struct request_queue *q,

struct request *nvme_alloc_request(struct request_queue *q,

		struct nvme_command *cmd, unsigned int flags, int qid)

		struct nvme_command *cmd, blk_mq_req_flags_t flags, int qid)

{

{

	unsigned op = nvme_is_write(cmd) ? REQ_OP_DRV_OUT : REQ_OP_DRV_IN;

	unsigned op = nvme_is_write(cmd) ? REQ_OP_DRV_OUT : REQ_OP_DRV_IN;

	struct request *req;

	struct request *req;
@@ -573,7 +573,8 @@ EXPORT_SYMBOL_GPL(nvme_setup_cmd); 
 */

 */

int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

		union nvme_result *result, void *buffer, unsigned bufflen,

		union nvme_result *result, void *buffer, unsigned bufflen,

		unsigned timeout, int qid, int at_head, int flags)

		unsigned timeout, int qid, int at_head,

		blk_mq_req_flags_t flags)

{

{

	struct request *req;

	struct request *req;

	int ret;

	int ret;

drivers/nvme/host/nvme.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -327,14 +327,15 @@ int nvme_reinit_tagset(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set); 




#define NVME_QID_ANY -1

#define NVME_QID_ANY -1

struct request *nvme_alloc_request(struct request_queue *q,

struct request *nvme_alloc_request(struct request_queue *q,

		struct nvme_command *cmd, unsigned int flags, int qid);

		struct nvme_command *cmd, blk_mq_req_flags_t flags, int qid);

blk_status_t nvme_setup_cmd(struct nvme_ns *ns, struct request *req,

blk_status_t nvme_setup_cmd(struct nvme_ns *ns, struct request *req,

		struct nvme_command *cmd);

		struct nvme_command *cmd);

int nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

int nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

		void *buf, unsigned bufflen);

		void *buf, unsigned bufflen);

int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

		union nvme_result *result, void *buffer, unsigned bufflen,

		union nvme_result *result, void *buffer, unsigned bufflen,

		unsigned timeout, int qid, int at_head, int flags);

		unsigned timeout, int qid, int at_head,

		blk_mq_req_flags_t flags);

int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count);

int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count);

void nvme_start_keep_alive(struct nvme_ctrl *ctrl);

void nvme_start_keep_alive(struct nvme_ctrl *ctrl);

void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);

void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE