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

Merge tag 'block-6.17-20250815' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:

 - Fix for unprivileged daemons in ublk

 - Speedup ublk release by removing unnecessary quiesce

 - Fix for blk-wbt, where a regression caused it to not be possible to
   enable at runtime

 - blk-wbt cleanups

 - Kill the page pool from drbd

 - Remove redundant __GFP_NOWARN uses in a few spots

 - Fix for a kobject double initialization issues

* tag 'block-6.17-20250815' of git://git.kernel.dk/linux:
  block: restore default wbt enablement
  Docs: admin-guide: Correct spelling mistake
  blk-wbt: doc: Update the doc of the wbt_lat_usec interface
  blk-wbt: Eliminate ambiguity in the comments of struct rq_wb
  blk-wbt: Optimize wbt_done() for non-throttled writes
  block: fix kobject double initialization in add_disk
  blk-cgroup: remove redundant __GFP_NOWARN
  block, bfq: remove redundant __GFP_NOWARN
  ublk: check for unprivileged daemon on each I/O fetch
  ublk: don't quiesce in ublk_ch_release
  drbd: Remove the open-coded page pool
parents 4ad976b0 8f5845e0

Documentation/ABI/stable/sysfs-block

+1 −1
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ Contact: linux-block@vger.kernel.org 
Description:

		[RW] If the device is registered for writeback throttling, then

		this file shows the target minimum read latency. If this latency

		is exceeded in a given window of time (see wb_window_usec), then

		is exceeded in a given window of time (see curr_win_nsec), then

		the writeback throttling will start scaling back writes. Writing

		a value of '0' to this file disables the feature. Writing a

		value of '-1' to this file resets the value to the default

Documentation/admin-guide/blockdev/zoned_loop.rst

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ zone_capacity_mb Device zone capacity (must always be equal to or lower than 
                   the zone size. Default: zone size.

conv_zones         Total number of conventioanl zones starting from sector 0.

                   Default: 8.

base_dir           Path to the base directoy where to create the directory

base_dir           Path to the base directory where to create the directory

                   containing the zone files of the device.

                   Default=/var/local/zloop.

                   The device directory containing the zone files is always

block/bfq-iosched.c

+1 −2
Original line number Diff line number Diff line
@@ -5847,8 +5847,7 @@ static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd, 
			goto out;

	}



	bfqq = kmem_cache_alloc_node(bfq_pool,

				     GFP_NOWAIT | __GFP_ZERO | __GFP_NOWARN,

	bfqq = kmem_cache_alloc_node(bfq_pool, GFP_NOWAIT | __GFP_ZERO,

				     bfqd->queue->node);



	if (bfqq) {

block/blk-cgroup.c

+3 −3
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg, struct gendisk *disk, 


	/* allocate */

	if (!new_blkg) {

		new_blkg = blkg_alloc(blkcg, disk, GFP_NOWAIT | __GFP_NOWARN);

		new_blkg = blkg_alloc(blkcg, disk, GFP_NOWAIT);

		if (unlikely(!new_blkg)) {

			ret = -ENOMEM;

			goto err_put_css;
@@ -1467,7 +1467,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) 


	spin_lock_init(&blkcg->lock);

	refcount_set(&blkcg->online_pin, 1);

	INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_NOWAIT | __GFP_NOWARN);

	INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_NOWAIT);

	INIT_HLIST_HEAD(&blkcg->blkg_list);

#ifdef CONFIG_CGROUP_WRITEBACK

	INIT_LIST_HEAD(&blkcg->cgwb_list);
@@ -1630,7 +1630,7 @@ int blkcg_activate_policy(struct gendisk *disk, const struct blkcg_policy *pol) 
			pd_prealloc = NULL;

		} else {

			pd = pol->pd_alloc_fn(disk, blkg->blkcg,

					      GFP_NOWAIT | __GFP_NOWARN);

					      GFP_NOWAIT);

		}



		if (!pd) {

block/blk-sysfs.c

+6 −8
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ static void blk_queue_release(struct kobject *kobj) 
	/* nothing to do here, all data is associated with the parent gendisk */

}



static const struct kobj_type blk_queue_ktype = {

const struct kobj_type blk_queue_ktype = {

	.default_groups = blk_queue_attr_groups,

	.sysfs_ops	= &queue_sysfs_ops,

	.release	= blk_queue_release,
@@ -875,15 +875,14 @@ int blk_register_queue(struct gendisk *disk) 
	struct request_queue *q = disk->queue;

	int ret;



	kobject_init(&disk->queue_kobj, &blk_queue_ktype);

	ret = kobject_add(&disk->queue_kobj, &disk_to_dev(disk)->kobj, "queue");

	if (ret < 0)

		goto out_put_queue_kobj;

		return ret;



	if (queue_is_mq(q)) {

		ret = blk_mq_sysfs_register(disk);

		if (ret)

			goto out_put_queue_kobj;

			goto out_del_queue_kobj;

	}

	mutex_lock(&q->sysfs_lock);
@@ -903,9 +902,9 @@ int blk_register_queue(struct gendisk *disk) 


	if (queue_is_mq(q))

		elevator_set_default(q);

	wbt_enable_default(disk);



	blk_queue_flag_set(QUEUE_FLAG_REGISTERED, q);

	wbt_enable_default(disk);



	/* Now everything is ready and send out KOBJ_ADD uevent */

	kobject_uevent(&disk->queue_kobj, KOBJ_ADD);
@@ -934,8 +933,8 @@ int blk_register_queue(struct gendisk *disk) 
	mutex_unlock(&q->sysfs_lock);

	if (queue_is_mq(q))

		blk_mq_sysfs_unregister(disk);

out_put_queue_kobj:

	kobject_put(&disk->queue_kobj);

out_del_queue_kobj:

	kobject_del(&disk->queue_kobj);

	return ret;

}
@@ -986,5 +985,4 @@ void blk_unregister_queue(struct gendisk *disk) 
		elevator_set_none(q);



	blk_debugfs_remove(disk);

	kobject_put(&disk->queue_kobj);

}