From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751251AbdALTIy (ORCPT ); Thu, 12 Jan 2017 14:08:54 -0500 Received: from mail-bn3nam01on0044.outbound.protection.outlook.com ([104.47.33.44]:60544 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751010AbdALTIO (ORCPT ); Thu, 12 Jan 2017 14:08:14 -0500 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=sandisk.com; X-AuditID: 0ac94369-b62949800001ff92-ee-5877d16a5537 From: Bart Van Assche To: Doug Ledford CC: , , "Greg Kroah-Hartman" , Bart Van Assche , Eric Van Hensbergen Subject: [PATCH v2 23/26] net/9p: Inline ib_dma_map_*() functions Date: Thu, 12 Jan 2017 11:07:15 -0800 Message-ID: <20170112190718.6728-24-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170112190718.6728-1-bart.vanassche@sandisk.com> References: <20170112190718.6728-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNLMWRmVeSWpSXmKPExsXCddJ5kW7WxfIIg0szdC1env/AajF31iZ2 i+bF69ksLu+aw2bx7FAviwOrx85Zd9k99s9dw+7xft9VNo/Pm+QCWKK4bFJSczLLUov07RK4 MnpWX2EumCtU8XrjNbYGxon8XYycHBICJhIPbsxh62Lk4hASWMoksXjSKiYIZxujxIsHs4Ay HGBVfe8kIOIbGSUufGpjBelmEzCS+PZ+JguILSKgJrHp1SJ2EJtZ4DSjxL1ebhBbWMBR4sby JrB6FgFViTenmsDqeQXsJRaf3sgGcYW8xK62i2A1nEDxb/8vMYLYQgJ2ErsO/GcBWSwh0Mcq cffAdKhmQYmTM5+wQCyTkDj44gUzRIO6xMkl85kmMArNQlI2C0nZAkamVYxiuZk5xbnpqQWG pnrFiXkpmcXZesn5uZsYIUGeuYPx7hPvQ4wCHIxKPLw7bMoihFgTy4orcw8xSnAwK4nwzjpf HiHEm5JYWZValB9fVJqTWnyIUZqDRUmc1+3elzAhgfTEktTs1NSC1CKYLBMHp1QDY4iG5Bp5 Zsk/RQHr/Bxnqj3nW+uzOTx228UrPg+WtUlYfTr7Jv2x68+HU275uVn06IdfihLJWn/m6DM9 aY/Hi89uz39Skrck/eyqpW7l5xYbvKjZ8XXTf8Va3aeLO+6elX0SPf94wiTJ7aycvzZuvrHS 76Tu5b6PnxN3BH30vhv2/qf0+x8vrNYosRRnJBpqMRcVJwIAgHwGPm4CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNJMWRmVeSWpSXmKPExsXCtZGTTZf/SnmEQd8fTouDP9sYLV6e/8Bq MXfWJnaL5sXr2Swu75rDZvHsUC+LA5vHzll32T32z13D7vF+31U2j2lrzjN5fN4kF8AaxWWT kpqTWZZapG+XwJXRs/oKc8FcoYrXG6+xNTBO5O9i5OCQEDCR6Hsn0cXIxSEksJ5RYtKPjcxd jJwcbAJGEt/ez2QBsUUE1CQ2vVrEDlLELHCaUeLxh1+MIAlhAUeJG8ubWEFsFgFViTenmsAa eAXsJR70HgWLSwjIS+xquwhmcwLFv/2/BNYrJGAnsevAf5YJjNwLGBlWMYrlZuYU56ZnFhga 6RUn5qVkFmfrJefnbmKEBEfUDsbrE80PMTJxcEo1MKomXDf5VRi/4mSAlpZI3td3ycVtm41n T6lbK11f8ZPL7/gq8+h8zxq3ujXti0vSLs6Y0TijRvrVRuYFryaY60e3XCmb+ORVDtPcQju7 rJz3jnrTghfYvNXcFHzTq1H1lyXHQ67u1IPcnl0bcj+eygn5vHrb7Jm/49xYd7P9WWbik6A7 uXdbqRJLcUaioRZzUXEiAAKygFK+AQAA MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:63.163.107.21;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(39410400002)(39450400003)(39840400002)(39850400002)(39860400002)(2980300002)(438002)(189002)(199003)(2270400002)(356003)(36756003)(54906002)(33646002)(5003940100001)(39060400001)(77096006)(38730400001)(8676002)(86362001)(92566002)(106466001)(4326007)(8936002)(69596002)(47776003)(2906002)(68736007)(50466002)(48376002)(110136003)(189998001)(76176999)(50986999)(81156014)(305945005)(50226002)(81166006)(1076002)(6666003)(5660300001)(626004)(6916009)(2950100002)(97736004)(50929005);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR02MB1419;H:milsmgep15.sandisk.com;FPR:;SPF:Pass;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11OLC013;1:hDTgslP4cxuv5aLqA+ddbirgD3888WLTbuyLKf1Oojl1Hl/SvvNR6nhr7Ukcy3orAZfl3Dw6ZGEycmwaAfvXIIubO0TGSnw5m9RBAo4XBqUeFvItV32+grO5cHOFLIi16Gz0TuPcBAnBNUjVye8hPas+246vD3JsxK/VkIpJQnF0Sqj8IdYjZwaeV9yyT1ZO2W2fcnrTHKrssaBeo4F1vchh5wI+FRMbAAWU28g7u7vJlbwt99+NnzMXaTeQxDY+VRUYyS8bcDGSK0D1mgBng9Z2cEBtjazj+CqQszKLsU22zWT1vgGMkBulxUmPQBeFQw9twnwUycj360rzR6uGvn+EY3fSbeCPz5IBKTAtToA7Fjs+0bhJ6s16zLI+t99VNwfmH5soLHFZL36Hp8SN+1r7svXw8asYU1W40yujlY3298hOmRJFSxHx8/8PMC4zH+0vcEsiCLJqnAGubME78zbg3J3DYGh9v7mN6wtzDDpz5VLJJ1jKsLBWP67tUv5+ X-MS-Office365-Filtering-Correlation-Id: e6a6d9b8-417d-4f0f-2277-08d43b1e5707 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(8251501002);SRVR:DM2PR02MB1419; X-Microsoft-Exchange-Diagnostics: 1;DM2PR02MB1419;3:eYez9YSItk/AKBoc8udVD0iRSKYqv12vY/e1RYdgiD9potJXoiUWDk1CzJkOc3G7v7jW67s3s6ytHszFhdw8c0nFE42pjMLSTfBbZVqey1l9FV6Zf1lQU0nzzUHy8IusgAF2N9N8RS4hyepYQDrpxsF9ijw/DF1eTpDuRU0gCvuHBFGCk+biPWQSnKhbqCRexK4gd/fU0hUFwKA1R0aQ7O6ccUSRRgISB8JRWeA6dDFghOVS2GB3ZAW1Nc02b7nzK05rV/MTRkQuG2Op6W5ijqIv4EHwdx8eor2eCWkPniIA9eYTQOD0sEXI+7Bi3yLH6JNFnlj4eG1Ds3+C6MlvPtcBDYXHU89/0skj+pjCrwncFyQOFQ4bKf6dr9ysigUHWT/HVA7gX78pB/P9a1HXFQ==;25:nlpFju2xQYqVDlnOet5WXhyAiGexZT60Ff5UJoCK4hbVzD3nD1+VkUCJM9j4zOhDDaVvdPHbIY/ETz+HlR2uglOWQl5Xq1cZEspJ4cDuAbDbS7d+YPm/NJcMgiAsSqp4IpfLxHiOZrcDmJq5jXtccU8NLDktX97TKGL1tGYHsjFoTCpkw8gILv537v8GGIGlfOU9/hsuPooY3sKVR10S5hnxNUs/QFtDYcBL+sP754ZfF0F2MbINTiYmVnmTCjWQxsHJv4A5XqKPXdUpeZ4GNBgh5xNh6yjUeCAHXceoQo0fs9yvpjCF6NR3CrXaJLBOWouV8trEouTCKlBpUr8mU35DnwdmklDFl9rlC3tyiX6vunM29MPTeKmXFbIWjAFbobqO1E1zSFCN/LxOr9qFRyO+QLRikE9xXeTN9zq2FHqhcKoB/2htbHkGhzKVjJ627GjtmAYyYDLcCU7lZH/eUw== X-Microsoft-Exchange-Diagnostics: 1;DM2PR02MB1419;31:yBe/RrWLmObwfqRcz+rSP6UQmyg04qSOK5/1+d8Xl2vSGdfkRcIha/NLLvMcnypsoFpsYgNPkFnXBOQRIFwLT34yKg+EOgoIxFHLtrKhSQDFkcOMCa+IOgr+LGtZSrVGacmdpQjd276yT3nZlJtE9oRB1irZmDqL/GjtM1BlWukjGPW97z7gM00KZEBFDdExlkeashupgx+jSov0ooDyKtMwyaBACNZ/XiOKjqlHmkd/TPpBH7utcaqsLimANXEsGdQxyqiCbUDXszTYhjftJUnrxsJtYc/Qx+cmg9GSIU8=;20:qkqL1h3/d0u2/2Twt2pl8ytNjPfJAq1bd4HmOl04Ix5KyAzA83pVmRONhoGDaeV+bnqohlG3Tu8zV8FB7WChFylflVK69IcHh6IphABJOEeabiBxgHpIzXXUa5OHh5f8gwUNohPhG8bZIIpeYa9vRdJatHStP2R0gdriQf4VLUpV74ci+DX+4wN0S9hiBYTMEpR92hcjzTM7a4knm+DH2IbrkaAve54lpEwKA39KENp1kD6e9YGYbibc1szucyto5J9Jti5V71StEyXD/1KAu13aYfGFknNw6T5/84T1oa+RoMjaNHdGrKVfgtiN4T08Jaip1lFq0MUkcJ7KPYz2H6aPmLxagVj/fIU/7B3rRvbxgyiGpSmz/mcLM28BUnOXWB3703Ks3COcnq/hBlQQ4ZEvQY3SldVhJfNxadKIau/rCiaC5sQUtpAitztUg9tHs6npZ8Ry6rFhfnPswSWOYMx1UBqEiP/00ihoaGfQhGm0rqlTLKO7TtDWtht+Myx4 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42932892334569)(235219596079481); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(13016025)(13018025)(10201501046)(3002001)(6055026)(2002001)(6041248)(20161123560025)(20161123562025)(20161123555025)(20161123564025)(6072148);SRVR:DM2PR02MB1419;BCL:0;PCL:0;RULEID:;SRVR:DM2PR02MB1419; X-Microsoft-Exchange-Diagnostics: 1;DM2PR02MB1419;4:rC+iinKob2LmT1sIJX5H0crUqlqM8ZSVuGHxS0wzKyqlhXvenlXWZTT1ZHs7JKIW95eQZ+Y4/ucP5zi+SaioYsk33SaF1VFz9l+1NdGw/nW8PC1w+LyZ8LM4v4THnAUa/1hm2n0GUPllVGc2twmXpJKErY99g4KMnRqQtYzYnqTtpeTmB+brqZmRfCjdqEw9HSoYZIyLtG49wAsTN2T9ymCrcmzYe4VH0R3FmOvf8RXKfa/kPFodOOtjz923an8UPkcPm1UPHYyEtEzepyWjpXRmWAcCGbWaXfM+V6CiVptr/OVZiRc5jeOzxgft+/c15ZIOCX9NJRtAEWhwCGeYZr5V8RivgnQOiCsVbavEi2KmAjVLFbiCvivxZF/N7Sj/LchWNIUleylcSvKkh1WN1nrOwMXcbwS668D+Vj40m9DQdq/Ge68E2Hnx4LlrgEl6Tuimxo6UG9Tl9f3nFgYTf2bMg267Sips1CG87NhpFkflwofZcZMf+7AOgN6bnt8bEgZWr0F0U4fBmu49KEv0u4PYJ8L4cY68A4g2cO0HEONbxSPp9cKiMTYxYldtTh4X09PMfPvAMSwpcPrqjmvdQuJ0S4Xwyz7Xay7oFqfX8iGVsRnZMbyUrozON5SZ8DS4939axj1vJQlJ58BlwfLf7hJ4Icjl/twgtClp34KMEVvNABYD2q69JTECR8mxrtO6SEwCUPUpH2wbwXH6jw5RJYQZ/oGmehOiU+RMBiYXdAs= X-Forefront-PRVS: 018577E36E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR02MB1419;23:roGQ9fbRZz7ID1D2OBCVxrhV9CWmkh+D3TQDHrV7t?= =?us-ascii?Q?GP9/tIA0+xdppMtHCjvN6FSkGzcHhj7BhxDzZ1cHtFM6/vYKKCB4FrFhZySs?= =?us-ascii?Q?+f0msZtsYV+oXFo5gzOoZN9qAU2PN06aBODZ52JDjb5+8eh8wQDzekcm6qcA?= =?us-ascii?Q?mOgPg14rYIZa4xOkbsKRY+xqqmd+OuQ6nN8cv+piMT/ZkEUzcMVLYQwMMFOn?= =?us-ascii?Q?fKYUo1ZzSBPy9xTgBoKD7mZsoVeXf0RbrxUdB3sqd1bGiK/WFXF0h4iPDTRE?= =?us-ascii?Q?/PbMBuhSip+VjmuUOxWRKj911mb0R+YLVMu5GUS47ZFdCE9unmPHgeCQJAZ3?= =?us-ascii?Q?wbHa1L1BRBN2DEotSSibmBNEWdMohIKCSmEO+cCkMFQMonyrG5G/uYjoyce3?= =?us-ascii?Q?Cdc8xquRA6LK6qeH9Nn+o0GXLu5Zebc/Tb2HC33rCNbj4z5dYORuUErePMUd?= =?us-ascii?Q?L02AIlQSdbwWhBe+mZXl1u5rIP+rt5FtTGRv8CU9iACjcDNEBxQz+0lcoofr?= =?us-ascii?Q?2LBwgofIyxXI4LpO0P4ZqwayaWGLua3CEMfibZqnMum/c/nDh5f2fP8+d4pS?= =?us-ascii?Q?6IPUywqnHK6FYQgVqvgqdwK0Gav6QQkA4oOStVDtTi2re59eUMs6aj+vrq8T?= =?us-ascii?Q?bKSaJb4XoxDK76nwf1Mh+BtIbh3CmVM5bDwn0PkEyomqRAfWKYDc5IHdBVCw?= =?us-ascii?Q?1SZUa5wuPcwFtHfzKJUy/K0zdPysSPHkfMhMXf/RcmHO21Fh8/rI4NU7o7h8?= =?us-ascii?Q?JObx9Q+YB7stHiurCTazSaH/wmmTOikJE52TNglheVsyQFLFLfiLd33FjBsD?= =?us-ascii?Q?xMIocVFmPc2XB4wA66ShuxYKJ4lobcg0saY1jCftl5paTSOWCN4JBxxxXoOY?= =?us-ascii?Q?NmyjZcdrBWBSNwVoGPI8/XmvwStlQ3HHjHv88QjUf444fQAgAGZGnHhQEZ4h?= =?us-ascii?Q?C+8j/8nT1FB58yXYCqiWV9ve73CdPjOfXc0qyYV31BIPLZoK6rYShmezHZzd?= =?us-ascii?Q?94dTRhK1N+DbyCj/vx7cfwOU7yp8kvkNyXZ2x8jcouVKPrIcvCtAJLFDfby0?= =?us-ascii?Q?zthH0/8QBt5/q+HAVKSo0Tv9gfUdUf20EK43cvol5rJRqVePe3opfhZYswCi?= =?us-ascii?Q?j9HkN/yqaLXzNfVwuiV9ft2kWqp6iXek3BBgt8aYQWrrS5geZck8yVmuJ6lL?= =?us-ascii?Q?+8FPZ1P4+juwks=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR02MB1419;6:kjGcwyPG5ZhfAUJ6U0Yaekb/74v5iOJaETDYIosAESztaUFOlzhettztllM4DXSIQxxGWzyPMK6OOHFmxZg2foGdWbxmFIYZwAoZq2wb3GmqmHaoM4eRyIxM+ffguECufj0V4MwKHfLluxKawVajdt93onp5s/styTDMMCS2MFjspTRWeBwm9lvXv2YIClpeNG0ONGR7clugJOFuNWzgM+Rz//b/ql2VR/650GiCik4DN9XFonzrbPkOGqNYZyFur9aQeB5AE1qlfI3gGJYP64uz6HmobsFwU4OZilV1RuamrsxYUVj/dZpa9pzZNFV549lQbnvcPafbPcBEud2JX2oOZMaj4hKMs/knqrIT5NybyROLa1d5vPUkmzOkA/RHaIXas3ysh+u89oEcQBZl3wzdGcSHPzZ/uUPzIqi4AuYyyGSv96ZF9O36qThcGrmwgWvem9xFg6+8J3+cXgFJKA==;5:VS0aRzrEyQ5jf6cPdOWjc55bAq8PZUvCeTXpbJKDLufox6lA7b+hHxHq4rdwjzR8dKN7Mw7GmiuqOCV9oqdVUTU7rUmQ685DYfQ4GumUpuEChzcwcYibudWuJS8SXJVZfeVQ425VmCconKiiinwDdw==;24:DrcdgbH27crPV8lbvAhZIigWLeIxL6jKiN2FPi+fSCeSrf3Xr6DAgLe/L6QLIXTahkBLyGYVrG+A/wgZBIvDFC1/IrPDH5CknHYzR2AD+p8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM2PR02MB1419;7:GIvDJGfB6y9wzpI3ErWd2pU9f9nnH695BD0F8hDoX46OgkcImW+HbVpuTMa2W+nBbYj6oXNJ4Xbd5XRVRt4HRN9zcpivdTQuzT7QoLfRzUfHWihk2x9CR2JkhEAjk2Xdj2d2Pc/Xcq5pOV4EmohnfIarhzZORt9w30KiODubeTsMFl5m5GgTjAVNjb6KTr/MzuVw4VmI5c+k7992EMRAhcpToWEIaQfAatKjAuu7/h8AtGyPlw+3bTx8CbkENuIocSF72X21vkTJ2/SnXK1qIYmGigpJOuIuPjWTP0nm+z9U/qqh4oCrUMf/8P+OkSpYqkwE3AzxFKb+mnafEO5RTpDLccgGq2aNuhkP/5gR7KV4iVaJ3dbFSVtm0p4s8j6vjDg5gChI1hliZRcpvjylUU5RO69lvvcVBXiSGKpebVpX3ACpRlqe/T0QmX7NY1xgCgrt5uwyc7DhA9eHqcPxUA== X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2017 19:08:06.0445 (UTC) X-MS-Exchange-CrossTenant-Id: fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d;Ip=[63.163.107.21];Helo=[milsmgep15.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR02MB1419 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Bart Van Assche Reviewed-by: Christoph Hellwig Reviewed-by: Sagi Grimberg Cc: Eric Van Hensbergen --- net/9p/trans_rdma.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c index 553ed4ecb6a0..b49d5998289e 100644 --- a/net/9p/trans_rdma.c +++ b/net/9p/trans_rdma.c @@ -294,8 +294,8 @@ recv_done(struct ib_cq *cq, struct ib_wc *wc) int16_t tag; req = NULL; - ib_dma_unmap_single(rdma->cm_id->device, c->busa, client->msize, - DMA_FROM_DEVICE); + dma_unmap_single(rdma->cm_id->device->dma_device, c->busa, + client->msize, DMA_FROM_DEVICE); if (wc->status != IB_WC_SUCCESS) goto err_out; @@ -339,9 +339,8 @@ send_done(struct ib_cq *cq, struct ib_wc *wc) struct p9_rdma_context *c = container_of(wc->wr_cqe, struct p9_rdma_context, cqe); - ib_dma_unmap_single(rdma->cm_id->device, - c->busa, c->req->tc->size, - DMA_TO_DEVICE); + dma_unmap_single(rdma->cm_id->device->dma_device, c->busa, + c->req->tc->size, DMA_TO_DEVICE); up(&rdma->sq_sem); kfree(c); } @@ -379,10 +378,9 @@ post_recv(struct p9_client *client, struct p9_rdma_context *c) struct ib_recv_wr wr, *bad_wr; struct ib_sge sge; - c->busa = 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)) + c->busa = dma_map_single(rdma->cm_id->device->dma_device, c->rc->sdata, + client->msize, DMA_FROM_DEVICE); + if (dma_mapping_error(rdma->cm_id->device->dma_device, c->busa)) goto error; c->cqe.done = recv_done; @@ -469,10 +467,10 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req) } c->req = req; - c->busa = 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)) { + c->busa = dma_map_single(rdma->cm_id->device->dma_device, + c->req->tc->sdata, c->req->tc->size, + DMA_TO_DEVICE); + if (dma_mapping_error(rdma->cm_id->device->dma_device, c->busa)) { err = -EIO; goto send_error; } -- 2.11.0