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

Merge tag 'block-5.13-2021-05-07' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - dasd spelling fixes (Bhaskar)

 - Limit bio max size on multi-page bvecs to the hardware limit, to
   avoid overly large bio's (and hence latencies). Originally queued for
   the merge window, but needed a fix and was dropped from the initial
   pull (Changheun)

 - NVMe pull request (Christoph):
      - reset the bdev to ns head when failover (Daniel Wagner)
      - remove unsupported command noise (Keith Busch)
      - misc passthrough improvements (Kanchan Joshi)
      - fix controller ioctl through ns_head (Minwoo Im)
      - fix controller timeouts during reset (Tao Chiu)

 - rnbd fixes/cleanups (Gioh, Md, Dima)

 - Fix iov_iter re-expansion (yangerkun)

* tag 'block-5.13-2021-05-07' of git://git.kernel.dk/linux-block:
  block: reexpand iov_iter after read/write
  nvmet: remove unsupported command noise
  nvme-multipath: reset bdev to ns head when failover
  nvme-pci: fix controller reset hang when racing with nvme_timeout
  nvme: move the fabrics queue ready check routines to core
  nvme: avoid memset for passthrough requests
  nvme: add nvme_get_ns helper
  nvme: fix controller ioctl through ns_head
  bio: limit bio max size
  RDMA/rtrs: fix uninitialized symbol 'cnt'
  s390: dasd: Mundane spelling fixes
  block/rnbd: Remove all likely and unlikely
  block/rnbd-clt: Check the return value of the function rtrs_clt_query
  block/rnbd: Fix style issues
  block/rnbd-clt: Change queue_depth type in rnbd_clt_session to size_t
parents 28b4afeb cf7b39a0

block/bio.c

+11 −2
Original line number Diff line number Diff line
@@ -255,6 +255,13 @@ void bio_init(struct bio *bio, struct bio_vec *table, 
}

EXPORT_SYMBOL(bio_init);



unsigned int bio_max_size(struct bio *bio)

{

	struct block_device *bdev = bio->bi_bdev;



	return bdev ? bdev->bd_disk->queue->limits.bio_max_bytes : UINT_MAX;

}



/**

 * bio_reset - reinitialize a bio

 * @bio:	bio to reset
@@ -866,7 +873,7 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page, 
		struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1];



		if (page_is_mergeable(bv, page, len, off, same_page)) {

			if (bio->bi_iter.bi_size > UINT_MAX - len) {

			if (bio->bi_iter.bi_size > bio_max_size(bio) - len) {

				*same_page = false;

				return false;

			}
@@ -995,6 +1002,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) 
{

	unsigned short nr_pages = bio->bi_max_vecs - bio->bi_vcnt;

	unsigned short entries_left = bio->bi_max_vecs - bio->bi_vcnt;

	unsigned int bytes_left = bio_max_size(bio) - bio->bi_iter.bi_size;

	struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt;

	struct page **pages = (struct page **)bv;

	bool same_page = false;
@@ -1010,7 +1018,8 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) 
	BUILD_BUG_ON(PAGE_PTRS_PER_BVEC < 2);

	pages += entries_left * (PAGE_PTRS_PER_BVEC - 1);



	size = iov_iter_get_pages(iter, pages, LONG_MAX, nr_pages, &offset);

	size = iov_iter_get_pages(iter, pages, bytes_left, nr_pages,

				  &offset);

	if (unlikely(size <= 0))

		return size ? size : -EFAULT;

block/blk-settings.c

+5 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ EXPORT_SYMBOL_GPL(blk_queue_rq_timeout); 
 */

void blk_set_default_limits(struct queue_limits *lim)

{

	lim->bio_max_bytes = UINT_MAX;

	lim->max_segments = BLK_MAX_SEGMENTS;

	lim->max_discard_segments = 1;

	lim->max_integrity_segments = 0;
@@ -140,6 +141,10 @@ void blk_queue_max_hw_sectors(struct request_queue *q, unsigned int max_hw_secto 
				 limits->logical_block_size >> SECTOR_SHIFT);

	limits->max_sectors = max_sectors;



	if (check_shl_overflow(max_sectors, SECTOR_SHIFT,

				&limits->bio_max_bytes))

		limits->bio_max_bytes = UINT_MAX;



	q->backing_dev_info->io_pages = max_sectors >> (PAGE_SHIFT - 9);

}

EXPORT_SYMBOL(blk_queue_max_hw_sectors);

drivers/block/rnbd/rnbd-clt.c

+27 −19
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static bool rnbd_rerun_if_needed(struct rnbd_clt_session *sess) 
	     cpu_q = rnbd_get_cpu_qlist(sess, nxt_cpu(cpu_q->cpu))) {

		if (!spin_trylock_irqsave(&cpu_q->requeue_lock, flags))

			continue;

		if (unlikely(!test_bit(cpu_q->cpu, sess->cpu_queues_bm)))

		if (!test_bit(cpu_q->cpu, sess->cpu_queues_bm))

			goto unlock;

		q = list_first_entry_or_null(&cpu_q->requeue_list,

					     typeof(*q), requeue_list);
@@ -320,7 +320,7 @@ static struct rtrs_permit *rnbd_get_permit(struct rnbd_clt_session *sess, 
	struct rtrs_permit *permit;



	permit = rtrs_clt_get_permit(sess->rtrs, con_type, wait);

	if (likely(permit))

	if (permit)

		/* We have a subtle rare case here, when all permits can be

		 * consumed before busy counter increased.  This is safe,

		 * because loser will get NULL as a permit, observe 0 busy
@@ -351,12 +351,11 @@ static struct rnbd_iu *rnbd_get_iu(struct rnbd_clt_session *sess, 
	struct rtrs_permit *permit;



	iu = kzalloc(sizeof(*iu), GFP_KERNEL);

	if (!iu) {

	if (!iu)

		return NULL;

	}



	permit = rnbd_get_permit(sess, con_type, wait);

	if (unlikely(!permit)) {

	if (!permit) {

		kfree(iu);

		return NULL;

	}
@@ -692,7 +691,11 @@ static void remap_devs(struct rnbd_clt_session *sess) 
		return;

	}



	rtrs_clt_query(sess->rtrs, &attrs);

	err = rtrs_clt_query(sess->rtrs, &attrs);

	if (err) {

		pr_err("rtrs_clt_query(\"%s\"): %d\n", sess->sessname, err);

		return;

	}

	mutex_lock(&sess->lock);

	sess->max_io_size = attrs.max_io_size;
@@ -805,7 +808,7 @@ static struct rnbd_clt_session *alloc_sess(const char *sessname) 
	mutex_init(&sess->lock);

	INIT_LIST_HEAD(&sess->devs_list);

	INIT_LIST_HEAD(&sess->list);

	bitmap_zero(sess->cpu_queues_bm, NR_CPUS);

	bitmap_zero(sess->cpu_queues_bm, num_possible_cpus());

	init_waitqueue_head(&sess->rtrs_waitq);

	refcount_set(&sess->refcount, 1);
@@ -1047,7 +1050,7 @@ static int rnbd_client_xfer_request(struct rnbd_clt_dev *dev, 
	};

	err = rtrs_clt_request(rq_data_dir(rq), &req_ops, rtrs, permit,

			       &vec, 1, size, iu->sgt.sgl, sg_cnt);

	if (unlikely(err)) {

	if (err) {

		rnbd_clt_err_rl(dev, "RTRS failed to transfer IO, err: %d\n",

				 err);

		return err;
@@ -1078,7 +1081,7 @@ static bool rnbd_clt_dev_add_to_requeue(struct rnbd_clt_dev *dev, 
	cpu_q = get_cpu_ptr(sess->cpu_queues);

	spin_lock_irqsave(&cpu_q->requeue_lock, flags);



	if (likely(!test_and_set_bit_lock(0, &q->in_list))) {

	if (!test_and_set_bit_lock(0, &q->in_list)) {

		if (WARN_ON(!list_empty(&q->requeue_list)))

			goto unlock;
@@ -1090,7 +1093,7 @@ static bool rnbd_clt_dev_add_to_requeue(struct rnbd_clt_dev *dev, 
			 */

			smp_mb__before_atomic();

		}

		if (likely(atomic_read(&sess->busy))) {

		if (atomic_read(&sess->busy)) {

			list_add_tail(&q->requeue_list, &cpu_q->requeue_list);

		} else {

			/* Very unlikely, but possible: busy counter was
@@ -1118,7 +1121,7 @@ static void rnbd_clt_dev_kick_mq_queue(struct rnbd_clt_dev *dev, 


	if (delay != RNBD_DELAY_IFBUSY)

		blk_mq_delay_run_hw_queue(hctx, delay);

	else if (unlikely(!rnbd_clt_dev_add_to_requeue(dev, q)))

	else if (!rnbd_clt_dev_add_to_requeue(dev, q))

		/*

		 * If session is not busy we have to restart

		 * the queue ourselves.
@@ -1135,12 +1138,12 @@ static blk_status_t rnbd_queue_rq(struct blk_mq_hw_ctx *hctx, 
	int err;

	blk_status_t ret = BLK_STS_IOERR;



	if (unlikely(dev->dev_state != DEV_STATE_MAPPED))

	if (dev->dev_state != DEV_STATE_MAPPED)

		return BLK_STS_IOERR;



	iu->permit = rnbd_get_permit(dev->sess, RTRS_IO_CON,

				      RTRS_PERMIT_NOWAIT);

	if (unlikely(!iu->permit)) {

	if (!iu->permit) {

		rnbd_clt_dev_kick_mq_queue(dev, hctx, RNBD_DELAY_IFBUSY);

		return BLK_STS_RESOURCE;

	}
@@ -1148,7 +1151,8 @@ static blk_status_t rnbd_queue_rq(struct blk_mq_hw_ctx *hctx, 
	iu->sgt.sgl = iu->first_sgl;

	err = sg_alloc_table_chained(&iu->sgt,

				     /* Even-if the request has no segment,

				      * sglist must have one entry at least */

				      * sglist must have one entry at least.

				      */

				     blk_rq_nr_phys_segments(rq) ? : 1,

				     iu->sgt.sgl,

				     RNBD_INLINE_SG_CNT);
@@ -1161,9 +1165,9 @@ static blk_status_t rnbd_queue_rq(struct blk_mq_hw_ctx *hctx, 


	blk_mq_start_request(rq);

	err = rnbd_client_xfer_request(dev, rq, iu);

	if (likely(err == 0))

	if (err == 0)

		return BLK_STS_OK;

	if (unlikely(err == -EAGAIN || err == -ENOMEM)) {

	if (err == -EAGAIN || err == -ENOMEM) {

		rnbd_clt_dev_kick_mq_queue(dev, hctx, 10/*ms*/);

		ret = BLK_STS_RESOURCE;

	}
@@ -1294,7 +1298,11 @@ find_and_get_or_create_sess(const char *sessname, 
		err = PTR_ERR(sess->rtrs);

		goto wake_up_and_put;

	}

	rtrs_clt_query(sess->rtrs, &attrs);



	err = rtrs_clt_query(sess->rtrs, &attrs);

	if (err)

		goto close_rtrs;



	sess->max_io_size = attrs.max_io_size;

	sess->queue_depth = attrs.queue_depth;

	sess->nr_poll_queues = nr_poll_queues;
@@ -1576,7 +1584,7 @@ struct rnbd_clt_dev *rnbd_clt_map_device(const char *sessname, 
	struct rnbd_clt_dev *dev;

	int ret;



	if (unlikely(exists_devpath(pathname, sessname)))

	if (exists_devpath(pathname, sessname))

		return ERR_PTR(-EEXIST);



	sess = find_and_get_or_create_sess(sessname, paths, path_cnt, port_nr, nr_poll_queues);

drivers/block/rnbd/rnbd-clt.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ struct rnbd_clt_session { 
	DECLARE_BITMAP(cpu_queues_bm, NR_CPUS);

	int	__percpu	*cpu_rr; /* per-cpu var for CPU round-robin */

	atomic_t		busy;

	int			queue_depth;

	size_t			queue_depth;

	u32			max_io_size;

	struct blk_mq_tag_set	tag_set;

	u32			nr_poll_queues;

drivers/block/rnbd/rnbd-srv.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ rnbd_get_sess_dev(int dev_id, struct rnbd_srv_session *srv_sess) 


	rcu_read_lock();

	sess_dev = xa_load(&srv_sess->index_idr, dev_id);

	if (likely(sess_dev))

	if (sess_dev)

		ret = kref_get_unless_zero(&sess_dev->kref);

	rcu_read_unlock();