From nobody Wed Apr 15 19:44:40 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93A9AC43219 for ; Mon, 21 Nov 2022 07:39:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229873AbiKUHjq (ORCPT ); Mon, 21 Nov 2022 02:39:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229627AbiKUHji (ORCPT ); Mon, 21 Nov 2022 02:39:38 -0500 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68B1D2936F; Sun, 20 Nov 2022 23:39:37 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4NFzmg3Sktz4f3mSm; Mon, 21 Nov 2022 15:39:31 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgC329g0K3tj2M2XAw--.53628S5; Mon, 21 Nov 2022 15:39:34 +0800 (CST) From: Ye Bin 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 Message-Id: <20221121080049.3850133-2-yebin@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221121080049.3850133-1-yebin@huaweicloud.com> References: <20221121080049.3850133-1-yebin@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgC329g0K3tj2M2XAw--.53628S5 X-Coremail-Antispam: 1UD129KBjvJXoWruw1xtw4DXF1DKr1UAw45trb_yoW8Jr4kpa y8uanIkrZxKr15Ar4xJFZIga4jyF4fCFWUCFW8K3ZxJF4qvryYyF4vk3yYqFyxCFWxAF4r Gryqgas5urWUZFUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUGw A2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMc Ij6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_ Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I 0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU2mL9UUUUU X-CM-SenderInfo: p1hex046kxt4xhlfz01xgou0bp/ X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ye Bin 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 --- 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, struc= t p9_req_t *req) =20 if (down_interruptible(&rdma->sq_sem)) { err =3D -EINTR; - goto send_error; + goto mapping_error; } =20 /* Mark request as `sent' *before* we actually send it, @@ -510,12 +510,15 @@ static int rdma_request(struct p9_client *client, str= uct p9_req_t *req) req->status =3D REQ_STATUS_SENT; err =3D ib_post_send(rdma->qp, &wr, NULL); if (err) - goto send_error; + goto mapping_error; =20 /* Success */ return 0; =20 /* 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 =3D REQ_STATUS_ERROR; kfree(c); --=20 2.31.1 From nobody Wed Apr 15 19:44:40 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DED0C4321E for ; Mon, 21 Nov 2022 07:39:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229837AbiKUHjm (ORCPT ); Mon, 21 Nov 2022 02:39:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229519AbiKUHji (ORCPT ); Mon, 21 Nov 2022 02:39:38 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 754582D1DE; Sun, 20 Nov 2022 23:39:37 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NFzmg6YCHz4f3jZb; Mon, 21 Nov 2022 15:39:31 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgC329g0K3tj2M2XAw--.53628S6; Mon, 21 Nov 2022 15:39:34 +0800 (CST) From: Ye Bin 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 2/5] 9p: fix miss release semaphore in 'rdma_request()' Date: Mon, 21 Nov 2022 16:00:46 +0800 Message-Id: <20221121080049.3850133-3-yebin@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221121080049.3850133-1-yebin@huaweicloud.com> References: <20221121080049.3850133-1-yebin@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgC329g0K3tj2M2XAw--.53628S6 X-Coremail-Antispam: 1UD129KBjvdXoW7Gw45Wr4kCw45JF43tF1fWFg_yoW3XwbE9F 4fGan3Xas7Jry7KFWjka1Fvr1kCFWxWr1xurn0ya4jkwn8Xr97Gw1jgr98Ar47CF4DCrW8 Jwn8X3yfWFy3ZjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbfxYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7IE14v26r15M2 8IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK 021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r 4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_ GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx 0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWU JVW8JwACjcxG0xvY0x0EwIxGrwACI402YVCY1x02628vn2kIc2xKxwCF04k20xvY0x0EwI xGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480 Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7 IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k2 6cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxV AFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07UC9aPUUUUU= X-CM-SenderInfo: p1hex046kxt4xhlfz01xgou0bp/ X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ye Bin If send request failed will not call 'send_done()', but already get '(&rdma->sq_sem'. So add release '(&rdma->sq_sem' after send request failed. Signed-off-by: Ye Bin --- net/9p/trans_rdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c index e498208ed72b..ae2bac9bf510 100644 --- a/net/9p/trans_rdma.c +++ b/net/9p/trans_rdma.c @@ -509,8 +509,10 @@ static int rdma_request(struct p9_client *client, stru= ct p9_req_t *req) */ req->status =3D REQ_STATUS_SENT; err =3D ib_post_send(rdma->qp, &wr, NULL); - if (err) + if (err) { + up(&rdma->sq_sem); goto mapping_error; + } =20 /* Success */ return 0; --=20 2.31.1 From nobody Wed Apr 15 19:44:40 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 772EBC433FE for ; Mon, 21 Nov 2022 07:39:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229882AbiKUHjs (ORCPT ); Mon, 21 Nov 2022 02:39:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229699AbiKUHji (ORCPT ); Mon, 21 Nov 2022 02:39:38 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F156D2D1E4; Sun, 20 Nov 2022 23:39:37 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NFzmh2tT2z4f3tqC; Mon, 21 Nov 2022 15:39:32 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgC329g0K3tj2M2XAw--.53628S7; Mon, 21 Nov 2022 15:39:35 +0800 (CST) From: Ye Bin 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 3/5] 9p: fix error handle in 'post_recv()' Date: Mon, 21 Nov 2022 16:00:47 +0800 Message-Id: <20221121080049.3850133-4-yebin@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221121080049.3850133-1-yebin@huaweicloud.com> References: <20221121080049.3850133-1-yebin@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgC329g0K3tj2M2XAw--.53628S7 X-Coremail-Antispam: 1UD129KBjvJXoW7ur13XF1kWw47ZF45XF1fJFb_yoW8Gw18pF Z3uwsxZr9Igr17Aw4kKayDuFySkrsYkF4fG34jkanxJ3WDtr98KF4Ut3yYqFyxGF4xJF4f Gr1DtayruF1UZrUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBYb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUWw A2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMc Ij6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_ Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I 0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7IU1c4S7UUUUU== X-CM-SenderInfo: p1hex046kxt4xhlfz01xgou0bp/ X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ye Bin There are two issues in 'post_recv()': 1. Miss unmap request if receive request failed; 2. Miss release 'rdma->rq_sem' if post receive failed or mapping failed; So add miss release 'rdma->rq_sem' and unmap request when do error handle. Signed-off-by: Ye Bin --- net/9p/trans_rdma.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c index ae2bac9bf510..bcab550c2e2c 100644 --- a/net/9p/trans_rdma.c +++ b/net/9p/trans_rdma.c @@ -386,6 +386,7 @@ post_recv(struct p9_client *client, struct p9_rdma_cont= ext *c) struct p9_trans_rdma *rdma =3D client->trans; struct ib_recv_wr wr; struct ib_sge sge; + int err =3D -EIO; =20 c->busa =3D ib_dma_map_single(rdma->cm_id->device, c->rc.sdata, client->msize, @@ -403,11 +404,17 @@ post_recv(struct p9_client *client, struct p9_rdma_co= ntext *c) wr.wr_cqe =3D &c->cqe; wr.sg_list =3D &sge; wr.num_sge =3D 1; - return ib_post_recv(rdma->qp, &wr, NULL); - + err =3D ib_post_recv(rdma->qp, &wr, NULL); + if (err) { + ib_dma_unmap_single(rdma->cm_id->device, c->busa, + client->msize, DMA_FROM_DEVICE); + goto error; + } + return 0; error: + up(&rdma->rq_sem); p9_debug(P9_DEBUG_ERROR, "EIO\n"); - return -EIO; + return err; } =20 static int rdma_request(struct p9_client *client, struct p9_req_t *req) --=20 2.31.1 From nobody Wed Apr 15 19:44:40 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DFD9C433FE for ; Mon, 21 Nov 2022 07:39:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229622AbiKUHjv (ORCPT ); Mon, 21 Nov 2022 02:39:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229791AbiKUHjj (ORCPT ); Mon, 21 Nov 2022 02:39:39 -0500 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 764542AE0E; Sun, 20 Nov 2022 23:39:38 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4NFzmh6wGQz4f3mTF; Mon, 21 Nov 2022 15:39:32 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgC329g0K3tj2M2XAw--.53628S8; Mon, 21 Nov 2022 15:39:35 +0800 (CST) From: Ye Bin 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 4/5] 9p: factor out 'post_send()' Date: Mon, 21 Nov 2022 16:00:48 +0800 Message-Id: <20221121080049.3850133-5-yebin@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221121080049.3850133-1-yebin@huaweicloud.com> References: <20221121080049.3850133-1-yebin@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgC329g0K3tj2M2XAw--.53628S8 X-Coremail-Antispam: 1UD129KBjvJXoWxCrWrXry3CrWrJF17Cr4Uurg_yoWrCr43p3 yrJa9IvrZxKF13Aws5Ka4jgF1Yyr4rCayUtryxCws3AFs0vr90yF4jyayYgFyxAFZ7Ca1r KryDKFZ3CryUZrDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBab4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAV Cq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0 rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267 AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E 14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7 xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Y z7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY 6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aV CY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x07UZo7tUUUUU= X-CM-SenderInfo: p1hex046kxt4xhlfz01xgou0bp/ X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ye Bin Factor out 'post_send()' to send request. No functional change. Signed-off-by: Ye Bin --- net/9p/trans_rdma.c | 130 +++++++++++++++++++++++--------------------- 1 file changed, 69 insertions(+), 61 deletions(-) diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c index bcab550c2e2c..bb917389adc9 100644 --- a/net/9p/trans_rdma.c +++ b/net/9p/trans_rdma.c @@ -417,14 +417,72 @@ post_recv(struct p9_client *client, struct p9_rdma_co= ntext *c) return err; } =20 -static int rdma_request(struct p9_client *client, struct p9_req_t *req) +static int post_send(struct p9_client *client, struct p9_req_t *req) { struct p9_trans_rdma *rdma =3D client->trans; + struct p9_rdma_context *c =3D NULL; struct ib_send_wr wr; struct ib_sge sge; + int err; + + c =3D kmalloc(sizeof *c, GFP_NOFS); + if (!c) { + err =3D -ENOMEM; + goto error; + } + c->req =3D req; + + c->busa =3D ib_dma_map_single(rdma->cm_id->device, + c->req->tc.sdata, c->req->tc.size, + DMA_TO_DEVICE); + if (ib_dma_mapping_error(rdma->cm_id->device, c->busa)) { + err =3D -EIO; + goto error; + } + + c->cqe.done =3D send_done; + + sge.addr =3D c->busa; + sge.length =3D c->req->tc.size; + sge.lkey =3D rdma->pd->local_dma_lkey; + + wr.next =3D NULL; + wr.wr_cqe =3D &c->cqe; + wr.opcode =3D IB_WR_SEND; + wr.send_flags =3D IB_SEND_SIGNALED; + wr.sg_list =3D &sge; + wr.num_sge =3D 1; + + if (down_interruptible(&rdma->sq_sem)) { + err =3D -EINTR; + goto mapping_error; + } + + /* Mark request as `sent' *before* we actually send it, + * because doing if after could erase the REQ_STATUS_RCVD + * status in case of a very fast reply. + */ + req->status =3D REQ_STATUS_SENT; + err =3D ib_post_send(rdma->qp, &wr, NULL); + if (err) + goto sem_error; + + return 0; +sem_error: + up(&rdma->sq_sem); +mapping_error: + ib_dma_unmap_single(rdma->cm_id->device, c->busa, + c->req->tc.size, DMA_TO_DEVICE); +error: + kfree(c); + return err; +} + +static int rdma_request(struct p9_client *client, struct p9_req_t *req) +{ + struct p9_trans_rdma *rdma =3D client->trans; int err =3D 0; unsigned long flags; - struct p9_rdma_context *c =3D NULL; struct p9_rdma_context *rpl_context =3D NULL; =20 /* When an error occurs between posting the recv and the send, @@ -476,67 +534,17 @@ static int rdma_request(struct p9_client *client, str= uct p9_req_t *req) req->rc.sdata =3D NULL; =20 dont_need_post_recv: - /* Post the request */ - c =3D kmalloc(sizeof *c, GFP_NOFS); - if (!c) { - err =3D -ENOMEM; - goto send_error; - } - c->req =3D req; - - c->busa =3D ib_dma_map_single(rdma->cm_id->device, - c->req->tc.sdata, c->req->tc.size, - DMA_TO_DEVICE); - if (ib_dma_mapping_error(rdma->cm_id->device, c->busa)) { - err =3D -EIO; - goto send_error; - } - - c->cqe.done =3D send_done; - - sge.addr =3D c->busa; - sge.length =3D c->req->tc.size; - sge.lkey =3D rdma->pd->local_dma_lkey; - - wr.next =3D NULL; - wr.wr_cqe =3D &c->cqe; - wr.opcode =3D IB_WR_SEND; - wr.send_flags =3D IB_SEND_SIGNALED; - wr.sg_list =3D &sge; - wr.num_sge =3D 1; - - if (down_interruptible(&rdma->sq_sem)) { - err =3D -EINTR; - goto mapping_error; - } - - /* Mark request as `sent' *before* we actually send it, - * because doing if after could erase the REQ_STATUS_RCVD - * status in case of a very fast reply. - */ - req->status =3D REQ_STATUS_SENT; - err =3D ib_post_send(rdma->qp, &wr, NULL); + err =3D post_send(client, req); if (err) { - up(&rdma->sq_sem); - goto mapping_error; + req->status =3D REQ_STATUS_ERROR; + p9_debug(P9_DEBUG_ERROR, "Error %d in rdma_request()\n", err); + + /* Ach. + * We did recv_post(), but not send. We have one recv_post + * in excess. + */ + atomic_inc(&rdma->excess_rc); } - - /* 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 =3D REQ_STATUS_ERROR; - kfree(c); - p9_debug(P9_DEBUG_ERROR, "Error %d in rdma_request()\n", err); - - /* Ach. - * We did recv_post(), but not send. We have one recv_post in excess. - */ - atomic_inc(&rdma->excess_rc); return err; =20 /* Handle errors that happened during or while preparing post_recv(): */ --=20 2.31.1 From nobody Wed Apr 15 19:44:40 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD74FC433FE for ; Mon, 21 Nov 2022 07:39:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229862AbiKUHjx (ORCPT ); Mon, 21 Nov 2022 02:39:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229803AbiKUHjj (ORCPT ); Mon, 21 Nov 2022 02:39:39 -0500 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDAFC13DC4; Sun, 20 Nov 2022 23:39:38 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4NFzmj33PDz4f3v7Z; Mon, 21 Nov 2022 15:39:33 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgC329g0K3tj2M2XAw--.53628S9; Mon, 21 Nov 2022 15:39:36 +0800 (CST) From: Ye Bin 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 5/5] 9p: refactor 'post_recv()' Date: Mon, 21 Nov 2022 16:00:49 +0800 Message-Id: <20221121080049.3850133-6-yebin@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221121080049.3850133-1-yebin@huaweicloud.com> References: <20221121080049.3850133-1-yebin@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgC329g0K3tj2M2XAw--.53628S9 X-Coremail-Antispam: 1UD129KBjvJXoWxJF4fGr1rKF1fJFykAFyUAwb_yoWrXr1fpF 4fuwsIyrZ0qF17Cw4kKa4UZF12kr4rCa1rG3y8Kws3JFn8trn5KF4jyryFgFWxuFZ7J3WF yr1DKFWruF1UZrUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBab4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAV Cq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0 rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267 AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E 14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7 xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Y z7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY 6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aV CY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x07UZo7tUUUUU= X-CM-SenderInfo: p1hex046kxt4xhlfz01xgou0bp/ X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ye Bin Refactor 'post_recv()', move receive resource request from 'rdma_request()'= to 'post_recv()'. Signed-off-by: Ye Bin --- net/9p/trans_rdma.c | 77 +++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c index bb917389adc9..78452c289f35 100644 --- a/net/9p/trans_rdma.c +++ b/net/9p/trans_rdma.c @@ -380,19 +380,40 @@ static void rdma_destroy_trans(struct p9_trans_rdma *= rdma) kfree(rdma); } =20 -static int -post_recv(struct p9_client *client, struct p9_rdma_context *c) +static int post_recv(struct p9_client *client, struct p9_req_t *req) { struct p9_trans_rdma *rdma =3D client->trans; + struct p9_rdma_context *c =3D NULL; struct ib_recv_wr wr; struct ib_sge sge; - int err =3D -EIO; + int err; + + c =3D kmalloc(sizeof *c, GFP_NOFS); + if (!c) { + err =3D -ENOMEM; + goto error; + } + c->rc.sdata =3D req->rc.sdata; + + /* + * Post a receive buffer for this request. We need to ensure + * there is a reply buffer available for every outstanding + * request. A flushed request can result in no reply for an + * outstanding request, so we must keep a count to avoid + * overflowing the RQ. + */ + if (down_interruptible(&rdma->rq_sem)) { + err =3D -EINTR; + goto error; + } =20 c->busa =3D ib_dma_map_single(rdma->cm_id->device, c->rc.sdata, client->msize, DMA_FROM_DEVICE); - if (ib_dma_mapping_error(rdma->cm_id->device, c->busa)) - goto error; + if (ib_dma_mapping_error(rdma->cm_id->device, c->busa)) { + err =3D -EIO; + goto sem_error; + } =20 c->cqe.done =3D recv_done; =20 @@ -405,15 +426,18 @@ post_recv(struct p9_client *client, struct p9_rdma_co= ntext *c) wr.sg_list =3D &sge; wr.num_sge =3D 1; err =3D ib_post_recv(rdma->qp, &wr, NULL); - if (err) { - ib_dma_unmap_single(rdma->cm_id->device, c->busa, - client->msize, DMA_FROM_DEVICE); - goto error; - } + if (err) + goto mapping_error; + return 0; - error: + +mapping_error: + ib_dma_unmap_single(rdma->cm_id->device, c->busa, + client->msize, DMA_FROM_DEVICE); +sem_error: up(&rdma->rq_sem); - p9_debug(P9_DEBUG_ERROR, "EIO\n"); +error: + kfree(c); return err; } =20 @@ -481,9 +505,8 @@ static int post_send(struct p9_client *client, struct p= 9_req_t *req) static int rdma_request(struct p9_client *client, struct p9_req_t *req) { struct p9_trans_rdma *rdma =3D client->trans; - int err =3D 0; unsigned long flags; - struct p9_rdma_context *rpl_context =3D NULL; + int err; =20 /* When an error occurs between posting the recv and the send, * there will be a receive context posted without a pending request. @@ -505,27 +528,7 @@ static int rdma_request(struct p9_client *client, stru= ct p9_req_t *req) } } =20 - /* Allocate an fcall for the reply */ - rpl_context =3D kmalloc(sizeof *rpl_context, GFP_NOFS); - if (!rpl_context) { - err =3D -ENOMEM; - goto recv_error; - } - rpl_context->rc.sdata =3D req->rc.sdata; - - /* - * Post a receive buffer for this request. We need to ensure - * there is a reply buffer available for every outstanding - * request. A flushed request can result in no reply for an - * outstanding request, so we must keep a count to avoid - * overflowing the RQ. - */ - if (down_interruptible(&rdma->rq_sem)) { - err =3D -EINTR; - goto recv_error; - } - - err =3D post_recv(client, rpl_context); + err =3D post_recv(client, req); if (err) { p9_debug(P9_DEBUG_ERROR, "POST RECV failed: %d\n", err); goto recv_error; @@ -547,9 +550,7 @@ static int rdma_request(struct p9_client *client, struc= t p9_req_t *req) } return err; =20 - /* Handle errors that happened during or while preparing post_recv(): */ - recv_error: - kfree(rpl_context); +recv_error: spin_lock_irqsave(&rdma->req_lock, flags); if (err !=3D -EINTR && rdma->state < P9_RDMA_CLOSING) { rdma->state =3D P9_RDMA_CLOSING; --=20 2.31.1