From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-927638-1516770190-2-11888810905139324539 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, URIBL_BLACK 1.7, LANGUAGES enfrda, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516770189; b=BjEnMlsWeittoT1YdX3nf4SJoPbUNvz4l5BiOczOwAb+Pbh 5c1r9Jp+VNIXs6UFRIDD2H1NtgYvs/Be9+F3G1mqNDErp4JhVc7380Drkb9u67KL DpEVF92wpLPiZvOoEJLtEip8dMCG+ZwonMFnZe9wOWr3wz6bOb/vRRb/OOepZzec 440nBf5FYt4bmUEetrDURjHGRJRM5QkCIDSvslKzsTrOZ3T3G6xoAKs4zIjibB9k 7YgeMj0vzxd5XRFfvoTDJ9u4FCzB5/KqIfc7oIQ4ypiCkgMecScj091rF5fJ9X8L ZDDCFJZx7X3Bg6dBXXplKES0GzrFjFEC1fEnm6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1516770189; bh=qla/NC VcVHJ9eT7hW4aKJrYkRU3RBK5jCwn/cQ8Io9E=; b=I01dxHZEpqLgL4JbcVhaZF q7ToYJb8VhTL6xbJ0qGHoa4fi+cpgOBss7acnVI0rNz7Z5t8PWgfUHle85uxyfwY SmJAfCcMT+/63gO4uAIjqAdsNSaJfYQyucqjOUdGODDZdznH0Leya4wF1qahWRJ2 miOc/Y0y3DbXnqlhaNVtMGMefkUvjfgWV39yAFw1jZ7TRigL3/+IJZyeIr+w151I yytQt1GUVrF7GS6HKc5eG7k1q3Hm25QZRTdh3DQsnLc/HIAPSH23yFrkg65SWgOF eHk8/t6PdKTLktKoIRaSQnUgr/PvfAEWf70aRjHkzXqrhpVHntLesVa+NWhaVQxQ == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=BNRWceD8 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=BNRWceD8 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752678AbeAXFDG (ORCPT ); Wed, 24 Jan 2018 00:03:06 -0500 Received: from mail-cys01nam02on0130.outbound.protection.outlook.com ([104.47.37.130]:40075 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752578AbeAXEOg (ORCPT ); Tue, 23 Jan 2018 23:14:36 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Sagi Grimberg , Christoph Hellwig , "Sasha Levin" Subject: [PATCH AUTOSEL for 4.14 018/100] nvme-fc: check if queue is ready in queue_rq Thread-Topic: [PATCH AUTOSEL for 4.14 018/100] nvme-fc: check if queue is ready in queue_rq Thread-Index: AQHTlMnV2PMFKytYxU24jD68cQzk0A== Date: Wed, 24 Jan 2018 04:14:31 +0000 Message-ID: <20180124041414.32065-18-alexander.levin@microsoft.com> References: <20180124041414.32065-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041414.32065-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0920;6:loUS8we8ZSqPRvanbAjD1I0yYfEvF3HqdyBrfHQ18uv8JWgZxS9fzVvyq/+gmYvfErO/ps7jjo+Ca0oVw38Jcr+GHxOlEhqUpZJuZT+v2eozw+XEHFgS8m13wZTJr6rxiL3Y85iyykcRJukL5eXXYzB/gDCZL6uKKKElQsmsnf8CaqK1y1VfHGU6I/Ry1Vl8ak941YEuTnnGO5ZuMt1lVBd2alJfC/03nti4xwtwXFTRZNWSHXL6ItN8njFZ84diJkQi6BrnlwHngdPogog2wXNEinj8UghLAXfKvpcRGIHcCuH7d3tl4UKGA6BnZdE55GvpCK2o98qWBREp3WShp0WCoN1lAYWlNOA8XKkifuEUi+NJwfu4ZmD5jltMMCuU;5:WKgiyhFgCQ3UY+l7y9wgPz41emVuh1MNU4hhy6T+82nBzI3u3it5P1H4sX6fze3goCBjJpmGX8XPTYY/chwTQnVRjOSu6MYSbr1JXIaNSRYriDeZjFqJrEDYwETK/iRWqH4iLtRf98u3wv7/5sElpOh0MQLJqQo+kWTn6FrjMNM=;24:PjrKLCduEEb6RecbfWuwYvCI/MaRdoOfBYJWC48ZFHFd4HXz5LULT2sNLBf2k7jXIhfwVmo8FddtWp43ry0LWaPUhecc/Ne7Gqmkd1untqY=;7:bnQBn3oiadtqH8eY6JjefdbQCqgvB91oGw8LhU5cR2moaZXr3a76t/O8rkXCQh3Lf9emqSRsZrC7Br9LSdFpUez+eHvyfSmmFkPXWY0eypecsbzHFZuZ9ATkFxiuvJD4C/gA7rrqk+0JPNVsBMRaJU9AQy0PcR9EI9bCoxnv+I9a6be5p4R8g05lA9ZitsnfOdnwlj57I4uSuqeqrWYYlZIECjjx3aOm4ZiPTMiphyDD/j02w8Eku15sKqqLkKm7 x-ms-exchange-antispam-srfa-diagnostics: SSOS;SSOR; x-ms-office365-filtering-correlation-id: 6137851d-d7b6-4677-8822-08d562e0f7f6 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB0920; x-ms-traffictypediagnostic: DM5PR2101MB0920: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(21532816269658); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(3231046)(2400081)(944501161)(93006095)(93001095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB0920;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0920; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(979002)(39860400002)(366004)(376002)(396003)(39380400002)(346002)(189003)(199004)(105586002)(106356001)(86362001)(2900100001)(66066001)(305945005)(14454004)(22452003)(72206003)(3280700002)(3660700001)(10290500003)(5660300001)(36756003)(2950100002)(575784001)(7736002)(478600001)(110136005)(316002)(97736004)(81166006)(6116002)(3846002)(26005)(1076002)(6346003)(54906003)(25786009)(81156014)(6436002)(10090500001)(68736007)(107886003)(99286004)(8676002)(8936002)(4326008)(5250100002)(2501003)(86612001)(6486002)(59450400001)(2906002)(6506007)(76176011)(6512007)(102836004)(53936002)(22906009)(217873001)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0920;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: Y05ZTNEIKny52XoLcayHcqU/DqBPNJ8mx0D/CpHPQ1ORjFhhdbMDDFkpZBsIGfHl7Qfg4t2Q4uOUvLmi948shw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6137851d-d7b6-4677-8822-08d562e0f7f6 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:14:31.3547 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0920 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Sagi Grimberg [ Upstream commit 9e0ed16ab9a9aaf670b81c9cd05b5e50defed654 ] In case the queue is not LIVE (fully functional and connected at the nvmf level), we cannot allow any commands other than connect to pass through. Add a new queue state flag NVME_FC_Q_LIVE which is set after nvmf connect and cleared in queue teardown. Signed-off-by: Sagi Grimberg Reviewed-by: James Smart Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/fc.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index be49d0f79381..3148d760d825 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -41,6 +41,7 @@ =20 enum nvme_fc_queue_flags { NVME_FC_Q_CONNECTED =3D (1 << 0), + NVME_FC_Q_LIVE =3D (1 << 1), }; =20 #define NVMEFC_QUEUE_DELAY 3 /* ms units */ @@ -1654,6 +1655,7 @@ nvme_fc_free_queue(struct nvme_fc_queue *queue) if (!test_and_clear_bit(NVME_FC_Q_CONNECTED, &queue->flags)) return; =20 + clear_bit(NVME_FC_Q_LIVE, &queue->flags); /* * Current implementation never disconnects a single queue. * It always terminates a whole association. So there is never @@ -1661,7 +1663,6 @@ nvme_fc_free_queue(struct nvme_fc_queue *queue) */ =20 queue->connection_id =3D 0; - clear_bit(NVME_FC_Q_CONNECTED, &queue->flags); } =20 static void @@ -1740,6 +1741,8 @@ nvme_fc_connect_io_queues(struct nvme_fc_ctrl *ctrl, = u16 qsize) ret =3D nvmf_connect_io_queue(&ctrl->ctrl, i); if (ret) break; + + set_bit(NVME_FC_Q_LIVE, &ctrl->queues[i].flags); } =20 return ret; @@ -2048,6 +2051,14 @@ busy: return BLK_STS_RESOURCE; } =20 +static inline blk_status_t nvme_fc_is_ready(struct nvme_fc_queue *queue, + struct request *rq) +{ + if (unlikely(!test_bit(NVME_FC_Q_LIVE, &queue->flags))) + return nvmf_check_init_req(&queue->ctrl->ctrl, rq); + return BLK_STS_OK; +} + static blk_status_t nvme_fc_queue_rq(struct blk_mq_hw_ctx *hctx, const struct blk_mq_queue_data *bd) @@ -2063,6 +2074,10 @@ nvme_fc_queue_rq(struct blk_mq_hw_ctx *hctx, u32 data_len; blk_status_t ret; =20 + ret =3D nvme_fc_is_ready(queue, rq); + if (unlikely(ret)) + return ret; + ret =3D nvme_setup_cmd(ns, rq, sqe); if (ret) return ret; @@ -2398,6 +2413,8 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) if (ret) goto out_disconnect_admin_queue; =20 + set_bit(NVME_FC_Q_LIVE, &ctrl->queues[0].flags); + /* * Check controller capabilities * --=20 2.11.0