From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA5D3C4338F for ; Wed, 18 Aug 2021 12:06:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 89A556023D for ; Wed, 18 Aug 2021 12:06:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236173AbhHRMGc (ORCPT ); Wed, 18 Aug 2021 08:06:32 -0400 Received: from smtp-out2.suse.de ([195.135.220.29]:53540 "EHLO smtp-out2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235622AbhHRMGI (ORCPT ); Wed, 18 Aug 2021 08:06:08 -0400 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 3196920074; Wed, 18 Aug 2021 12:05:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1629288333; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gJfb3xtaQFR5r/ftAJql45a44xJsCJfy582wo5ZaI48=; b=Wubv7qKWhxAXiZwU8pG3XpF/SsXqyRuNxZy2kxjLqCtYMZPW1n6mWnTY7KW0g6fubApyRd 8I941Zfj1LBEFYXtSXmJ4OHUbO8XSpNqXAFJ2aF/NyixdtOokRQUfRmDRYYW0FgY7QvMAb okXN4YbLR0LDqIAWKxBY3kpHfG4W20o= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1629288333; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gJfb3xtaQFR5r/ftAJql45a44xJsCJfy582wo5ZaI48=; b=0TZkzUP+ZV3mDd1wWMl22tSnrlft4g9eXOyb/jBSdTqEnUyA7t0ghgze/IT1qEeQHxfRz5 PdXNQdhaotpsgvDw== Received: from adalid.arch.suse.de (adalid.arch.suse.de [10.161.8.13]) by relay2.suse.de (Postfix) with ESMTP id 553A0A3B93; Wed, 18 Aug 2021 12:05:31 +0000 (UTC) Received: by adalid.arch.suse.de (Postfix, from userid 17828) id 79A88518CF7B; Wed, 18 Aug 2021 14:05:31 +0200 (CEST) From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, James Smart , Keith Busch , Ming Lei , Sagi Grimberg , Hannes Reinecke , Wen Xiong , Himanshu Madhani , Daniel Wagner , James Smart Subject: [PATCH v5 1/3] nvme-fc: Wait with a timeout for queue to freeze Date: Wed, 18 Aug 2021 14:05:28 +0200 Message-Id: <20210818120530.130501-2-dwagner@suse.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210818120530.130501-1-dwagner@suse.de> References: <20210818120530.130501-1-dwagner@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Do not wait indifinitly for all queues to freeze. Instead use a timeout and abort the operation if we get stuck. Reviewed-by: James Smart Reviewed-by: Hannes Reinecke Signed-off-by: Daniel Wagner --- drivers/nvme/host/fc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 7f462af1b02a..8e59e6d142c1 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2963,7 +2963,14 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl) dev_info(ctrl->ctrl.device, "reconnect: revising io queue count from %d to %d\n", prior_ioq_cnt, nr_io_queues); - nvme_wait_freeze(&ctrl->ctrl); + if (!nvme_wait_freeze_timeout(&ctrl->ctrl, NVME_IO_TIMEOUT)) { + /* + * If we timed out waiting for freeze we are likely to + * be stuck. Fail the controller initialization just + * to be safe. + */ + return -ENODEV; + } blk_mq_update_nr_hw_queues(&ctrl->tag_set, nr_io_queues); nvme_unfreeze(&ctrl->ctrl); } -- 2.29.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FEE9C4338F for ; Wed, 18 Aug 2021 12:06:28 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 076256103A for ; Wed, 18 Aug 2021 12:06:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 076256103A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fUzn2pSzRCzbg+5nDAF6alNKH9EvdKfpBogQR2yGQ5E=; b=wrFrzOuFARuFDz EAUm++GFbGoaG5/+vVRf23z1gP21LKrc/wRMwzfSAeI9mPzAHUjhSbBsU+qmae0awx0vWhtKylkI/ xm+AbpC4kW0UlNUMzbS5LWZz37nKekGFrhcSWttCsd3gmRQ/GXVHX+25dKEBw/4+wTqWs8g02joaP dNno210D+VPGQY4oHdk/7OKs8M/hi64LR6OeyBBjdtjRYzNCcXpX5YKyaw67AHssXrg6HaLwUWjKq Y1dPpZ9P1pJDDibzjAv8Jc6xjPTsVnmdUkr3BdEje/ubUY0o1oBtDJ+87YQ185lze4TBqurlZSB7Q EujyvuWtEoiPGtt78hfQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mGKKV-005QdT-Vv; Wed, 18 Aug 2021 12:06:00 +0000 Received: from smtp-out2.suse.de ([195.135.220.29]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mGKK6-005QXv-Fg for linux-nvme@lists.infradead.org; Wed, 18 Aug 2021 12:05:42 +0000 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 3196920074; Wed, 18 Aug 2021 12:05:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1629288333; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gJfb3xtaQFR5r/ftAJql45a44xJsCJfy582wo5ZaI48=; b=Wubv7qKWhxAXiZwU8pG3XpF/SsXqyRuNxZy2kxjLqCtYMZPW1n6mWnTY7KW0g6fubApyRd 8I941Zfj1LBEFYXtSXmJ4OHUbO8XSpNqXAFJ2aF/NyixdtOokRQUfRmDRYYW0FgY7QvMAb okXN4YbLR0LDqIAWKxBY3kpHfG4W20o= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1629288333; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gJfb3xtaQFR5r/ftAJql45a44xJsCJfy582wo5ZaI48=; b=0TZkzUP+ZV3mDd1wWMl22tSnrlft4g9eXOyb/jBSdTqEnUyA7t0ghgze/IT1qEeQHxfRz5 PdXNQdhaotpsgvDw== Received: from adalid.arch.suse.de (adalid.arch.suse.de [10.161.8.13]) by relay2.suse.de (Postfix) with ESMTP id 553A0A3B93; Wed, 18 Aug 2021 12:05:31 +0000 (UTC) Received: by adalid.arch.suse.de (Postfix, from userid 17828) id 79A88518CF7B; Wed, 18 Aug 2021 14:05:31 +0200 (CEST) From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, James Smart , Keith Busch , Ming Lei , Sagi Grimberg , Hannes Reinecke , Wen Xiong , Himanshu Madhani , Daniel Wagner , James Smart Subject: [PATCH v5 1/3] nvme-fc: Wait with a timeout for queue to freeze Date: Wed, 18 Aug 2021 14:05:28 +0200 Message-Id: <20210818120530.130501-2-dwagner@suse.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210818120530.130501-1-dwagner@suse.de> References: <20210818120530.130501-1-dwagner@suse.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210818_050534_767614_3ADA64A8 X-CRM114-Status: GOOD ( 11.40 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org Do not wait indifinitly for all queues to freeze. Instead use a timeout and abort the operation if we get stuck. Reviewed-by: James Smart Reviewed-by: Hannes Reinecke Signed-off-by: Daniel Wagner --- drivers/nvme/host/fc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 7f462af1b02a..8e59e6d142c1 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2963,7 +2963,14 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl) dev_info(ctrl->ctrl.device, "reconnect: revising io queue count from %d to %d\n", prior_ioq_cnt, nr_io_queues); - nvme_wait_freeze(&ctrl->ctrl); + if (!nvme_wait_freeze_timeout(&ctrl->ctrl, NVME_IO_TIMEOUT)) { + /* + * If we timed out waiting for freeze we are likely to + * be stuck. Fail the controller initialization just + * to be safe. + */ + return -ENODEV; + } blk_mq_update_nr_hw_queues(&ctrl->tag_set, nr_io_queues); nvme_unfreeze(&ctrl->ctrl); } -- 2.29.2 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme