nvmet-rdma: fix possible bogus dereference under heavy load
Subsystems (2)
Sagi Grimberg
maintainerPATCH v2 1/1 nvmet-rdma: fix possible bogus dereference under heavy load
Currently we always repost the recv buffer before we send a response capsule back to the host. Since ordering is not guaranteed for send and recv completions, it is posible that we will receive a new request from the host before we got a send completion for the response capsule.
Today, we pre-allocate 2x rsps the length of the queue, but in reality, under heavy load there is nothing that is really preventing the gap to expand until we exhaust all our rsps.
To fix this, if we don't have any pre-allocated rsps left, we dynamically allocate a rsp and make sure to free it when we are done. If under memory pressure we fail to allocate a rsp, we silently drop the command and wait for the host to retry.
---
Changes from v1:
- fixed list mutation outside locking in nvmet_rdma_get_rsp
- check allocation status in nvmet_rdma_get_rsp
- silent drop in case that fallback memory allocation failed
drivers/nvme/target/rdma.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)
drivers/nvme/target/rdma.c +27 -2
@@ -66,6 +66,7 @@ struct nvmet_rdma_rsp {struct nvmet_req req; +bool allocated;u8 n_rdma;u32 flags;u32 invalidate_rkey;
@@ -174,11 +175,21 @@ nvmet_rdma_get_rsp(struct nvmet_rdma_queue *queue)unsigned long flags;spin_lock_irqsave (&queue->rsps_lock, flags); - rsp =list_first_entry (&queue->free_rsps, + rsp =list_first_entry_or_null (&queue->free_rsps, struct nvmet_rdma_rsp, free_list); -list_del (&rsp->free_list); +if (likely (rsp)) { +list_del (&rsp->free_list); + rsp->allocated = false; + }spin_unlock_irqrestore (&queue->rsps_lock, flags); +if (unlikely (!rsp)) { + rsp =kmalloc (sizeof (*rsp),GFP_KERNEL ); +if (unlikely (!rsp)) +return NULL ; + rsp->allocated = true; + } +return rsp; }
@@ -187,6 +198,11 @@ nvmet_rdma_put_rsp(struct nvmet_rdma_rsp *rsp) {unsigned long flags; +if (rsp->allocated) { +kfree (rsp); +return ; + } +spin_lock_irqsave (&rsp->queue->rsps_lock, flags);list_add_tail (&rsp->free_list, &rsp->queue->free_rsps);spin_unlock_irqrestore (&rsp->queue->rsps_lock, flags);
@@ -776,6 +792,15 @@ static void nvmet_rdma_recv_done(struct ib_cq *cq, struct ib_wc *wc) cmd->queue = queue; rsp =nvmet_rdma_get_rsp (queue); +if (unlikely (!rsp)) { +/* +* we get here only under memory pressure, +* silently drop and have the host retry +* as we can't even fail it. +*/ +nvmet_rdma_post_recv (queue->dev, cmd); +return ; + } rsp->queue = queue; rsp->cmd = cmd; rsp->flags =0 ;
Signature · 1 line
2.17.1
Christoph Hellwig
maintainerPATCH v2 1/1 nvmet-rdma: fix possible bogus dereference under heavy load
drivers/nvme/target/rdma.c nvmet_rdma_get_rsp(struct nvmet_rdma_queue *queue) · line 182
Quoted 7 lines · Sagi Grimberg
drivers/nvme/target/rdma.c +4
-2- rsp =list_first_entry (&queue->free_rsps, + rsp =list_first_entry_or_null (&queue->free_rsps, struct nvmet_rdma_rsp, free_list); -list_del (&rsp->free_list); +if (likely (rsp)) { +list_del (&rsp->free_list); + rsp->allocated = false;
Given that we never set allocated to true for something we got from the freelist, and the structures were allocated using kcalloc I don't ?ee why we need to set it to false here.
Otherwise this looks fine:
Sagi Grimberg
maintainerPATCH v2 1/1 nvmet-rdma: fix possible bogus dereference under heavy load
Quoted 12 lines
drivers/nvme/target/rdma.c nvmet_rdma_get_rsp(struct nvmet_rdma_queue *queue) · line 182
Quoted 8 lines
drivers/nvme/target/rdma.c +4
-2- rsp =list_first_entry (&queue->free_rsps, + rsp =list_first_entry_or_null (&queue->free_rsps, struct nvmet_rdma_rsp, free_list); -list_del (&rsp->free_list); +if (likely (rsp)) { +list_del (&rsp->free_list); + rsp->allocated = false;Given that we never set allocated to true for something we got from the freelist, and the structures were allocated using kcalloc I don't ?ee why we need to set it to false here.
I have no problem removing it, should I send a new spin?
Christoph Hellwig
maintainerPATCH v2 1/1 nvmet-rdma: fix possible bogus dereference under heavy load
Quoted 13 lines · Sagi Grimberg
Quoted 12 lines
drivers/nvme/target/rdma.c nvmet_rdma_get_rsp(struct nvmet_rdma_queue *queue) · line 182
Quoted 8 lines
drivers/nvme/target/rdma.c +4
-2- rsp =list_first_entry (&queue->free_rsps, + rsp =list_first_entry_or_null (&queue->free_rsps, struct nvmet_rdma_rsp, free_list); -list_del (&rsp->free_list); +if (likely (rsp)) { +list_del (&rsp->free_list); + rsp->allocated = false;Given that we never set allocated to true for something we got from the freelist, and the structures were allocated using kcalloc I don't ?ee why we need to set it to false here.
Quoted 1 line
I have no problem removing it, should I send a new spin?
I can fix it up.