* [PATCH] nvme-rdma: minor cleanup in nvme_rdma_create_cq()
@ 2023-04-07 9:15 zhenwei pi
2023-04-07 21:32 ` Sagi Grimberg
2023-04-11 6:08 ` Christoph Hellwig
0 siblings, 2 replies; 3+ messages in thread
From: zhenwei pi @ 2023-04-07 9:15 UTC (permalink / raw)
To: hch, sagi, kbusch; +Cc: linux-nvme, zhenwei pi, Yamin Friedman
Before cleanup:
enum ib_poll_context poll_ctx;
if (nvme_rdma_poll_queue(queue)) {
poll_ctx = IB_POLL_DIRECT;
queue->ib_cq = ib_alloc_cq(ibdev, queue, queue->cq_size,
comp_vector, poll_ctx);
} else {
poll_ctx = IB_POLL_SOFTIRQ;
queue->ib_cq = ib_cq_pool_get(ibdev, queue->cq_size,
comp_vector, poll_ctx);
}
After cleanup:
if (nvme_rdma_poll_queue(queue))
queue->ib_cq = ib_alloc_cq(ibdev, queue, queue->cq_size,
comp_vector, IB_POLL_DIRECT);
else
queue->ib_cq = ib_cq_pool_get(ibdev, queue->cq_size,
comp_vector, IB_POLL_SOFTIRQ);
IB_POLL_SOFTIRQ/IB_POLL_SOFTIRQ gets used directly in function, this
seems more accessible.
Cc: Yamin Friedman <yaminf@mellanox.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
---
drivers/nvme/host/rdma.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index bbad26b82b56..4767ae19178c 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -464,7 +464,6 @@ static int nvme_rdma_create_cq(struct ib_device *ibdev,
struct nvme_rdma_queue *queue)
{
int ret, comp_vector, idx = nvme_rdma_queue_idx(queue);
- enum ib_poll_context poll_ctx;
/*
* Spread I/O queues completion vectors according their queue index.
@@ -473,15 +472,12 @@ static int nvme_rdma_create_cq(struct ib_device *ibdev,
comp_vector = (idx == 0 ? idx : idx - 1) % ibdev->num_comp_vectors;
/* Polling queues need direct cq polling context */
- if (nvme_rdma_poll_queue(queue)) {
- poll_ctx = IB_POLL_DIRECT;
+ if (nvme_rdma_poll_queue(queue))
queue->ib_cq = ib_alloc_cq(ibdev, queue, queue->cq_size,
- comp_vector, poll_ctx);
- } else {
- poll_ctx = IB_POLL_SOFTIRQ;
+ comp_vector, IB_POLL_DIRECT);
+ else
queue->ib_cq = ib_cq_pool_get(ibdev, queue->cq_size,
- comp_vector, poll_ctx);
- }
+ comp_vector, IB_POLL_SOFTIRQ);
if (IS_ERR(queue->ib_cq)) {
ret = PTR_ERR(queue->ib_cq);
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] nvme-rdma: minor cleanup in nvme_rdma_create_cq()
2023-04-07 9:15 [PATCH] nvme-rdma: minor cleanup in nvme_rdma_create_cq() zhenwei pi
@ 2023-04-07 21:32 ` Sagi Grimberg
2023-04-11 6:08 ` Christoph Hellwig
1 sibling, 0 replies; 3+ messages in thread
From: Sagi Grimberg @ 2023-04-07 21:32 UTC (permalink / raw)
To: zhenwei pi, hch, kbusch; +Cc: linux-nvme, Yamin Friedman
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] nvme-rdma: minor cleanup in nvme_rdma_create_cq()
2023-04-07 9:15 [PATCH] nvme-rdma: minor cleanup in nvme_rdma_create_cq() zhenwei pi
2023-04-07 21:32 ` Sagi Grimberg
@ 2023-04-11 6:08 ` Christoph Hellwig
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2023-04-11 6:08 UTC (permalink / raw)
To: zhenwei pi; +Cc: hch, sagi, kbusch, linux-nvme, Yamin Friedman
Thanks,
applied to nvme-6.4.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-11 6:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-07 9:15 [PATCH] nvme-rdma: minor cleanup in nvme_rdma_create_cq() zhenwei pi
2023-04-07 21:32 ` Sagi Grimberg
2023-04-11 6:08 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox