Commit 8d72e5bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block fixes from Jens Axboe:

 - Allow symlink from the bfq.weight cgroup parameter to the general
   weight (Angelo)

 - Damien is new skd maintainer (Bart)

 - NVMe pull request from Sagi, with a few small fixes.

 - Ensure we set DMA segment size properly, dma-debug is now tripping on
   these (Christoph)

 - Remove useless debugfs_create() return check (Greg)

 - Remove redundant unlikely() check on IS_ERR() (Kefeng)

 - Fixup request freeing on exit (Ming)

* tag 'for-linus-20190608' of git://git.kernel.dk/linux-block:
  block, bfq: add weight symlink to the bfq.weight cgroup parameter
  cgroup: let a symlink too be created with a cftype file
  block: free sched's request pool in blk_cleanup_queue
  nvme-rdma: use dynamic dma mapping per command
  nvme: Fix u32 overflow in the number of namespace list calculation
  mmc: also set max_segment_size in the device
  mtip32xx: also set max_segment_size in the device
  rsxx: don't call dma_set_max_seg_size
  nvme-pci: don't limit DMA segement size
  block: Drop unlikely before IS_ERR(_OR_NULL)
  block: aoe: no need to check return value of debugfs_create functions
  nvmet: fix data_len to 0 for bdev-backed write_zeroes
  MAINTAINERS: Hand over skd maintainership
  nvme-tcp: fix queue mapping when queue count is limited
  nvme-rdma: fix queue mapping when queue count is limited
parents 1b02caa3 6c70f899

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -14995,7 +14995,7 @@ S: Odd Fixes 
F:	drivers/net/ethernet/adaptec/starfire*



STEC S1220 SKD DRIVER

M:	Bart Van Assche <bart.vanassche@wdc.com>

M:	Damien Le Moal <Damien.LeMoal@wdc.com>

L:	linux-block@vger.kernel.org

S:	Maintained

F:	drivers/block/skd*[ch]

block/bfq-cgroup.c

+4 −2
Original line number Diff line number Diff line
@@ -1046,7 +1046,8 @@ struct blkcg_policy blkcg_policy_bfq = { 
struct cftype bfq_blkcg_legacy_files[] = {

	{

		.name = "bfq.weight",

		.flags = CFTYPE_NOT_ON_ROOT,

		.link_name = "weight",

		.flags = CFTYPE_NOT_ON_ROOT | CFTYPE_SYMLINKED,

		.seq_show = bfq_io_show_weight,

		.write_u64 = bfq_io_set_weight_legacy,

	},
@@ -1166,7 +1167,8 @@ struct cftype bfq_blkcg_legacy_files[] = { 
struct cftype bfq_blkg_files[] = {

	{

		.name = "bfq.weight",

		.flags = CFTYPE_NOT_ON_ROOT,

		.link_name = "weight",

		.flags = CFTYPE_NOT_ON_ROOT | CFTYPE_SYMLINKED,

		.seq_show = bfq_io_show_weight,

		.write = bfq_io_set_weight,

	},

block/blk-cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, 
			blkg_free(new_blkg);

		} else {

			blkg = blkg_create(pos, q, new_blkg);

			if (unlikely(IS_ERR(blkg))) {

			if (IS_ERR(blkg)) {

				ret = PTR_ERR(blkg);

				goto fail_unlock;

			}

block/blk-core.c

+13 −0
Original line number Diff line number Diff line
@@ -320,6 +320,19 @@ void blk_cleanup_queue(struct request_queue *q) 
	if (queue_is_mq(q))

		blk_mq_exit_queue(q);



	/*

	 * In theory, request pool of sched_tags belongs to request queue.

	 * However, the current implementation requires tag_set for freeing

	 * requests, so free the pool now.

	 *

	 * Queue has become frozen, there can't be any in-queue requests, so

	 * it is safe to free requests now.

	 */

	mutex_lock(&q->sysfs_lock);

	if (q->elevator)

		blk_mq_sched_free_requests(q);

	mutex_unlock(&q->sysfs_lock);



	percpu_ref_exit(&q->q_usage_counter);



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

block/blk-mq-sched.c

+27 −3
Original line number Diff line number Diff line
@@ -475,14 +475,18 @@ static int blk_mq_sched_alloc_tags(struct request_queue *q, 
	return ret;

}



/* called in queue's release handler, tagset has gone away */

static void blk_mq_sched_tags_teardown(struct request_queue *q)

{

	struct blk_mq_tag_set *set = q->tag_set;

	struct blk_mq_hw_ctx *hctx;

	int i;



	queue_for_each_hw_ctx(q, hctx, i)

		blk_mq_sched_free_tags(set, hctx, i);

	queue_for_each_hw_ctx(q, hctx, i) {

		if (hctx->sched_tags) {

			blk_mq_free_rq_map(hctx->sched_tags);

			hctx->sched_tags = NULL;

		}

	}

}



int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e)
@@ -523,6 +527,7 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) 
			ret = e->ops.init_hctx(hctx, i);

			if (ret) {

				eq = q->elevator;

				blk_mq_sched_free_requests(q);

				blk_mq_exit_sched(q, eq);

				kobject_put(&eq->kobj);

				return ret;
@@ -534,11 +539,30 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) 
	return 0;



err:

	blk_mq_sched_free_requests(q);

	blk_mq_sched_tags_teardown(q);

	q->elevator = NULL;

	return ret;

}



/*

 * called in either blk_queue_cleanup or elevator_switch, tagset

 * is required for freeing requests

 */

void blk_mq_sched_free_requests(struct request_queue *q)

{

	struct blk_mq_hw_ctx *hctx;

	int i;



	lockdep_assert_held(&q->sysfs_lock);

	WARN_ON(!q->elevator);



	queue_for_each_hw_ctx(q, hctx, i) {

		if (hctx->sched_tags)

			blk_mq_free_rqs(q->tag_set, hctx->sched_tags, i);

	}

}



void blk_mq_exit_sched(struct request_queue *q, struct elevator_queue *e)

{

	struct blk_mq_hw_ctx *hctx;

CRA Git | Maintained and supported by SUSTech CRA and CCSE