From patchwork Wed Oct 26 22:56:28 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: 9398617 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 ED6C560231 for ; Wed, 26 Oct 2016 22:57:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3F5829E21 for ; Wed, 26 Oct 2016 22:57:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A827229E2B; Wed, 26 Oct 2016 22:57:11 +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 2465329E21 for ; Wed, 26 Oct 2016 22:57:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934257AbcJZW5H (ORCPT ); Wed, 26 Oct 2016 18:57:07 -0400 Received: from mail-sn1nam02on0081.outbound.protection.outlook.com ([104.47.36.81]:11720 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933860AbcJZW4m (ORCPT ); Wed, 26 Oct 2016 18:56:42 -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=brZBuXZAiAi+NG/Rj47BV/WChTmavjU17fvmEFov0tM=; b=oxDYE1dLK/Tn9yZ8FTT0T8+xPzNCaF9QzDOrDBSQKzXS0nCRwUXA0QwUMktaJRRMSiPbp7ifg7TPONZp3PJEQn3LUUPuyOjN6h9kdxQDKnw99l3ViP5xDocQjUDvJzjrmSdwmxe+x8RvIirrli4nEzO8ib0RMNB5W9WXH+VacnU= Received: from CY4PR02CA0044.namprd02.prod.outlook.com (10.175.57.158) by CY1PR0201MB1579.namprd02.prod.outlook.com (10.163.140.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12; Wed, 26 Oct 2016 22:56:31 +0000 Received: from BN1AFFO11FD041.protection.gbl (2a01:111:f400:7c10::123) by CY4PR02CA0044.outlook.office365.com (2603:10b6:903:117::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12 via Frontend Transport; Wed, 26 Oct 2016 22:56:31 +0000 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; 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 BN1AFFO11FD041.mail.protection.outlook.com (10.58.52.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.5 via Frontend Transport; Wed, 26 Oct 2016 22:56:30 +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 25.E2.26959.A0231185; Wed, 26 Oct 2016 15:45:30 -0700 (PDT) Received: from milsmgip12.sandisk.com (10.177.8.100) by MILHUBIP03.sdcorp.global.sandisk.com (10.177.9.96) with Microsoft SMTP Server id 14.3.319.2; Wed, 26 Oct 2016 15:56:28 -0700 X-AuditID: 0ac94369-b97ff7000001694f-d6-5811320a6112 Received: from exp-402881.sandisk.com ( [10.177.9.6]) by (Symantec Messaging Gateway) with SMTP id 94.D8.03615.C9431185; Wed, 26 Oct 2016 15:56:28 -0700 (PDT) Subject: [PATCH 12/12] nvme: Fix a race condition related to stopping queues To: Jens Axboe References: CC: Christoph Hellwig , James Bottomley , "Martin K. Petersen" , Mike Snitzer , Doug Ledford , Keith Busch , Ming Lei , Laurence Oberman , "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: Date: Wed, 26 Oct 2016 15:56:28 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLIsWRmVeSWpSXmKPExsXCddJ5kS6XkWCEwdtfqhb/9xxjs3h5/gOr xcrVR5ksVk3Ms7h39AuTxd5b2hbzlz1lt3h2qJfFovv6DjaL8x9eMVksP/6PyaJt41dGi/c/ rrM78HpMbH7H7rFz1l12j8V7XjJ5PDi0mcVj85J6j903G9g8Pj69xeLxft9VNo/Pm+QCOKO4 bFJSczLLUov07RK4Mqau+chYcIG7ou3lF7YGxjauLkZODgkBE4nd+26wdTFycQgJLGWS6Js7 gQ0kISSwg1Hi7odgmKJPXz8yQcQXM0o0PHACsYUFfCQuXXsEFhcRkJX4vvs1VK+dxM8z69lB hjIL7GGR+PdgKQtIgk3ASOLb+5lANgcHL1DRjp+xICaLgKrE46XZIBWiAhESm77OAavmFRCU ODnzCZjNKWAvsebrdFaQcmYBTYn1u/RBwswC8hLb385hBtkkITCFTaLzz2qoM9UlTi6ZzzSB UXgWklGzENpnIWlfwMi8ilEsNzOnODc9tcDQVK84MS8lszhbLzk/dxMjJBIzdzDefeJ9iFGA g1GJh7dhrUCEEGtiWXFl7iFGCQ5mJRHeHkPBCCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8bve+ hAkJpCeWpGanphakFsFkmTg4pRoYzSfv3mHxZsfjLxZPpm4KOXvX/a6S5ue9eR9sZPf1Ky71 S66/sPmOcknsrVqOyvKXmr28O5MP11l8Vpz49nD/saU79qiIGq7nO6uu7JinKc0i2xqh1e+z ztNQp25TxBfZv98WFf/wLOWZo/Cj8OCjm+YmLi+nX//CkXfQdr32baFdR2cy1F74osRSnJFo qMVcVJwIAHPfGPbAAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGLMWRmVeSWpSXmKPExsXCtZGTTXeOiWCEwZzD8hb/9xxjs3h5/gOr xcrVR5ksVk3Ms7h39AuTxd5b2hbzlz1lt3h2qJfFovv6DjaL8x9eMVksP/6PyaJt41dGi/c/ rrM78HpMbH7H7rFz1l12j8V7XjJ5PDi0mcVj85J6j903G9g8Pj69xeLxft9VNo/Pm+QCOKO4 bFJSczLLUov07RK4Mqau+chYcIG7ou3lF7YGxjauLkZODgkBE4lPXz8ydTFycQgJLGSUuPZn HyNIQljAR+LStUdMILaIgKzE992v2UBsIQE7iZ9n1rODNDAL7GGRWLvtK1iCTcBI4tv7mSxd jBwcvEBFO37GgpgsAqoSj5dmg1SICkRIbPo6hwXE5hUQlDg58wmYzSlgL7Hm63RWEJtZQF3i z7xLzBC2vMT2t3OYJzDyzULSMgtJ2SwkZQsYmVcxiuVm5hTnpmcWGBrpFSfmpWQWZ+sl5+du YoTERNQOxusTzQ8xMnFwSjUwpulOVkk+FWPo6Z8StLpez0NDdC2f4T7b54UX7tUzZ045b95+ ieFP398idh7ve27BLivkk6bJ3jVzaf5Z+X/r8WzVv7wq4qw9j8MW/FyRVGP4YYmLWOhkwRnc Kruncaz+xcsrJaM4rchHUEw+y3neFPt7y9TjvuV9zzlwuaTjs5VoTsZG+0dKLMUZiYZazEXF iQD/jurBOQIAAA== 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)(356003)(305945005)(87936001)(50466002)(81166006)(31696002)(7846002)(81156014)(586003)(189998001)(31686004)(97736004)(69596002)(8676002)(4001350100001)(68736007)(11100500001)(230700001)(86362001)(8936002)(6916009)(65826007)(5660300001)(626004)(7416002)(110136003)(2950100002)(83506001)(33646002)(2270400002)(77096005)(92566002)(47776003)(2906002)(4326007)(50986999)(76176999)(65806001)(65956001)(54356999)(64126003)(23676002)(19580395003)(19580405001)(106466001)(36756003)(229853001)(53416004); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0201MB1579; H:milsmgep15.sandisk.com; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD041; 1:wqPdrQm42JqYKJUaZs6RZ2Tggosd91O0sCi5nPnzR2dM8HPRosIXuQ9J0bp2djD6MIHVuf5xhWRu9fTp7VHKahEduBIWR1KDLexk9I9jlV9iXICAq6OK/IVtEQ43u5DyMf2eGFzuQTezTQs2blgq6VN7IRd4U1gNQw+WJVpEDy2quLAU2MVvf8qTvWHmERVgQs5dC4vZicJsWPMQPBkse+XQzNy9nv+2gQFTVcLzXLVY2SO4dnikh/eb+E9jIwTcnTMfOLTlwfRTae1f8BqaOyNBO6jYqJejOKQm9IHbeA9nCPccy6Csb62xKnMSSCCfJ14CJGNetP/hCN0CehnSSvUb3Rswsw4ICpBjfxzUVkd0SKjeMA61z7HJRB0bcSDYm17OIadJXBJwhmDoaFyLKdkaTTxuDkm6cOYi0x1qWgyoR8OSug4j/gv6CIluLMwQp2in4OQq5d4EAf0qwuXv0rRenszVzu7GEw7a4L/8iLtF04VAlPyeDO+67TMLkNvBQV+iA8LlVNbAb10fAvqE7GZR2N9J1wqbOhqWEzrCw9IzqgEToqSSUZc889TnWH0I X-MS-Office365-Filtering-Correlation-Id: ff048085-1b9f-43b6-3af0-08d3fdf353c6 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1579; 2:uIxDclHRWd5+S27hlwcBxjBa2IInLFglLTBVbX0WnRP5CXiLznF2Losmp0VHe96VvVn56R51kxTpWkW6BaaN5xJ8t7UaTtdpMhB42pn+hn6DSY88EhzPKHLJI33oDejrQmUURbquTcs0C6bdqxV/OCn6K8MbUfA8mztRzTXGwuNXLZDvqvfO08D2tCvMWZffvXtvGE/EvHo5khE92gWebA==; 3:OUH94cohmgUAbHx4ehHV4YaJ9p96bK1If9+RYfvSBbVEVb+K/Or7WpDu21CrVUqXB2YywxduhBzBZYrpisN9U/PFvE+fMcNfWwgqVFN0BiGEaN+FzoYKdc9tje2qjO8wgHzQfSdC8aN3hHnCzVDpMFQvPoJBfSKa+O7RtMjNdcUhLGRQjI7uje1DMW3ozW+Rk1whE+6KTJpPxgyvRBIBmkviLkL/KyEgct3pGAMgBhDWN9xMDQm0sqQwk0voCbn2Zh7pcEASeE4T3IJF5pd2Los0Un5z83u8h75mi3iufEg=; 25:TnsPO3B4i5QCfLe8WiSayJ7h1Bo28ERXhZtWJbNMu0TzSUtdc9pQWA3/juPvfuP8lLZPLi+LUp67YXiPBkZlG3wFlnBdyC8Aq2GN2hxl0TQ5ne8fEy9nOmm6MIAg2lD5U/W31MfNRKjESeOtawAJyGZFTupIkZ9gKUUzgvtOl/nk4RVXe+IRATU3xWs5J0zSdWKSIFSiQt2LF7zuHt8UNmRCnKXKq8HU2FhNFRmnLQEYb0H+B4e8G3BH0qudKMMZuMiFDSGgVb5EPSPeXw/g+NHgoWfOjl1r62ejwm5H6j5nB6WxQLowgSsKtx0hf+V60urgO27eI2ImQsRPTET9ufLlWyx79ye5R7a0wr+OxqJe/8pbnzhIGULpZraJ+P0G1I4Y99mZCloBkM1eHU2oXYvYw098H UncVDn0tvqzgDf5ropQPOYlpU/02T186CUf X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:CY1PR0201MB1579; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1579; 31:wl927gSsAbDCmA4z6vITfhJjjaraodKpUpgXOXiDGw08+mvSShTSsUzkjjC0AWZVLCfAqQyaDDid0pyqnav1o0NM41te/GmsLcw4t19JpLRQ7CTQOJdSotKgU4NRAzZLakguO0nSz/7aUYGqViB+ykFY63onXlNfEoW+vn25NJPFxUGDk6B9qDzlhlY4GX10w2tbD+JNPhZvRrITywehxHpWNLBPDWLq4tp+Ggj1N1RzD/GgcJ/9sUJoW+oJrQ/K; 20:4GlppW+Bv6EtPugnd22w9JSgr2hQUw9CsYokTCJrDdCBs1f5tdyAtJrXVxgXJ6l2QZzw7xNjZxPjlIZE6em7C+1cfLPIheCLKs0mgH34vtQhV1+MpPPK5nWwi01GbUG0LLqU8DuxkJUw2t6pyF25IyUJx+aLz4eiuqID43P8D7oKZJ8vkyZewN3U+n2ITgWamnYdTgK2XYsEY3RWj3PYOHlasV/8OZXFTw7JL8tUj48Wd+I0P6Q8MseJyz7jg6ywN8IjoAeZwAb0HeUPsdIIl7ElsMK+7tQDes0oUqPpyPb3J0zwbPtzo8OZVcYNn+/gHc78wlltgL2FbGSDYbXIx7JwLNZwJDD/YH+sNw8IZuBSCPBXYlQdTn2PijXHIFV3l28V7fJ4am+YRjHNy6LNNAjlSnUTmktIjUw8q1oIOitMNytW8bpB3Znf1jpZiMzh1XeyXzYQ8t9FOSIsys2wMpTaPc62XouvIRFo4BAvqpmp7jDh5OQiYXk5eH1eojil X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42932892334569)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13018025)(5005006)(13016025)(8121501046)(10201501046)(3002001)(6055026); SRVR:CY1PR0201MB1579; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0201MB1579; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1579; 4:1EY8VlV6ZHP7gXs1MDgcr0/RkSZ3qZptAnBSiD7J6m12W1FCujIWmnXo2Qq5FyyJHf4dJw3Zfe9+uedgdquGERqMffE9ztu0N8wIMPSnEQpUK9edNb84L7KlUMhuPGDiVTLaEUNEjb+sAAOyEYcvLDh7X9v5sAv75R4qty7ZE4zs8NcT0E1VYPwSapolFVzsPH5zQPNExM2UxHauudt/1+jA4cgXnd6/+vtxECz1wH3Eejk1oVWNGTGIMp9tznHZkl3GZeZZ124LVn64vnNNScWp8hFPhws975sKyQVvlSHoZhtlpCmmJDLRrA3fmOJboUTery5KDHGOWhiMKh0b41xkXtMFv/O4zqSYdJFEqVNHo4yfpq2iDDqvNr7T4nEKE8t/B4Yu/0FbSk2sKMXjhK3e/hXuzkTkih2ZNSJ1iBxtB1mJ8TF8u+ylwS4flKEVehhUobqOeFDU+QP4gDph2uSCPbO6bzVoi6nMqVayfudzBdvLnQuUJQgUMt0YCrMswwSA64pCTZmGTbSR6iZDPx2DFfuSyAVAM+/hNpL4uUs= X-Forefront-PRVS: 0107098B6C X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTFQUjAyMDFNQjE1Nzk7MjM6S3RkaVNzdGlSckZEUGp2ZmplbU9CZHpN?= =?utf-8?B?dE9MekNJMFRjMHBjK3FNSmQ5UmhaR2dpL3Q0c3hQckVjejVCOWpvL25OTjZ6?= =?utf-8?B?SDBoRGxrQWpTUkNqL0x6MTVYZCtzSWwrV1NoWkUxMXlVTzFrL1ArNncwZFpE?= =?utf-8?B?SjdaclFIT3NsSTIwQ29vWFdTYVpvcGV1VVVnSDBYeFUwTm1FZ0VxazJ1NjZR?= =?utf-8?B?TU9FaWRYb2taN3N0akZIbzZIQTdnaFZCSkFmUFBTTzV1WG9iZXB3ZWpZK3ov?= =?utf-8?B?SkdBeHZuSXVHZFdsV1UxZFFoeS9HU1REcTVJTmpid0Z5amF1QTRNbHh3VDcx?= =?utf-8?B?NlhQQ01VK2pSV1dROXhrV0ttMEVsamZic091MWh4STYyRWw5aFBaWlRtZStG?= =?utf-8?B?cUFNcUpwbzZ3NzNaNkRYSnBpYWRuYWxuQzJ6Ym12d0ZoSkp1NjNlcCtDVjVm?= =?utf-8?B?S3oydjB0bUlWN2IrQ0xPb0UvdGV4eGxBOGFRT282WXJWZHdsZ2ZvN0tkcCt1?= =?utf-8?B?WFhTNWd4SGVBOERFc0F5TEZkYlNiSDA0a0xCQUpYWk1ib2RwWW5zYWkrVWp4?= =?utf-8?B?eFVkeG1PcXlkYy9NSjZGa2k5TVgvUnREVU5TRUxZKzFCRnpBSWFLZHZuUS9Y?= =?utf-8?B?NzUzNmhhanhpTTI5ZmRIR3JFLzV3QUhWT0c0S1YveEtWaGt5WS9ZZzJhZmdh?= =?utf-8?B?OVlxY1ZjR25KNWZmaVNLbmNnN3dwcGtjT2VzN3BWMzJacTZzVzl4SHE5Z2x3?= =?utf-8?B?WHVWVzMvdEdSemhmMHdvZDZjdEdyRzQvN08xd3hTemhqdGU2SHNkbnZ5YktE?= =?utf-8?B?ZytNbWtPc1o1ek55YVhNYytMZnpYWnJVZGZYWTlXSGVncjNUVFd2SE9keTc3?= =?utf-8?B?Wk4xaUhqc0NCdjc5Mm5KdE9KZC9vMkhQUUF1QUlGU0VnQmp6S21MRUJaZitX?= =?utf-8?B?Y08zU0Z0WlB1RFpHNEdaTDlvcTFaSmdTeU1XbEY5WTU1dXFnSWpneHRMNXZa?= =?utf-8?B?K2M3Rm4zWWpLVEVsVGEzdDMyQlQzbXd3bS81VTE0b25iVDJNTkhERlIxTkJ4?= =?utf-8?B?c3FLOUZhTE54UmVqZlI4SWtXYndtek00U2RkcVRtbDZybnpHeS82Z2JVV2VE?= =?utf-8?B?SWQ3L0hSL2MrSERyd0FnRWxXT2IzTnJBUFduRHpjUkJJZCtPWFlaMW9JYnll?= =?utf-8?B?T05WZkZKT05yc0FLQW1ha2huN3pxR01zd2t4ZzVWd2hpYkt2WWtzYVJDV2gy?= =?utf-8?B?Ym1ZQTBhYXBGS3BlSml5WGdJdkQxMWo3RWUxY1o4VU5GWnJSM0h2by9aaGFk?= =?utf-8?B?VERCOGQyU0gwRnhBVlVqNjZKcnVrSFFuM1RCWG1IYU1SK3o0eWpMbmtqaWVo?= =?utf-8?B?VXUxY2xXMXd1bXJqbTlha0xML21tdmd2K0FCRndySjFpZ3c0N1RkSmVRY1By?= =?utf-8?B?VW1aNzRLREZ6RGQ5MjdDTmZjaHJKMHBjMXNiMzVqekc0ZC9jSGdnWXNGdjI3?= =?utf-8?B?TGhqY3l6L0RvbUYrbmV6MVRZSlUwbjVURG1QL3dHWHlzQ0hRQlNSaXZ4QUI1?= =?utf-8?B?ZlV0SXdtUTVJNmZ6M1hxZTlDSEJqRDFQMzlmWkVqRVRRL1VTamNkOXpPZG5U?= =?utf-8?B?ckZsNktMMlRwUzBaR2ZhRlUrRVVUL3RZZHZPYUFXMHR3cGxTNklxQVptMUNY?= =?utf-8?B?aFNzWjFrYXRhbXlkQ2Y2WHRyWTZjcytHZy8xOWFuYmpZSVI3TGhTbVNHWnBZ?= =?utf-8?B?V1Z1RWdyVmthOFIrUzdud0pBPT0=?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1579; 6:zpV5UF7A5T9X3EK90SxM01tIsuAvigHNcS0mRRxdMmW6DVjOxDBTrDsMQQkbLUJMaKpvr38aSpxkCsoSRkqfs+Nig2LFU0C41lCUmHR11iEVQDWXlbb4x5ONlYG3jyiCfdkU6IfjBxcRVAZrQwrgqHc/dyal/wLfGwvuXlxPoxfZY/+o0tV2LRa57s2eoQFIrErPzZGAQKEfpztiyDdBajE9wbOF5HPBaQllLWbzUL/niOKmrMSgm3sw9Ej5HFysyvnIl9/29DoOSMY5/0cu5SvlAAl/QAHgfnWLnw0lSYeLHR70ppGFdIOjEAwq01P0r+D+gu+t/Iglz0f+hvAgNg==; 5:5esCKKvMKK61LxTxpgWpcydwWVX5unQoeSjsczhHQ06CcEnXnnD7mQrAn8g30cEvjhah4XHEhHVPXQGJOccopjGIM0mQeLtBn/6DPvPzHxuy+W6Y6+n9tfKVVE8PGSgGXVf/2m9a7KJLlbKhfnekdA==; 24:OhpSphX3nGMk4kb3TeyxrhhzcJu40Red/Oxbo7dX/pNUkmlrfMRZfgIZ+9c2/Om8w8UlDz+7gQtDpVenjy7zLgPAWaqlAo2HbOg5+dXTooQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1579; 7:AqxOuVKkgc0dr4rtbKKCZEWRA3QXvqeVhimRnb/V4ewfZbWngO/SaaO90keZwmYA49IbmsePmR6MvY3e0ywwOdo5DfiaVzbypKmVO0N/CHr1R7K0Ue8+1C36sBt7CZHSTze94LKm9eIVgdmUoHiWEwHPPiXLmGTkGPRwIjP3yP0u47E1ep8XO55Nl000BwtSvk1HSGJ4jgOJvDYLvXk0XBzVZ/W9ezpuK37+Tg+NVZJqDruEM247tX+5K/qwIIQ1Mx3E7ooq1/PiwqTVYe/GBrAFzSnK7c8wcayyYA0kMBTY1nWPHcGrzvL+hkqahQVwDaRz12iWclx2ShxIi5wHkicc65bklcyQFGlhRpo7cF0=; 20:SDXMkFNrfjmvAzx0+vZty767dZLvxmGAH8PwoleWCCboUX7c07IAAtEJ6zCZAsuQ8oK/763lfIghaTM6LNojwE1Iga6Up3YwZuA1eAMXn8WacWatHLMV1AfKC9QD+1BjwtF+6m2BrBzCQd0WCr2DhFzRQ4GjgxTPdJCcwR44jvD2o0eyFz1b7iucliN412sGjF4nYXubi2OWXao1KKoiGKM+yAPZVP66d82zcKdeCs2AV87fCEvJ24gR7iyDhWJF X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2016 22:56:30.2364 (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: CY1PR0201MB1579 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 Avoid that nvme_queue_rq() is still running when nvme_stop_queues() returns. Signed-off-by: Bart Van Assche Reviewed-by: Sagi Grimberg Reviewed-by: Christoph Hellwig Cc: Keith Busch --- drivers/nvme/host/core.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index b662416..d6ab9a0 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -201,13 +201,7 @@ static struct nvme_ns *nvme_get_ns_from_disk(struct gendisk *disk) void nvme_requeue_req(struct request *req) { - unsigned long flags; - - blk_mq_requeue_request(req, false); - spin_lock_irqsave(req->q->queue_lock, flags); - if (!blk_mq_queue_stopped(req->q)) - blk_mq_kick_requeue_list(req->q); - spin_unlock_irqrestore(req->q->queue_lock, flags); + blk_mq_requeue_request(req, !blk_mq_queue_stopped(req->q)); } EXPORT_SYMBOL_GPL(nvme_requeue_req); @@ -2079,8 +2073,11 @@ void nvme_stop_queues(struct nvme_ctrl *ctrl) mutex_lock(&ctrl->namespaces_mutex); list_for_each_entry(ns, &ctrl->namespaces, list) { - blk_mq_cancel_requeue_work(ns->queue); - blk_mq_stop_hw_queues(ns->queue); + struct request_queue *q = ns->queue; + + blk_mq_cancel_requeue_work(q); + blk_mq_stop_hw_queues(q); + blk_mq_quiesce_queue(q); } mutex_unlock(&ctrl->namespaces_mutex); }