From patchwork Tue Dec 1 18:18:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 7739591 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A68259F30B for ; Tue, 1 Dec 2015 18:18:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE7B9204F6 for ; Tue, 1 Dec 2015 18:18:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D3CA620452 for ; Tue, 1 Dec 2015 18:18:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756733AbbLASSg (ORCPT ); Tue, 1 Dec 2015 13:18:36 -0500 Received: from mail-by2on0060.outbound.protection.outlook.com ([207.46.100.60]:60174 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756002AbbLASSe (ORCPT ); Tue, 1 Dec 2015 13:18:34 -0500 Received: from BN1PR02CA0037.namprd02.prod.outlook.com (10.141.56.37) by BL2PR02MB292.namprd02.prod.outlook.com (10.141.90.149) with Microsoft SMTP Server (TLS) id 15.1.331.20; Tue, 1 Dec 2015 18:18:32 +0000 Received: from BY2FFO11FD055.protection.gbl (2a01:111:f400:7c0c::177) by BN1PR02CA0037.outlook.office365.com (2a01:111:e400:2a::37) with Microsoft SMTP Server (TLS) id 15.1.331.20 via Frontend Transport; Tue, 1 Dec 2015 18:18:32 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.172) smtp.mailfrom=sandisk.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=bestguesspass action=none header.from=sandisk.com; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.172 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.172; helo=milsmgep11.sandisk.com; Received: from milsmgep11.sandisk.com (63.163.107.172) by BY2FFO11FD055.mail.protection.outlook.com (10.1.15.192) with Microsoft SMTP Server id 15.1.331.11 via Frontend Transport; Tue, 1 Dec 2015 18:18:31 +0000 Received: from MILHUBIP03.sdcorp.global.sandisk.com ( [172.22.12.162]) by milsmgep11.sandisk.com (Symantec Messaging Gateway) with SMTP id BF.BE.04667.774ED565; Tue, 1 Dec 2015 10:18:31 -0800 (PST) Received: from milsmgip11.sandisk.com (10.177.8.100) by MILHUBIP03.sdcorp.global.sandisk.com (10.177.9.96) with Microsoft SMTP Server id 14.3.248.2; Tue, 1 Dec 2015 10:18:31 -0800 X-AuditID: ac160a68-f790b6d00000123b-65-565de4774eeb Received: from [10.60.52.33] ( [10.177.8.100]) by milsmgip11.sandisk.com (Symantec Messaging Gateway) with SMTP id 67.86.15370.674ED565; Tue, 1 Dec 2015 10:18:30 -0800 (PST) Subject: [PATCH 3/6] IB/srp: Initialize dma_length in srp_map_idb To: Doug Ledford References: <565DE3EC.2070002@sandisk.com> CC: Sagi Grimberg , Christoph Hellwig , Sebastian Parschauer , "linux-rdma@vger.kernel.org" From: Bart Van Assche Message-ID: <565DE476.3080308@sandisk.com> Date: Tue, 1 Dec 2015 10:18:30 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <565DE3EC.2070002@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpkkeLIzCtJLcpLzFFi42JZI8azSLf8SWyYwZsj3BYvz39gtTg9YRGT xbNDvSwWr48/ZbI4eZvfgdVj+oxNrB6bV2h5/Pnzmdnj/b6rbB6fN8kFsEZx2aSk5mSWpRbp 2yVwZby5N5W14AR7xaHdZ1kaGFexdTFyckgImEjc+zEByhaTuHBvPZDNxSEkcIJRomPpRkYI ZzujxNqfZ1hhOs7uPscOkdjEKPFn1XZGkISwgKPEtd8LwEaJCKhJbHq1iB3EFhLQkljetg1s ErPAOUaJvm+7wSaxCRhJfHs/k6WLkYODF6hoyl5vkDCLgIrErSOdYHNEBSIkJk5oACvnFRCU ODnzCQuIzSmgLfH8y0dmkFZmAU2J9bv0QcLMAvIS29/OYQZZJSFwklXizNZFzBA3qEucXDKf aQKjyCwko2YhtM9C0r6AkXkVo1huZk5xbnpqgaGhXnFiXkpmcbZecn7uJkZwxHBl7GDcOsn8 EKMAB6MSD6/E2pgwIdbEsuLK3EOMEhzMSiK8T9fGhgnxpiRWVqUW5ccXleakFh9ilOZgURLn tW5RCxMSSE8sSc1OTS1ILYLJMnFwSjUw3uER1PA+dz3EudDn6pWV/A35EVEvO2c6CCTO0HNf VPfv+lnDG91sK0Ujz57jeqXU+U41/faLA8qsAt/MS16pKmk3rKsx7Z6jcm9//WVujf9uW7Pb 3r1+/PXQBZHsYs83jI/Sn4WVFN5smjGn1oM1Meern7ht5vSMQ7w5JYJ7bD991Df/Of2XEktx RqKhFnNRcSIAOG1avJQCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsXCtZEjRbfsSWyYweQv1hYvz39gtTg9YRGT xbNDvSwWr48/ZbI4eZvfgdVj+oxNrB6bV2h5/Pnzmdnj/b6rbB6fN8kFsEZx2aSk5mSWpRbp 2yVwZby5N5W14AR7xaHdZ1kaGFexdTFyckgImEic3X2OHcIWk7hwbz1QnItDSGADo8S8/9sY QRLCAo4S134vAGsQEVCT2PRqEViDkICWxPI2kBouDmaBc4wSKy7fZQZJsAkYSXx7P5Oli5GD gxeoaMpeb5Awi4CKxK0jnWBzRAUiJCZOaGAFsXkFBCVOznzCAmJzCmhLPP/yEWwMs4C6xJ95 l6BseYntb+cwT2Dkn4WkZRaSsllIyhYwMq9iFMvNzCnOTc8sMDTUK07MS8ksztZLzs/dxAgO W87IHYxPJ5ofYmTi4JRqYOz+IRXg8auveMohlrkRMRv35cgaWb61+McsYKjxbKvRYnn2gIvT vtvfipKZyzvD/lpCkN6khdOSWu/Eel648SPm1IyMlStWbT3LHDTFdpLTrmhhJ6MZLhuKNnGp 3u55tdiL61XN12cqWUrPU1Kv/2tkvbB0bsatad4ubOpTxSsvCmpzerL41CmxFGckGmoxFxUn AgCjB9k6CwIAAA== X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD055; 1:cdj0S4GjjJYhsoxm4kUPeW/vAroW/hhQhSD+nGV8gjYZa/3FYkCAaiJu50toQ7etF1Hh7i5HaIRDVKGTOXohct6rrMY9Tknxf183RsUULVWP5AJPhuf3f0oanCmdQqVPwbS1738co20SkRlKqMANssfq9chfIXa/Fv7ZXtP7S44asA+/VBi0EqWeUimDzuKh1BIY4SAQZh64iRVl/HRmJ5NwKKjATRn8nox5cC28L10FcZLk8/uOdixV4UGFuizehUARd0gmXBzRbbGuFr4UcMVlAlnbm3WfIFCfdZvkkCrLXCTMymArBXHbJeVxSQaaRy6TpspJx71WURFSY1oShOJrkwsSbVbqE1MGajpS1Hm8uSf6gE81bQwuHskKrD9d X-Forefront-Antispam-Report: CIP:63.163.107.172; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(189002)(199003)(87266999)(23676002)(76176999)(50986999)(59896002)(86362001)(5001960100002)(1220700001)(80316001)(2950100001)(65816999)(81156007)(229853001)(189998001)(33656002)(586003)(11100500001)(50466002)(36756003)(4001350100001)(77096005)(110136002)(69596002)(54356999)(230700001)(47776003)(92566002)(64126003)(65806001)(97736004)(19580405001)(1096002)(19580395003)(5008740100001)(87936001)(106466001)(83506001)(65956001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2PR02MB292; H:milsmgep11.sandisk.com; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2PR02MB292; 2:sS6eSxZaWMyGZR0vxhi8iHZx9rpMDQWrt3tlFCgDx2fpxBCl8d5DQan/n4SWF1QWWkM5AMB8RuDZrIEVJzV8J09bNyY2FJoEu5EyLns4f4454//YYImwJWvRn/G1YnneepBUL2ihppF2cXL5Ad8qQQ==; 3:c6canHDbbAKihaJLW7oXQxA0nu28Ajg+ZESidMoVbqYm9qWERfb4W++fh9h6EYcCdNC8Q734b6C9QKoai/TAnVV2nNsUvQwEBbS35lNW62f/5+8DGw/mmL3uCRiKTM0VFKnJW3OwQq6enEwp2Ki7SjhRI8i14697huhZJgCjNfvl4h8+Dh7t8+x1pgfaKtnBoKDWhFWQ7zmquSfG3ABFP5wgAYP2hSdKADW9bB0t6P/DxgCVuK0ovUdrnUkkWijkfxe5heireroInXHfay3PFw==; 25:dxki0slRRb2R+kdN2Tn5SpFv0rQgtCpsOaV74pSeLsbAFZl7OGtmD+gLjCGLwChAJYcwk6iUX6i838eJKyRkVC8qES/Fwnc+E23EsO3Uznl4IeyoVQPXydvQ1XFCSjT3W/6D2CiG27pn6hSPBfrPAWgFniWGPayw3i0HdsWtUtxmdCQ8gyDTBPowPltg+sVQh7fOiSxrzKEsWjIIRlxBcsQ2+hPhyD3hBXHzEtm4+Gm1/B2pyglVT1USLOXtnnxY X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501001); SRVR:BL2PR02MB292; X-Microsoft-Exchange-Diagnostics: 1; BL2PR02MB292; 20:WUu4ZWEEgSmhWwWG8nufhSBdQypGXlSkwrP9DKNVt2tNIKS/DW847kNV0rrTmn5w2EAXUe7cyjhZGNu8tvPVUqZH9yT1aySmY0m0859I+Sc1tP4UYDNjKmdpOogtD+d1LXXgRE9UOjFYLDRsYq9AiYR2oGQtTjKXqd0+vyOpYxBfSc2SPMO5Qt5Wqb5grYTlRl99JGs0SQYx1xoCPqNgM+f3D7q+4ifIoDcf5+kursaO3TAimOAG42biIwRJ1Q9qp89W0nheNLIFqCpRDoRKdf/tMqkdUcwYQee4u5QBNw+SnrWwhO6G6nyIM9GFAhLVEtNTsTnAaseWNvmsy2p9RFuFneSxRUhA81i7RiNf8mTo8My7qxuGoeNhN4qRZod2A5/wvaCxPM6wwciwsWTXUC/VrlJXfJYmcwD4acoKITjmXfC7+w0uELwjcxUFfsppXvp2I5OlRlngI5btA71F30wJkEKFuIxtkJypsa3th/xRodxvVrHTulslNeQc9Kf8; 4:dEM9XIyGvCUr59wRzK9iIVapb6OsHIXiIMBUwzEB7Y+WKvvk46F7ssRhmjMlVJqUMJNDpldL2wYLl4MZaKsTDBaIfg7VKdL4frEiVmeNHBpEatIInG9Yf4uXVoA+NXGrv9Ul8f1iVobzV+qe1Rw1afmNPq9Y+sR3NXV0QIDHt65E9+M4D1fEXGEgnW1z8ZD1Fl52mLyoecWfzZEZT88ieHshJOmimcWQvZ2rS1PGzCbaCAzJsWizNPLS0+FDda/TvwYFOUPuYxAW83L/QGGzWmW9oR+42kz58oAGGhqK2WLXqI2O5fPiVhBPOHXsY0l6JniizXPMGMCjEmHx0a7oDDHjyzpuhMsd/pIqc23+3zhvdpQ0ytZnDe9vapDpWrgz X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(520078)(10201501046)(3002001); SRVR:BL2PR02MB292; BCL:0; PCL:0; RULEID:; SRVR:BL2PR02MB292; X-Forefront-PRVS: 07778E4001 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTDJQUjAyTUIyOTI7MjM6bzBDMVpCR2lpQTkvdjcwWm5CWXRJaVIxRWdh?= =?utf-8?B?WHNEcnVSZC84UnZINTRiOHpNaHF5VWpMdU01Y2RvVDEzenNTaUY3dURib3h4?= =?utf-8?B?My9NYjlKU0Q5YndTT2FQT0x6K1pQV3V3KzJCc2I2Wkg3NElPUytEbEF3bWF3?= =?utf-8?B?SGp0bGtvd3UxTHFIS3A3MzZ6R0VZL3Y1WU1ScjhWVUFoSmhrRFMxbWdpYVVr?= =?utf-8?B?ZTVJZmVuUjlVRHhGblVOMk5mTTllYXJrK2s4VVhRbjNMeEF0anIvN2hMbjlV?= =?utf-8?B?YXk2ZWFkTFNvbzJncGpIVDNiOTJlenA1WkJiUy9XMEJRczdsZ0txeUdHVVJa?= =?utf-8?B?NjlER3VtYTZyU2oyV2wyVm5QNHhQVFJhTnBHREpqS01paERhaXRWblhzZlZG?= =?utf-8?B?RjhMRXhDVGJZTzAzMXMyR3B6WldKMkU3a3prMktkMVUxd1lGRXB4VWM3eXRh?= =?utf-8?B?SVE3ZzZ2Y0t1VkpwM1ppL3V4djRUdWVtRmF4V2VuSXY2N0FXR09CQnBrbzJj?= =?utf-8?B?UzBkSWpkQ0tFKzlwTXVOQmNBRzRERGFRZWVqRmZUb2QvWGFqcXFrNGJWcDNK?= =?utf-8?B?QjJlYWhSUHZZZWdhU3RBM1VkU1IraDZZWmkxaklLeUgrZFNnWTFSQXVPZzg5?= =?utf-8?B?V0FOUmRUWU1pbUxmQi9vOEJmcDlCN3hOdUVkWmVTUGRKQzVxaXRHOWpGWFA4?= =?utf-8?B?Ujg4UituTHhNNDMydDN1RW5XQWVCOE5vd0Q1bUNrbDJlQ3NTUFlJdzFiNnd5?= =?utf-8?B?blFuWkdqcklQUk9tNnBoRlppS3R1NXFZWnRkOVdTd1libTd5dlBNa1VyOGhI?= =?utf-8?B?TldjWlI3c0pXSDQ4bmFETFFGUFR4MHl0NWo4SkN0V1djaUtSN2NSVFQzUmtx?= =?utf-8?B?SU5DNzdRbGVzSmRXVTR5U2RoOHV2QkhsdW4yYWVDU0JmTENMMngzNHdDa2VF?= =?utf-8?B?U0NCaHpYWEJaSUovaVloN1VrNjhvZHhweFYyeGMyTE9SdjVYcXlGcStaNjF6?= =?utf-8?B?WWVuYmFCMmN4Y1cwbmJmTldCTGlHNC9LQnA3R2R0SVlxVUQreHlQQ3NVK3Fl?= =?utf-8?B?UEN1dU9ZQXBBV3NhcythOUxGM2hlZzR4b0YvOUJrVE5vWHFwMlNON0VSODQz?= =?utf-8?B?dXg3Vk1rNDdYb0NyMWUwNTluWFBrVlFDb1I5Q2J6WEtsMnlVcUR1V0JCQ28r?= =?utf-8?B?TWUrVVgrYWFVTDlxd1AyNEZFYVVNdE1LbDhkbnlHTmZYd0V5c0hGR2NvN29O?= =?utf-8?B?VnA0clpvSmZIcjdDOEJqSGIyUkwzL3EwZ25YMVRXTDhIQW01cHREMXVNZEZu?= =?utf-8?B?b3lGdW9lcEx3SGdUdDAvZmo5d3FnTkd2dnhiRTRhc3BLTkVJZ2ovWU9VVnNi?= =?utf-8?B?QzhrRHNLZjRZTEdXQ1R3SUI2djY4TTlkc24wNGdXcEoxQzBmL1VmN2JONE13?= =?utf-8?B?TkVrNGw2NWsySXV4MWFzRjJuS1dGTmI0WU9kRm1seXp5MTdXdHZZOHp2UFJy?= =?utf-8?Q?X06HXo7f4Mt/2bMC3KeI6Z4k=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2PR02MB292; 5:NEo6LX1olRfWs8RSiXQC+N3sLN3B+xTK8/9WU6Kd9wTu0k1oR5Hj4w4y8bBiQkcZ8HaBoH3e2WNSaUR/aIwpXA44g4KB8+gLpulIDdT6neMexq7Hc3NnqzI7HcFsR9gAQbJtyKsbQ8SZ6ESqPOymYg==; 24:ZLAScEW/1na+S4Jj6o6vhWkgnIMgl7+87wNf/yDasN3i6E+A4VBf+Ei6gN9xiGPrhrPyT4+e5bpfNaKDIbkP8e4LZpiIOE8un85HE2xqxN0=; 20:YATgW9laBjDAu2nKkF3Tu4TDsyEml49FMltIFdL7kl6K9/squ90lc7BDpadDI1SaJ6MJx6Z0BKSeW4ADOWQA5k45lV0UOdeLCGBoyaPg+/WRxVmJQCkzszhRKXuxKZJIEU5DOFq2Y5h+/R+dHyWP965zy3+yq/B6k4140LDIi70a8bvrg1aGL6imJ0oA1+e4Q+HhKigAnmQ9AVkb/6Xgb6XBW49+h1KwVqGfYIQVtvsGoM6gzkPveiJAfHRDThOt SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2015 18:18:31.3649 (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.172]; Helo=[milsmgep11.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR02MB292 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Christoph Hellwig Without this sg_dma_len will return 0 on architectures tha have the dma_length field. Fixes: commit f7f7aab1a5c0 ("IB/srp: Convert to new registration API") Signed-off-by: Christoph Hellwig Reviewed-by: Sagi Grimberg --- drivers/infiniband/ulp/srp/ib_srp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index c7a95d2..72fac20 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -1524,6 +1524,9 @@ static int srp_map_idb(struct srp_rdma_ch *ch, struct srp_request *req, state.sg_nents = 1; sg_set_buf(idb_sg, req->indirect_desc, idb_len); idb_sg->dma_address = req->indirect_dma_addr; /* hack! */ +#ifdef CONFIG_NEED_SG_DMA_LENGTH + idb_sg->dma_length = idb_sg->length; /* hack^2 */ +#endif ret = srp_map_finish_fr(&state, ch); if (ret < 0) return ret;