Commit a58dfea2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.8-2020-06-11' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:
 "Some followup fixes for this merge window. In particular:

   - Seqcount write missing preemption disable for stats (Ahmed)

   - blktrace fixes (Chaitanya)

   - Redundant initializations (Colin)

   - Various small NVMe fixes (Chaitanya, Christoph, Daniel, Max,
     Niklas, Rikard)

   - loop flag bug regression fix (Martijn)

   - blk-mq tagging fixes (Christoph, Ming)"

* tag 'block-5.8-2020-06-11' of git://git.kernel.dk/linux-block:
  umem: remove redundant initialization of variable ret
  pktcdvd: remove redundant initialization of variable ret
  nvmet: fail outstanding host posted AEN req
  nvme-pci: use simple suspend when a HMB is enabled
  nvme-fc: don't call nvme_cleanup_cmd() for AENs
  nvmet-tcp: constify nvmet_tcp_ops
  nvme-tcp: constify nvme_tcp_mq_ops and nvme_tcp_admin_mq_ops
  nvme: do not call del_gendisk() on a disk that was never added
  blk-mq: fix blk_mq_all_tag_iter
  blk-mq: split out a __blk_mq_get_driver_tag helper
  blktrace: fix endianness for blk_log_remap()
  blktrace: fix endianness in get_pdu_int()
  blktrace: use errno instead of bi_status
  block: nr_sects_write(): Disable preemption on seqcount write
  block: remove the error argument to the block_bio_complete tracepoint
  loop: Fix wrong masking of status flags
  block/bio-integrity: don't free 'buf' if bio_integrity_add_page() failed
parents b3597945 9a6a5738

block/bio-integrity.c

+0 −1
Original line number Diff line number Diff line
@@ -281,7 +281,6 @@ bool bio_integrity_prep(struct bio *bio) 


		if (ret == 0) {

			printk(KERN_ERR "could not attach integrity payload\n");

			kfree(buf);

			status = BLK_STS_RESOURCE;

			goto err_end_io;

		}

block/bio.c

+1 −2
Original line number Diff line number Diff line
@@ -1434,8 +1434,7 @@ again: 
	}



	if (bio->bi_disk && bio_flagged(bio, BIO_TRACE_COMPLETION)) {

		trace_block_bio_complete(bio->bi_disk->queue, bio,

					 blk_status_to_errno(bio->bi_status));

		trace_block_bio_complete(bio->bi_disk->queue, bio);

		bio_clear_flag(bio, BIO_TRACE_COMPLETION);

	}

block/blk-mq-tag.c

+36 −3
Original line number Diff line number Diff line
@@ -191,6 +191,33 @@ found_tag: 
	return tag + tag_offset;

}



bool __blk_mq_get_driver_tag(struct request *rq)

{

	struct sbitmap_queue *bt = &rq->mq_hctx->tags->bitmap_tags;

	unsigned int tag_offset = rq->mq_hctx->tags->nr_reserved_tags;

	bool shared = blk_mq_tag_busy(rq->mq_hctx);

	int tag;



	if (blk_mq_tag_is_reserved(rq->mq_hctx->sched_tags, rq->internal_tag)) {

		bt = &rq->mq_hctx->tags->breserved_tags;

		tag_offset = 0;

	}



	if (!hctx_may_queue(rq->mq_hctx, bt))

		return false;

	tag = __sbitmap_queue_get(bt);

	if (tag == BLK_MQ_NO_TAG)

		return false;



	rq->tag = tag + tag_offset;

	if (shared) {

		rq->rq_flags |= RQF_MQ_INFLIGHT;

		atomic_inc(&rq->mq_hctx->nr_active);

	}

	rq->mq_hctx->tags->rqs[rq->tag] = rq;

	return true;

}



void blk_mq_put_tag(struct blk_mq_tags *tags, struct blk_mq_ctx *ctx,

		    unsigned int tag)

{
@@ -269,6 +296,7 @@ struct bt_tags_iter_data { 


#define BT_TAG_ITER_RESERVED		(1 << 0)

#define BT_TAG_ITER_STARTED		(1 << 1)

#define BT_TAG_ITER_STATIC_RQS		(1 << 2)



static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data)

{
@@ -282,8 +310,11 @@ static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) 


	/*

	 * We can hit rq == NULL here, because the tagging functions

	 * test and set the bit before assining ->rqs[].

	 * test and set the bit before assigning ->rqs[].

	 */

	if (iter_data->flags & BT_TAG_ITER_STATIC_RQS)

		rq = tags->static_rqs[bitnr];

	else

		rq = tags->rqs[bitnr];

	if (!rq)

		return true;
@@ -339,11 +370,13 @@ static void __blk_mq_all_tag_iter(struct blk_mq_tags *tags, 
 *		indicates whether or not @rq is a reserved request. Return

 *		true to continue iterating tags, false to stop.

 * @priv:	Will be passed as second argument to @fn.

 *

 * Caller has to pass the tag map from which requests are allocated.

 */

void blk_mq_all_tag_iter(struct blk_mq_tags *tags, busy_tag_iter_fn *fn,

		void *priv)

{

	return __blk_mq_all_tag_iter(tags, fn, priv, 0);

	return __blk_mq_all_tag_iter(tags, fn, priv, BT_TAG_ITER_STATIC_RQS);

}



/**

block/blk-mq-tag.h

+8 −0
Original line number Diff line number Diff line
@@ -51,6 +51,14 @@ enum { 
	BLK_MQ_TAG_MAX		= BLK_MQ_NO_TAG - 1,

};



bool __blk_mq_get_driver_tag(struct request *rq);

static inline bool blk_mq_get_driver_tag(struct request *rq)

{

	if (rq->tag != BLK_MQ_NO_TAG)

		return true;

	return __blk_mq_get_driver_tag(rq);

}



extern bool __blk_mq_tag_busy(struct blk_mq_hw_ctx *);

extern void __blk_mq_tag_idle(struct blk_mq_hw_ctx *);

block/blk-mq.c

+0 −29
Original line number Diff line number Diff line
@@ -1052,35 +1052,6 @@ static inline unsigned int queued_to_index(unsigned int queued) 
	return min(BLK_MQ_MAX_DISPATCH_ORDER - 1, ilog2(queued) + 1);

}



bool blk_mq_get_driver_tag(struct request *rq)

{

	struct blk_mq_alloc_data data = {

		.q = rq->q,

		.hctx = rq->mq_hctx,

		.flags = BLK_MQ_REQ_NOWAIT,

		.cmd_flags = rq->cmd_flags,

	};

	bool shared;



	if (rq->tag != BLK_MQ_NO_TAG)

		return true;



	if (blk_mq_tag_is_reserved(data.hctx->sched_tags, rq->internal_tag))

		data.flags |= BLK_MQ_REQ_RESERVED;



	shared = blk_mq_tag_busy(data.hctx);

	rq->tag = blk_mq_get_tag(&data);

	if (rq->tag >= 0) {

		if (shared) {

			rq->rq_flags |= RQF_MQ_INFLIGHT;

			atomic_inc(&data.hctx->nr_active);

		}

		data.hctx->tags->rqs[rq->tag] = rq;

	}



	return rq->tag != BLK_MQ_NO_TAG;

}



static int blk_mq_dispatch_wake(wait_queue_entry_t *wait, unsigned mode,

				int flags, void *key)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE