Commit 34bbce9e 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:
 "Sending this a bit sooner than I otherwise would have, as a fix in the
  merge window had some unfortunate issues and side effects for some
  folks.

  This contains:

   - Fixes from Jan for the bdi registration/unregistration. These have
     been tested by the various parties reporting issues, and should be
     solid at this point.

   - Also from Jan, fix for axonram gendisk registration.

   - A stable fix for zram from Johannes.

   - A small series from Ming, fixing up some long standing issues with
     blk-mq hardware queue kobject initialization and registration.

   - A fix for sed opal from Jon, fixing a nonsensical range check and
     some set-but-not-used variables.

   - A fix from Neil for a long standing deadlock issue for stacking
     device drivers. With this in place, dm/md don't have to work around
     the issue anymore, and can be properly fixed up"

* 'for-linus' of git://git.kernel.dk/linux-block:
  axonram: Fix gendisk handling
  blk: improve order of bio handling in generic_make_request()
  Revert "scsi, block: fix duplicate bdi name registration crashes"
  block: Make del_gendisk() safer for disks without queues
  bdi: Fix use-after-free in wb_congested_put()
  block: Allow bdi re-registration
  block/sed: Fix opal user range check and unused variables
  zram: set physical queue limits to avoid array out of bounds accesses
  blk-mq: free hctx->cpumask in release handler of hctx's kobject
  blk-mq: make lifetime consistent between hctx and its kobject
  blk-mq: make lifetime consitent between q/ctx and its kobject
  blk-mq: initialize mq kobjects in blk_mq_init_allocated_queue()
parents bb61ce54 672a2c87

arch/powerpc/sysdev/axonram.c

+4 −1
Original line number Diff line number Diff line
@@ -274,7 +274,9 @@ failed: 
			if (bank->disk->major > 0)

				unregister_blkdev(bank->disk->major,

						bank->disk->disk_name);

			if (bank->disk->flags & GENHD_FL_UP)

				del_gendisk(bank->disk);

			put_disk(bank->disk);

		}

		device->dev.platform_data = NULL;

		if (bank->io_addr != 0)
@@ -299,6 +301,7 @@ axon_ram_remove(struct platform_device *device) 
	device_remove_file(&device->dev, &dev_attr_ecc);

	free_irq(bank->irq_id, device);

	del_gendisk(bank->disk);

	put_disk(bank->disk);

	iounmap((void __iomem *) bank->io_addr);

	kfree(bank);

block/blk-core.c

+21 −6
Original line number Diff line number Diff line
@@ -578,8 +578,6 @@ void blk_cleanup_queue(struct request_queue *q) 
		q->queue_lock = &q->__queue_lock;

	spin_unlock_irq(lock);



	put_disk_devt(q->disk_devt);



	/* @q is and will stay empty, shutdown and put */

	blk_put_queue(q);

}
@@ -2017,17 +2015,34 @@ blk_qc_t generic_make_request(struct bio *bio) 
		struct request_queue *q = bdev_get_queue(bio->bi_bdev);



		if (likely(blk_queue_enter(q, false) == 0)) {

			struct bio_list hold;

			struct bio_list lower, same;



			/* Create a fresh bio_list for all subordinate requests */

			hold = bio_list_on_stack;

			bio_list_init(&bio_list_on_stack);

			ret = q->make_request_fn(q, bio);



			blk_queue_exit(q);



			bio = bio_list_pop(current->bio_list);

			/* sort new bios into those for a lower level

			 * and those for the same level

			 */

			bio_list_init(&lower);

			bio_list_init(&same);

			while ((bio = bio_list_pop(&bio_list_on_stack)) != NULL)

				if (q == bdev_get_queue(bio->bi_bdev))

					bio_list_add(&same, bio);

				else

					bio_list_add(&lower, bio);

			/* now assemble so we handle the lowest level first */

			bio_list_merge(&bio_list_on_stack, &lower);

			bio_list_merge(&bio_list_on_stack, &same);

			bio_list_merge(&bio_list_on_stack, &hold);

		} else {

			struct bio *bio_next = bio_list_pop(current->bio_list);



			bio_io_error(bio);

			bio = bio_next;

		}

		bio = bio_list_pop(current->bio_list);

	} while (bio);

	current->bio_list = NULL; /* deactivate */

block/blk-mq-sysfs.c

+25 −15
Original line number Diff line number Diff line
@@ -17,6 +17,15 @@ static void blk_mq_sysfs_release(struct kobject *kobj) 
{

}



static void blk_mq_hw_sysfs_release(struct kobject *kobj)

{

	struct blk_mq_hw_ctx *hctx = container_of(kobj, struct blk_mq_hw_ctx,

						  kobj);

	free_cpumask_var(hctx->cpumask);

	kfree(hctx->ctxs);

	kfree(hctx);

}



struct blk_mq_ctx_sysfs_entry {

	struct attribute attr;

	ssize_t (*show)(struct blk_mq_ctx *, char *);
@@ -200,7 +209,7 @@ static struct kobj_type blk_mq_ctx_ktype = { 
static struct kobj_type blk_mq_hw_ktype = {

	.sysfs_ops	= &blk_mq_hw_sysfs_ops,

	.default_attrs	= default_hw_ctx_attrs,

	.release	= blk_mq_sysfs_release,

	.release	= blk_mq_hw_sysfs_release,

};



static void blk_mq_unregister_hctx(struct blk_mq_hw_ctx *hctx)
@@ -242,24 +251,15 @@ static int blk_mq_register_hctx(struct blk_mq_hw_ctx *hctx) 
static void __blk_mq_unregister_dev(struct device *dev, struct request_queue *q)

{

	struct blk_mq_hw_ctx *hctx;

	struct blk_mq_ctx *ctx;

	int i, j;

	int i;



	queue_for_each_hw_ctx(q, hctx, i) {

	queue_for_each_hw_ctx(q, hctx, i)

		blk_mq_unregister_hctx(hctx);



		hctx_for_each_ctx(hctx, ctx, j)

			kobject_put(&ctx->kobj);



		kobject_put(&hctx->kobj);

	}



	blk_mq_debugfs_unregister_hctxs(q);



	kobject_uevent(&q->mq_kobj, KOBJ_REMOVE);

	kobject_del(&q->mq_kobj);

	kobject_put(&q->mq_kobj);



	kobject_put(&dev->kobj);



	q->mq_sysfs_init_done = false;
@@ -277,7 +277,19 @@ void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx) 
	kobject_init(&hctx->kobj, &blk_mq_hw_ktype);

}



static void blk_mq_sysfs_init(struct request_queue *q)

void blk_mq_sysfs_deinit(struct request_queue *q)

{

	struct blk_mq_ctx *ctx;

	int cpu;



	for_each_possible_cpu(cpu) {

		ctx = per_cpu_ptr(q->queue_ctx, cpu);

		kobject_put(&ctx->kobj);

	}

	kobject_put(&q->mq_kobj);

}



void blk_mq_sysfs_init(struct request_queue *q)

{

	struct blk_mq_ctx *ctx;

	int cpu;
@@ -297,8 +309,6 @@ int blk_mq_register_dev(struct device *dev, struct request_queue *q) 


	blk_mq_disable_hotplug();



	blk_mq_sysfs_init(q);



	ret = kobject_add(&q->mq_kobj, kobject_get(&dev->kobj), "%s", "mq");

	if (ret < 0)

		goto out;

block/blk-mq.c

+10 −18
Original line number Diff line number Diff line
@@ -1955,16 +1955,6 @@ static void blk_mq_exit_hw_queues(struct request_queue *q, 
	}

}



static void blk_mq_free_hw_queues(struct request_queue *q,

		struct blk_mq_tag_set *set)

{

	struct blk_mq_hw_ctx *hctx;

	unsigned int i;



	queue_for_each_hw_ctx(q, hctx, i)

		free_cpumask_var(hctx->cpumask);

}



static int blk_mq_init_hctx(struct request_queue *q,

		struct blk_mq_tag_set *set,

		struct blk_mq_hw_ctx *hctx, unsigned hctx_idx)
@@ -2045,7 +2035,6 @@ static void blk_mq_init_cpu_queues(struct request_queue *q, 
		struct blk_mq_ctx *__ctx = per_cpu_ptr(q->queue_ctx, i);

		struct blk_mq_hw_ctx *hctx;



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

		__ctx->cpu = i;

		spin_lock_init(&__ctx->lock);

		INIT_LIST_HEAD(&__ctx->rq_list);
@@ -2257,15 +2246,19 @@ void blk_mq_release(struct request_queue *q) 
	queue_for_each_hw_ctx(q, hctx, i) {

		if (!hctx)

			continue;

		kfree(hctx->ctxs);

		kfree(hctx);

		kobject_put(&hctx->kobj);

	}



	q->mq_map = NULL;



	kfree(q->queue_hw_ctx);



	/* ctx kobj stays in queue_ctx */

	/*

	 * release .mq_kobj and sw queue's kobject now because

	 * both share lifetime with request queue.

	 */

	blk_mq_sysfs_deinit(q);



	free_percpu(q->queue_ctx);

}
@@ -2330,10 +2323,7 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set, 
			if (hctx->tags)

				blk_mq_free_map_and_requests(set, j);

			blk_mq_exit_hctx(q, set, hctx, j);

			free_cpumask_var(hctx->cpumask);

			kobject_put(&hctx->kobj);

			kfree(hctx->ctxs);

			kfree(hctx);

			hctxs[j] = NULL;



		}
@@ -2352,6 +2342,9 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, 
	if (!q->queue_ctx)

		goto err_exit;



	/* init q->mq_kobj and sw queues' kobjects */

	blk_mq_sysfs_init(q);



	q->queue_hw_ctx = kzalloc_node(nr_cpu_ids * sizeof(*(q->queue_hw_ctx)),

						GFP_KERNEL, set->numa_node);

	if (!q->queue_hw_ctx)
@@ -2442,7 +2435,6 @@ void blk_mq_free_queue(struct request_queue *q) 
	blk_mq_del_queue_tag_set(q);



	blk_mq_exit_hw_queues(q, set, set->nr_hw_queues);

	blk_mq_free_hw_queues(q, set);

}



/* Basically redo blk_mq_init_queue with queue frozen */

block/blk-mq.h

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ static inline struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *q, 
/*

 * sysfs helpers

 */

extern void blk_mq_sysfs_init(struct request_queue *q);

extern void blk_mq_sysfs_deinit(struct request_queue *q);

extern int blk_mq_sysfs_register(struct request_queue *q);

extern void blk_mq_sysfs_unregister(struct request_queue *q);

extern void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx);

CRA Git | Maintained and supported by SUSTech CRA and CCSE