Commit 9221dced authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block fixes from Jens Axboe:

 - A set of patches fixing code comments / kerneldoc (Bart)

 - Don't allow loop file change for exclusive open (Jan)

 - Fix revalidate of hidden genhd (Jan)

 - Init queue failure memory free fix (Jes)

 - Improve rq limits failure print (John)

 - Fixup for queue removal/addition (Ming)

 - Missed error progagation for io_uring buffer registration (Pavel)

* tag 'for-linus-20190601' of git://git.kernel.dk/linux-block:
  block: print offending values when cloned rq limits are exceeded
  blk-mq: Document the blk_mq_hw_queue_to_node() arguments
  blk-mq: Fix spelling in a source code comment
  block: Fix bsg_setup_queue() kernel-doc header
  block: Fix rq_qos_wait() kernel-doc header
  block: Fix blk_mq_*_map_queues() kernel-doc headers
  block: Fix throtl_pending_timer_fn() kernel-doc header
  block: Convert blk_invalidate_devt() header into a non-kernel-doc header
  block/partitions/ldm: Convert a kernel-doc header into a non-kernel-doc header
  blk-mq: Fix memory leak in error handling
  block: don't protect generic_make_request_checks with blk_queue_enter
  block: move blk_exit_queue into __blk_release_queue
  block: Don't revalidate bdev of hidden gendisk
  loop: Don't change loop device under exclusive opener
  io_uring: Fix __io_uring_register() false success
parents 1975b337 61939b12

block/blk-core.c

+11 −70
Original line number Diff line number Diff line
@@ -282,35 +282,6 @@ void blk_set_queue_dying(struct request_queue *q) 
}

EXPORT_SYMBOL_GPL(blk_set_queue_dying);



/* Unconfigure the I/O scheduler and dissociate from the cgroup controller. */

void blk_exit_queue(struct request_queue *q)

{

	/*

	 * Since the I/O scheduler exit code may access cgroup information,

	 * perform I/O scheduler exit before disassociating from the block

	 * cgroup controller.

	 */

	if (q->elevator) {

		ioc_clear_queue(q);

		elevator_exit(q, q->elevator);

		q->elevator = NULL;

	}



	/*

	 * Remove all references to @q from the block cgroup controller before

	 * restoring @q->queue_lock to avoid that restoring this pointer causes

	 * e.g. blkcg_print_blkgs() to crash.

	 */

	blkcg_exit_queue(q);



	/*

	 * Since the cgroup code may dereference the @q->backing_dev_info

	 * pointer, only decrease its reference count after having removed the

	 * association with the block cgroup controller.

	 */

	bdi_put(q->backing_dev_info);

}



/**

 * blk_cleanup_queue - shutdown a request queue

 * @q: request queue to shutdown
@@ -346,14 +317,6 @@ void blk_cleanup_queue(struct request_queue *q) 
	del_timer_sync(&q->backing_dev_info->laptop_mode_wb_timer);

	blk_sync_queue(q);



	/*

	 * I/O scheduler exit is only safe after the sysfs scheduler attribute

	 * has been removed.

	 */

	WARN_ON_ONCE(q->kobj.state_in_sysfs);



	blk_exit_queue(q);



	if (queue_is_mq(q))

		blk_mq_exit_queue(q);
@@ -994,22 +957,8 @@ blk_qc_t generic_make_request(struct bio *bio) 
	 * yet.

	 */

	struct bio_list bio_list_on_stack[2];

	blk_mq_req_flags_t flags = 0;

	struct request_queue *q = bio->bi_disk->queue;

	blk_qc_t ret = BLK_QC_T_NONE;



	if (bio->bi_opf & REQ_NOWAIT)

		flags = BLK_MQ_REQ_NOWAIT;

	if (bio_flagged(bio, BIO_QUEUE_ENTERED))

		blk_queue_enter_live(q);

	else if (blk_queue_enter(q, flags) < 0) {

		if (!blk_queue_dying(q) && (bio->bi_opf & REQ_NOWAIT))

			bio_wouldblock_error(bio);

		else

			bio_io_error(bio);

		return ret;

	}



	if (!generic_make_request_checks(bio))

		goto out;
@@ -1046,22 +995,11 @@ blk_qc_t generic_make_request(struct bio *bio) 
	bio_list_init(&bio_list_on_stack[0]);

	current->bio_list = bio_list_on_stack;

	do {

		bool enter_succeeded = true;



		if (unlikely(q != bio->bi_disk->queue)) {

			if (q)

				blk_queue_exit(q);

			q = bio->bi_disk->queue;

			flags = 0;

			if (bio->bi_opf & REQ_NOWAIT)

				flags = BLK_MQ_REQ_NOWAIT;

			if (blk_queue_enter(q, flags) < 0) {

				enter_succeeded = false;

				q = NULL;

			}

		}

		struct request_queue *q = bio->bi_disk->queue;

		blk_mq_req_flags_t flags = bio->bi_opf & REQ_NOWAIT ?

			BLK_MQ_REQ_NOWAIT : 0;



		if (enter_succeeded) {

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

			struct bio_list lower, same;



			/* Create a fresh bio_list for all subordinate requests */
@@ -1069,6 +1007,8 @@ blk_qc_t generic_make_request(struct bio *bio) 
			bio_list_init(&bio_list_on_stack[0]);

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



			blk_queue_exit(q);



			/* sort new bios into those for a lower level

			 * and those for the same level

			 */
@@ -1095,8 +1035,6 @@ blk_qc_t generic_make_request(struct bio *bio) 
	current->bio_list = NULL; /* deactivate */



out:

	if (q)

		blk_queue_exit(q);

	return ret;

}

EXPORT_SYMBOL(generic_make_request);
@@ -1200,7 +1138,9 @@ static int blk_cloned_rq_check_limits(struct request_queue *q, 
				      struct request *rq)

{

	if (blk_rq_sectors(rq) > blk_queue_get_max_sectors(q, req_op(rq))) {

		printk(KERN_ERR "%s: over max size limit.\n", __func__);

		printk(KERN_ERR "%s: over max size limit. (%u > %u)\n",

			__func__, blk_rq_sectors(rq),

			blk_queue_get_max_sectors(q, req_op(rq)));

		return -EIO;

	}
@@ -1212,7 +1152,8 @@ static int blk_cloned_rq_check_limits(struct request_queue *q, 
	 */

	blk_recalc_rq_segments(rq);

	if (rq->nr_phys_segments > queue_max_segments(q)) {

		printk(KERN_ERR "%s: over max segments limit.\n", __func__);

		printk(KERN_ERR "%s: over max segments limit. (%hu > %hu)\n",

			__func__, rq->nr_phys_segments, queue_max_segments(q));

		return -EIO;

	}

block/blk-mq-cpumap.c

+7 −3
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ int blk_mq_map_queues(struct blk_mq_queue_map *qmap) 
		/*

		 * First do sequential mapping between CPUs and queues.

		 * In case we still have CPUs to map, and we have some number of

		 * threads per cores then map sibling threads to the same queue for

		 * performace optimizations.

		 * threads per cores then map sibling threads to the same queue

		 * for performance optimizations.

		 */

		if (cpu < nr_queues) {

			map[cpu] = cpu_to_queue_index(qmap, nr_queues, cpu);
@@ -60,7 +60,11 @@ int blk_mq_map_queues(struct blk_mq_queue_map *qmap) 
}

EXPORT_SYMBOL_GPL(blk_mq_map_queues);



/*

/**

 * blk_mq_hw_queue_to_node - Look up the memory node for a hardware queue index

 * @qmap: CPU to hardware queue map.

 * @index: hardware queue index.

 *

 * We have no quick way of doing reverse lookups. This is only used at

 * queue init time, so runtime isn't important.

 */

block/blk-mq-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


/**

 * blk_mq_pci_map_queues - provide a default queue mapping for PCI device

 * @set:	tagset to provide the mapping for

 * @qmap:	CPU to hardware queue map.

 * @pdev:	PCI device associated with @set.

 * @offset:	Offset to use for the pci irq vector

 *

block/blk-mq-rdma.c

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 


/**

 * blk_mq_rdma_map_queues - provide a default queue mapping for rdma device

 * @set:	tagset to provide the mapping for

 * @dev:	rdma device associated with @set.

 * @map:	CPU to hardware queue map.

 * @dev:	rdma device to provide a mapping for.

 * @first_vec:	first interrupt vectors to use for queues (usually 0)

 *

 * This function assumes the rdma device @dev has at least as many available

block/blk-mq-virtio.c

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 


/**

 * blk_mq_virtio_map_queues - provide a default queue mapping for virtio device

 * @set:	tagset to provide the mapping for

 * @vdev:	virtio device associated with @set.

 * @qmap:	CPU to hardware queue map.

 * @vdev:	virtio device to provide a mapping for.

 * @first_vec:	first interrupt vectors to use for queues (usually 0)

 *

 * This function assumes the virtio device @vdev has at least as many available

CRA Git | Maintained and supported by SUSTech CRA and CCSE