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

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

Pull block fixes from Jens Axboe:
 "Small set of fixes for this series. Mostly just minor fixes, the only
  oddball in here is the sg change.

  The sg change came out of the stall fix for NVMe, where we added a
  mempool and limited us to a single page allocation. CONFIG_SG_DEBUG
  sort-of ruins that, since we'd need to account for that. That's
  actually a generic problem, since lots of drivers need to allocate SG
  lists. So this just removes support for CONFIG_SG_DEBUG, which I added
  back in 2007 and to my knowledge it was never useful.

  Anyway, outside of that, this pull contains:

   - clone of request with special payload fix (Bart)

   - drbd discard handling fix (Bart)

   - SATA blk-mq stall fix (me)

   - chunk size fix (Keith)

   - double free nvme rdma fix (Sagi)"

* tag 'for-linus-20180629' of git://git.kernel.dk/linux-block:
  sg: remove ->sg_magic member
  drbd: Fix drbd_request_prepare() discard handling
  blk-mq: don't queue more if we get a busy return
  block: Fix cloning of requests with a special payload
  nvme-rdma: fix possible double free of controller async event buffer
  block: Fix transfer when chunk sectors exceeds max
parents 1904148a 9544bc53

block/blk-core.c

+4 −0
Original line number Diff line number Diff line
@@ -3473,6 +3473,10 @@ static void __blk_rq_prep_clone(struct request *dst, struct request *src) 
	dst->cpu = src->cpu;

	dst->__sector = blk_rq_pos(src);

	dst->__data_len = blk_rq_bytes(src);

	if (src->rq_flags & RQF_SPECIAL_PAYLOAD) {

		dst->rq_flags |= RQF_SPECIAL_PAYLOAD;

		dst->special_vec = src->special_vec;

	}

	dst->nr_phys_segments = src->nr_phys_segments;

	dst->ioprio = src->ioprio;

	dst->extra_len = src->extra_len;

block/blk-mq.c

+12 −0
Original line number Diff line number Diff line
@@ -1075,6 +1075,9 @@ static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx **hctx, 


#define BLK_MQ_RESOURCE_DELAY	3		/* ms units */



/*

 * Returns true if we did some work AND can potentially do more.

 */

bool blk_mq_dispatch_rq_list(struct request_queue *q, struct list_head *list,

			     bool got_budget)

{
@@ -1205,8 +1208,17 @@ bool blk_mq_dispatch_rq_list(struct request_queue *q, struct list_head *list, 
			blk_mq_run_hw_queue(hctx, true);

		else if (needs_restart && (ret == BLK_STS_RESOURCE))

			blk_mq_delay_run_hw_queue(hctx, BLK_MQ_RESOURCE_DELAY);



		return false;

	}



	/*

	 * If the host/device is unable to accept more work, inform the

	 * caller of that.

	 */

	if (ret == BLK_STS_RESOURCE || ret == BLK_STS_DEV_RESOURCE)

		return false;



	return (queued + errors) != 0;

}

drivers/block/drbd/drbd_req.c

+2 −2
Original line number Diff line number Diff line
@@ -1244,8 +1244,8 @@ drbd_request_prepare(struct drbd_device *device, struct bio *bio, unsigned long 
	_drbd_start_io_acct(device, req);



	/* process discards always from our submitter thread */

	if ((bio_op(bio) & REQ_OP_WRITE_ZEROES) ||

	    (bio_op(bio) & REQ_OP_DISCARD))

	if (bio_op(bio) == REQ_OP_WRITE_ZEROES ||

	    bio_op(bio) == REQ_OP_DISCARD)

		goto queue_for_submitter_thread;



	if (rw == WRITE && req->private_bio && req->i.size

drivers/gpu/drm/i915/i915_drv.h

+0 −3
Original line number Diff line number Diff line
@@ -2245,9 +2245,6 @@ static inline struct scatterlist *____sg_next(struct scatterlist *sg) 
 **/

static inline struct scatterlist *__sg_next(struct scatterlist *sg)

{

#ifdef CONFIG_DEBUG_SG

	BUG_ON(sg->sg_magic != SG_MAGIC);

#endif

	return sg_is_last(sg) ? NULL : ____sg_next(sg);

}

drivers/nvme/host/rdma.c

+5 −2
Original line number Diff line number Diff line
@@ -732,8 +732,11 @@ static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl, 
		blk_cleanup_queue(ctrl->ctrl.admin_q);

		nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.admin_tagset);

	}

	if (ctrl->async_event_sqe.data) {

		nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,

				sizeof(struct nvme_command), DMA_TO_DEVICE);

		ctrl->async_event_sqe.data = NULL;

	}

	nvme_rdma_free_queue(&ctrl->queues[0]);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE