From nobody Sat Feb 7 19:08:09 2026 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 F35C1C77B7A for ; Mon, 29 May 2023 10:59:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231466AbjE2K7h (ORCPT ); Mon, 29 May 2023 06:59:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231442AbjE2K7e (ORCPT ); Mon, 29 May 2023 06:59:34 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A45B3B2 for ; Mon, 29 May 2023 03:59:32 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-64d341bdedcso2298985b3a.3 for ; Mon, 29 May 2023 03:59:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685357972; x=1687949972; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8tYonR6LNuZCooEmlmgTKMf28bl9/ZTlTCygYn5q1Cw=; b=PSmEwZz643pnW8Xse8tY1hqnFmGInOC5b4zZrlmoZFPpZqkupjDpaW0LrQGo32BJdz D3swe/ZRiykdDI52GI9N2wuHsVJRr8A8/3hLLzaYua7xRDSzc7zHYUfFUxqSEQRDX6UP 5lbDKZJXhwnj0sy6UezOo11WA4GLf/hZ/uCT+XTXMu3F24J2h5L+zc3Sq2BrXBsYldVs 8uaIGxKQ9zgSj5Dld/rykhraq95m+PLW8Ucxs0Gu5MZ4JDcm9JAisnQxQmyc49Gszvio 340nBpOxwIVEYY2nEEhhrjoM25k++YkFbTDzTWZXzbLjFRGRLb8P5f2EsRs+c+DivbMe 4eGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685357972; x=1687949972; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8tYonR6LNuZCooEmlmgTKMf28bl9/ZTlTCygYn5q1Cw=; b=iQFwn1HySEx0oZkbG516Qr9vtVfKAhX6IAM2kgUZIYhmDhf3y2RWhhf4Np+Buf1ypd X1cXKItswHH27657fyb3Da57UkVmNZ+B2+TPGCfo2T/2YinkRBAAhvhS7CDx7HuNbsOF GjYx0ptRBGEMscu2M366TM94/GSOZ12zlKEwbwDfYpn5yoXhYGqUfKuGHXGexMNDpidM 27eHZX7Mt9CdU7qgpBTI9o8/RXV6n6+vOwLhSX2IveoWfyOQYnptiRLPkvO0WsCjOzVH Cnf/cAVNtUwFkMQwp5BZvZoxJ8ZjaghBzmC1Iqb6FxvcPvhPuqYuPhv2s8VpNJFVAAuB G7CA== X-Gm-Message-State: AC+VfDx3MPZS7aOh0vssVZa2QLQLKfFxeHNP6Vtu0Ynb/M2rHDP+E+8A fz/YwB8ipSE+RJPLm70qGxs= X-Google-Smtp-Source: ACHHUZ4ygugDxsqcfbKWLBrVviCK5pvhu9JvUr44CQ8V7ogK9Db/5jSaRcvpGuwthUjh+dHPoY1zgg== X-Received: by 2002:a05:6a20:12d6:b0:110:7edc:fb50 with SMTP id v22-20020a056a2012d600b001107edcfb50mr7535813pzg.9.1685357972097; Mon, 29 May 2023 03:59:32 -0700 (PDT) Received: from localhost.localdomain ([143.92.64.20]) by smtp.gmail.com with ESMTPSA id v7-20020a63d547000000b0053f22b76cdcsm6863110pgi.82.2023.05.29.03.59.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 May 2023 03:59:31 -0700 (PDT) From: "brookxu.cn" To: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 1/4] nvme: unfreeze while exit from recovery or resetting Date: Mon, 29 May 2023 18:59:23 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Chunguang Xu Remove controller will interrupt err_work/connect_work, leave controller at freezed and IO queues at quiescing. Then IOs issued by scan_work will be blocked, nvme_remove_namespaces() will hang on fush scan_work. Try to fix that we should unfreeze contrller and unquiescing IO queues while exit from error_recovery or resetting. Signed-off-by: Chunguang Xu --- drivers/nvme/host/tcp.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index bf0230442d57..cfebcae7fc9b 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -2031,12 +2031,24 @@ static void nvme_tcp_teardown_io_queues(struct nvme= _ctrl *ctrl, nvme_tcp_destroy_io_queues(ctrl, remove); } =20 +static inline void nvme_ctrl_reconnect_exit(struct nvme_ctrl *ctrl) +{ + /* fast fail all pending requests */ + blk_mq_unquiesce_queue(ctrl->admin_q); + + if (ctrl->queue_count > 1) { + nvme_unquiesce_io_queues(ctrl); + nvme_unfreeze(ctrl); + } +} + static void nvme_tcp_reconnect_or_remove(struct nvme_ctrl *ctrl) { /* If we are resetting/deleting then do nothing */ if (ctrl->state !=3D NVME_CTRL_CONNECTING) { WARN_ON_ONCE(ctrl->state =3D=3D NVME_CTRL_NEW || ctrl->state =3D=3D NVME_CTRL_LIVE); + nvme_ctrl_reconnect_exit(ctrl); return; } =20 @@ -2107,13 +2119,7 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctr= l, bool new) return 0; =20 destroy_io: - if (ctrl->queue_count > 1) { - nvme_quiesce_io_queues(ctrl); - nvme_sync_io_queues(ctrl); - nvme_tcp_stop_io_queues(ctrl); - nvme_cancel_tagset(ctrl); - nvme_tcp_destroy_io_queues(ctrl, new); - } + nvme_tcp_teardown_io_queues(ctrl, new); destroy_admin: nvme_quiesce_admin_queue(ctrl); blk_sync_queue(ctrl->admin_q); @@ -2166,6 +2172,7 @@ static void nvme_tcp_error_recovery_work(struct work_= struct *work) /* state change failure is ok if we started ctrl delete */ WARN_ON_ONCE(ctrl->state !=3D NVME_CTRL_DELETING && ctrl->state !=3D NVME_CTRL_DELETING_NOIO); + nvme_ctrl_reconnect_exit(ctrl); return; } =20 @@ -2197,6 +2204,7 @@ static void nvme_reset_ctrl_work(struct work_struct *= work) /* state change failure is ok if we started ctrl delete */ WARN_ON_ONCE(ctrl->state !=3D NVME_CTRL_DELETING && ctrl->state !=3D NVME_CTRL_DELETING_NOIO); + nvme_ctrl_reconnect_exit(ctrl); return; } =20 @@ -2213,7 +2221,7 @@ static void nvme_reset_ctrl_work(struct work_struct *= work) static void nvme_tcp_stop_ctrl(struct nvme_ctrl *ctrl) { flush_work(&to_tcp_ctrl(ctrl)->err_work); - cancel_delayed_work_sync(&to_tcp_ctrl(ctrl)->connect_work); + flush_delayed_work(&to_tcp_ctrl(ctrl)->connect_work); } =20 static void nvme_tcp_free_ctrl(struct nvme_ctrl *nctrl) --=20 2.25.1 From nobody Sat Feb 7 19:08:09 2026 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 7658EC7EE29 for ; Mon, 29 May 2023 10:59:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231482AbjE2K7m (ORCPT ); Mon, 29 May 2023 06:59:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229597AbjE2K7f (ORCPT ); Mon, 29 May 2023 06:59:35 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2E9BB2 for ; Mon, 29 May 2023 03:59:34 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-64f47448aeaso2317121b3a.0 for ; Mon, 29 May 2023 03:59:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685357974; x=1687949974; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=63KAqVVdXGOoTrSylFFLhnHQleDcSgfdSMcTbn9SMvM=; b=oiRjRhuNdihyDtRj+itgk5qVaD+34X0RfxNTyBxmlm4vY8ELsjSxUz0O1elP8t9f0S yl3FEaNNR3nohNXCGbFai7uzra7YrPJWEy8wft+1ozLwGRaK8tgIGyq7mBG7Dxm/qi1P P+gTHnb9AaarJWzOpYCrYC7Az8hBU8y14pKdc/YuH/3DL9AUNmqaJZYNUOa6W0EQ69n3 u67bXvHhHso46v+9DH55bCwp3UA7FDUsOyAe3Vs66Mt4VqH6e6aO7ZHsLZaCSN+UnLqp ruOyNwYAcwzLPgF49it5/8CDzSqj3yt77nHPZxLaH4ZSOGG2i4lGlgW0vPNt/AKPgwBk /4gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685357974; x=1687949974; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=63KAqVVdXGOoTrSylFFLhnHQleDcSgfdSMcTbn9SMvM=; b=d5WX4pernuCjBOpTcUVyb7LahRBgZeP1dyJCRpHllyEM0Qsh43SgPxh1uY+SNGIrjE 2zVIwTXrjR2rttD7ncbj0zRksVz3a9dZHfn7ySCGA1AoeK5VcJQ9pCXzxS8mClJK7IER w447XyWwxEfKjMOZyomyC+/ycmDF56PnKPIaWDIUddZ6B6xG0CuXDm+jlTYygWQUPKxz zRCkXPx78+f/0reGn44z5wPzWRxs3PHU7s7qwG2GnzG04FI4NsqHpnjhaZmgYdv11Qni syzR/PFxWupqyNIx3bD1Fe5QJc7WaoGdS6ep+CLfJihr1mwMi5d5SRqNURx11H2p/l6I x0Og== X-Gm-Message-State: AC+VfDy0050h4jo87Lqlc7J6rg2o9h7GdSK4EWW9kNKst4R0awb5tFJR kPGSP7YaG5Yi+26md/Mo41k= X-Google-Smtp-Source: ACHHUZ4h0oIv5BoInIChTF6doTA25m5LmNP6412qwvIAH1L0J0bj9+NiqrJQcu5Qd3qNfQLeOGhhQg== X-Received: by 2002:a05:6a21:32a2:b0:10f:96aa:9e4a with SMTP id yt34-20020a056a2132a200b0010f96aa9e4amr9774800pzb.2.1685357974245; Mon, 29 May 2023 03:59:34 -0700 (PDT) Received: from localhost.localdomain ([143.92.64.20]) by smtp.gmail.com with ESMTPSA id v7-20020a63d547000000b0053f22b76cdcsm6863110pgi.82.2023.05.29.03.59.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 May 2023 03:59:33 -0700 (PDT) From: "brookxu.cn" To: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 2/4] nvme: donot retry request for NVME_CTRL_DELETING_NOIO Date: Mon, 29 May 2023 18:59:24 +0800 Message-Id: <41041f049985675f95a38bdd8bb998c5a4ab140c.1685350577.git.chunguang.xu@shopee.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Chunguang Xu According to NVME_CTRL_DELETING_NOIO definition, we should not requeue any request while controller at this state. Signed-off-by: Chunguang Xu --- drivers/nvme/host/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 1f0cbb77b249..304eb4eda6c4 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -346,6 +346,8 @@ enum nvme_disposition { =20 static inline enum nvme_disposition nvme_decide_disposition(struct request= *req) { + struct nvme_ctrl *ctrl =3D nvme_req(req)->ctrl; + if (likely(nvme_req(req)->status =3D=3D 0)) return COMPLETE; =20 @@ -362,7 +364,8 @@ static inline enum nvme_disposition nvme_decide_disposi= tion(struct request *req) blk_queue_dying(req->q)) return FAILOVER; } else { - if (blk_queue_dying(req->q)) + if (ctrl->state =3D=3D NVME_CTRL_DELETING_NOIO || + blk_queue_dying(req->q)) return COMPLETE; } =20 --=20 2.25.1 From nobody Sat Feb 7 19:08:09 2026 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 230EEC7EE2F for ; Mon, 29 May 2023 10:59:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231565AbjE2K7o (ORCPT ); Mon, 29 May 2023 06:59:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231467AbjE2K7h (ORCPT ); Mon, 29 May 2023 06:59:37 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9A90CD for ; Mon, 29 May 2023 03:59:36 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-64fec2e0e25so190186b3a.1 for ; Mon, 29 May 2023 03:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685357976; x=1687949976; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=14IeKFKyO0pcEcP2T20UmiR679IiGg3A2D145C6b2n0=; b=rtw4s0zcr86QVVIPEt0FBcZ14qSZwrUwBbG7EXWGEcEazWjxryPP+540XqF70NitCE m4wWSIy0DTOxYr9NASRF2v7CsqTg0L+s5CnP+ocad2v8kmMkjfy+JEF/U6B8BTnhgZtX Ow+lQq2udEM8cV7mfH6vX7dLsIAwwK+FolvsM/oG5PGQ0HDbSmWenyzkbX+t4h/Avij1 bsc4V34eTOynYW/TlICn+55fQtzAVuG3fMkLrrtYHOVSBttRhYtG95miMjY5hZ0CgT+6 4wFhAJE5uba/FwMSfNzeeSPzRMNz42R8nIx6rP3ZuPXazLhAvaoXDxITLUKWpyNmItzZ 5r3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685357976; x=1687949976; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=14IeKFKyO0pcEcP2T20UmiR679IiGg3A2D145C6b2n0=; b=k9smefYk0XomFJsbnWrrDhAuqQmsZxVQ4BjKPpxopkb7DUW6oVQaUCjnIjF5vZT77i YnMWWWT0idx841GTheoaz4iCI9s7IRpFJAUPBoiZrrzCDZLcAWx7bKTmSwFCJz6dcYps ckWpAxwWL5RLghczqInRyVFlB3T2JLJmROwdUaVbox8o+YzfRM1IkUaTwGfFw56t3enj IiWXWsTnMJFAww2qHdGx5npS8Es1QpifCYs+lp2iNwOOXoXkZSLzQdjhGuscDCSAfm7p MHNX2MXz3Yau5oofmzZQXyGPUC7PfKVpV7PNQnJD3uFcAKysB+80XrQFKskEa0HZfyWN uTCA== X-Gm-Message-State: AC+VfDwwX8n+VgORXZqwYsTliMTG5yVIUqxa86DBp7S8tojWyQQBxMER ruprnUm1nP0TOQQ2wLT3WQk= X-Google-Smtp-Source: ACHHUZ7I+haGz9+NyjW+6/WdCddkapRJgOEh18pWpXYq10OABHqcb4cm/F8vXLMGzrJL7vwCVhZh5A== X-Received: by 2002:a05:6a20:8428:b0:10c:b441:5bd3 with SMTP id c40-20020a056a20842800b0010cb4415bd3mr8901649pzd.11.1685357976278; Mon, 29 May 2023 03:59:36 -0700 (PDT) Received: from localhost.localdomain ([143.92.64.20]) by smtp.gmail.com with ESMTPSA id v7-20020a63d547000000b0053f22b76cdcsm6863110pgi.82.2023.05.29.03.59.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 May 2023 03:59:35 -0700 (PDT) From: "brookxu.cn" To: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 3/4] nvme: optimize nvme_check_ready() for NVME_CTRL_DELETING_NOIO Date: Mon, 29 May 2023 18:59:25 +0800 Message-Id: <32d00d1689773fcb2a177ca3ce89a3b12c1fa4c5.1685350577.git.chunguang.xu@shopee.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Chunguang Xu nvme_check_ready() will directly return queue_alive while controller is NVME_CTRL_DELETING, maybe we should do the same things for NVME_CTRL_DELETING_NOIO. Signed-off-by: Chunguang Xu --- drivers/nvme/host/nvme.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index a2d4f59e0535..35066ad10cd9 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -793,7 +793,8 @@ static inline bool nvme_check_ready(struct nvme_ctrl *c= trl, struct request *rq, if (likely(ctrl->state =3D=3D NVME_CTRL_LIVE)) return true; if (ctrl->ops->flags & NVME_F_FABRICS && - ctrl->state =3D=3D NVME_CTRL_DELETING) + (ctrl->state =3D=3D NVME_CTRL_DELETING || + ctrl->state =3D=3D NVME_CTRL_DELETING_NOIO)) return queue_live; return __nvme_check_ready(ctrl, rq, queue_live); } --=20 2.25.1 From nobody Sat Feb 7 19:08:09 2026 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 39FD7C7EE29 for ; Mon, 29 May 2023 10:59:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231630AbjE2K7r (ORCPT ); Mon, 29 May 2023 06:59:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231529AbjE2K7l (ORCPT ); Mon, 29 May 2023 06:59:41 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 708A9E4 for ; Mon, 29 May 2023 03:59:39 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-64d426e63baso3657027b3a.0 for ; Mon, 29 May 2023 03:59:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685357978; x=1687949978; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ep47zFrzrdEJ44Hqc9XXjwqqYSSyPX231+NhLADfiSE=; b=BA2fC5N1ViNb2dN8CaIv6BZ9CCv38VCwNNvuctEjmYMVKzxpEkHud0V5SJbJaSgXw9 zoplBdEAGJ0tbsPTqJx9bbZJGJirQztqVYGv7Qt4y1oMhENq68yp0BESuTZTgigN57Yr I08pIgJyGduPlNM/ePTDS9TqbTkXwo8PkOayh0vlouWBXRqcEGUQcyEXdm/V6/hnHeSf e0soX/X499Z8kzDESYgjPkSOWcWDextsasMh4MXWHrbx/dNuZCpu14Ni4Z5UOKKgueyy sZF4OkVi4l4Br7QuLAvZIuSwNe22BG8fNXhdm2RTagOXVbR3BB+GU43dNHl9pcamn5Pi KkWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685357978; x=1687949978; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ep47zFrzrdEJ44Hqc9XXjwqqYSSyPX231+NhLADfiSE=; b=FHGb4qwXxXVfwgSyJexM0ryZ9Y4sFrHEhyFPG41zX7bIA+PZXLl2zD5NVxozRQJW7y 8dblAm4yrmR6vvaRIMZWBo6FKrbKnTh5zp4vDsJVwCKcpQ8SB8X3wJlMkaDrNppQunW8 +7pCMCs5YTUsB4+tU4DKfNS6mXo/HA18qcu168HDrAslCIuU/b/R5r8g8nXxvMyziLvx NQOepi/w65JKj3dUExrT3wYR0fOZBZYUqqU0PsOG5vpYNJGNnNI1QUDrrhmIWL1bFivx ScYSGHoAv4eUHM4mr+PKqsORncacPpbYWlNwXyaRVVxIIXgdBTOmEU5sITvZl0j5gBCl LLSw== X-Gm-Message-State: AC+VfDzYkvNuGrdWU/tKT6yhuiflAVafgtctGwzFuaFUVCxMkyC+GHsG /cgFOv+wgck0sVyIF7FWxHw= X-Google-Smtp-Source: ACHHUZ5d174/h7CwQtC7Bod/+WNGrMAoyHWHrWbfqf3DkpTp/xsWlFE4CKHSjR1+BQpvsXQDE83POw== X-Received: by 2002:a05:6a20:d705:b0:107:10b6:4c84 with SMTP id iz5-20020a056a20d70500b0010710b64c84mr8144873pzb.21.1685357978667; Mon, 29 May 2023 03:59:38 -0700 (PDT) Received: from localhost.localdomain ([143.92.64.20]) by smtp.gmail.com with ESMTPSA id v7-20020a63d547000000b0053f22b76cdcsm6863110pgi.82.2023.05.29.03.59.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 May 2023 03:59:38 -0700 (PDT) From: "brookxu.cn" To: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 4/4] nvme-tcp: remove admin_q quiescing from nvme_tcp_teardown_io_queues Date: Mon, 29 May 2023 18:59:26 +0800 Message-Id: <1976b5b41456b03a3c5acf68f25b8f6c0873da92.1685350577.git.chunguang.xu@shopee.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Chunguang Xu remove admin q quiescing form nvme_tcp_teardown_io_queues(), as it will done by nvme_tcp_teardown_admin_queue() and other functions. Signed-off-by: Chunguang Xu --- drivers/nvme/host/tcp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index cfebcae7fc9b..75f39a02e685 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -2020,7 +2020,6 @@ static void nvme_tcp_teardown_io_queues(struct nvme_c= trl *ctrl, { if (ctrl->queue_count <=3D 1) return; - nvme_quiesce_admin_queue(ctrl); nvme_start_freeze(ctrl); nvme_quiesce_io_queues(ctrl); nvme_sync_io_queues(ctrl); --=20 2.25.1