From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A2D283ACA62; Thu, 5 Mar 2026 14:51:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772722270; cv=none; b=h8AHJXN86ZE++OCuXBqqY8OXAzRrFhr0cBdP/TPjVPnNTaHlO6Md1yMbqtU+/eWeNfU8sbF7kiUBh+tdLLTo7E9vp21ZHUJKWk81uGCghSxnOMYhGo2yH9ZwPsTaxQE92zag92LQPTBv2Gt9b5ZVpIYASvzRJ+0c684u3TNnwpI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772722270; c=relaxed/simple; bh=JoHnB+hEOdt0RDk7MkYUyVXmPLQfiIYySS3DTCMwrCA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZjnDIXErdBPWssxIXYG2WQMfR1hOd14mXyu82rXLDtBq2baiLu4ppVp+creYfLxMGzbAUelm2br/YCLcIGaNGN4OiLgz5/S3W43C2HcdvuhvVkDGg320dEed1MlV6My9XH13N/TSqcUsaWcNKaSzqi4p76tAuc7Kp1hdG1A8b3o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oLpNBbXV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oLpNBbXV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22FC5C2BC87; Thu, 5 Mar 2026 14:51:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772722270; bh=JoHnB+hEOdt0RDk7MkYUyVXmPLQfiIYySS3DTCMwrCA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oLpNBbXVF7rc3wU+RBoK9SAkyB5MIwma+eOEfQVF+55km/KsDNW0Be783QApm4Tbc VGDaXEm/7QG5BgixMFTSU7pLUfWZW/MEIOfQQkQCQ1UNiU+TMnaAYG9dxp5U8hsL5q J/H+sa7F5SiP7NYD2s6xVZyvOj/F8sYkwhV5GVGq5h1t+9D9ClwgRV667KkmqurKTm QvZLRgmg43LYKkGT3a9ZjXyqCwE8N0/RaumqUi+dFeI8vCtubTTlQ+2BG7YkhjX33k 6d1uEIUSNvcIbGE9rh1V58JW2i0sDVAmSvqOHxu7ZoCtsn+AHPx4thp9PU7smdRv06 5wsk8z5vtNl9g== From: Chuck Lever To: Anna Schumaker Cc: Trond Myklebust , , , Chuck Lever Subject: [PATCH v2 5/8] xprtrdma: Decouple frwr_wp_create from frwr_map Date: Thu, 5 Mar 2026 09:51:00 -0500 Message-ID: <20260305145054.7096-15-cel@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260305145054.7096-10-cel@kernel.org> References: <20260305145054.7096-10-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3542; i=chuck.lever@oracle.com; h=from:subject; bh=CWjYGjf0teI7A/d6aez5Ld3HwZtIWt188Yba0L+ue14=; b=owEBbQKS/ZANAwAKATNqszNvZn+XAcsmYgBpqZhWhJiTg9aBRUoKoH+B/j6PxstWmBKxoPCJP t6bq55T14mJAjMEAAEKAB0WIQQosuWwEobfJDzyPv4zarMzb2Z/lwUCaamYVgAKCRAzarMzb2Z/ lxORD/kBoBvHDlarssR82zfNJqCyJ7t61olyxGXGu6Z3uRbW0Q+K9EDZJhwj5trwznM7yO+1L0d mywdrOHSLcB1QLaA8Mfn0HK15whHemLYC8tsHpZKhGcW96eYimnPSvW5cz/zZOcM3tnfVvwXqAX ietLGQuCceGJgQHYH+tBnhHxm3bmkSFqTtK5ii75FfK228WHAamXS9mB6e7A7dnJ7tUfrDRkGwQ v27TvpyDG+7JaGzYxkIqrcbEp8wqki28edaFJ2SyugTxekwVXoBb/3pCjshgHZhTkevfh6ZeQ3k CCXDTaGm3toDvleckG7SyLxP9lxN/MQhFV5Ym+oX1SQ7IlJpHKivjt/CHHraAd72ui0XiY1NTPo eLdEYjb+TIYsVmuKAq0J9c74KvZJdnkayOnBVYxmB2rr/Fy174f6K2nYMpsG6W4TqNvQDnpH2BZ G6KGH0J9CQD/pZCL1zhHjPxM9qqvsSpe+UbL/SC5eKW9zhkZcystFycHhDlRLEeeHVqv8PchXK6 C4nSOM761ULaKLjgxsiWPL50UKdKsMRxWPET1sRIXLVOyFezoceirOd+BvDcu4vN1Vq4HhDaR2F NofDqfOIHi45/aqaozetvC26e9s4csDKZ/2T3ZYjora6bBXRRpgY6I3siGHVpjOMK1JuWnYu0m8 T2byyvQw0/f1qYg== X-Developer-Key: i=chuck.lever@oracle.com; a=openpgp; fpr=28B2E5B01286DF243CF23EFE336AB3336F667F97 Content-Transfer-Encoding: 8bit From: Chuck Lever frwr_wp_create is the only caller of frwr_map outside the encode path. It registers a single 4-byte write-pad region from a stack- local rpcrdma_mr_seg. Inlining the registration logic directly (sg_init_table + sg_set_page + ib_dma_map_sg + ib_map_mr_sg + IOVA mangle + reg_wr setup) eliminates the coupling that would otherwise complicate the removal of rpcrdma_mr_seg from frwr_map's interface. The inlined version adds a proper error-unwind ladder: on failure, the DMA mapping (if established) is released, ep->re_write_pad_mr is cleared, and the MR is returned to the transport free list. The old frwr_map-based code relied on rpcrdma_mrs_destroy at teardown to reclaim partially-initialized MRs. This is a one-time setup path; duplicating ~20 lines is a reasonable tradeoff for decoupling the write-pad registration from the data- path MR registration. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/frwr_ops.c | 57 +++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 7 deletions(-) diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c index 31434aeb8e29..4331b0b65f4c 100644 --- a/net/sunrpc/xprtrdma/frwr_ops.c +++ b/net/sunrpc/xprtrdma/frwr_ops.c @@ -669,9 +669,13 @@ void frwr_unmap_async(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req) */ int frwr_wp_create(struct rpcrdma_xprt *r_xprt) { + struct rpcrdma_buffer *buf = &r_xprt->rx_buf; struct rpcrdma_ep *ep = r_xprt->rx_ep; - struct rpcrdma_mr_seg seg; + struct ib_reg_wr *reg_wr; struct rpcrdma_mr *mr; + struct ib_mr *ibmr; + int dma_nents; + int ret; mr = rpcrdma_mr_get(r_xprt); if (!mr) @@ -679,11 +683,39 @@ int frwr_wp_create(struct rpcrdma_xprt *r_xprt) mr->mr_req = NULL; ep->re_write_pad_mr = mr; - seg.mr_len = XDR_UNIT; - seg.mr_page = virt_to_page(ep->re_write_pad); - seg.mr_offset = offset_in_page(ep->re_write_pad); - if (IS_ERR(frwr_map(r_xprt, &seg, 1, true, xdr_zero, mr))) - return -EIO; + sg_init_table(mr->mr_sg, 1); + sg_set_page(mr->mr_sg, virt_to_page(ep->re_write_pad), + XDR_UNIT, offset_in_page(ep->re_write_pad)); + + mr->mr_dir = DMA_FROM_DEVICE; + mr->mr_nents = 1; + dma_nents = ib_dma_map_sg(ep->re_id->device, mr->mr_sg, + mr->mr_nents, mr->mr_dir); + if (!dma_nents) { + ret = -EIO; + goto out_mr; + } + mr->mr_device = ep->re_id->device; + + ibmr = mr->mr_ibmr; + if (ib_map_mr_sg(ibmr, mr->mr_sg, dma_nents, NULL, + PAGE_SIZE) != dma_nents) { + ret = -EIO; + goto out_unmap; + } + + /* IOVA is not tagged with an XID; the write-pad is not RPC-specific. */ + ib_update_fast_reg_key(ibmr, ib_inc_rkey(ibmr->rkey)); + + reg_wr = &mr->mr_regwr; + reg_wr->mr = ibmr; + reg_wr->key = ibmr->rkey; + reg_wr->access = IB_ACCESS_REMOTE_WRITE | IB_ACCESS_LOCAL_WRITE; + + mr->mr_handle = ibmr->rkey; + mr->mr_length = ibmr->length; + mr->mr_offset = ibmr->iova; + trace_xprtrdma_mr_fastreg(mr); mr->mr_cqe.done = frwr_wc_fastreg; @@ -693,5 +725,16 @@ int frwr_wp_create(struct rpcrdma_xprt *r_xprt) mr->mr_regwr.wr.opcode = IB_WR_REG_MR; mr->mr_regwr.wr.send_flags = 0; - return ib_post_send(ep->re_id->qp, &mr->mr_regwr.wr, NULL); + ret = ib_post_send(ep->re_id->qp, &mr->mr_regwr.wr, NULL); + if (!ret) + return 0; + +out_unmap: + frwr_mr_unmap(mr); +out_mr: + ep->re_write_pad_mr = NULL; + spin_lock(&buf->rb_lock); + rpcrdma_mr_push(mr, &buf->rb_mrs); + spin_unlock(&buf->rb_lock); + return ret; } -- 2.53.0