[PATCH v9] Convert NVMe driver to blk-mq

Matias Bjørling m at bjorling.me
Tue Jun 24 16:12:10 PDT 2014


Hi all,

Added Acked-by from Keith and Jens. Additionally to the acks, we may perform
performance and correctness tests at a few select customers to find any setup
specific bugs and/or regressions.

The patch is based on the following:

Jens for-linus up to:

  66cb45aa41315d1d9972cada354fbdf7870d7714
  block: add support for limiting gaps in SG lists

Matthew master up to:

  7171511eaec5bf23fb06078f59784a3a0626b38f
  Linux 3.16-rc1

The merged trees with the patch on top can be found here:

  https://github.com/MatiasBjorling/linux-collab nvmemq_review

and the separate changes can be found in the nvmemq_v9 branch

Changes since v8:
 * QUEUE_FLAG_VIRT_HOLE was renamed to QUEUE_FLAG_SG_GAPS
 * Previous revertion of patches lost the IRQ affinity hint
 * Removed test code in nvme_reset_notify

Changes since v7:
 * Jens implemented support for QUEUE_FLAG_VIRT_HOLE to limit
   requests to a continuous range of virtual memory.
 * Keith fixed up the abortion logic.
 * Usual style fixups

Changes since v6:
 * Rebased on top of Matthew's master and Jens' for-linus
 * A couple of style fixups

Changes since v5:
 * Splits are now supported directly within blk-mq
 * Remove nvme_queue->cpu_mask variable
 * Remove unnecessary null check
 * Style fixups

Changes since v4:
 * Fix timeout retries
 * Fix naming in nvme_init_hctx
 * Fix racy behavior of admin queue in nvme_dev_remove
 * Fix wrong return values in nvme_queue_request
 * Put cqe_seen back
 * Introduce abort_completion for killing timed out I/Os
 * Move locks outside of nvme_submit_iod
 * Various renaming and style fixes

Changes since v3:
 * Added abortion logic
 * Fixed possible race on abortion
 * Removed req data with flush. Handled by by blk-mq
 * Added safety check for submitting user rq to admin queue.
 * Use dev->online_queues for nr_hw_queues
 * Fix loop with initialization in nvme_create_io_queues
 * Style fixups

Changes since v2:
  * Rebased on top of current 3.16/core.
  * Use blk-mq queue management for spreading io queues
  * Removed rcu handling and allocated all io queues up front for mgmt by blk-mq
  * Removed the need for hotplugging notification
  * Fixed flush data handling
  * Fixed double free of spinlock
  * Various cleanups

Matias Bjørling (1):
  NVMe: Convert to blk-mq

 drivers/block/nvme-core.c | 1204 ++++++++++++++++++---------------------------
 drivers/block/nvme-scsi.c |    8 +-
 include/linux/nvme.h      |   15 +-
 3 files changed, 489 insertions(+), 738 deletions(-)

-- 
1.9.1




More information about the Linux-nvme mailing list