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

Merge tag 'block-7.1-20260424' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux 

Pull block fixes from Jens Axboe:

 - Series for zloop, fixing a variety of issues

 - t10-pi code cleanup

 - Fix for a merge window regression with the bio memory allocation mask

 - Fix for a merge window regression in ublk, caused by an issue with
   the maple tree iteration code at teardown

 - ublk self tests additions

 - Zoned device pgmap fixes

 - Various little cleanups and fixes

* tag 'block-7.1-20260424' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux: (21 commits)
  Revert "floppy: fix reference leak on platform_device_register() failure"
  ublk: avoid unpinning pages under maple tree spinlock
  ublk: refactor common helper ublk_shmem_remove_ranges()
  ublk: fix maple tree lockdep warning in ublk_buf_cleanup
  selftests: ublk: add ublk auto integrity test
  selftests: ublk: enable test_integrity_02.sh on fio 3.42
  selftests: ublk: remove unused argument to _cleanup
  block: only restrict bio allocation gfp mask asked to block
  block/blk-throttle: Add WQ_PERCPU to alloc_workqueue users
  block: Add WQ_PERCPU to alloc_workqueue users
  block: relax pgmap check in bio_add_page for compatible zone device pages
  block: add pgmap check to biovec_phys_mergeable
  floppy: fix reference leak on platform_device_register() failure
  ublk: use unchecked copy helpers for bio page data
  t10-pi: reduce ref tag code duplication
  zloop: remove irq-safe locking
  zloop: factor out zloop_mark_{full,empty} helpers
  zloop: set RQF_QUIET when completing requests on deleted devices
  zloop: improve the unaligned write pointer warning
  zloop: use vfs_truncate
  ...
parents fa58e6e9 895a9b37

block/bio-integrity-auto.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int __init blk_integrity_auto_init(void) 
	 * Make it highpri CPU intensive wq with max concurrency of 1.

	 */

	kintegrityd_wq = alloc_workqueue("kintegrityd", WQ_MEM_RECLAIM |

					 WQ_HIGHPRI | WQ_CPU_INTENSIVE, 1);

					 WQ_HIGHPRI | WQ_CPU_INTENSIVE | WQ_PERCPU, 1);

	if (!kintegrityd_wq)

		panic("Failed to create kintegrityd\n");

	return 0;

block/bio-integrity.c

+3 −3
Original line number Diff line number Diff line
@@ -231,10 +231,10 @@ int bio_integrity_add_page(struct bio *bio, struct page *page, 
	if (bip->bip_vcnt > 0) {

		struct bio_vec *bv = &bip->bip_vec[bip->bip_vcnt - 1];



		if (!zone_device_pages_have_same_pgmap(bv->bv_page, page))

		if (!zone_device_pages_compatible(bv->bv_page, page))

			return 0;



		if (bvec_try_merge_hw_page(q, bv, page, len, offset)) {

		if (zone_device_pages_have_same_pgmap(bv->bv_page, page) &&

		    bvec_try_merge_hw_page(q, bv, page, len, offset)) {

			bip->bip_iter.bi_size += len;

			return len;

		}

block/bio.c

+6 −5
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ struct bio *bio_alloc_bioset(struct block_device *bdev, unsigned short nr_vecs, 
	if (WARN_ON_ONCE(!mempool_initialized(&bs->bvec_pool) && nr_vecs > 0))

		return NULL;



	if (saved_gfp & __GFP_DIRECT_RECLAIM)

		gfp = try_alloc_gfp(gfp);

	if (bs->cache && nr_vecs <= BIO_INLINE_VECS) {

		/*
@@ -1048,10 +1049,10 @@ int bio_add_page(struct bio *bio, struct page *page, 
	if (bio->bi_vcnt > 0) {

		struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1];



		if (!zone_device_pages_have_same_pgmap(bv->bv_page, page))

		if (!zone_device_pages_compatible(bv->bv_page, page))

			return 0;



		if (bvec_try_merge_page(bv, page, len, offset)) {

		if (zone_device_pages_have_same_pgmap(bv->bv_page, page) &&

		    bvec_try_merge_page(bv, page, len, offset)) {

			bio->bi_iter.bi_size += len;

			return len;

		}
@@ -1958,7 +1959,7 @@ int bioset_init(struct bio_set *bs, 


	if (flags & BIOSET_NEED_RESCUER) {

		bs->rescue_workqueue = alloc_workqueue("bioset",

							WQ_MEM_RECLAIM, 0);

							WQ_MEM_RECLAIM | WQ_PERCPU, 0);

		if (!bs->rescue_workqueue)

			goto bad;

	}

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1282,7 +1282,7 @@ int __init blk_dev_init(void) 


	/* used for unplugging and affects IO latency/throughput - HIGHPRI */

	kblockd_workqueue = alloc_workqueue("kblockd",

					    WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);

					    WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_PERCPU, 0);

	if (!kblockd_workqueue)

		panic("Failed to create kblockd\n");

block/blk-throttle.c

+1 −1
Original line number Diff line number Diff line
@@ -1839,7 +1839,7 @@ void blk_throtl_exit(struct gendisk *disk) 


static int __init throtl_init(void)

{

	kthrotld_workqueue = alloc_workqueue("kthrotld", WQ_MEM_RECLAIM, 0);

	kthrotld_workqueue = alloc_workqueue("kthrotld", WQ_MEM_RECLAIM | WQ_PERCPU, 0);

	if (!kthrotld_workqueue)

		panic("Failed to create kthrotld\n");