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 10/13] nvme-mpath: remove I/O polling support Date: Sun, 2 Dec 2018 17:46:25 +0100 [thread overview] Message-ID: <20181202164628.1116-11-hch@lst.de> (raw) In-Reply-To: <20181202164628.1116-1-hch@lst.de> The ->poll_fn has been stale for a while, as a lot of places check for mq ops. But there is no real point in it anyway, as we don't even use the multipath code for subsystems without multiple ports, which is usually what we do high performance I/O to. If it really becomes an issue we should rework the nvme code to also skip the multipath code for any private namespace, even if that could mean some trouble when rescanning. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/nvme/host/multipath.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index ffebdd0ae34b..ec310b1b9267 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -220,21 +220,6 @@ static blk_qc_t nvme_ns_head_make_request(struct request_queue *q, return ret; } -static int nvme_ns_head_poll(struct request_queue *q, blk_qc_t qc, bool spin) -{ - struct nvme_ns_head *head = q->queuedata; - struct nvme_ns *ns; - int found = 0; - int srcu_idx; - - srcu_idx = srcu_read_lock(&head->srcu); - ns = srcu_dereference(head->current_path[numa_node_id()], &head->srcu); - if (likely(ns && nvme_path_is_optimized(ns))) - found = ns->queue->poll_fn(q, qc, spin); - srcu_read_unlock(&head->srcu, srcu_idx); - return found; -} - static void nvme_requeue_work(struct work_struct *work) { struct nvme_ns_head *head = @@ -281,7 +266,6 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head) goto out; q->queuedata = head; blk_queue_make_request(q, nvme_ns_head_make_request); - q->poll_fn = nvme_ns_head_poll; blk_queue_flag_set(QUEUE_FLAG_NONROT, q); /* set to a default value for 512 until disk is validated */ blk_queue_logical_block_size(q, 512); -- 2.19.1
WARNING: multiple messages have this Message-ID (diff)
From: hch@lst.de (Christoph Hellwig) Subject: [PATCH 10/13] nvme-mpath: remove I/O polling support Date: Sun, 2 Dec 2018 17:46:25 +0100 [thread overview] Message-ID: <20181202164628.1116-11-hch@lst.de> (raw) In-Reply-To: <20181202164628.1116-1-hch@lst.de> The ->poll_fn has been stale for a while, as a lot of places check for mq ops. But there is no real point in it anyway, as we don't even use the multipath code for subsystems without multiple ports, which is usually what we do high performance I/O to. If it really becomes an issue we should rework the nvme code to also skip the multipath code for any private namespace, even if that could mean some trouble when rescanning. Signed-off-by: Christoph Hellwig <hch at lst.de> --- drivers/nvme/host/multipath.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index ffebdd0ae34b..ec310b1b9267 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -220,21 +220,6 @@ static blk_qc_t nvme_ns_head_make_request(struct request_queue *q, return ret; } -static int nvme_ns_head_poll(struct request_queue *q, blk_qc_t qc, bool spin) -{ - struct nvme_ns_head *head = q->queuedata; - struct nvme_ns *ns; - int found = 0; - int srcu_idx; - - srcu_idx = srcu_read_lock(&head->srcu); - ns = srcu_dereference(head->current_path[numa_node_id()], &head->srcu); - if (likely(ns && nvme_path_is_optimized(ns))) - found = ns->queue->poll_fn(q, qc, spin); - srcu_read_unlock(&head->srcu, srcu_idx); - return found; -} - static void nvme_requeue_work(struct work_struct *work) { struct nvme_ns_head *head = @@ -281,7 +266,6 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head) goto out; q->queuedata = head; blk_queue_make_request(q, nvme_ns_head_make_request); - q->poll_fn = nvme_ns_head_poll; blk_queue_flag_set(QUEUE_FLAG_NONROT, q); /* set to a default value for 512 until disk is validated */ blk_queue_logical_block_size(q, 512); -- 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 ` Christoph Hellwig [this message] 2018-12-02 16:46 ` [PATCH 10/13] nvme-mpath: " 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 ` [PATCH 12/13] block: only allow polling if a poll queue_map exists 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-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 10/13] nvme-mpath: remove I/O polling support 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 10/13] nvme-mpath: remove I/O polling support 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-11-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.