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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 551C6C04A94 for ; Sat, 12 Aug 2023 05:56:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234620AbjHLF4k (ORCPT ); Sat, 12 Aug 2023 01:56:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229670AbjHLF4k (ORCPT ); Sat, 12 Aug 2023 01:56:40 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D0912D44 for ; Fri, 11 Aug 2023 22:56:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1D54864165 for ; Sat, 12 Aug 2023 05:56:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2830FC433C8; Sat, 12 Aug 2023 05:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1691819798; bh=6bEh79rht1m4onS0KGIOymQ70hQX+9W34reDW5jrSLo=; h=Subject:To:Cc:From:Date:From; b=Sq4Cc0awYg0cnIjP3fWWVmqRDcavCvEifZLWTIk9qCIDAP5O2Z82UHw4BzrCvAl34 TNdZaSgcrlQaD3p4p8OwwVTc+kJUGe1VzmlOMFWUK7JIg2eRjHISzqXIzSgD7ct7hl klyxfH2TkiCLAZqBGiFcR9c1hAsYwgpayyA1H88E= Subject: FAILED: patch "[PATCH] nvme-tcp: fix potential unbalanced freeze & unfreeze" failed to apply to 5.4-stable tree To: ming.lei@redhat.com, kbusch@kernel.org, sagi@grimberg.me, yi.zhang@redhat.com Cc: From: Date: Sat, 12 Aug 2023 07:56:29 +0200 Message-ID: <2023081229-semicolon-uplifting-ffd6@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 99dc264014d5aed66ee37ddf136a38b5a2b1b529 # git commit -s git send-email --to '' --in-reply-to '2023081229-semicolon-uplifting-ffd6@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 99dc264014d5 ("nvme-tcp: fix potential unbalanced freeze & unfreeze") 9f27bd701d18 ("nvme: rename the queue quiescing helpers") 91c11d5f3254 ("nvme-rdma: stop auth work after tearing down queues in error recovery") 1f1a4f89562d ("nvme-tcp: stop auth work after tearing down queues in error recovery") eac3ef262941 ("nvme-pci: split the initial probe from the rest path") a6ee7f19ebfd ("nvme-pci: call nvme_pci_configure_admin_queue from nvme_pci_enable") 3f30a79c2e2c ("nvme-pci: set constant paramters in nvme_pci_alloc_ctrl") 2e87570be9d2 ("nvme-pci: factor out a nvme_pci_alloc_dev helper") 081a7d958ce4 ("nvme-pci: factor the iod mempool creation into a helper") 94cc781f69f4 ("nvme: move OPAL setup from PCIe to core") cd50f9b24726 ("nvme: split nvme_kill_queues") 6bcd5089ee13 ("nvme: don't unquiesce the admin queue in nvme_kill_queues") 0ffc7e98bfaa ("nvme-pci: refactor the tagset handling in nvme_reset_work") 71b26083d59c ("block: set the disk capacity to 0 in blk_mark_disk_dead") 6dfba1c09c10 ("nvme-fc: use the tagset alloc/free helpers") 1864ea46155c ("nvme-fc: store the generic nvme_ctrl in set->driver_data") cefa1032f111 ("nvme-rdma: use the tagset alloc/free helpers") 2d60738c8f80 ("nvme-rdma: store the generic nvme_ctrl in set->driver_data") fe60e8c53411 ("nvme: add common helpers to allocate and free tagsets") 61ce339f19fa ("nvme-pci: set min_align_mask before calculating max_hw_sectors") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 99dc264014d5aed66ee37ddf136a38b5a2b1b529 Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Tue, 11 Jul 2023 17:40:40 +0800 Subject: [PATCH] nvme-tcp: fix potential unbalanced freeze & unfreeze Move start_freeze into nvme_tcp_configure_io_queues(), and there is at least two benefits: 1) fix unbalanced freeze and unfreeze, since re-connection work may fail or be broken by removal 2) IO during error recovery can be failfast quickly because nvme fabrics unquiesces queues after teardown. One side-effect is that !mpath request may timeout during connecting because of queue topo change, but that looks not one big deal: 1) same problem exists with current code base 2) compared with !mpath, mpath use case is dominant Fixes: 2875b0aecabe ("nvme-tcp: fix controller reset hang during traffic") Cc: stable@vger.kernel.org Signed-off-by: Ming Lei Tested-by: Yi Zhang Reviewed-by: Sagi Grimberg Signed-off-by: Keith Busch diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 3e7dd6f91832..fb24cd8ac46c 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1868,6 +1868,7 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new) goto out_cleanup_connect_q; if (!new) { + nvme_start_freeze(ctrl); nvme_unquiesce_io_queues(ctrl); if (!nvme_wait_freeze_timeout(ctrl, NVME_IO_TIMEOUT)) { /* @@ -1876,6 +1877,7 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new) * to be safe. */ ret = -ENODEV; + nvme_unfreeze(ctrl); goto out_wait_freeze_timed_out; } blk_mq_update_nr_hw_queues(ctrl->tagset, @@ -1980,7 +1982,6 @@ static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl, if (ctrl->queue_count <= 1) return; nvme_quiesce_admin_queue(ctrl); - nvme_start_freeze(ctrl); nvme_quiesce_io_queues(ctrl); nvme_sync_io_queues(ctrl); nvme_tcp_stop_io_queues(ctrl);