* [PATCH 1/4] nvme-pci: merge init_request methods
@ 2017-06-13 7:15 Christoph Hellwig
2017-06-13 7:15 ` [PATCH 2/4] nvme-rdma: merge init_request and exit_request methods Christoph Hellwig
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Christoph Hellwig @ 2017-06-13 7:15 UTC (permalink / raw)
Now that we get the tagset passed we can have a single implementation for
the I/O and admin queues.
Signed-off-by: Christoph Hellwig <hch at lst.de>
---
drivers/nvme/host/pci.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 788bb2c479d0..94504fbc404e 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -348,19 +348,6 @@ static void nvme_admin_exit_hctx(struct blk_mq_hw_ctx *hctx, unsigned int hctx_i
nvmeq->tags = NULL;
}
-static int nvme_admin_init_request(struct blk_mq_tag_set *set,
- struct request *req, unsigned int hctx_idx,
- unsigned int numa_node)
-{
- struct nvme_dev *dev = set->driver_data;
- struct nvme_iod *iod = blk_mq_rq_to_pdu(req);
- struct nvme_queue *nvmeq = dev->queues[0];
-
- BUG_ON(!nvmeq);
- iod->nvmeq = nvmeq;
- return 0;
-}
-
static int nvme_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
unsigned int hctx_idx)
{
@@ -380,7 +367,8 @@ static int nvme_init_request(struct blk_mq_tag_set *set, struct request *req,
{
struct nvme_dev *dev = set->driver_data;
struct nvme_iod *iod = blk_mq_rq_to_pdu(req);
- struct nvme_queue *nvmeq = dev->queues[hctx_idx + 1];
+ int queue_idx = (set == &dev->tagset) ? hctx_idx + 1 : 0;
+ struct nvme_queue *nvmeq = dev->queues[queue_idx];
BUG_ON(!nvmeq);
iod->nvmeq = nvmeq;
@@ -1299,7 +1287,7 @@ static const struct blk_mq_ops nvme_mq_admin_ops = {
.complete = nvme_pci_complete_rq,
.init_hctx = nvme_admin_init_hctx,
.exit_hctx = nvme_admin_exit_hctx,
- .init_request = nvme_admin_init_request,
+ .init_request = nvme_init_request,
.timeout = nvme_timeout,
};
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/4] nvme-rdma: merge init_request and exit_request methods
2017-06-13 7:15 [PATCH 1/4] nvme-pci: merge init_request methods Christoph Hellwig
@ 2017-06-13 7:15 ` Christoph Hellwig
2017-06-14 15:39 ` Max Gurtovoy
2017-06-15 9:24 ` Sagi Grimberg
2017-06-13 7:15 ` [PATCH 3/4] nvme-fc: merge init_request methods Christoph Hellwig
` (3 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: Christoph Hellwig @ 2017-06-13 7:15 UTC (permalink / raw)
Now that we get the tagset passed we can have a single implementation for
the I/O and admin queues.
Signed-off-by: Christoph Hellwig <hch at lst.de>
---
drivers/nvme/host/rdma.c | 43 +++++++++++--------------------------------
1 file changed, 11 insertions(+), 32 deletions(-)
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index aa42d256f8f8..d5111cfcc055 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -294,10 +294,12 @@ static int nvme_rdma_reinit_request(void *data, struct request *rq)
return ret;
}
-static void __nvme_rdma_exit_request(struct nvme_rdma_ctrl *ctrl,
- struct request *rq, unsigned int queue_idx)
+static void nvme_rdma_exit_request(struct blk_mq_tag_set *set,
+ struct request *rq, unsigned int hctx_idx)
{
+ struct nvme_rdma_ctrl *ctrl = set->driver_data;
struct nvme_rdma_request *req = blk_mq_rq_to_pdu(rq);
+ int queue_idx = (set == &ctrl->tag_set) ? hctx_idx + 1 : 0;
struct nvme_rdma_queue *queue = &ctrl->queues[queue_idx];
struct nvme_rdma_device *dev = queue->device;
@@ -308,22 +310,13 @@ static void __nvme_rdma_exit_request(struct nvme_rdma_ctrl *ctrl,
DMA_TO_DEVICE);
}
-static void nvme_rdma_exit_request(struct blk_mq_tag_set *set,
- struct request *rq, unsigned int hctx_idx)
-{
- return __nvme_rdma_exit_request(set->driver_data, rq, hctx_idx + 1);
-}
-
-static void nvme_rdma_exit_admin_request(struct blk_mq_tag_set *set,
- struct request *rq, unsigned int hctx_idx)
-{
- return __nvme_rdma_exit_request(set->driver_data, rq, 0);
-}
-
-static int __nvme_rdma_init_request(struct nvme_rdma_ctrl *ctrl,
- struct request *rq, unsigned int queue_idx)
+static int nvme_rdma_init_request(struct blk_mq_tag_set *set,
+ struct request *rq, unsigned int hctx_idx,
+ unsigned int numa_node)
{
+ struct nvme_rdma_ctrl *ctrl = set->driver_data;
struct nvme_rdma_request *req = blk_mq_rq_to_pdu(rq);
+ int queue_idx = (set == &ctrl->tag_set) ? hctx_idx + 1 : 0;
struct nvme_rdma_queue *queue = &ctrl->queues[queue_idx];
struct nvme_rdma_device *dev = queue->device;
struct ib_device *ibdev = dev->dev;
@@ -351,20 +344,6 @@ static int __nvme_rdma_init_request(struct nvme_rdma_ctrl *ctrl,
return -ENOMEM;
}
-static int nvme_rdma_init_request(struct blk_mq_tag_set *set,
- struct request *rq, unsigned int hctx_idx,
- unsigned int numa_node)
-{
- return __nvme_rdma_init_request(set->driver_data, rq, hctx_idx + 1);
-}
-
-static int nvme_rdma_init_admin_request(struct blk_mq_tag_set *set,
- struct request *rq, unsigned int hctx_idx,
- unsigned int numa_node)
-{
- return __nvme_rdma_init_request(set->driver_data, rq, 0);
-}
-
static int nvme_rdma_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
unsigned int hctx_idx)
{
@@ -1542,8 +1521,8 @@ static const struct blk_mq_ops nvme_rdma_mq_ops = {
static const struct blk_mq_ops nvme_rdma_admin_mq_ops = {
.queue_rq = nvme_rdma_queue_rq,
.complete = nvme_rdma_complete_rq,
- .init_request = nvme_rdma_init_admin_request,
- .exit_request = nvme_rdma_exit_admin_request,
+ .init_request = nvme_rdma_init_request,
+ .exit_request = nvme_rdma_exit_request,
.reinit_request = nvme_rdma_reinit_request,
.init_hctx = nvme_rdma_init_admin_hctx,
.timeout = nvme_rdma_timeout,
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/4] nvme-fc: merge init_request methods
2017-06-13 7:15 [PATCH 1/4] nvme-pci: merge init_request methods Christoph Hellwig
2017-06-13 7:15 ` [PATCH 2/4] nvme-rdma: merge init_request and exit_request methods Christoph Hellwig
@ 2017-06-13 7:15 ` Christoph Hellwig
2017-06-14 15:40 ` Max Gurtovoy
2017-06-15 9:25 ` Sagi Grimberg
2017-06-13 7:15 ` [PATCH 4/4] nvme-loop: " Christoph Hellwig
` (2 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: Christoph Hellwig @ 2017-06-13 7:15 UTC (permalink / raw)
Now that we get the tagset passed we can have a single implementation for
the I/O and admin queues.
Signed-off-by: Christoph Hellwig <hch at lst.de>
---
drivers/nvme/host/fc.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index ba9024a20bac..8c85d7c4123e 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -1448,18 +1448,8 @@ nvme_fc_init_request(struct blk_mq_tag_set *set, struct request *rq,
{
struct nvme_fc_ctrl *ctrl = set->driver_data;
struct nvme_fc_fcp_op *op = blk_mq_rq_to_pdu(rq);
- struct nvme_fc_queue *queue = &ctrl->queues[hctx_idx+1];
-
- return __nvme_fc_init_request(ctrl, queue, op, rq, queue->rqcnt++);
-}
-
-static int
-nvme_fc_init_admin_request(struct blk_mq_tag_set *set, struct request *rq,
- unsigned int hctx_idx, unsigned int numa_node)
-{
- struct nvme_fc_ctrl *ctrl = set->driver_data;
- struct nvme_fc_fcp_op *op = blk_mq_rq_to_pdu(rq);
- struct nvme_fc_queue *queue = &ctrl->queues[0];
+ int queue_idx = (set == &ctrl->tag_set) ? hctx_idx + 1 : 0;
+ struct nvme_fc_queue *queue = &ctrl->queues[queue_idx];
return __nvme_fc_init_request(ctrl, queue, op, rq, queue->rqcnt++);
}
@@ -2695,7 +2685,7 @@ nvme_fc_connect_ctrl_work(struct work_struct *work)
static const struct blk_mq_ops nvme_fc_admin_mq_ops = {
.queue_rq = nvme_fc_queue_rq,
.complete = nvme_fc_complete_rq,
- .init_request = nvme_fc_init_admin_request,
+ .init_request = nvme_fc_init_request,
.exit_request = nvme_fc_exit_request,
.reinit_request = nvme_fc_reinit_request,
.init_hctx = nvme_fc_init_admin_hctx,
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/4] nvme-loop: merge init_request methods
2017-06-13 7:15 [PATCH 1/4] nvme-pci: merge init_request methods Christoph Hellwig
2017-06-13 7:15 ` [PATCH 2/4] nvme-rdma: merge init_request and exit_request methods Christoph Hellwig
2017-06-13 7:15 ` [PATCH 3/4] nvme-fc: merge init_request methods Christoph Hellwig
@ 2017-06-13 7:15 ` Christoph Hellwig
2017-06-14 15:51 ` Max Gurtovoy
2017-06-15 9:25 ` Sagi Grimberg
2017-06-14 15:36 ` [PATCH 1/4] nvme-pci: " Max Gurtovoy
2017-06-15 9:24 ` Sagi Grimberg
4 siblings, 2 replies; 12+ messages in thread
From: Christoph Hellwig @ 2017-06-13 7:15 UTC (permalink / raw)
Now that we get the tagset passed we can have a single implementation for
the I/O and admin queues.
Signed-off-by: Christoph Hellwig <hch at lst.de>
---
drivers/nvme/target/loop.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
index b7715b46e021..c4e3a4d00768 100644
--- a/drivers/nvme/target/loop.c
+++ b/drivers/nvme/target/loop.c
@@ -232,15 +232,10 @@ static int nvme_loop_init_request(struct blk_mq_tag_set *set,
struct request *req, unsigned int hctx_idx,
unsigned int numa_node)
{
- return nvme_loop_init_iod(set->driver_data, blk_mq_rq_to_pdu(req),
- hctx_idx + 1);
-}
+ struct nvme_loop_ctrl *ctrl = set->driver_data;
-static int nvme_loop_init_admin_request(struct blk_mq_tag_set *set,
- struct request *req, unsigned int hctx_idx,
- unsigned int numa_node)
-{
- return nvme_loop_init_iod(set->driver_data, blk_mq_rq_to_pdu(req), 0);
+ return nvme_loop_init_iod(ctrl, blk_mq_rq_to_pdu(req),
+ (set == &ctrl->tag_set) ? hctx_idx + 1 : 0);
}
static int nvme_loop_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
@@ -278,7 +273,7 @@ static const struct blk_mq_ops nvme_loop_mq_ops = {
static const struct blk_mq_ops nvme_loop_admin_mq_ops = {
.queue_rq = nvme_loop_queue_rq,
.complete = nvme_loop_complete_rq,
- .init_request = nvme_loop_init_admin_request,
+ .init_request = nvme_loop_init_request,
.init_hctx = nvme_loop_init_admin_hctx,
.timeout = nvme_loop_timeout,
};
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 1/4] nvme-pci: merge init_request methods
2017-06-13 7:15 [PATCH 1/4] nvme-pci: merge init_request methods Christoph Hellwig
` (2 preceding siblings ...)
2017-06-13 7:15 ` [PATCH 4/4] nvme-loop: " Christoph Hellwig
@ 2017-06-14 15:36 ` Max Gurtovoy
2017-06-15 9:24 ` Sagi Grimberg
4 siblings, 0 replies; 12+ messages in thread
From: Max Gurtovoy @ 2017-06-14 15:36 UTC (permalink / raw)
On 6/13/2017 10:15 AM, Christoph Hellwig wrote:
> Now that we get the tagset passed we can have a single implementation for
> the I/O and admin queues.
>
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> ---
> drivers/nvme/host/pci.c | 18 +++---------------
> 1 file changed, 3 insertions(+), 15 deletions(-)
>
Look good,
Reviewed-by: Max Gurtovoy <maxg at mellanox.com>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/4] nvme-rdma: merge init_request and exit_request methods
2017-06-13 7:15 ` [PATCH 2/4] nvme-rdma: merge init_request and exit_request methods Christoph Hellwig
@ 2017-06-14 15:39 ` Max Gurtovoy
2017-06-15 9:24 ` Sagi Grimberg
1 sibling, 0 replies; 12+ messages in thread
From: Max Gurtovoy @ 2017-06-14 15:39 UTC (permalink / raw)
On 6/13/2017 10:15 AM, Christoph Hellwig wrote:
> Now that we get the tagset passed we can have a single implementation for
> the I/O and admin queues.
>
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> ---
> drivers/nvme/host/rdma.c | 43 +++++++++++--------------------------------
> 1 file changed, 11 insertions(+), 32 deletions(-)
>
Looks good,
Reviewed-by: Max Gurtovoy <maxg at mellanox.com>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/4] nvme-fc: merge init_request methods
2017-06-13 7:15 ` [PATCH 3/4] nvme-fc: merge init_request methods Christoph Hellwig
@ 2017-06-14 15:40 ` Max Gurtovoy
2017-06-15 9:25 ` Sagi Grimberg
1 sibling, 0 replies; 12+ messages in thread
From: Max Gurtovoy @ 2017-06-14 15:40 UTC (permalink / raw)
On 6/13/2017 10:15 AM, Christoph Hellwig wrote:
> Now that we get the tagset passed we can have a single implementation for
> the I/O and admin queues.
>
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> ---
> drivers/nvme/host/fc.c | 16 +++-------------
> 1 file changed, 3 insertions(+), 13 deletions(-)
>
Looks good,
Reviewed-by: Max Gurtovoy <maxg at mellanox.com>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 4/4] nvme-loop: merge init_request methods
2017-06-13 7:15 ` [PATCH 4/4] nvme-loop: " Christoph Hellwig
@ 2017-06-14 15:51 ` Max Gurtovoy
2017-06-15 9:25 ` Sagi Grimberg
1 sibling, 0 replies; 12+ messages in thread
From: Max Gurtovoy @ 2017-06-14 15:51 UTC (permalink / raw)
On 6/13/2017 10:15 AM, Christoph Hellwig wrote:
> Now that we get the tagset passed we can have a single implementation for
> the I/O and admin queues.
>
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> ---
> drivers/nvme/target/loop.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
Looks good,
Reviewed-by: Max Gurtovoy <maxg at mellanox.com>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/4] nvme-pci: merge init_request methods
2017-06-13 7:15 [PATCH 1/4] nvme-pci: merge init_request methods Christoph Hellwig
` (3 preceding siblings ...)
2017-06-14 15:36 ` [PATCH 1/4] nvme-pci: " Max Gurtovoy
@ 2017-06-15 9:24 ` Sagi Grimberg
4 siblings, 0 replies; 12+ messages in thread
From: Sagi Grimberg @ 2017-06-15 9:24 UTC (permalink / raw)
Looks good,
Reviewed-by: Sagi Grimberg <sagi at grimberg.me>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/4] nvme-rdma: merge init_request and exit_request methods
2017-06-13 7:15 ` [PATCH 2/4] nvme-rdma: merge init_request and exit_request methods Christoph Hellwig
2017-06-14 15:39 ` Max Gurtovoy
@ 2017-06-15 9:24 ` Sagi Grimberg
1 sibling, 0 replies; 12+ messages in thread
From: Sagi Grimberg @ 2017-06-15 9:24 UTC (permalink / raw)
Looks good,
Reviewed-by: Sagi Grimberg <sagi at grimberg.me>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/4] nvme-fc: merge init_request methods
2017-06-13 7:15 ` [PATCH 3/4] nvme-fc: merge init_request methods Christoph Hellwig
2017-06-14 15:40 ` Max Gurtovoy
@ 2017-06-15 9:25 ` Sagi Grimberg
1 sibling, 0 replies; 12+ messages in thread
From: Sagi Grimberg @ 2017-06-15 9:25 UTC (permalink / raw)
Looks good,
Reviewed-by: Sagi Grimberg <sagi at grimberg.me>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 4/4] nvme-loop: merge init_request methods
2017-06-13 7:15 ` [PATCH 4/4] nvme-loop: " Christoph Hellwig
2017-06-14 15:51 ` Max Gurtovoy
@ 2017-06-15 9:25 ` Sagi Grimberg
1 sibling, 0 replies; 12+ messages in thread
From: Sagi Grimberg @ 2017-06-15 9:25 UTC (permalink / raw)
Looks good,
Reviewed-by: Sagi Grimberg <sagi at grimberg.me>
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2017-06-15 9:25 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-13 7:15 [PATCH 1/4] nvme-pci: merge init_request methods Christoph Hellwig
2017-06-13 7:15 ` [PATCH 2/4] nvme-rdma: merge init_request and exit_request methods Christoph Hellwig
2017-06-14 15:39 ` Max Gurtovoy
2017-06-15 9:24 ` Sagi Grimberg
2017-06-13 7:15 ` [PATCH 3/4] nvme-fc: merge init_request methods Christoph Hellwig
2017-06-14 15:40 ` Max Gurtovoy
2017-06-15 9:25 ` Sagi Grimberg
2017-06-13 7:15 ` [PATCH 4/4] nvme-loop: " Christoph Hellwig
2017-06-14 15:51 ` Max Gurtovoy
2017-06-15 9:25 ` Sagi Grimberg
2017-06-14 15:36 ` [PATCH 1/4] nvme-pci: " Max Gurtovoy
2017-06-15 9:24 ` Sagi Grimberg
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.