From: Ye Bin <yebin@huaweicloud.com>
To: ericvh@gmail.com, lucho@ionkov.net, asmadeus@codewreck.org,
linux_oss@crudebyte.com, davem@davemloft.net,
edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
v9fs-developer@lists.sourceforge.net, netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, yebin10@huawei.com
Subject: [PATCH 1/5] 9p: fix miss unmap request in 'rdma_request()'
Date: Mon, 21 Nov 2022 16:00:45 +0800 [thread overview]
Message-ID: <20221121080049.3850133-2-yebin@huaweicloud.com> (raw)
In-Reply-To: <20221121080049.3850133-1-yebin@huaweicloud.com>
From: Ye Bin <yebin10@huawei.com>
If send request failed or fail to get semaphore will not call 'send_done()',
request may miss to unmap. So add unmap handle above error.
Signed-off-by: Ye Bin <yebin10@huawei.com>
---
net/9p/trans_rdma.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c
index 6ff706760676..e498208ed72b 100644
--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c
@@ -500,7 +500,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req)
if (down_interruptible(&rdma->sq_sem)) {
err = -EINTR;
- goto send_error;
+ goto mapping_error;
}
/* Mark request as `sent' *before* we actually send it,
@@ -510,12 +510,15 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req)
req->status = REQ_STATUS_SENT;
err = ib_post_send(rdma->qp, &wr, NULL);
if (err)
- goto send_error;
+ goto mapping_error;
/* Success */
return 0;
/* Handle errors that happened during or while preparing the send: */
+ mapping_error:
+ ib_dma_unmap_single(rdma->cm_id->device, c->busa,
+ c->req->tc.size, DMA_TO_DEVICE);
send_error:
req->status = REQ_STATUS_ERROR;
kfree(c);
--
2.31.1
next prev parent reply other threads:[~2022-11-21 7:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-21 8:00 [PATCH 0/5] Fix error handle in 'rdma_request()' Ye Bin
2022-11-21 8:00 ` Ye Bin [this message]
2022-11-21 8:00 ` [PATCH 2/5] 9p: fix miss release semaphore " Ye Bin
2022-11-21 8:00 ` [PATCH 3/5] 9p: fix error handle in 'post_recv()' Ye Bin
2022-11-21 8:00 ` [PATCH 4/5] 9p: factor out 'post_send()' Ye Bin
2022-11-21 8:00 ` [PATCH 5/5] 9p: refactor 'post_recv()' Ye Bin
2022-11-22 0:27 ` [PATCH 0/5] Fix error handle in 'rdma_request()' asmadeus
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=20221121080049.3850133-2-yebin@huaweicloud.com \
--to=yebin@huaweicloud.com \
--cc=asmadeus@codewreck.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=ericvh@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux_oss@crudebyte.com \
--cc=lucho@ionkov.net \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=v9fs-developer@lists.sourceforge.net \
--cc=yebin10@huawei.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).