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

Merge tag 'for-5.18/block-2022-04-01' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:
 "Either fixes or a few additions that got missed in the initial merge
  window pull. In detail:

   - List iterator fix to avoid leaking value post loop (Jakob)

   - One-off fix in minor count (Christophe)

   - Fix for a regression in how io priority setting works for an
     exiting task (Jiri)

   - Fix a regression in this merge window with blkg_free() being called
     in an inappropriate context (Ming)

   - Misc fixes (Ming, Tom)"

* tag 'for-5.18/block-2022-04-01' of git://git.kernel.dk/linux-block:
  blk-wbt: remove wbt_track stub
  block: use dedicated list iterator variable
  block: Fix the maximum minor value is blk_alloc_ext_minor()
  block: restore the old set_task_ioprio() behaviour wrt PF_EXITING
  block: avoid calling blkg_free() in atomic context
  lib/sbitmap: allocate sb->map via kvzalloc_node
parents 3b1509f2 8d7829eb

block/blk-cgroup.c

+22 −10
Original line number Diff line number Diff line
@@ -65,19 +65,12 @@ static bool blkcg_policy_enabled(struct request_queue *q, 
	return pol && test_bit(pol->plid, q->blkcg_pols);

}



/**

 * blkg_free - free a blkg

 * @blkg: blkg to free

 *

 * Free @blkg which may be partially allocated.

 */

static void blkg_free(struct blkcg_gq *blkg)

static void blkg_free_workfn(struct work_struct *work)

{

	struct blkcg_gq *blkg = container_of(work, struct blkcg_gq,

					     free_work);

	int i;



	if (!blkg)

		return;



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

		if (blkg->pd[i])

			blkcg_policy[i]->pd_free_fn(blkg->pd[i]);
@@ -89,6 +82,25 @@ static void blkg_free(struct blkcg_gq *blkg) 
	kfree(blkg);

}



/**

 * blkg_free - free a blkg

 * @blkg: blkg to free

 *

 * Free @blkg which may be partially allocated.

 */

static void blkg_free(struct blkcg_gq *blkg)

{

	if (!blkg)

		return;



	/*

	 * Both ->pd_free_fn() and request queue's release handler may

	 * sleep, so free us by scheduling one work func

	 */

	INIT_WORK(&blkg->free_work, blkg_free_workfn);

	schedule_work(&blkg->free_work);

}



static void __blkg_release(struct rcu_head *rcu)

{

	struct blkcg_gq *blkg = container_of(rcu, struct blkcg_gq, rcu_head);

block/blk-ioc.c

+1 −2
Original line number Diff line number Diff line
@@ -280,7 +280,6 @@ int set_task_ioprio(struct task_struct *task, int ioprio) 


		task_lock(task);

		if (task->flags & PF_EXITING) {

			err = -ESRCH;

			kmem_cache_free(iocontext_cachep, ioc);

			goto out;

		}
@@ -292,7 +291,7 @@ int set_task_ioprio(struct task_struct *task, int ioprio) 
	task->io_context->ioprio = ioprio;

out:

	task_unlock(task);

	return err;

	return 0;

}

EXPORT_SYMBOL_GPL(set_task_ioprio);

block/blk-mq.c

+16 −9
Original line number Diff line number Diff line
@@ -4462,21 +4462,28 @@ static bool blk_mq_elv_switch_none(struct list_head *head, 
	return true;

}



static void blk_mq_elv_switch_back(struct list_head *head,

static struct blk_mq_qe_pair *blk_lookup_qe_pair(struct list_head *head,

						struct request_queue *q)

{

	struct blk_mq_qe_pair *qe;

	struct elevator_type *t = NULL;



	list_for_each_entry(qe, head, node)

		if (qe->q == q) {

			t = qe->type;

			break;

		if (qe->q == q)

			return qe;



	return NULL;

}



	if (!t)

		return;

static void blk_mq_elv_switch_back(struct list_head *head,

				  struct request_queue *q)

{

	struct blk_mq_qe_pair *qe;

	struct elevator_type *t;



	qe = blk_lookup_qe_pair(head, q);

	if (!qe)

		return;

	t = qe->type;

	list_del(&qe->node);

	kfree(qe);

block/blk-wbt.h

+0 −3
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ u64 wbt_default_latency_nsec(struct request_queue *); 


#else



static inline void wbt_track(struct request *rq, enum wbt_flags flags)

{

}

static inline int wbt_init(struct request_queue *q)

{

	return -EINVAL;

block/genhd.c

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ int blk_alloc_ext_minor(void) 
{

	int idx;



	idx = ida_alloc_range(&ext_devt_ida, 0, NR_EXT_DEVT, GFP_KERNEL);

	idx = ida_alloc_range(&ext_devt_ida, 0, NR_EXT_DEVT - 1, GFP_KERNEL);

	if (idx == -ENOSPC)

		return -EBUSY;

	return idx;