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

Merge tag 'block-5.12-2021-03-12-v2' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:
 "Mostly just random fixes all over the map.

  The only odd-one-out change is finally getting the rename of
  BIO_MAX_PAGES to BIO_MAX_VECS done. This should've been done with the
  multipage bvec change, but it's been left.

  Do it now to avoid hassles around changes piling up for the next merge
  window.

  Summary:

   - NVMe pull request:
      - one more quirk (Dmitry Monakhov)
      - fix max_zone_append_sectors initialization (Chaitanya Kulkarni)
      - nvme-fc reset/create race fix (James Smart)
      - fix status code on aborts/resets (Hannes Reinecke)
      - fix the CSS check for ZNS namespaces (Chaitanya Kulkarni)
      - fix a use after free in a debug printk in nvme-rdma (Lv Yunlong)

   - Follow-up NVMe error fix for NULL 'id' (Christoph)

   - Fixup for the bd_size_lock being IRQ safe, now that the offending
     driver has been dropped (Damien).

   - rsxx probe failure error return (Jia-Ju)

   - umem probe failure error return (Wei)

   - s390/dasd unbind fixes (Stefan)

   - blk-cgroup stats summing fix (Xunlei)

   - zone reset handling fix (Damien)

   - Rename BIO_MAX_PAGES to BIO_MAX_VECS (Christoph)

   - Suppress uevent trigger for hidden devices (Daniel)

   - Fix handling of discard on busy device (Jan)

   - Fix stale cache issue with zone reset (Shin'ichiro)"

* tag 'block-5.12-2021-03-12-v2' of git://git.kernel.dk/linux-block:
  nvme: fix the nsid value to print in nvme_validate_or_alloc_ns
  block: Discard page cache of zone reset target range
  block: Suppress uevent for hidden device when removed
  block: rename BIO_MAX_PAGES to BIO_MAX_VECS
  nvme-pci: add the DISABLE_WRITE_ZEROES quirk for a Samsung PM1725a
  nvme-rdma: Fix a use after free in nvmet_rdma_write_data_done
  nvme-core: check ctrl css before setting up zns
  nvme-fc: fix racing controller reset and create association
  nvme-fc: return NVME_SC_HOST_ABORTED_CMD when a command has been aborted
  nvme-fc: set NVME_REQ_CANCELLED in nvme_fc_terminate_exchange()
  nvme: add NVME_REQ_CANCELLED flag in nvme_cancel_request()
  nvme: simplify error logic in nvme_validate_ns()
  nvme: set max_zone_append_sectors nvme_revalidate_zones
  block: rsxx: fix error return code of rsxx_pci_probe()
  block: Fix REQ_OP_ZONE_RESET_ALL handling
  umem: fix error return code in mm_pci_probe()
  blk-cgroup: Fix the recursive blkg rwstat
  s390/dasd: fix hanging IO request during DASD driver unbind
  s390/dasd: fix hanging DASD driver unbind
  block: Try to handle busy underlying device on discard
parents 9278be92 f4f9fc29

block/bio.c

+7 −7
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static struct biovec_slab { 
	{ .nr_vecs = 16, .name = "biovec-16" },

	{ .nr_vecs = 64, .name = "biovec-64" },

	{ .nr_vecs = 128, .name = "biovec-128" },

	{ .nr_vecs = BIO_MAX_PAGES, .name = "biovec-max" },

	{ .nr_vecs = BIO_MAX_VECS, .name = "biovec-max" },

};



static struct biovec_slab *biovec_slab(unsigned short nr_vecs)
@@ -46,7 +46,7 @@ static struct biovec_slab *biovec_slab(unsigned short nr_vecs) 
		return &bvec_slabs[1];

	case 65 ... 128:

		return &bvec_slabs[2];

	case 129 ... BIO_MAX_PAGES:

	case 129 ... BIO_MAX_VECS:

		return &bvec_slabs[3];

	default:

		BUG();
@@ -151,9 +151,9 @@ static void bio_put_slab(struct bio_set *bs) 


void bvec_free(mempool_t *pool, struct bio_vec *bv, unsigned short nr_vecs)

{

	BIO_BUG_ON(nr_vecs > BIO_MAX_PAGES);

	BIO_BUG_ON(nr_vecs > BIO_MAX_VECS);



	if (nr_vecs == BIO_MAX_PAGES)

	if (nr_vecs == BIO_MAX_VECS)

		mempool_free(bv, pool);

	else if (nr_vecs > BIO_INLINE_VECS)

		kmem_cache_free(biovec_slab(nr_vecs)->slab, bv);
@@ -186,15 +186,15 @@ struct bio_vec *bvec_alloc(mempool_t *pool, unsigned short *nr_vecs, 
	/*

	 * Try a slab allocation first for all smaller allocations.  If that

	 * fails and __GFP_DIRECT_RECLAIM is set retry with the mempool.

	 * The mempool is sized to handle up to BIO_MAX_PAGES entries.

	 * The mempool is sized to handle up to BIO_MAX_VECS entries.

	 */

	if (*nr_vecs < BIO_MAX_PAGES) {

	if (*nr_vecs < BIO_MAX_VECS) {

		struct bio_vec *bvl;



		bvl = kmem_cache_alloc(bvs->slab, bvec_alloc_gfp(gfp_mask));

		if (likely(bvl) || !(gfp_mask & __GFP_DIRECT_RECLAIM))

			return bvl;

		*nr_vecs = BIO_MAX_PAGES;

		*nr_vecs = BIO_MAX_VECS;

	}



	return mempool_alloc(pool, gfp_mask);

block/blk-cgroup-rwstat.c

+2 −1
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ void blkg_rwstat_recursive_sum(struct blkcg_gq *blkg, struct blkcg_policy *pol, 


	lockdep_assert_held(&blkg->q->queue_lock);



	memset(sum, 0, sizeof(*sum));

	rcu_read_lock();

	blkg_for_each_descendant_pre(pos_blkg, pos_css, blkg) {

		struct blkg_rwstat *rwstat;
@@ -122,7 +123,7 @@ void blkg_rwstat_recursive_sum(struct blkcg_gq *blkg, struct blkcg_policy *pol, 
			rwstat = (void *)pos_blkg + off;



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

			sum->cnt[i] = blkg_rwstat_read_counter(rwstat, i);

			sum->cnt[i] += blkg_rwstat_read_counter(rwstat, i);

	}

	rcu_read_unlock();

}

block/blk-crypto-fallback.c

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ static bool blk_crypto_split_bio_if_needed(struct bio **bio_ptr) 


	bio_for_each_segment(bv, bio, iter) {

		num_sectors += bv.bv_len >> SECTOR_SHIFT;

		if (++i == BIO_MAX_PAGES)

		if (++i == BIO_MAX_VECS)

			break;

	}

	if (num_sectors < bio_sectors(bio)) {

block/blk-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static unsigned int __blkdev_sectors_to_bio_pages(sector_t nr_sects) 
{

	sector_t pages = DIV_ROUND_UP_SECTOR_T(nr_sects, PAGE_SIZE / 512);



	return min(pages, (sector_t)BIO_MAX_PAGES);

	return min(pages, (sector_t)BIO_MAX_VECS);

}



static int __blkdev_issue_zero_pages(struct block_device *bdev,

block/blk-map.c

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter, 
	if (!iov_iter_count(iter))

		return -EINVAL;



	bio = bio_kmalloc(gfp_mask, iov_iter_npages(iter, BIO_MAX_PAGES));

	bio = bio_kmalloc(gfp_mask, iov_iter_npages(iter, BIO_MAX_VECS));

	if (!bio)

		return -ENOMEM;

	bio->bi_opf |= req_op(rq);