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

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

Pull block fixes from Jens Axboe:
 "Small set of fixes that should go into this series. This contains:

   - compat signal mask fix for io_uring (Arnd)

   - EAGAIN corner case for direct vs buffered writes for io_uring
     (Roman)

   - NVMe pull request from Christoph with various little fixes

   - sbitmap ws_active fix, which caused a perf regression for shared
     tags (me)

   - sbitmap bit ordering fix (Ming)

   - libata on-stack DMA fix (Raymond)"

* tag 'for-linus-20190329' of git://git.kernel.dk/linux-block:
  nvmet: fix error flow during ns enable
  nvmet: fix building bvec from sg list
  nvme-multipath: relax ANA state check
  nvme-tcp: fix an endianess miss-annotation
  libata: fix using DMA buffers on stack
  io_uring: offload write to async worker in case of -EAGAIN
  sbitmap: order READ/WRITE freed instance and setting clear bit
  blk-mq: fix sbitmap ws_active for shared tags
  io_uring: fix big-endian compat signal mask handling
  blk-mq: update comment for blk_mq_hctx_has_pending()
  blk-mq: use blk_mq_put_driver_tag() to put tag
parents 7376e39a 7bca889e

block/blk-flush.c

+2 −2
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error) 
		blk_mq_tag_set_rq(hctx, flush_rq->tag, fq->orig_rq);

		flush_rq->tag = -1;

	} else {

		blk_mq_put_driver_tag_hctx(hctx, flush_rq);

		blk_mq_put_driver_tag(flush_rq);

		flush_rq->internal_tag = -1;

	}
@@ -324,7 +324,7 @@ static void mq_flush_data_end_io(struct request *rq, blk_status_t error) 


	if (q->elevator) {

		WARN_ON(rq->tag < 0);

		blk_mq_put_driver_tag_hctx(hctx, rq);

		blk_mq_put_driver_tag(rq);

	}



	/*

block/blk-mq.c

+13 −3
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ static int blk_mq_poll_stats_bkt(const struct request *rq) 
}



/*

 * Check if any of the ctx's have pending work in this hardware queue

 * Check if any of the ctx, dispatch list or elevator

 * have pending work in this hardware queue.

 */

static bool blk_mq_hctx_has_pending(struct blk_mq_hw_ctx *hctx)

{
@@ -1071,7 +1072,13 @@ static int blk_mq_dispatch_wake(wait_queue_entry_t *wait, unsigned mode, 
	hctx = container_of(wait, struct blk_mq_hw_ctx, dispatch_wait);



	spin_lock(&hctx->dispatch_wait_lock);

	if (!list_empty(&wait->entry)) {

		struct sbitmap_queue *sbq;



		list_del_init(&wait->entry);

		sbq = &hctx->tags->bitmap_tags;

		atomic_dec(&sbq->ws_active);

	}

	spin_unlock(&hctx->dispatch_wait_lock);



	blk_mq_run_hw_queue(hctx, true);
@@ -1087,6 +1094,7 @@ static int blk_mq_dispatch_wake(wait_queue_entry_t *wait, unsigned mode, 
static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx *hctx,

				 struct request *rq)

{

	struct sbitmap_queue *sbq = &hctx->tags->bitmap_tags;

	struct wait_queue_head *wq;

	wait_queue_entry_t *wait;

	bool ret;
@@ -1109,7 +1117,7 @@ static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx *hctx, 
	if (!list_empty_careful(&wait->entry))

		return false;



	wq = &bt_wait_ptr(&hctx->tags->bitmap_tags, hctx)->wait;

	wq = &bt_wait_ptr(sbq, hctx)->wait;



	spin_lock_irq(&wq->lock);

	spin_lock(&hctx->dispatch_wait_lock);
@@ -1119,6 +1127,7 @@ static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx *hctx, 
		return false;

	}



	atomic_inc(&sbq->ws_active);

	wait->flags &= ~WQ_FLAG_EXCLUSIVE;

	__add_wait_queue(wq, wait);
@@ -1139,6 +1148,7 @@ static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx *hctx, 
	 * someone else gets the wakeup.

	 */

	list_del_init(&wait->entry);

	atomic_dec(&sbq->ws_active);

	spin_unlock(&hctx->dispatch_wait_lock);

	spin_unlock_irq(&wq->lock);

block/blk-mq.h

+0 −9
Original line number Diff line number Diff line
@@ -224,15 +224,6 @@ static inline void __blk_mq_put_driver_tag(struct blk_mq_hw_ctx *hctx, 
	}

}



static inline void blk_mq_put_driver_tag_hctx(struct blk_mq_hw_ctx *hctx,

				       struct request *rq)

{

	if (rq->tag == -1 || rq->internal_tag == -1)

		return;



	__blk_mq_put_driver_tag(hctx, rq);

}



static inline void blk_mq_put_driver_tag(struct request *rq)

{

	if (rq->tag == -1 || rq->internal_tag == -1)

drivers/ata/libata-zpodd.c

+24 −10
Original line number Diff line number Diff line
@@ -52,39 +52,53 @@ static int eject_tray(struct ata_device *dev) 
/* Per the spec, only slot type and drawer type ODD can be supported */

static enum odd_mech_type zpodd_get_mech_type(struct ata_device *dev)

{

	char buf[16];

	char *buf;

	unsigned int ret;

	struct rm_feature_desc *desc = (void *)(buf + 8);

	struct rm_feature_desc *desc;

	struct ata_taskfile tf;

	static const char cdb[] = {  GPCMD_GET_CONFIGURATION,

			2,      /* only 1 feature descriptor requested */

			0, 3,   /* 3, removable medium feature */

			0, 0, 0,/* reserved */

			0, sizeof(buf),

			0, 16,

			0, 0, 0,

	};



	buf = kzalloc(16, GFP_KERNEL);

	if (!buf)

		return ODD_MECH_TYPE_UNSUPPORTED;

	desc = (void *)(buf + 8);



	ata_tf_init(dev, &tf);

	tf.flags = ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;

	tf.command = ATA_CMD_PACKET;

	tf.protocol = ATAPI_PROT_PIO;

	tf.lbam = sizeof(buf);

	tf.lbam = 16;



	ret = ata_exec_internal(dev, &tf, cdb, DMA_FROM_DEVICE,

				buf, sizeof(buf), 0);

	if (ret)

				buf, 16, 0);

	if (ret) {

		kfree(buf);

		return ODD_MECH_TYPE_UNSUPPORTED;

	}



	if (be16_to_cpu(desc->feature_code) != 3)

	if (be16_to_cpu(desc->feature_code) != 3) {

		kfree(buf);

		return ODD_MECH_TYPE_UNSUPPORTED;

	}



	if (desc->mech_type == 0 && desc->load == 0 && desc->eject == 1)

	if (desc->mech_type == 0 && desc->load == 0 && desc->eject == 1) {

		kfree(buf);

		return ODD_MECH_TYPE_SLOT;

	else if (desc->mech_type == 1 && desc->load == 0 && desc->eject == 1)

	} else if (desc->mech_type == 1 && desc->load == 0 &&

		   desc->eject == 1) {

		kfree(buf);

		return ODD_MECH_TYPE_DRAWER;

	else

	} else {

		kfree(buf);

		return ODD_MECH_TYPE_UNSUPPORTED;

	}

}



/* Test if ODD is zero power ready by sense code */

static bool zpready(struct ata_device *dev)

drivers/nvme/host/multipath.c

+1 −4
Original line number Diff line number Diff line
@@ -404,15 +404,12 @@ static inline bool nvme_state_is_live(enum nvme_ana_state state) 
static void nvme_update_ns_ana_state(struct nvme_ana_group_desc *desc,

		struct nvme_ns *ns)

{

	enum nvme_ana_state old;



	mutex_lock(&ns->head->lock);

	old = ns->ana_state;

	ns->ana_grpid = le32_to_cpu(desc->grpid);

	ns->ana_state = desc->state;

	clear_bit(NVME_NS_ANA_PENDING, &ns->flags);



	if (nvme_state_is_live(ns->ana_state) && !nvme_state_is_live(old))

	if (nvme_state_is_live(ns->ana_state))

		nvme_mpath_set_live(ns);

	mutex_unlock(&ns->head->lock);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE