From patchwork Sat Jan 7 17:18:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9503207 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 7005B606E0 for ; Sat, 7 Jan 2017 17:18:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E7E528470 for ; Sat, 7 Jan 2017 17:18:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 53702284D8; Sat, 7 Jan 2017 17:18:12 +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=ham 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 3764B28470 for ; Sat, 7 Jan 2017 17:18:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161118AbdAGRSK (ORCPT ); Sat, 7 Jan 2017 12:18:10 -0500 Received: from mail-it0-f65.google.com ([209.85.214.65]:33413 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032635AbdAGRSJ (ORCPT ); Sat, 7 Jan 2017 12:18:09 -0500 Received: by mail-it0-f65.google.com with SMTP id c20so5131539itb.0; Sat, 07 Jan 2017 09:18:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=5oNQmgjdQS26/OE1rKMW5x1rspoavKlUWzzOiMxSc5w=; b=X1yVAL9rPBTjiRwUZixLoVOCj3LY3/14SrRSvffw9kzIeG5h8js5dAZ0+GO/9g7zJi n5Cb3mkOVggWWmKKhms1qXsvAHxGBSAWk2Pz5XOiLVx1eUcoJpL1W7iqBEZlqVmrjvus nTZfOE7B5e9K4SF/8FPi7XvTOy59FjaoEH2H6J+ymoXZoxY3jrcX2THHFXEA0Qbszi58 meTnvLuyj70UCfJ9Yq7YjR5O3I8LEbxxIHrIKrqa2aWE5o8UqObOoZxR4CkIvxCXPHX7 hxK+lfGrdnPs3fsen7C+jHmOZOEx7KmpVVv1G8PFU5x6yNdWhpjVj99XgunQ948NZXKU K6bw== 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:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=5oNQmgjdQS26/OE1rKMW5x1rspoavKlUWzzOiMxSc5w=; b=eTsxgaRIrLJTfKvcj+4N5dZC9LkdnHABAlU1etPZjy9vboSQ6XPfD3lUghQhZRwUQZ F0s9JfjKVqiCQfwaz7fFhzD8GCTjS4dwTKPEZqknqDqxpc29GqFAQQqNtlezfaKFBM7b OV8zTpZwGSwWgvIeyiRFWxcbc1KS9FEz6ELctdHLylvPaAJKm7FI2AvI7Sj9WQSWcQPb hieQVvAdkf/Sq3Mo+JnPEOyFPIgmB1hcQeLjjwLMJBWpKPdSzfrQnG4cqaj5kxstd8yr eBXw1rAc3lIuljm0wUUWXNryDcFVV1F1zsOgv6GrHqVPfWlhQMKn4bxM5UpWEVfGQh6w c1cQ== X-Gm-Message-State: AIkVDXI/Xx1eZdZE8HNTdP/5O50yXzqsUQxOZdQAw9ueC54CdUI2jAfAurLSRcYFSliDFg== X-Received: by 10.36.0.137 with SMTP id 131mr3355188ita.1.1483809488407; Sat, 07 Jan 2017 09:18:08 -0800 (PST) Received: from klimt.1015granger.net ([2604:8800:100:81fc:ec4:7aff:fe6c:6aa0]) by smtp.gmail.com with ESMTPSA id a23sm3399258itb.11.2017.01.07.09.18.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Jan 2017 09:18:07 -0800 (PST) Subject: [PATCH v1 21/22] svcrdma: Clean-up svc_rdma_unmap_dma From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Sat, 07 Jan 2017 12:18:07 -0500 Message-ID: <20170107171807.14126.25561.stgit@klimt.1015granger.net> In-Reply-To: <20170107170258.14126.8503.stgit@klimt.1015granger.net> References: <20170107170258.14126.8503.stgit@klimt.1015granger.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP svcrdma no longer manages FRMRs, so there's no need to compare each SGE's lkey with the PD's local_dma_lkey. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/svc_rdma_transport.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" 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/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index 9b60740..4500000 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c @@ -223,23 +223,13 @@ struct svc_rdma_op_ctxt *svc_rdma_get_context(struct svcxprt_rdma *xprt) void svc_rdma_unmap_dma(struct svc_rdma_op_ctxt *ctxt) { struct svcxprt_rdma *xprt = ctxt->xprt; - struct ib_device *device = xprt->sc_cm_id->device; - u32 lkey = xprt->sc_pd->local_dma_lkey; unsigned int i; - for (i = 0; i < ctxt->mapped_sges; i++) { - /* - * Unmap the DMA addr in the SGE if the lkey matches - * the local_dma_lkey, otherwise, ignore it since it is - * an FRMR lkey and will be unmapped later when the - * last WR that uses it completes. - */ - if (ctxt->sge[i].lkey == lkey) - ib_dma_unmap_page(device, - ctxt->sge[i].addr, - ctxt->sge[i].length, - ctxt->direction); - } + for (i = 0; i < ctxt->mapped_sges; i++) + ib_dma_unmap_page(xprt->sc_device, + ctxt->sge[i].addr, + ctxt->sge[i].length, + ctxt->direction); ctxt->mapped_sges = 0; }