From patchwork Mon Sep 26 18:28:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 9351159 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 7443E607D6 for ; Mon, 26 Sep 2016 18:28:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 672C62895B for ; Mon, 26 Sep 2016 18:28:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A88E28A17; Mon, 26 Sep 2016 18:28:58 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 A1E612895B for ; Mon, 26 Sep 2016 18:28:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162973AbcIZS25 (ORCPT ); Mon, 26 Sep 2016 14:28:57 -0400 Received: from mail-cys01nam02on0046.outbound.protection.outlook.com ([104.47.37.46]:50928 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1162880AbcIZS2y (ORCPT ); Mon, 26 Sep 2016 14:28:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sandiskcorp.onmicrosoft.com; s=selector1-sandisk-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=TciJWTgAKydAbELzHaM6kVBHBKXfYybYnkjSjCdF0Ts=; b=ltSA7qPhNELiAgfTG8YWDecgGI5jk9sxJqdO2sSJ4RnJPTdi/IK2s6LlcMX8HJcuquzpYDuE4zQS9+RRW+ZCALLusVKaZme3/dNgQpXRGIvMcGojAt9T5yd02fDQBj0FYWaqkADehvjHUUxVrd60EEVS7fv7TgrYffI6hDPblEA= Received: from BLUPR02CA035.namprd02.prod.outlook.com (10.160.23.153) by BL2PR02MB2130.namprd02.prod.outlook.com (10.167.97.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5; Mon, 26 Sep 2016 18:28:49 +0000 Received: from BL2FFO11FD064.protection.gbl (2a01:111:f400:7c09::113) by BLUPR02CA035.outlook.office365.com (2a01:111:e400:8ad::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5 via Frontend Transport; Mon, 26 Sep 2016 18:28:49 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=bestguesspass action=none header.from=sandisk.com; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.21 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.21; helo=milsmgep15.sandisk.com; Received: from milsmgep15.sandisk.com (63.163.107.21) by BL2FFO11FD064.mail.protection.outlook.com (10.173.161.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.629.5 via Frontend Transport; Mon, 26 Sep 2016 18:28:43 +0000 Received: from MILHUBIP03.sdcorp.global.sandisk.com (Unknown_Domain [10.201.67.162]) (using TLS with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by (Symantec Messaging Gateway) with SMTP id 46.D8.26959.B8669E75; Mon, 26 Sep 2016 11:18:51 -0700 (PDT) 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.301.0; Mon, 26 Sep 2016 11:28:42 -0700 X-AuditID: 0ac94369-b97ff7000001694f-aa-57e9668bf193 Received: from exp-402881.sandisk.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id CC.DC.02783.AD869E75; Mon, 26 Sep 2016 11:28:42 -0700 (PDT) Subject: [PATCH 8/9] SRP transport: Port srp_wait_for_queuecommand() to scsi-mq To: Jens Axboe References: <7948dbb8-6333-dc62-2673-4da35b4dfdbc@sandisk.com> CC: Christoph Hellwig , James Bottomley , "Martin K. Petersen" , Mike Snitzer , Doug Ledford , Keith Busch , "linux-block@vger.kernel.org" , "linux-scsi@vger.kernel.org" , "linux-rdma@vger.kernel.org" , "linux-nvme@lists.infradead.org" From: Bart Van Assche Message-ID: <456fc29e-a20f-51ec-631b-39ae311aa83a@sandisk.com> Date: Mon, 26 Sep 2016 11:28:42 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <7948dbb8-6333-dc62-2673-4da35b4dfdbc@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrAIsWRmVeSWpSXmKPExsXCddJ5kW532stwg4kH5Sz+7znGZvHy/AdW i5WrjzJZrJqYZ3Hv6Bcmi723tC3mL3vKbvHsUC+LRff1HWwWy4//Y7Jo2/iV0YHbY2LzO3aP xXteMnk8OLSZxWPzknqP3Tcb2Dw+Pr3F4vF+31U2j8+b5AI4orhsUlJzMstSi/TtErgy/p76 y1zwXaBiXV9cA+Nqvi5GTg4JAROJKxMb2bsYuTiEBJYySZyeuZkVwtnBKHFv5W4WmKpFZ+ez QVUxSvQ/2MoGkhAWCJRY9G43mC0iICvxffdrMFtIwE5i1uw2sAZmgQ/MEm97j4Il2ASMJL69 nwk0lYODF6joUKMKSJhFQFViyav5YCWiAhEStx52gC3mFRCUODnzCZjNKWAv8fruL2aQVmYB TYn1u/RBwswC8hLb385hBlklIfCVVeLCskdMEDeoS5xcMp9pAqPwLCSjZiG0z0LSvoCReRWj WG5mTnFuemqBoalecWJeSmZxtl5yfu4mRki8Ze5gvPvE+xCjAAejEg+vx+Hn4UKsiWXFlbmH GCU4mJVEeHnTX4YL8aYkVlalFuXHF5XmpBYfYpTmYFES53W79yVMSCA9sSQ1OzW1ILUIJsvE wSnVwLimg1HykYbPwmOyZ0LP+/KmFN0Tzk4/+0b70eQsg/0Lzx1VfMGraidZ7m63mtGg5sry 0GOKaQ1dTI/SdA+HLOOu0ai/p96Vs2Jiq2t8XPmH2D61IEUmkctzJzNlzJC49HTBCiXTuQzz vFtV5Ganizx6Ouv/nLmr1+c4iy7cMy/zYbrE16hnm5RYijMSDbWYi4oTAV2MasqzAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprOLMWRmVeSWpSXmKPExsXCtZEjRfdWxstwg453whb/9xxjs3h5/gOr xcrVR5ksVk3Ms7h39AuTxd5b2hbzlz1lt3h2qJfFovv6DjaL5cf/MVm0bfzK6MDtMbH5HbvH 4j0vmTweHNrM4rF5Sb3H7psNbB4fn95i8Xi/7yqbx+dNcgEcUVw2Kak5mWWpRfp2CVwZf0/9 ZS74LlCxri+ugXE1XxcjJ4eEgInEorPz2boYuTiEBBYzSvxsvMMCkhAWCJRY9G43G4gtIiAr 8X33azBbSMBOYtbsNrAGZoEPzBJdd66ygyTYBIwkvr2fCdTMwcELVHSoUQUkzCKgKrHk1Xyw XlGBCIlbDzvA5vMKCEqcnPkEzOYUsJd4ffcXM4jNLKAu8WfeJShbXmL72znMExj5ZiFpmYWk bBaSsgWMzKsYxXIzc4pz0zMLDA31ihPzUjKLs/WS83M3MYKDnjNyB+PTieaHGJk4OKUaGJky vJ4ysRVKN7L2OczW2nFH2+PWO674/gUHDz748viIjbfpcR/n65L3/Zi//N7wWVjypmT83Bq7 Wd8ZjnyekHH6gNffFYHsb6y1539apZzi/fjERY97Ap1/llVL7krfmf+Ia4aw1jEmG9bqHdyT 2i9P5W8x6WM4+U639GfAowLvdlV7ERGFJiWW4oxEQy3mouJEALV07GIqAgAA 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)(2980300002)(438002)(189002)(199003)(4326007)(86362001)(92566002)(81166006)(19580405001)(77096005)(65826007)(65956001)(2906002)(65806001)(47776003)(50466002)(8676002)(81156014)(19580395003)(586003)(6916009)(2950100002)(31696002)(7416002)(7846002)(305945005)(626004)(33646002)(87936001)(64126003)(83506001)(5660300001)(11100500001)(8936002)(69596002)(2270400002)(229853001)(76176999)(4001350100001)(50986999)(53416004)(97736004)(106466001)(31686004)(68736007)(110136003)(54356999)(23676002)(189998001)(356003)(36756003)(230700001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2PR02MB2130; H:milsmgep15.sandisk.com; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD064; 1:12haOiOeZLU3KmcIk3UyJaaxERRg4yO7Ii1jdyw2a+ZIeJkl0XCOehv5Yvfb0u+LX7aqJLVKM0pUkr8s0+wi4RyhVL4sqjV4AO3HQysQr04oiw/RKW5ieCupvpryJ9/sYjClpfXSqgAoCB+Zu0A5IR+3ykFE1gDws/7rhchiYlb0yE0FZebODGnIWOHj4pvcwxocrf3mE3jQUY2VW+Vq8wcUnn5rcZV6T5wQlZcBxeMnoYf9FazcWojJAalJFUAE0sigQvq23VxqOLOE3Ysa+siKj1SuSZapd4J4X78CaCxn5TE5WlMhvPUFsph4IkognKK2o/mbSicyEBdvVwvisQ1/fivkvAi0/oaL3X82oSeFBhGQ3KkIgiAdPuks7eBhsdg/Q23mSVpz/1NAbQtTbTG4RlAIKTrSSGNWoilxw89naA8612hbJTZJLXV6h2oVm+uFenL8zBSlvm9VTIlcSStLIf2aebSbgib1nxUfUpHi4iLR85I7YxDXvPLQuGFZFdNwf9mQiLGbslc+Q9gMlh/o5UD0FvlePIAAV4CsmzipZlIAlyMtEJBdBrW50qfK X-MS-Office365-Filtering-Correlation-Id: 993a9624-e3d0-4dc8-dd55-08d3e63af55f X-Microsoft-Exchange-Diagnostics: 1; BL2PR02MB2130; 2:prwn+wHO54ebecZ7dcFp242cPMiFhra1p+BHcucWYzgutgg0dgegJkIATbrIMFfRZIGPDkJRlTMQ70yxWAnZu3o60NJpYjLcyJ2rrQBvfkb9zIFFahyLfT2TESoBl7CDMrZIIp25VwuCfaL8AGuf/2OJkvE667Fwz+HkykkfmnXpq4AvmocabzvzvGv80xNz; 3:Sk7SqehtU3+hCMDtlaQ47HHJBHTu9jP/h+0UHBMhDaBZp4MgNnGlRmGmN5HNxJ+nSkwJfyqo0dlWQ9Z+Ccp/79OsOfbFxor7uxRmiobuREHp5EQbA91cvEKL0FcBIIuEqiuHQvH3WZPdK8EmvCTjF3rVhxQaA4hpQThRCLHQcQmGaSrQKnUrvJA70G5QQIkuPUt0ANu3HJlAiDOMktYHafgWZ6ckOGu7x8DP9hXQLBsJirxYAaHUJKFtxfXnfwhCA4yeqXLIEmYMXT9Ql68kYA==; 25:uCap9gh7SIYZRTBxzf7brtImAQj8G0g7U//Jl3/BCnkAMFDXqPWYPHYBZWfbuHLAsUpazFPpZuTdomSZeWlAJ1jIY66Xdu0+mY1d3w6Q+JJSqtkFtZwQxfi8klUjSSnOiMuYVRUZLbmknn6my2RjYhM0JBGirMsFxrCYWlKb5kU1AFwQ2WRQpuBOuUwW6adob1bmfWaCmgoyQkc2vjx7eCVcwNjadFhbMgWrcEWu1QpTUl6mquJHHLh7UdAzNINOWCZchUdaskZOPJHSlvyw9Ig7KQVzMyTmduXfc6X9KeQJ8obSSaIy9azpb06y23OaDJiz0nvxan8ebnBOD1hH19RUJBuLHx4QpXn6AqvGg6XEfujBfXstVkVUeCnoAA0VHgvxvvlxgNuAUZ5q8dOMsuusHTZ0OOV31Nl1cL3Q+cE= X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:BL2PR02MB2130; X-Microsoft-Exchange-Diagnostics: 1; BL2PR02MB2130; 31:O7VLizLu+5oymS3tHy+yQYQUqtBcpW/IkXk2zP2DRCfdNNHVQRdEIkzRcD6znIJwTKITAXA0m3IFEPbNdYjzTtDoFp1us7NiNF+prGCRikBYIv1qzd7uYeLKCkUj0aEvfybGzJYaJzCfUIP945+2H8q7mfqK+6AiyPVozd10fC4Vew3g3wkYan78Afy3MsjMOSb139rdPjOcUlcdqF5KicTyoMj4OC7M2aLgZRFIleo=; 20:qbF6X8PK4ktwJkuuYKYkzqx49XNKJqiD2+v+hhOF/WFNzegi7s1WsZbrcaYvc20kwtuzl6WHBJ+90qFegCEoIpPD7sfEBbFXZYeKZ9cDcyUdIp3pjQBzq7wXULv+V3xaWmOgJcrXdTPbreQR03vZ4mjeyLmTEQYLtz6z+/2LAja1EeE1JWvMHuqyByF3MM2ah2hgza34oBgT0gia0jC+0gn0M1TfEv0gHLMuhzjUyz8/bsRjvjvtj5MdfSha7LvHlyM3C7Qj1tKaq921qUuNgtbvzd4r+2hpwiPpD8dZul1ZHQtSOdo6l1lS7oCVOU/qN2q+BzISmObz21vzqrf4DCmKdmcgBjud4BiEWs45UIbbp9fmDyctMz/XeUBm9AuTTsAp2bRmnc11DjQuov7Q/8P06cWcj5aXki9wo2SxNEefMZNOpszMnPJd6Ys5jC3pe/Z70la/tyEWKNXeF1W7LqfeMUEpQfIU2YrJccbGlbEakyF8K1KJUy/OFTttqBD8 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(104084551191319)(146099531331640)(42932892334569)(17755550239193); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(13018025)(13016025)(10201501046)(3002001)(6055026); SRVR:BL2PR02MB2130; BCL:0; PCL:0; RULEID:; SRVR:BL2PR02MB2130; X-Microsoft-Exchange-Diagnostics: 1; BL2PR02MB2130; 4:Ajf/I3r7KSF8xV/MP1FhO3J1oC5rNbg5gQ7ZvEBlafbXFvQjq1TpSXAWJkWRA1T/QAc3fMoVn4W6jHzq5DwI7emtPs+cHZuHw0KoxUHwkiY+ACVahCJ9nCZ8WrK8REF0y41fxTb6dax9XWX+UrYwrIlf6J8A+jqBaSvh2VYEyzZh5kpIRDQn7V5uT1H6QKwgUP7Id3rp7S1gZvwOLbHSZuf8PDWY1mSJ+3IMSI3GlaPMnrE23a/1QRpyCoDpKPYlorgs0g8MRxna2ucgndMciPbs0pciCHsWHb+5kAwlGskaJi1EdbC3mjoeceH4DYmTOgL2i7xc8pOJvN+1eMiiqnqzMhEUFEMGB/rOk/xzhuE6sb5pYStHoB0K2FVo+pPKQnXgoxLYLEzo8rVl1WQgHlzEU6g8Gxspm/RXPdSV2x3kU4X7t3+dnXsI4qLbG7XlaxXI+n1zE9aP70x9V2ztfvALWdfzSC88F1EmHao8TVKMUZNRfcXrN77hl/9a14MbBCH+xaP8Dw4XodbYv5wZlxGfeyKrPqoBs3ujYQPIVoY4FJIYHe+REOjz3BIWfr9RxUaEiRXnfXXNpeXYystgcA== X-Forefront-PRVS: 00770C4423 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTDJQUjAyTUIyMTMwOzIzOlFXcVNseFg4TEZsbEo1NEIzVGlVSmpPeSta?= =?utf-8?B?OXRSWFBlQllIOVlFbGd3dWJqWm1xT0xZbzdCd254ZVArZ2VDUFRkMkNNbUFO?= =?utf-8?B?QzI5V3dGdzU3SUhKN2Y0SCt3NUd2dy9jTGFiTXZtNHBETDNUY2R3WGM0YVlj?= =?utf-8?B?eHM3a1RMV0ZYRzB2a0I1VDRGdW9kdGphZkNGa01IZFk2SWszeUQ2dTkvcHlQ?= =?utf-8?B?YTFnZE92cC9CK3IrbmRET2lYcy9rV2x0R2RRbnd2NkpuaTNYTHFUbThXNTND?= =?utf-8?B?NUhGa05SNUtVQWYwRkU1TVp5MG8xMUpkVmVZRVBlanY4NXNYdE5QUUlwakFP?= =?utf-8?B?TUo3WmxJanhsM09GaTRLZ3hWdVk1aW9iUjhaNTVweEN6cEVBSW5TcXF2bTVZ?= =?utf-8?B?TFd0eTBrcEFWcHlHNjZ5b2R0N2k3MjYyTkx2QjlQU0dMbUM3eExKZ3BCRmxm?= =?utf-8?B?MzFGNzJqMHV6a1J2Q2xWR1FVaFdhVU9UYnY4VmVFeGlWSUFhNjBlZ2tLV2Jh?= =?utf-8?B?UFZHMUhucVRycHBodFRzQlhWV2MveUl4TFJqWCtQVDRIR2ZKcFliSVlxeEUr?= =?utf-8?B?TStqdWlmN3hCQ1lDVjhjcVBqeWNWM0t5TUV2S0k1eVU5Ym9FbzBVL2MvVUhj?= =?utf-8?B?M2tIaEc2M096dU9ETVhkaTlES2RhM01vOUhEQUQrRm8zcm5uT3IvT0hYODc4?= =?utf-8?B?bEs0aldaYWxGL0pSUUFURWtoWlp4YjRrWno0cFZuNmRGMko1OHAyZG4yMlhY?= =?utf-8?B?cTg1SXN0cGJCOU5uaHBKb3FiVTZmT0RScDliMW9wMHAvaTExUU4vcmJWMy9x?= =?utf-8?B?UlB0UlRDZkZwRmZFTzc0bitUQ3J5eG1qdXZNeStaSlBPLzhUYksySmJlM2p1?= =?utf-8?B?RlQzSnRFRDVuWVJhdG9DMk9zQjR3cXg1Z2tsYjFOQm80dFNkNDI0a0hMVHFO?= =?utf-8?B?KzVFVjFwTzhMNkdhejlOTkVDT2hITEpIa3B1dVlDcVpQWnplbDFzVkpSbHZi?= =?utf-8?B?VDBpbng2TmFYYm1oNFk2RUdUemhpU1ljVGdzQ2gybjF5enIzRG5MMnhITlVF?= =?utf-8?B?Sjlya1ZKUVU0TlJpdEkvTlEyQ0VmWjdsTjdaTzM4MjZkUmtwRk9NMmpPZVAy?= =?utf-8?B?MHhXVlhDSXVrMUExTERRMjNsVUNYZVFtZm02VTZDNUE0eG9KTlFkODZQR0tz?= =?utf-8?B?azdzVDc0WEkva1kxTXV5Ujl4M3dXSTJ3WVR6KzBDUEFMaXdHZUxlV21hZVdG?= =?utf-8?B?Qk85Z0dqaFhRRVFRaVRJdjdLdUx2MWxlaG1uc2tBNFBtSlU3am1kK1RHd3No?= =?utf-8?B?U2JJU1RYcFd6YjVxZDVVTHBkV1RaSitaV1ZmaXlxb3MvOFFIKzVmR3Q0dS9R?= =?utf-8?B?L0N5RTljU0xBMmoxaEhHcVVTdjBNeHhkTlVybnlySyt3S1RkZThDMG42Wllz?= =?utf-8?B?Y0tMb21OU1VoWTNKRmhSR2szWlk0eTdxWkM0WmhFc2s5cERpbVZrNm96VDhT?= =?utf-8?B?WGtmclAxbTZFeFgzRnpLN1hwTzVqNkNCQ29EUFE1dlJ1b3lnQ1h5eDdlTUZF?= =?utf-8?B?T2Ric084VEcvVHFTeHJLRllwMS94L2xZUjU2Y0xJVk44Y0F5SXJuc3FFK3Zh?= =?utf-8?B?ZG9HVk5OYUdoNEh1MGcyeCtUcUdJUkxxeVptTUR0ZG5wSFBva21YTVBDRCtt?= =?utf-8?B?clF3RytVQS9kWnhVb1ZZNDVCa1hMYU1RMXplZlhmV3h0YlYzcExDLzJlZW9j?= =?utf-8?B?anp1T0lRS2xsTlNIQzRodz09?= X-Microsoft-Exchange-Diagnostics: 1; BL2PR02MB2130; 6:LGngSdosuye9OarIRHNuz/tUh3FICLIXyjb6eg28PPq9O/ofidxPRoEFyIH9AAaBW5xyZtpTaNxylsQxAh/GhzXvArw95aSQE4OHAlXEy2jBLm4oZYz35N53kXNXTZfZfeDbPS2b8bKW+Zdk5guAfamSHsE6cjzY3OojEAbZS2zivxGBb80wjeKvuNThtEKij2pDwCkXDBLQuh0A7xT12L5ypqO+4dwQq52eRTUOvwLtvZZORVPz/u0QeyyrMsmECH72DMB+1cNyxDMAa8tmh473/LVw7ZgWljfE/donsIjQOEPvazf2kjWJqK6YSf4YjMBDJOtHWMFEXSRaP5jzag==; 5:rXBMWJgkZXHrUu4gL/Dg7obu0s2L/NuQ3YH0O82p+zhTbOMAiuh1xt0eqUlDLAk6uca+XeKn1EWEztm0p0FDWYRFl0LM/kyVLue+1Y/AUiNGGxJmtlHudbUHXnkyj8eBBSumYPmnpKzUSdDVskJIEA==; 24:RYHZk6LRH7+2eOVuzBVfv7urwoZIQp5OPweZRw1AY3yMa+TglEYaeQbs7ZGt7AZiAR1Ix2ZlmJeidy9rK0Bxc0cllINx06AjVRHvyxXc8vg=; 7:NPZO7GpfE+/flESaxVVSmurkU/JhBOLR6IAo+tR9qXSRwIu3HxlkTK9/989GmJIDuwnS0wc4PtOOx08O33U6FdaHvP76ct8w/ujmrKrxIAs39RFoaXT9n5P/6Tobt+MM0CYN+NcKv0ve34pL89OqX8mONw7xm320fXFkKXpPd/DcCi49XlY9jVnpSkB+QI0of2VvGZzWIgpCi/5k4Mo3LDg2lwr6n8/W1VU9L01t4HnnD+J/x8DV37HkYDlUHyBtoCl3Tmg02GkGV1d+hlq6KsiSr6r6dUvamywVWWRYDZAWWnQUrHLYWETur8l4nRS6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BL2PR02MB2130; 20:NUc2z4IzY6R8x8XlAVcByntxBQb4WriWN+ZGCtEhtzFyw1jaYdJbfugNLsh2rHejehzkxdPaJJnV5qvDdOlPCG7jOxad+4mohnV2HRKDmPIeRGMrXE7OdkH4NyquOqRZZ7R/mQN9ZXFsTsYg8SA4z9RxtaOa1E07vCWQAjedHnguXLnJq3AcgTVZczHidkgaIEXot/NwFujLT4SVguaoyjctHTqM91ep5ViPX/6ROe/juWSyLAbWoqSGoIb0qgTQ X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2016 18:28:43.9735 (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: BL2PR02MB2130 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Ensure that if scsi-mq is enabled that srp_wait_for_queuecommand() waits until ongoing shost->hostt->queuecommand() calls have finished. For the !scsi-mq path, use blk_quiesce_queue() and blk_resume_queue() instead of busy-waiting. Signed-off-by: Bart Van Assche Cc: James Bottomley Cc: Martin K. Petersen Cc: Doug Ledford --- drivers/scsi/scsi_transport_srp.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c index e3cd3ec..841a3eb 100644 --- a/drivers/scsi/scsi_transport_srp.c +++ b/drivers/scsi/scsi_transport_srp.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -402,34 +402,18 @@ static void srp_reconnect_work(struct work_struct *work) } } -/** - * scsi_request_fn_active() - number of kernel threads inside scsi_request_fn() - * @shost: SCSI host for which to count the number of scsi_request_fn() callers. - * - * To do: add support for scsi-mq in this function. - */ -static int scsi_request_fn_active(struct Scsi_Host *shost) +/* Wait until ongoing shost->hostt->queuecommand() calls have finished. */ +static void srp_wait_for_queuecommand(struct Scsi_Host *shost) { struct scsi_device *sdev; struct request_queue *q; - int request_fn_active = 0; shost_for_each_device(sdev, shost) { q = sdev->request_queue; - spin_lock_irq(q->queue_lock); - request_fn_active += q->request_fn_active; - spin_unlock_irq(q->queue_lock); + blk_quiesce_queue(q); + blk_resume_queue(q); } - - return request_fn_active; -} - -/* Wait until ongoing shost->hostt->queuecommand() calls have finished. */ -static void srp_wait_for_queuecommand(struct Scsi_Host *shost) -{ - while (scsi_request_fn_active(shost)) - msleep(20); } static void __rport_fail_io_fast(struct srp_rport *rport)