From patchwork Fri Oct 20 14:47:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 10020445 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A1609603B5 for ; Fri, 20 Oct 2017 14:47:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8009028E13 for ; Fri, 20 Oct 2017 14:47:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74B3828EC2; Fri, 20 Oct 2017 14:47:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F26C28ED0 for ; Fri, 20 Oct 2017 14:47:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751735AbdJTOru (ORCPT ); Fri, 20 Oct 2017 10:47:50 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:56521 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751830AbdJTOrt (ORCPT ); Fri, 20 Oct 2017 10:47:49 -0400 Received: by mail-it0-f68.google.com with SMTP id r127so13675626itb.5; Fri, 20 Oct 2017 07:47:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=6IKNDLWi6nXx22FbItB+4q2yyO5epspz5u74b7cvE+w=; b=LV3ywm2Jcg2pa4k89khbyKAAU0OjTaUHzpbvkAwWpp9LLO0or6PPTzsYlM4pqO3HHQ mEREqWauPhsVoAWFH0r89+jdvqz6Db3n/6M0gT8FoJ0zCAZjHUyfvxQY32UQ0riY6Kz4 d2MlyPjwv+H9XQNgMgFfU7+yKbWejaoMM71gHaQe5u1C0MWmeXivRDe1mZQviRCMvAOk jPjANzRVaGp5b3gv8CfHwfvtmkIKDXR7jloGstyGcVWDhHoZ7lVP4hOloewC5TAUHle6 /lKm/ir8FNtCWwkWmN6iQTLIS8CAS+ZAAGuIUrx0tlsU7BBeXubdFQf92fdR0ZrUwSZK FRIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:cc:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=6IKNDLWi6nXx22FbItB+4q2yyO5epspz5u74b7cvE+w=; b=lHAiIFg54LMje+VveP5OWX7t8iqN5eDzOdsvWddsIwTYG9T9Fi0D9DbmV2LXvrVNbx Gj+MBP2Lc77kKzMXO3nCh2BA/idzJNqA7Vb4/SbJ2J1AE9Y084Yi9U/BTl8h52Gxy8Nz 8yS6PVsDeBEo4W8QrPpNoHOld4zHp4L0IV0Q9eJ+ficp6V/oPcizzPprXgD3C+B917jR OXZ4l9tJ8wd8B35rBQy1IlpAcHlIDHDj++0i314sFfCh2EnOWvU+X8/BjTt9H+kc96Es zBKl/Nb1vMIz/UWzBGyX0QLoGxf3R2UXUx1IahfTsmw79mJBrGUk6QFbT//trAcWRuAI cpRg== X-Gm-Message-State: AMCzsaWERoLeeXs2tUmh4MSw46LP7Hef3BOZID1pXiNT0rAjaQc+ga7v +PkpdfD4wUh0ocu6NN/WkbeUJg== X-Google-Smtp-Source: ABhQp+T9aC9Cw2ymjNG5xb6A0hCwbWXvWbFqnnkK2YaGeV6CdWBinpyhSMcZn90PAQZyipM94eiMxQ== X-Received: by 10.36.65.200 with SMTP id b69mr3118260itd.116.1508510868729; Fri, 20 Oct 2017 07:47:48 -0700 (PDT) Received: from manet.1015granger.net (c-68-46-169-226.hsd1.mi.comcast.net. [68.46.169.226]) by smtp.gmail.com with ESMTPSA id c80sm570086itd.31.2017.10.20.07.47.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Oct 2017 07:47:48 -0700 (PDT) Subject: [PATCH 2/9] xprtrdma: Fix error handling in rpcrdma_prepare_msg_sges() From: Chuck Lever To: anna.schumaker@netapp.com Cc: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Fri, 20 Oct 2017 10:47:47 -0400 Message-ID: <20171020144747.14869.77935.stgit@manet.1015granger.net> In-Reply-To: <20171020143635.14869.15714.stgit@manet.1015granger.net> References: <20171020143635.14869.15714.stgit@manet.1015granger.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When this function fails, it needs to undo the DMA mappings it's done so far. Otherwise these are leaked. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/rpc_rdma.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c index 3c92558..4f6c539 100644 --- a/net/sunrpc/xprtrdma/rpc_rdma.c +++ b/net/sunrpc/xprtrdma/rpc_rdma.c @@ -511,6 +511,28 @@ static bool rpcrdma_results_inline(struct rpcrdma_xprt *r_xprt, return 0; } +/** + * rpcrdma_unmap_sges - DMA-unmap Send buffers + * @ia: interface adapter (device) + * @req: req with possibly some SGEs to be DMA unmapped + * + */ +void +rpcrdma_unmap_sges(struct rpcrdma_ia *ia, struct rpcrdma_req *req) +{ + struct ib_sge *sge; + unsigned int count; + + /* The first two SGEs contain the transport header and + * the inline buffer. These are always left mapped so + * they can be cheaply re-used. + */ + sge = &req->rl_send_sge[2]; + for (count = req->rl_mapped_sges; count--; sge++) + ib_dma_unmap_page(ia->ri_device, + sge->addr, sge->length, DMA_TO_DEVICE); +} + /* Prepare the RPC-over-RDMA header SGE. */ static bool @@ -641,10 +663,12 @@ static bool rpcrdma_results_inline(struct rpcrdma_xprt *r_xprt, return true; out_mapping_overflow: + rpcrdma_unmap_sges(ia, req); pr_err("rpcrdma: too many Send SGEs (%u)\n", sge_no); return false; out_mapping_err: + rpcrdma_unmap_sges(ia, req); pr_err("rpcrdma: Send mapping error\n"); return false; } @@ -671,20 +695,6 @@ static bool rpcrdma_results_inline(struct rpcrdma_xprt *r_xprt, return false; } -void -rpcrdma_unmap_sges(struct rpcrdma_ia *ia, struct rpcrdma_req *req) -{ - struct ib_device *device = ia->ri_device; - struct ib_sge *sge; - int count; - - sge = &req->rl_send_sge[2]; - for (count = req->rl_mapped_sges; count--; sge++) - ib_dma_unmap_page(device, sge->addr, sge->length, - DMA_TO_DEVICE); - req->rl_mapped_sges = 0; -} - /** * rpcrdma_marshal_req - Marshal and send one RPC request * @r_xprt: controlling transport