Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752101AbaFMMKL (ORCPT ); Fri, 13 Jun 2014 08:10:11 -0400 Received: from mail-lb0-f178.google.com ([209.85.217.178]:34206 "EHLO mail-lb0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751140AbaFMMKJ (ORCPT ); Fri, 13 Jun 2014 08:10:09 -0400 From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: willy@linux.intel.com, keith.busch@intel.com, sbradshaw@micron.com, axboe@fb.com, tom.leiming@gmail.com, hch@infradead.org Cc: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH v8] convert nvme driver to blk-mq Date: Fri, 13 Jun 2014 14:09:55 +0200 Message-Id: <1402661396-19207-1-git-send-email-m@bjorling.me> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Thanks for all the hard work, feedback and suggestions. I think we're there. I did a test with the qemu nvme device, it passes xfstests, spurious removals, and ioctl tests. Take it for a spin on your physical devices. The patch is based on the following: Jens for-linus up to: 28747fcd2211d0fccbe3d3c91a1067c3744db908 block: remove WQ_POWER_EFFICIENT from kblockd Matthew master up to: bd67608a6127c994e897c49cc4f72d9095925301 NVMe: Rename io_timeout to nvme_io_timeout The merged trees with the patch on top is found here: https://github.com/MatiasBjorling/linux-collab nvmemq_review and the separate changes can be found in the nvmemq_v8 branch 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 cleanup Matias Bjørling (1): NVMe: conversion 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/