Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-linus' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:
 "A set of fixes that should go into the next -rc. This contains:

   - A use-after-free in the request_list exit for the legacy IO path,
     from Bart.

   - A fix for CFQ, fixing a recent regression with the conversion to
     higher resolution timing for iops mode. From Hou Tao.

   - A single fix for nbd, split in two patches, fixing a leak of a data
     structure.

   - A regression fix from Keith, ensuring that callers of
     blk_mq_update_nr_hw_queues() hold the right lock"

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: Avoid that blk_exit_rl() triggers a use-after-free
  cfq-iosched: fix the delay of cfq_group's vdisktime under iops mode
  blk-mq: Take tagset lock when updating hw queues
  nbd: don't leak nbd_config
  nbd: nbd_reset() call in nbd_dev_add() is redundant
parents 46356945 b425e504

block/blk-cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void blkg_free(struct blkcg_gq *blkg) 
			blkcg_policy[i]->pd_free_fn(blkg->pd[i]);



	if (blkg->blkcg != &blkcg_root)

		blk_exit_rl(&blkg->rl);

		blk_exit_rl(blkg->q, &blkg->rl);



	blkg_rwstat_exit(&blkg->stat_ios);

	blkg_rwstat_exit(&blkg->stat_bytes);

block/blk-core.c

+8 −2
Original line number Diff line number Diff line
@@ -648,13 +648,19 @@ int blk_init_rl(struct request_list *rl, struct request_queue *q, 
	if (!rl->rq_pool)

		return -ENOMEM;



	if (rl != &q->root_rl)

		WARN_ON_ONCE(!blk_get_queue(q));



	return 0;

}



void blk_exit_rl(struct request_list *rl)

void blk_exit_rl(struct request_queue *q, struct request_list *rl)

{

	if (rl->rq_pool)

	if (rl->rq_pool) {

		mempool_destroy(rl->rq_pool);

		if (rl != &q->root_rl)

			blk_put_queue(q);

	}

}



struct request_queue *blk_alloc_queue(gfp_t gfp_mask)

block/blk-mq.c

+9 −1
Original line number Diff line number Diff line
@@ -2641,7 +2641,8 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr) 
	return ret;

}



void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues)

static void __blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set,

							int nr_hw_queues)

{

	struct request_queue *q;
@@ -2665,6 +2666,13 @@ void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues) 
	list_for_each_entry(q, &set->tag_list, tag_set_list)

		blk_mq_unfreeze_queue(q);

}



void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues)

{

	mutex_lock(&set->tag_list_lock);

	__blk_mq_update_nr_hw_queues(set, nr_hw_queues);

	mutex_unlock(&set->tag_list_lock);

}

EXPORT_SYMBOL_GPL(blk_mq_update_nr_hw_queues);



/* Enable polling stats and return whether they were already enabled. */

block/blk-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ static void blk_release_queue(struct kobject *kobj) 


	blk_free_queue_stats(q->stats);



	blk_exit_rl(&q->root_rl);

	blk_exit_rl(q, &q->root_rl);



	if (q->queue_tags)

		__blk_queue_free_tags(q);

block/blk.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ void blk_free_flush_queue(struct blk_flush_queue *q); 


int blk_init_rl(struct request_list *rl, struct request_queue *q,

		gfp_t gfp_mask);

void blk_exit_rl(struct request_list *rl);

void blk_exit_rl(struct request_queue *q, struct request_list *rl);

void blk_rq_bio_prep(struct request_queue *q, struct request *rq,

			struct bio *bio);

void blk_queue_bypass_start(struct request_queue *q);