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

Commit 522a15db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block layer fixes from Jens Axboe:
 "A smaller collection of fixes that have come up since the initial
  merge window pull request.  This contains:

   - error handling cleanup and support for larger than 16 byte cdbs in
     sg_io() from Christoph.  The latter just matches what bsg and
     friends support, sg_io() got left out in the merge.

   - an option for brd to expose partitions in /proc/partitions.  They
     are hidden by default for compat reasons.  From Dmitry Monakhov.

   - a few blk-mq fixes from me - killing a dead/unused flag, fix for
     merging happening even if turned off, and correction of a few
     comments.

   - removal of unnecessary ->owner setting in systemace.  From Michal
     Simek.

   - two related fixes for a problem with nesting freezing of queues in
     blk-mq.  One from Ming Lei removing an unecessary freeze operation,
     and another from Tejun fixing the nesting regression introduced in
     the merge window.

   - fix for a BUG_ON() at bio_endio time when protection info is
     attached and the IO has an error.  From Sagi Grimberg.

   - two scsi_ioctl bug fixes for regressions with scsi-mq from Tony
     Battersby.

   - a cfq weight update fix and subsequent comment update from Toshiaki
     Makita"

* 'for-linus' of git://git.kernel.dk/linux-block:
  cfq-iosched: Add comments on update timing of weight
  cfq-iosched: Fix wrong children_weight calculation
  block: fix error handling in sg_io
  fix regression in SCSI_IOCTL_SEND_COMMAND
  scsi-mq: fix requests that use a separate CDB buffer
  block: support > 16 byte CDBs for SG_IO
  block: cleanup error handling in sg_io
  brd: add ram disk visibility option
  block: systemace: Remove .owner field for driver
  blk-mq: blk_mq_freeze_queue() should allow nesting
  blk-mq: correct a few wrong/bad comments
  block: Fix BUG_ON when pi errors occur
  blk-mq: don't allow merges if turned off for the queue
  blk-mq: get rid of unused BLK_MQ_F_SHOULD_SORT flag
  blk-mq: fix WARNING "percpu_ref_kill() called more than once!"
parents 9e36c633 7b5af5cf

block/bio-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ void bio_integrity_endio(struct bio *bio, int error) 
	 */

	if (error) {

		bio->bi_end_io = bip->bip_end_io;

		bio_endio(bio, error);

		bio_endio_nodec(bio, error);



		return;

	}

block/blk-core.c

+0 −1
Original line number Diff line number Diff line
@@ -1252,7 +1252,6 @@ void blk_rq_set_block_pc(struct request *rq) 
	rq->__sector = (sector_t) -1;

	rq->bio = rq->biotail = NULL;

	memset(rq->__cmd, 0, sizeof(rq->__cmd));

	rq->cmd = rq->__cmd;

}

EXPORT_SYMBOL(blk_rq_set_block_pc);

block/blk-mq.c

+22 −14
Original line number Diff line number Diff line
@@ -112,18 +112,22 @@ static void blk_mq_usage_counter_release(struct percpu_ref *ref) 
 */

void blk_mq_freeze_queue(struct request_queue *q)

{

	bool freeze;



	spin_lock_irq(q->queue_lock);

	q->mq_freeze_depth++;

	freeze = !q->mq_freeze_depth++;

	spin_unlock_irq(q->queue_lock);



	if (freeze) {

		percpu_ref_kill(&q->mq_usage_counter);

		blk_mq_run_queues(q, false);

	}

	wait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->mq_usage_counter));

}



static void blk_mq_unfreeze_queue(struct request_queue *q)

{

	bool wake = false;

	bool wake;



	spin_lock_irq(q->queue_lock);

	wake = !--q->mq_freeze_depth;
@@ -172,6 +176,8 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx, 
	/* tag was already set */

	rq->errors = 0;



	rq->cmd = rq->__cmd;



	rq->extra_len = 0;

	rq->sense_len = 0;

	rq->resid_len = 0;
@@ -1068,13 +1074,17 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio) 
		blk_account_io_start(rq, 1);

}



static inline bool hctx_allow_merges(struct blk_mq_hw_ctx *hctx)

{

	return (hctx->flags & BLK_MQ_F_SHOULD_MERGE) &&

		!blk_queue_nomerges(hctx->queue);

}



static inline bool blk_mq_merge_queue_io(struct blk_mq_hw_ctx *hctx,

					 struct blk_mq_ctx *ctx,

					 struct request *rq, struct bio *bio)

{

	struct request_queue *q = hctx->queue;



	if (!(hctx->flags & BLK_MQ_F_SHOULD_MERGE)) {

	if (!hctx_allow_merges(hctx)) {

		blk_mq_bio_to_request(rq, bio);

		spin_lock(&ctx->lock);

insert_rq:
@@ -1082,6 +1092,8 @@ static inline bool blk_mq_merge_queue_io(struct blk_mq_hw_ctx *hctx, 
		spin_unlock(&ctx->lock);

		return false;

	} else {

		struct request_queue *q = hctx->queue;



		spin_lock(&ctx->lock);

		if (!blk_mq_attempt_merge(q, ctx, bio)) {

			blk_mq_bio_to_request(rq, bio);
@@ -1574,7 +1586,7 @@ static int blk_mq_init_hw_queues(struct request_queue *q, 
		hctx->tags = set->tags[i];



		/*

		 * Allocate space for all possible cpus to avoid allocation in

		 * Allocate space for all possible cpus to avoid allocation at

		 * runtime

		 */

		hctx->ctxs = kmalloc_node(nr_cpu_ids * sizeof(void *),
@@ -1662,8 +1674,8 @@ static void blk_mq_map_swqueue(struct request_queue *q) 


	queue_for_each_hw_ctx(q, hctx, i) {

		/*

		 * If not software queues are mapped to this hardware queue,

		 * disable it and free the request entries

		 * If no software queues are mapped to this hardware queue,

		 * disable it and free the request entries.

		 */

		if (!hctx->nr_ctx) {

			struct blk_mq_tag_set *set = q->tag_set;
@@ -1713,14 +1725,10 @@ static void blk_mq_del_queue_tag_set(struct request_queue *q) 
{

	struct blk_mq_tag_set *set = q->tag_set;



	blk_mq_freeze_queue(q);



	mutex_lock(&set->tag_list_lock);

	list_del_init(&q->tag_set_list);

	blk_mq_update_tag_set_depth(set);

	mutex_unlock(&set->tag_list_lock);



	blk_mq_unfreeze_queue(q);

}



static void blk_mq_add_queue_tag_set(struct blk_mq_tag_set *set,

block/cfq-iosched.c

+16 −3
Original line number Diff line number Diff line
@@ -1272,15 +1272,22 @@ __cfq_group_service_tree_add(struct cfq_rb_root *st, struct cfq_group *cfqg) 
	rb_insert_color(&cfqg->rb_node, &st->rb);

}



/*

 * This has to be called only on activation of cfqg

 */

static void

cfq_update_group_weight(struct cfq_group *cfqg)

{

	BUG_ON(!RB_EMPTY_NODE(&cfqg->rb_node));



	if (cfqg->new_weight) {

		cfqg->weight = cfqg->new_weight;

		cfqg->new_weight = 0;

	}

}



static void

cfq_update_group_leaf_weight(struct cfq_group *cfqg)

{

	BUG_ON(!RB_EMPTY_NODE(&cfqg->rb_node));



	if (cfqg->new_leaf_weight) {

		cfqg->leaf_weight = cfqg->new_leaf_weight;
@@ -1299,7 +1306,12 @@ cfq_group_service_tree_add(struct cfq_rb_root *st, struct cfq_group *cfqg) 
	/* add to the service tree */

	BUG_ON(!RB_EMPTY_NODE(&cfqg->rb_node));



	cfq_update_group_weight(cfqg);

	/*

	 * Update leaf_weight.  We cannot update weight at this point

	 * because cfqg might already have been activated and is

	 * contributing its current weight to the parent's child_weight.

	 */

	cfq_update_group_leaf_weight(cfqg);

	__cfq_group_service_tree_add(st, cfqg);



	/*
@@ -1323,6 +1335,7 @@ cfq_group_service_tree_add(struct cfq_rb_root *st, struct cfq_group *cfqg) 
	 */

	while ((parent = cfqg_parent(pos))) {

		if (propagate) {

			cfq_update_group_weight(pos);

			propagate = !parent->nr_active++;

			parent->children_weight += pos->weight;

		}

block/scsi_ioctl.c

+27 −13
Original line number Diff line number Diff line
@@ -279,7 +279,6 @@ static int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr, 
	r = blk_rq_unmap_user(bio);

	if (!ret)

		ret = r;

	blk_put_request(rq);



	return ret;

}
@@ -297,8 +296,6 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, 


	if (hdr->interface_id != 'S')

		return -EINVAL;

	if (hdr->cmd_len > BLK_MAX_CDB)

		return -EINVAL;



	if (hdr->dxfer_len > (queue_max_hw_sectors(q) << 9))

		return -EIO;
@@ -317,16 +314,23 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, 
	if (hdr->flags & SG_FLAG_Q_AT_HEAD)

		at_head = 1;



	ret = -ENOMEM;

	rq = blk_get_request(q, writing ? WRITE : READ, GFP_KERNEL);

	if (!rq)

		return -ENOMEM;

		goto out;

	blk_rq_set_block_pc(rq);



	if (blk_fill_sghdr_rq(q, rq, hdr, mode)) {

		blk_put_request(rq);

		return -EFAULT;

	if (hdr->cmd_len > BLK_MAX_CDB) {

		rq->cmd = kzalloc(hdr->cmd_len, GFP_KERNEL);

		if (!rq->cmd)

			goto out_put_request;

	}



	ret = -EFAULT;

	if (blk_fill_sghdr_rq(q, rq, hdr, mode))

		goto out_free_cdb;



	ret = 0;

	if (hdr->iovec_count) {

		size_t iov_data_len;

		struct iovec *iov = NULL;
@@ -335,7 +339,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, 
					    0, NULL, &iov);

		if (ret < 0) {

			kfree(iov);

			goto out;

			goto out_free_cdb;

		}



		iov_data_len = ret;
@@ -358,7 +362,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, 
				      GFP_KERNEL);



	if (ret)

		goto out;

		goto out_free_cdb;



	bio = rq->bio;

	memset(sense, 0, sizeof(sense));
@@ -376,9 +380,14 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, 


	hdr->duration = jiffies_to_msecs(jiffies - start_time);



	return blk_complete_sghdr_rq(rq, hdr, bio);

out:

	ret = blk_complete_sghdr_rq(rq, hdr, bio);



out_free_cdb:

	if (rq->cmd != rq->__cmd)

		kfree(rq->cmd);

out_put_request:

	blk_put_request(rq);

out:

	return ret;

}
@@ -448,6 +457,11 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 
	}



	rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_WAIT);

	if (!rq) {

		err = -ENOMEM;

		goto error;

	}

	blk_rq_set_block_pc(rq);



	cmdlen = COMMAND_SIZE(opcode);
@@ -501,7 +515,6 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 
	memset(sense, 0, sizeof(sense));

	rq->sense = sense;

	rq->sense_len = 0;

	blk_rq_set_block_pc(rq);



	blk_execute_rq(q, disk, rq, 0);
@@ -521,6 +534,7 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 
	

error:

	kfree(buffer);

	if (rq)

		blk_put_request(rq);

	return err;

}