From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@fb.com>, Keith Busch <keith.busch@intel.com>, Sagi Grimberg <sagi@grimberg.me> Cc: Max Gurtovoy <maxg@mellanox.com>, linux-nvme@lists.infradead.org, linux-block@vger.kernel.org Subject: [PATCH 12/13] block: only allow polling if a poll queue_map exists Date: Sun, 2 Dec 2018 17:46:27 +0100 [thread overview] Message-ID: <20181202164628.1116-13-hch@lst.de> (raw) In-Reply-To: <20181202164628.1116-1-hch@lst.de> This avoids having to have differnet mq_ops for different setups with or without poll queues. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-sysfs.c | 2 +- drivers/nvme/host/pci.c | 29 +++++++++-------------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 9f0cb370b39b..bb7c642ffefa 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -402,7 +402,7 @@ static ssize_t queue_poll_store(struct request_queue *q, const char *page, unsigned long poll_on; ssize_t ret; - if (!q->mq_ops || !q->mq_ops->poll) + if (!q->tag_set || q->tag_set->nr_maps <= HCTX_TYPE_POLL) return -EINVAL; ret = queue_var_store(&poll_on, page, count); diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 4ccb4ea22ac6..7732c4979a4e 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1602,22 +1602,15 @@ static const struct blk_mq_ops nvme_mq_admin_ops = { .timeout = nvme_timeout, }; -#define NVME_SHARED_MQ_OPS \ - .queue_rq = nvme_queue_rq, \ - .commit_rqs = nvme_commit_rqs, \ - .complete = nvme_pci_complete_rq, \ - .init_hctx = nvme_init_hctx, \ - .init_request = nvme_init_request, \ - .map_queues = nvme_pci_map_queues, \ - .timeout = nvme_timeout \ - static const struct blk_mq_ops nvme_mq_ops = { - NVME_SHARED_MQ_OPS, -}; - -static const struct blk_mq_ops nvme_mq_poll_ops = { - NVME_SHARED_MQ_OPS, - .poll = nvme_poll, + .queue_rq = nvme_queue_rq, + .complete = nvme_pci_complete_rq, + .commit_rqs = nvme_commit_rqs, + .init_hctx = nvme_init_hctx, + .init_request = nvme_init_request, + .map_queues = nvme_pci_map_queues, + .timeout = nvme_timeout, + .poll = nvme_poll, }; static void nvme_dev_remove_admin(struct nvme_dev *dev) @@ -2304,11 +2297,7 @@ static int nvme_dev_add(struct nvme_dev *dev) int ret; if (!dev->ctrl.tagset) { - if (dev->io_queues[HCTX_TYPE_POLL]) - dev->tagset.ops = &nvme_mq_poll_ops; - else - dev->tagset.ops = &nvme_mq_ops; - + dev->tagset.ops = &nvme_mq_ops; dev->tagset.nr_hw_queues = dev->online_queues - 1; dev->tagset.nr_maps = HCTX_MAX_TYPES; dev->tagset.timeout = NVME_IO_TIMEOUT; -- 2.19.1
WARNING: multiple messages have this Message-ID (diff)
From: hch@lst.de (Christoph Hellwig) Subject: [PATCH 12/13] block: only allow polling if a poll queue_map exists Date: Sun, 2 Dec 2018 17:46:27 +0100 [thread overview] Message-ID: <20181202164628.1116-13-hch@lst.de> (raw) In-Reply-To: <20181202164628.1116-1-hch@lst.de> This avoids having to have differnet mq_ops for different setups with or without poll queues. Signed-off-by: Christoph Hellwig <hch at lst.de> --- block/blk-sysfs.c | 2 +- drivers/nvme/host/pci.c | 29 +++++++++-------------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 9f0cb370b39b..bb7c642ffefa 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -402,7 +402,7 @@ static ssize_t queue_poll_store(struct request_queue *q, const char *page, unsigned long poll_on; ssize_t ret; - if (!q->mq_ops || !q->mq_ops->poll) + if (!q->tag_set || q->tag_set->nr_maps <= HCTX_TYPE_POLL) return -EINVAL; ret = queue_var_store(&poll_on, page, count); diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 4ccb4ea22ac6..7732c4979a4e 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1602,22 +1602,15 @@ static const struct blk_mq_ops nvme_mq_admin_ops = { .timeout = nvme_timeout, }; -#define NVME_SHARED_MQ_OPS \ - .queue_rq = nvme_queue_rq, \ - .commit_rqs = nvme_commit_rqs, \ - .complete = nvme_pci_complete_rq, \ - .init_hctx = nvme_init_hctx, \ - .init_request = nvme_init_request, \ - .map_queues = nvme_pci_map_queues, \ - .timeout = nvme_timeout \ - static const struct blk_mq_ops nvme_mq_ops = { - NVME_SHARED_MQ_OPS, -}; - -static const struct blk_mq_ops nvme_mq_poll_ops = { - NVME_SHARED_MQ_OPS, - .poll = nvme_poll, + .queue_rq = nvme_queue_rq, + .complete = nvme_pci_complete_rq, + .commit_rqs = nvme_commit_rqs, + .init_hctx = nvme_init_hctx, + .init_request = nvme_init_request, + .map_queues = nvme_pci_map_queues, + .timeout = nvme_timeout, + .poll = nvme_poll, }; static void nvme_dev_remove_admin(struct nvme_dev *dev) @@ -2304,11 +2297,7 @@ static int nvme_dev_add(struct nvme_dev *dev) int ret; if (!dev->ctrl.tagset) { - if (dev->io_queues[HCTX_TYPE_POLL]) - dev->tagset.ops = &nvme_mq_poll_ops; - else - dev->tagset.ops = &nvme_mq_ops; - + dev->tagset.ops = &nvme_mq_ops; dev->tagset.nr_hw_queues = dev->online_queues - 1; dev->tagset.nr_maps = HCTX_MAX_TYPES; dev->tagset.timeout = NVME_IO_TIMEOUT; -- 2.19.1
next prev parent reply other threads:[~2018-12-02 16:48 UTC|newest] Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-12-02 16:46 block and nvme polling improvements V3 Christoph Hellwig 2018-12-02 16:46 ` Christoph Hellwig 2018-12-02 16:46 ` [PATCH 01/13] block: move queues types to the block layer Christoph Hellwig 2018-12-02 16:46 ` Christoph Hellwig 2018-12-04 0:49 ` Sagi Grimberg 2018-12-04 0:49 ` Sagi Grimberg 2018-12-04 15:00 ` Christoph Hellwig 2018-12-04 15:00 ` Christoph Hellwig 2018-12-04 17:08 ` Sagi Grimberg 2018-12-04 17:08 ` Sagi Grimberg 2018-12-02 16:46 ` [PATCH 02/13] nvme-pci: use atomic bitops to mark a queue enabled Christoph Hellwig 2018-12-02 16:46 ` Christoph Hellwig 2018-12-04 0:54 ` Sagi Grimberg 2018-12-04 0:54 ` Sagi Grimberg 2018-12-04 15:04 ` Christoph Hellwig 2018-12-04 15:04 ` Christoph Hellwig 2018-12-04 17:11 ` Sagi Grimberg 2018-12-04 17:11 ` Sagi Grimberg 2018-12-02 16:46 ` [PATCH 03/13] nvme-pci: cleanup SQ allocation a bit Christoph Hellwig 2018-12-02 16:46 ` Christoph Hellwig 2018-12-04 0:55 ` Sagi Grimberg 2018-12-04 0:55 ` Sagi Grimberg 2018-12-02 16:46 ` [PATCH 04/13] nvme-pci: only allow polling with separate poll queues Christoph Hellwig 2018-12-02 16:46 ` Christoph Hellwig 2018-12-03 18:23 ` Keith Busch 2018-12-03 18:23 ` Keith Busch 2018-12-04 0:56 ` Sagi Grimberg 2018-12-04 0:56 ` Sagi Grimberg 2018-12-02 16:46 ` [PATCH 05/13] nvme-pci: consolidate code for polling non-dedicated queues Christoph Hellwig 2018-12-02 16:46 ` Christoph Hellwig 2018-12-04 0:58 ` Sagi Grimberg 2018-12-04 0:58 ` Sagi Grimberg 2018-12-04 15:04 ` Christoph Hellwig 2018-12-04 15:04 ` Christoph Hellwig 2018-12-04 17:13 ` Sagi Grimberg 2018-12-04 17:13 ` Sagi Grimberg 2018-12-04 18:19 ` Jens Axboe 2018-12-04 18:19 ` Jens Axboe 2018-12-02 16:46 ` [PATCH 06/13] nvme-pci: refactor nvme_disable_io_queues Christoph Hellwig 2018-12-02 16:46 ` Christoph Hellwig 2018-12-04 1:00 ` Sagi Grimberg 2018-12-04 1:00 ` Sagi Grimberg 2018-12-04 15:05 ` Christoph Hellwig 2018-12-04 15:05 ` Christoph Hellwig 2018-12-04 18:19 ` Jens Axboe 2018-12-04 18:19 ` Jens Axboe 2018-12-02 16:46 ` [PATCH 07/13] nvme-pci: don't poll from irq context when deleting queues Christoph Hellwig 2018-12-02 16:46 ` Christoph Hellwig 2018-12-03 18:15 ` Keith Busch 2018-12-03 18:15 ` Keith Busch 2018-12-04 1:05 ` Sagi Grimberg 2018-12-04 1:05 ` Sagi Grimberg 2018-12-02 16:46 ` [PATCH 08/13] nvme-pci: remove the CQ lock for interrupt driven queues Christoph Hellwig 2018-12-02 16:46 ` Christoph Hellwig 2018-12-04 1:08 ` Sagi Grimberg 2018-12-04 1:08 ` Sagi Grimberg 2018-12-02 16:46 ` [PATCH 09/13] nvme-rdma: remove I/O polling support Christoph Hellwig 2018-12-02 16:46 ` Christoph Hellwig 2018-12-02 16:46 ` [PATCH 10/13] nvme-mpath: " Christoph Hellwig 2018-12-02 16:46 ` Christoph Hellwig 2018-12-03 18:22 ` Keith Busch 2018-12-03 18:22 ` Keith Busch 2018-12-04 1:11 ` Sagi Grimberg 2018-12-04 1:11 ` Sagi Grimberg 2018-12-04 15:07 ` Christoph Hellwig 2018-12-04 15:07 ` Christoph Hellwig 2018-12-04 17:18 ` Sagi Grimberg 2018-12-04 17:18 ` Sagi Grimberg 2018-12-02 16:46 ` [PATCH 11/13] block: remove ->poll_fn Christoph Hellwig 2018-12-02 16:46 ` Christoph Hellwig 2018-12-04 1:11 ` Sagi Grimberg 2018-12-04 1:11 ` Sagi Grimberg 2018-12-02 16:46 ` Christoph Hellwig [this message] 2018-12-02 16:46 ` [PATCH 12/13] block: only allow polling if a poll queue_map exists Christoph Hellwig 2018-12-04 1:14 ` Sagi Grimberg 2018-12-04 1:14 ` Sagi Grimberg 2018-12-02 16:46 ` [PATCH 13/13] block: enable polling by default if a poll map is initalized Christoph Hellwig 2018-12-02 16:46 ` Christoph Hellwig 2018-12-04 1:14 ` Sagi Grimberg 2018-12-04 1:14 ` Sagi Grimberg 2018-12-04 18:40 ` block and nvme polling improvements V3 Jens Axboe 2018-12-04 18:40 ` Jens Axboe -- strict thread matches above, loose matches on Subject: below -- 2018-11-29 19:12 block and nvme polling improvements V2 Christoph Hellwig 2018-11-29 19:13 ` [PATCH 12/13] block: only allow polling if a poll queue_map exists Christoph Hellwig 2018-11-29 19:13 ` Christoph Hellwig 2018-11-21 16:23 block and nvme polling improvements Christoph Hellwig 2018-11-21 16:23 ` [PATCH 12/13] block: only allow polling if a poll queue_map exists Christoph Hellwig 2018-11-21 16:23 ` Christoph Hellwig
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20181202164628.1116-13-hch@lst.de \ --to=hch@lst.de \ --cc=axboe@fb.com \ --cc=keith.busch@intel.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=maxg@mellanox.com \ --cc=sagi@grimberg.me \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.