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

Merge tag 'block-5.11-2021-01-10' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - Missing CRC32 selections (Arnd)

 - Fix for a merge window regression with bdev inode init (Christoph)

 - bcache fixes

 - rnbd fixes

 - NVMe pull request from Christoph:
    - fix a race in the nvme-tcp send code (Sagi Grimberg)
    - fix a list corruption in an nvme-rdma error path (Israel Rukshin)
    - avoid a possible double fetch in nvme-pci (Lalithambika Krishnakumar)
    - add the susystem NQN quirk for a Samsung driver (Gopal Tiwari)
    - fix two compiler warnings in nvme-fcloop (James Smart)
    - don't call sleeping functions from irq context in nvme-fc (James Smart)
    - remove an unused argument (Max Gurtovoy)
    - remove unused exports (Minwoo Im)

 - Use-after-free fix for partition iteration (Ming)

 - Missing blk-mq debugfs flag annotation (John)

 - Bdev freeze regression fix (Satya)

 - blk-iocost NULL pointer deref fix (Tejun)

* tag 'block-5.11-2021-01-10' of git://git.kernel.dk/linux-block: (26 commits)
  bcache: set bcache device into read-only mode for BCH_FEATURE_INCOMPAT_OBSO_LARGE_BUCKET
  bcache: introduce BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE for large bucket
  bcache: check unsupported feature sets for bcache register
  bcache: fix typo from SUUP to SUPP in features.h
  bcache: set pdev_set_uuid before scond loop iteration
  blk-mq-debugfs: Add decode for BLK_MQ_F_TAG_HCTX_SHARED
  block/rnbd-clt: avoid module unload race with close confirmation
  block/rnbd: Adding name to the Contributors List
  block/rnbd-clt: Fix sg table use after free
  block/rnbd-srv: Fix use after free in rnbd_srv_sess_dev_force_close
  block/rnbd: Select SG_POOL for RNBD_CLIENT
  block: pre-initialize struct block_device in bdev_alloc_inode
  fs: Fix freeze_bdev()/thaw_bdev() accounting of bd_fsfreeze_sb
  nvme: remove the unused status argument from nvme_trace_bio_complete
  nvmet-rdma: Fix list_del corruption on queue establishment failure
  nvme: unexport functions with no external caller
  nvme: avoid possible double fetch in handling CQE
  nvme-tcp: Fix possible race of io_work and direct send
  nvme-pci: mark Samsung PM1725a as IGNORE_DEV_SUBNQN
  nvme-fcloop: Fix sscanf type and list_first_entry_or_null warnings
  ...
parents d430adfe 5342fd42

block/bfq-iosched.c

+4 −4
Original line number Diff line number Diff line
@@ -6332,13 +6332,13 @@ static unsigned int bfq_update_depths(struct bfq_data *bfqd, 
	 * limit 'something'.

	 */

	/* no more than 50% of tags for async I/O */

	bfqd->word_depths[0][0] = max((1U << bt->sb.shift) >> 1, 1U);

	bfqd->word_depths[0][0] = max(bt->sb.depth >> 1, 1U);

	/*

	 * no more than 75% of tags for sync writes (25% extra tags

	 * w.r.t. async I/O, to prevent async I/O from starving sync

	 * writes)

	 */

	bfqd->word_depths[0][1] = max(((1U << bt->sb.shift) * 3) >> 2, 1U);

	bfqd->word_depths[0][1] = max((bt->sb.depth * 3) >> 2, 1U);



	/*

	 * In-word depths in case some bfq_queue is being weight-
@@ -6348,9 +6348,9 @@ static unsigned int bfq_update_depths(struct bfq_data *bfqd, 
	 * shortage.

	 */

	/* no more than ~18% of tags for async I/O */

	bfqd->word_depths[1][0] = max(((1U << bt->sb.shift) * 3) >> 4, 1U);

	bfqd->word_depths[1][0] = max((bt->sb.depth * 3) >> 4, 1U);

	/* no more than ~37% of tags for sync writes (~20% extra tags) */

	bfqd->word_depths[1][1] = max(((1U << bt->sb.shift) * 6) >> 4, 1U);

	bfqd->word_depths[1][1] = max((bt->sb.depth * 6) >> 4, 1U);



	for (i = 0; i < 2; i++)

		for (j = 0; j < 2; j++)

block/blk-iocost.c

+11 −5
Original line number Diff line number Diff line
@@ -2551,8 +2551,8 @@ static void ioc_rqos_throttle(struct rq_qos *rqos, struct bio *bio) 
	bool use_debt, ioc_locked;

	unsigned long flags;



	/* bypass IOs if disabled or for root cgroup */

	if (!ioc->enabled || !iocg->level)

	/* bypass IOs if disabled, still initializing, or for root cgroup */

	if (!ioc->enabled || !iocg || !iocg->level)

		return;



	/* calculate the absolute vtime cost */
@@ -2679,14 +2679,14 @@ static void ioc_rqos_merge(struct rq_qos *rqos, struct request *rq, 
			   struct bio *bio)

{

	struct ioc_gq *iocg = blkg_to_iocg(bio->bi_blkg);

	struct ioc *ioc = iocg->ioc;

	struct ioc *ioc = rqos_to_ioc(rqos);

	sector_t bio_end = bio_end_sector(bio);

	struct ioc_now now;

	u64 vtime, abs_cost, cost;

	unsigned long flags;



	/* bypass if disabled or for root cgroup */

	if (!ioc->enabled || !iocg->level)

	/* bypass if disabled, still initializing, or for root cgroup */

	if (!ioc->enabled || !iocg || !iocg->level)

		return;



	abs_cost = calc_vtime_cost(bio, iocg, true);
@@ -2863,6 +2863,12 @@ static int blk_iocost_init(struct request_queue *q) 
	ioc_refresh_params(ioc, true);

	spin_unlock_irq(&ioc->lock);



	/*

	 * rqos must be added before activation to allow iocg_pd_init() to

	 * lookup the ioc from q. This means that the rqos methods may get

	 * called before policy activation completion, can't assume that the

	 * target bio has an iocg associated and need to test for NULL iocg.

	 */

	rq_qos_add(q, rqos);

	ret = blkcg_activate_policy(q, &blkcg_policy_iocost);

	if (ret) {

block/blk-mq-debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ static const char *const hctx_flag_name[] = { 
	HCTX_FLAG_NAME(BLOCKING),

	HCTX_FLAG_NAME(NO_SCHED),

	HCTX_FLAG_NAME(STACKING),

	HCTX_FLAG_NAME(TAG_HCTX_SHARED),

};

#undef HCTX_FLAG_NAME

block/genhd.c

+7 −4
Original line number Diff line number Diff line
@@ -246,15 +246,18 @@ struct block_device *disk_part_iter_next(struct disk_part_iter *piter) 
		part = rcu_dereference(ptbl->part[piter->idx]);

		if (!part)

			continue;

		piter->part = bdgrab(part);

		if (!piter->part)

			continue;

		if (!bdev_nr_sectors(part) &&

		    !(piter->flags & DISK_PITER_INCL_EMPTY) &&

		    !(piter->flags & DISK_PITER_INCL_EMPTY_PART0 &&

		      piter->idx == 0))

		      piter->idx == 0)) {

			bdput(piter->part);

			piter->part = NULL;

			continue;

		}



		piter->part = bdgrab(part);

		if (!piter->part)

			continue;

		piter->idx += inc;

		break;

	}

drivers/block/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ config BLK_DEV_RBD 
config BLK_DEV_RSXX

	tristate "IBM Flash Adapter 900GB Full Height PCIe Device Driver"

	depends on PCI

	select CRC32

	help

	  Device driver for IBM's high speed PCIe SSD

	  storage device: Flash Adapter 900GB Full Height.