From nobody Sat Feb 7 21:15:38 2026 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BC0D188904 for ; Wed, 27 Nov 2024 08:52:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732697543; cv=none; b=ZZsgad9GPTICwnO9hyID4bmE6Y5c18tQ9ZVEu2m465f5wYGmaHAQA8W47qR8QariZjK/HNaZ0yKfjuL4LeJv2dmQmmVCPPg0joereiiv4+gjyg4GUmRzrzqbw1ixcv71Fo+BWBcmmy8Tvmj5X9k9G2SDrlRqEur8Y3FALxwgqqk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732697543; c=relaxed/simple; bh=wY6f7nJu9Pg2hjSOyD0ZoDO4+PdS+dIa8RaflRe+mA4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VJbaJLpYqFSEQtkhfNxtGhUfUjyiiyNx2SGrWbY/4FO6Uh/RwFifEpGYgMVTtsRQVs09DAQ4bILqcdd+wQHzEt17wG+zy7NsaWpmOJ10f9LYt1mXOpRBLLtqQvNKyTW1vPPjQXPzf42vQgxl9mvJ1Prh0UEopnE8FH8XJ0EWbKc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XFajuxcn; arc=none smtp.client-ip=209.85.210.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XFajuxcn" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-724e14b90cfso4659084b3a.2 for ; Wed, 27 Nov 2024 00:52:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732697542; x=1733302342; darn=vger.kernel.org; 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=I5TXHgZ3Z8QTGy7TWH/5+kFsxPLaG9TqvwezPRwTQdc=; b=XFajuxcn4dstM9oYc/PefeDLcfGcCpIuPYbMdj3tnhJtkdItBOuFRQaIVDKXt0Sf2m lX94PNnQuNlJ5Eca+aUUotqnebAAqPjAuj+ZDVZvv0LjWkqjRj8pLLOiV0aeJdLwW2jm S/6L7WXC+hCMQ2QECw2zNBl+Ra4Lif0swIkIwlwOaMGwjMEneMxw7/2OaJhjDAOsS6A1 8lPKG9rWOLVoBun6SALz6dUDUbXf35Sa6Q1S37uMQTzi6EIZ1310lbICSs1Sc/IGmHdI Sj3AZOw5gSuEPp7EsbDMDJmL2sLvbCefBKdFtls6kHsToqeT9pkGT0105QIfqvcJZfyp RieA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732697542; x=1733302342; 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=I5TXHgZ3Z8QTGy7TWH/5+kFsxPLaG9TqvwezPRwTQdc=; b=MzJ5xLT7KnEV2Em7mUIhRDZwVpF7VJiiBc1y1+bpfLU2KlJKrEctaDg+GhzSmay4fe qqu6/NkDTj+PFr0nD/ZLrLWKMWJriqp5MQZEVD2VRgRFv/4AvYGcKozicKK9VgctX8ei EYcDOhGKIvK7wQ/FiLPXfvXRIiN6K34STPJwgbaXfgW2joLHOicom9DarkJ6u65jMGZ4 infs324TqN2rqiZNsc0HapxWDG5/Zsxcs6QDdY41h5Bn8+GyUKFVLx+LRpkc7koqVo2T woDfFRQCu/MRsSgzrgYeQqet+tv/OvqPH9r1BJZgHFrHNib0XNJLVpOXt3qo0t5dZtAW udOw== X-Forwarded-Encrypted: i=1; AJvYcCVlt8Q2tdA0jQMWN7HU/4Xza1uAfs1BBgge8UBEJNFURds5C7f0SeYjlpXK04RQy/smPE8WjyCIlGc/a7g=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2G+LHY484sbnyClEBHLYOLzkxJDpOJ5EeyIlTZ7cuainju+6q G+GKU0kp5pV9BA9oa4P5gDHzpaHgShCaNpHkmEkZO3hIGyMwtfVo X-Gm-Gg: ASbGnct3ERN1d/DXkQ/pXvkU5URW03qfIO60lfr+0O6TuaztofuCbdjIletn+22/yh2 Jj7QV9SHSp3mC633NpoVkEsy38F8sTYwWlcTFzEr6VN2sYTo3Pd9FVtTYQzfBPSpvA8TwBtlJz+ vRFpIRRddGkpLR+Sj4+gMLBK57zgUmezcOe77Ev318GxnuaGAfZWenIRHbTvhPooJvCqzKpfO44 m6WfdXQkj5Ffvs1lEXt3eIH1lSAcpMgZdOGj2didQjUJOkqGr/k4Sj+neot+g== X-Google-Smtp-Source: AGHT+IF6CYkTsIeE1XeYAMX6OTkwBCN+caMMwhD4ZTXviHRAggHQYeZCg5sgJ6GOgj0vulov/WbgKQ== X-Received: by 2002:a17:90b:38ca:b0:2ea:4578:46c0 with SMTP id 98e67ed59e1d1-2ee08ece4a4mr3032590a91.18.1732697541734; Wed, 27 Nov 2024 00:52:21 -0800 (PST) Received: from localhost.localdomain ([143.92.64.17]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ee0fa60091sm960531a91.20.2024.11.27.00.52.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2024 00:52:21 -0800 (PST) From: "brookxu.cn" To: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, hare@suse.de Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/5] nvme-tcp: fix the memleak while create new ctrl failed Date: Wed, 27 Nov 2024 17:27:47 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Chunguang.xu" Now while we create new ctrl failed, we have not free the tagset occupied by admin_q, here try to fix it. Fixes: fd1418de10b9 ("nvme-tcp: avoid open-coding nvme_tcp_teardown_admin_q= ueue()") Signed-off-by: Chunguang.xu Reviewed-by: Christoph Hellwig --- drivers/nvme/host/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 3e416af2659f..55abfe5e1d25 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -2278,7 +2278,7 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl= , bool new) } destroy_admin: nvme_stop_keep_alive(ctrl); - nvme_tcp_teardown_admin_queue(ctrl, false); + nvme_tcp_teardown_admin_queue(ctrl, new); return ret; } =20 --=20 2.25.1 From nobody Sat Feb 7 21:15:38 2026 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E696B1917F0 for ; Wed, 27 Nov 2024 08:52:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732697546; cv=none; b=EDUtx6R/zauu+rtbLyI90V3YotH5JjQhUCPIRhUkYDxwd3r+wm4sVVDs1KXQOrcssHLRyS4YUl+4QnghL4mtEBVaOmZibBMTn4jHuwY7d+XcFBo8Q57QKQkHiXEx59GYDzkCFGNcUdp4ASacHJOij8jXEnDH1pQsR+HnGVkjZJg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732697546; c=relaxed/simple; bh=paxDOqh2qSf2kzQc5voZMVG473IaskEVDZOMOwSPc2c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=f3bpP4QsT8U4tcteW+lgLMbRb7Qs4DNEuYj8aXMGIXONLEa965f+XInxM8bf96eyC9ekEud8JvTExqjGCYQcaiJEX96mv2+3ow6coy8kBkgytfmS4Ap3zVY5R8+9oeF92S1XPqzzwwWdi6hyMFhXvvsTpz7+625FHLhR6X0Xuxk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=L7vQnfcG; arc=none smtp.client-ip=209.85.215.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="L7vQnfcG" Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-7fc2dbee20fso2559655a12.3 for ; Wed, 27 Nov 2024 00:52:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732697544; x=1733302344; darn=vger.kernel.org; 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=dpmERBoqTwRUxsoOOwQBdGMoKAty6EzjZaeUApmpNRM=; b=L7vQnfcGWZUO7HUn/Ypxl1LEJ8tTVDd6jXXePCVth3KfbI5svKPiCTONHNXUiLSd2D q2fFlJCW8wic+dsP+WY26yT06vt2i5VdA9BahGATrEdTre1Nj3vXridN1FbZm1Z6EQ3Q hUadTF5lTMgHk3Usn3xm4TaFtgJY1sb0dfrHVIFs/VUGGRac0TVw/KYd7rRx97LzBoMM hFqQ0x+BF8w8vNX7Iqx4VlAp262A6hiWgTBI5DcXJT2O43M+ADcgML4eHA7qQum04UwV 4JPXKFVyG78Zzrt5TvB2vwWwnFdGIM1SAVs0Kq4z/dZnG7KZISRS+UhnpBxGE9xrvBk6 Uilg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732697544; x=1733302344; 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=dpmERBoqTwRUxsoOOwQBdGMoKAty6EzjZaeUApmpNRM=; b=tNN7uKEfIYFOxJJVMpbO5uKg6JxSU9t3MfWK9mAqtfuz55C1U3Ke29MPdD27OfZluR /RYFmhEcRboOS1HKQ+uHOkx/EbDRw6FFecF8iG461BpNVPQPboIUy19CVI9vJbwij3KN n7BGpD8J8zkS7tWEPrf+XMWHlCg4InALmLjAPsTG80ZgT7pN0M9qiEpp2AR2i7Ksw3qx swohLP2XRwP8J5WofHzE3edsx1M5C0tAJQD17o088qh46sdN4oMk9mNvKjVKEZh/auRS jVAQpiRFaUenD1Xbexv54S5CfXkj4MC3ufCwsEQIqBqNhxoU7vaYe2xaL+VeDWMdkSv2 cZdg== X-Forwarded-Encrypted: i=1; AJvYcCUAsGozuSbNJ7/CNJSGG48gGObiyKECcUNtTH4lVS/UD8sln6F6ztdYcwBgXmIM7r8yYqJsoMF3Ew8t5iE=@vger.kernel.org X-Gm-Message-State: AOJu0YzuOo3XJrlvi3ALjopFk9tGF9uAvqoj3BXJPyFeXWVmj8p5InFi HBhhDfwufSKqUFdnXGXADLPQRBRI0DFaPDZvsI/IvhvlytlpX7Z0 X-Gm-Gg: ASbGncufOFXfO1UmCMM797+9r7EZ7Q3w5OX2FyDTy5yattl28n/CjjeFU6jxjd/UrXR LPopM1CqyMDbJa94sjiA+KLZ27eF3dXeNMZawq4on1QZ1Ly038WnTKqqPi4TkN1k1FC1+DLhj1J GJNpRGkZA2DnHT4qTC2dpUCcTUwYnSY8jucDVsuYyE6ZzB+zC72DyrlRNB+NxIdflBlgqikZ4aO KNowtGzGjHkQVoI8Rq7quOEHAJWX1XdzfJENS7GzSer8Vg7Ov5bJRWLvagcZA== X-Google-Smtp-Source: AGHT+IF/cp5rzTT3tE1mP8JhClMCc7LgiUCv5UBMIenswP4dQfK1tVc737MNwzcTj7GoQFR/nN2XrQ== X-Received: by 2002:a05:6a21:78b:b0:1d9:6a6b:faf4 with SMTP id adf61e73a8af0-1e0e0b2c903mr3625688637.15.1732697544232; Wed, 27 Nov 2024 00:52:24 -0800 (PST) Received: from localhost.localdomain ([143.92.64.17]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ee0fa60091sm960531a91.20.2024.11.27.00.52.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2024 00:52:23 -0800 (PST) From: "brookxu.cn" To: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, hare@suse.de Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/5] nvme-rdma: unquiesce admin_q before destroy it Date: Wed, 27 Nov 2024 17:27:48 +0800 Message-Id: <1be6b47b5d05975d7ac7ffbc20257c283b179491.1732699313.git.chunguang.xu@shopee.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Chunguang.xu" Kernel will hang on destroy admin_q while we create ctrl failed, such as following calltrace: PID: 23644 TASK: ff2d52b40f439fc0 CPU: 2 COMMAND: "nvme" #0 [ff61d23de260fb78] __schedule at ffffffff8323bc15 #1 [ff61d23de260fc08] schedule at ffffffff8323c014 #2 [ff61d23de260fc28] blk_mq_freeze_queue_wait at ffffffff82a3dba1 #3 [ff61d23de260fc78] blk_freeze_queue at ffffffff82a4113a #4 [ff61d23de260fc90] blk_cleanup_queue at ffffffff82a33006 #5 [ff61d23de260fcb0] nvme_rdma_destroy_admin_queue at ffffffffc12686ce [n= vme_rdma] #6 [ff61d23de260fcc8] nvme_rdma_setup_ctrl at ffffffffc1268ced [nvme_rdma] #7 [ff61d23de260fd28] nvme_rdma_create_ctrl at ffffffffc126919b [nvme_rdma] #8 [ff61d23de260fd68] nvmf_dev_write at ffffffffc024f362 [nvme_fabrics] #9 [ff61d23de260fe38] vfs_write at ffffffff827d5f25 RIP: 00007fda7891d574 RSP: 00007ffe2ef06958 RFLAGS: 00000202 RAX: ffffffffffffffda RBX: 000055e8122a4d90 RCX: 00007fda7891d574 RDX: 000000000000012b RSI: 000055e8122a4d90 RDI: 0000000000000004 RBP: 00007ffe2ef079c0 R8: 000000000000012b R9: 000055e8122a4d90 R10: 0000000000000000 R11: 0000000000000202 R12: 0000000000000004 R13: 000055e8122923c0 R14: 000000000000012b R15: 00007fda78a54500 ORIG_RAX: 0000000000000001 CS: 0033 SS: 002b This due to we have quiesced admi_q before cancel requests, but forgot to unquiesce before destroy it, as a result we fail to drain the pending requests, and hang on blk_mq_freeze_queue_wait() forever. Here try to reuse nvme_rdma_teardown_admin_queue() to fix this issue and simplify the code. Reported-by: Yingfu.zhou Signed-off-by: Chunguang.xu Signed-off-by: Yue.zhao Reviewed-by: Christoph Hellwig --- drivers/nvme/host/rdma.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 24a2759798d0..913e6e5a8070 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1091,13 +1091,7 @@ static int nvme_rdma_setup_ctrl(struct nvme_rdma_ctr= l *ctrl, bool new) } destroy_admin: nvme_stop_keep_alive(&ctrl->ctrl); - nvme_quiesce_admin_queue(&ctrl->ctrl); - blk_sync_queue(ctrl->ctrl.admin_q); - nvme_rdma_stop_queue(&ctrl->queues[0]); - nvme_cancel_admin_tagset(&ctrl->ctrl); - if (new) - nvme_remove_admin_tag_set(&ctrl->ctrl); - nvme_rdma_destroy_admin_queue(ctrl); + nvme_rdma_teardown_admin_queue(ctrl, new); return ret; } =20 --=20 2.25.1 From nobody Sat Feb 7 21:15:38 2026 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6EC3A1925AD for ; Wed, 27 Nov 2024 08:52:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732697549; cv=none; b=ri+yCm9DrtsGSE1T/dJmbwG69tV4RQkMgsQPLcpv4mCv5fFOJXKYJBQY0atFwXgW2i/EbBbDptTa2hCP2zFFjiS1bU+GIsQKMyWKp3NGCay5+JRGWR0XPIjnvlF8MI8ePjL1vdWoVig62T1wcop0G6Z9tskuD1YkA+zwy4D+rCI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732697549; c=relaxed/simple; bh=1HDKk/Dd+pkpZa+2tIr+DaBy6svxJk9HZbJm/yZlWJQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=czyLgkFN28aSHZw3AUk+wUwLLjPsPUwv1PXv2BRKI/fJIOiptRTyY5hxVDe3ueLg4YBe4S1JDz8PUnl0ZeGiphLbA0JKtyYCuPC/TpBWTnx48f2TwGzgybkwvGEDccZ3VS/za64dpen5cccdaheLMKY2cGJ4FibXHmLGN3/wf0M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=m1FTM1/0; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="m1FTM1/0" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-724fee568aaso3611142b3a.1 for ; Wed, 27 Nov 2024 00:52:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732697547; x=1733302347; darn=vger.kernel.org; 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=4RSIHKTpy8icvDsa4C0bncAYt/fFFkTLxjGVcQzpyx0=; b=m1FTM1/0rweG1KX5S7l2Af6IpTesBnYVxFXGfJ6RhL3gODRx4OjMU/cQCW+e4XnZ/P 4qHqiaNzjZQN5IgXDHtINZlBxgMGZLU9LULP5HMfgDCbA+JdKQlJiafK5C3YtYwOLh5r kyoD2qDpMNOlMTLdvk2nehpHASDj4teewREaJdRmlqrhzvToE72ChSjZyk+ppxvGtLa0 EMj9Aut6Fp6q0EiyAWG0EnPLKfxYcN24Qg4HewJEAATYIZ+3n+dB+YGjSTgkELyaCm6H F00VY4VWyCV2d5bXuxiO7QezYtdNmGz/CbHKiDSKMTUY3ZFCZkZ3/089tkcyJToR8TM5 tdmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732697547; x=1733302347; 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=4RSIHKTpy8icvDsa4C0bncAYt/fFFkTLxjGVcQzpyx0=; b=k37rIPg3dHaGMXPs3Vrp1oTEAu4Oo1HSgMDBJj8jjfd2fNMOxf2oKbDFCs6+Evifai QPA+ACN+NF/cznMQQT72vmw5j2XbEfQCVz65QXoSxiV4L5PbbS3YbFJvTy1jG6O1c2lI wr5vpH5P7Q2m4kYge6lxqzEfZcvTiqGGOZCkxkeSykKQi+JdqNwVJ9m36Rwk/22z1LBK A+rzB3iK/CHC06/qJ69UYzerHGirEbf+4L/Rvm4taBkN5ZtqrYw5Cti23Bhbzuj7JVFM IWq25J8pvuj626uWbVYHx2roodyuJLaeDnNQL11S4MN2CzW7cuS9ar9AbBlm2OQvd/EQ WYRw== X-Forwarded-Encrypted: i=1; AJvYcCWzWyTXBQ0hgPrgmCO9cZJXXo2d4RGWgPUp7UNco5Kivix6FChBOOJ2tliPy5u3GBr/U7eqgTtVH8ZhADM=@vger.kernel.org X-Gm-Message-State: AOJu0YztPBtnA+J79EUo+HiU3GMjakh03ciLbZJTBh6mRk9QChrIMJ3H z1Snaf17WZJETtSscKwL3cniUhVzfz7G8XwVB6n/iHFvTadIlNy1 X-Gm-Gg: ASbGncvHa1GlGkF5iGjm/h8Xj4o17SM8fSPv9smq1yPY27do52OC2138Cb0/gDveCdw chwKhV2ihwhZMUjsmAyyvZ36IKxLEDj/s3Hed6h8VLAjL4Atb7kxa6qTdFvCPaIbH2tgrT0uO5s KtYtu7ai/WPa9bYNL93/nLGEq5iHcxdKetF9QxFAmGIxzjzSoi7CwIbj0SZ8Czlcd7jKy8jZnaz yrwCLrAltHnfC4s93dpRXF2Xb/SJ76vMTGRFkMCEaKDK7nAvd1UVgKYfkAZHA== X-Google-Smtp-Source: AGHT+IFnDmXR5zcT1/Y9Mc2kxjwApnxXnOIz6wmA06+t0D7T3R5QzG3gdIfmwN80A+SWqMRjZsk87A== X-Received: by 2002:a05:6a21:9986:b0:1d9:c615:944f with SMTP id adf61e73a8af0-1e0e0ac35b8mr3936370637.11.1732697546789; Wed, 27 Nov 2024 00:52:26 -0800 (PST) Received: from localhost.localdomain ([143.92.64.17]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ee0fa60091sm960531a91.20.2024.11.27.00.52.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2024 00:52:26 -0800 (PST) From: "brookxu.cn" To: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, hare@suse.de Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] nvme-tcp: no need to quiesec admin_q in nvme_tcp_teardown_io_queues() Date: Wed, 27 Nov 2024 17:27:49 +0800 Message-Id: <7e662471e392c6b45fc37de94139e886c53c9cdd.1732699313.git.chunguang.xu@shopee.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Chunguang.xu" As we quiesec admin_q in nvme_tcp_teardown_admin_queue(), so we should no need to quiesec it in nvme_tcp_reaardown_io_queues(), make things simple. Signed-off-by: Chunguang.xu Reviewed-by: Christoph Hellwig --- 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 55abfe5e1d25..98bf758dc6fc 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -2178,7 +2178,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_quiesce_io_queues(ctrl); nvme_sync_io_queues(ctrl); nvme_tcp_stop_io_queues(ctrl); --=20 2.25.1 From nobody Sat Feb 7 21:15:38 2026 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 234B9192B89 for ; Wed, 27 Nov 2024 08:52:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732697551; cv=none; b=UAwjgrF4MUEc5zZfyA44cfRTU7KgtlBNq5DsetoEd3jwRcJ5jv+zmtzmP+4pnqaE8av0Q93ZIGtsiS6l1v+JwHXBBTEOvACrGVYS9pnzUcrOQHjJ/utlekYEReyZYAvnCDswXQufPhJivHE47ZuVK8nT3n7QG3MoDn0fF+DdDv4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732697551; c=relaxed/simple; bh=YIACx/HJt7huWs2y8Xhx9617l3vSSaHOP1w3p8OeZ44=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RobjcBUs7NSRvKYhAn8UKm9CIBKh2z7/Qbk85LEGm/FpV7v7SM6RGMPv5ndN8H8nzNOyBtv49Uu6v2FuCmLIkf9REVvXOM2wM0X/OexER65FrelGU2d3Eho6X/CzWk+/ej0zTcCurX4L5pavn4eEgeUY0wm2vCWryhtj11KYbtY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZzX65IEx; arc=none smtp.client-ip=209.85.215.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZzX65IEx" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-7ee020ec76dso5602109a12.3 for ; Wed, 27 Nov 2024 00:52:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732697549; x=1733302349; darn=vger.kernel.org; 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=3WpxC1ak5i/GsjHW0+FMk1rTOqPJjGGRzFkrWXfXPjw=; b=ZzX65IEx4cxxZTrcpakq7HzAGJFRJldY1DBZ5vdgqEmUiuE8LLV0F2RIy6boQLGF6X TWJZ/e4XmQbe1rN5xRKF3i12mfJhJhi9U7PM79NUJboqqU9WKb2cmtNySJRLKW/7dzo4 Ks+PFhpI6tL1qfireQL7zW1SSgyJX+V/7wnjKE+Mfg65iFkcI5vCngu/npT4l2gnpO3r +1KSinrF/G4ZS7E4pKoKmJxeBQBJwCenWYRq6rKIFsvYVQtOiZ57sUhzydtkAp7LvAuJ yHS12+SvUqzcn6spW6+10Q2SOxT/vuEbIBuaZmjywUqdGZ+gJ6iUtH+z2B5A1iXreC+T sUIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732697549; x=1733302349; 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=3WpxC1ak5i/GsjHW0+FMk1rTOqPJjGGRzFkrWXfXPjw=; b=pOzmQtFfk7NDLxGK2sAJbJFrEzINrSo+hDfA9VPVtCB0ARi7aXXFgNNYwmBAJHn31D VbYZV+ZmJIaFU57fW/BzbLH5fvqhxpNjP4sFi4/9kAsp8WhBI9dJBzCA8JNRuyvh2j2V ZpfsXLXFq+FP/pvFYSLaViXmQKQDtVFomklU8gN9EwoTUq226qOz8beXPtqe6x4m+g9q 749TTXHFvRq79wBVySUxgMZAreN8OOgo4rNlSZVJAilzCU4zGXbe4F58uiUgeToVaI4o /VN3fJdAIc3EWbknDugHdn4qroJvySemXqoGwPHhQ35ZwrQ/QqLmpmjxM6y2YAyPZcJ4 fmsA== X-Forwarded-Encrypted: i=1; AJvYcCVlUhHILQu3OGkkGTscjg5LGe0xYxWojCFDTIOUk4UmYcJPijMzM+kqgNM5drHfZUZ3omoFqle/F7NGs5Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4zNljhQqKqHpc2aAtGQsgv1dS6sUzH0Jw3HFwAyYFK+drVgPb 6OX4xojqSy2uqMBdnGyNAl17p4w5lDvnuDGEIOmePhhbsbaZZlZr X-Gm-Gg: ASbGncs30PWn6g1USwqaqHCtQEkdEJt0OrKiyI9v7sor6f3pepCzJnuQuME6zuflD59 Gq3dz6sXK8On3Tlk1Z4znVr6kCKzEucCyq9+3GMK1KdW+jYNNqhg7AVcgHoOqFvzvn7I2sokDms tOJAQIG2jgYaUjHwDZKRsS7OdhTTVnG7V1Q0/Swaf7jTOD302OGPxbs9QV4Q5d0ncgzJCr8B9kE mvgx1SRBF0qyXy7MyRPaoM5ePh1ywPcGNRiCym5rIuP9SIIepoETeRf05rpZw== X-Google-Smtp-Source: AGHT+IE7W77IZPGT6pO6nsofu0SApJz/06UMb2dL6eXuQw16iAZ3rYd5M/ikmsqDsnhpiwQuFqFmdQ== X-Received: by 2002:a05:6a20:9144:b0:1e0:c50c:9842 with SMTP id adf61e73a8af0-1e0e0b5cc99mr4084950637.31.1732697549421; Wed, 27 Nov 2024 00:52:29 -0800 (PST) Received: from localhost.localdomain ([143.92.64.17]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ee0fa60091sm960531a91.20.2024.11.27.00.52.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2024 00:52:28 -0800 (PST) From: "brookxu.cn" To: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, hare@suse.de Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/5] nvme-tcp: simplify nvme_tcp_configure_admin_queue() Date: Wed, 27 Nov 2024 17:27:50 +0800 Message-Id: <8282314c0d688f51be9f9ee90cd3463ff76baa1f.1732699313.git.chunguang.xu@shopee.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Chunguang.xu" As nvme_tcp_configure_admin_queue() is the only one caller of nvme_tcp_destroy_admin_queue(), so we can merge nvme_tcp_configure_admin_qu= eue() into nvme_tcp_destroy_admin_queue() to simplify the code. Signed-off-by: Chunguang.xu Reviewed-by: Christoph Hellwig --- drivers/nvme/host/tcp.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 98bf758dc6fc..28c76a3e1bd2 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -2101,14 +2101,6 @@ static int nvme_tcp_configure_io_queues(struct nvme_= ctrl *ctrl, bool new) return ret; } =20 -static void nvme_tcp_destroy_admin_queue(struct nvme_ctrl *ctrl, bool remo= ve) -{ - nvme_tcp_stop_queue(ctrl, 0); - if (remove) - nvme_remove_admin_tag_set(ctrl); - nvme_tcp_free_admin_queue(ctrl); -} - static int nvme_tcp_configure_admin_queue(struct nvme_ctrl *ctrl, bool new) { int error; @@ -2163,9 +2155,11 @@ static void nvme_tcp_teardown_admin_queue(struct nvm= e_ctrl *ctrl, blk_sync_queue(ctrl->admin_q); nvme_tcp_stop_queue(ctrl, 0); nvme_cancel_admin_tagset(ctrl); - if (remove) + if (remove) { nvme_unquiesce_admin_queue(ctrl); - nvme_tcp_destroy_admin_queue(ctrl, remove); + nvme_remove_admin_tag_set(ctrl); + } + nvme_tcp_free_admin_queue(ctrl); if (ctrl->tls_pskid) { dev_dbg(ctrl->device, "Wipe negotiated TLS_PSK %08x\n", ctrl->tls_pskid); --=20 2.25.1 From nobody Sat Feb 7 21:15:38 2026 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A712C19340C for ; Wed, 27 Nov 2024 08:52:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732697554; cv=none; b=BVGbh1vRlgaWr54dJ9ry4nmczG/e6ilN39bHOOcUWsEdJuxGA6vsknZP93hKFuJ8WnXv8xbrZ/6PVn0m5ELhYuJAta3o346UkC0x1lXytzGTanjN4Hr7/I0IzT04viyizNy69we93nlZuVkawHF9qWVdznlPa5Vvl5vjZy8WzXc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732697554; c=relaxed/simple; bh=02JUn+UocIGDebOBg43HAGjPIitOi8jA4J/kRnAkAbM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Y+nZNZc/yrZVSvMjy7fwqsFEmLj1JzC2czb3GcK5Tx0clvP6Kxfvb/aRAhZ/QQEW0EYUXfqgcgDe7a65fUDiFeWvYYW3WNGaXtbdDs4Hy4MLZy+9RAChP3SnGScDVMiY/XfVP/JxvEczHOH8akfPCaeCvMpXZauI5MEjozsAgT4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SaG+uFWb; arc=none smtp.client-ip=209.85.215.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SaG+uFWb" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-7f8b37edeb7so5654948a12.0 for ; Wed, 27 Nov 2024 00:52:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732697552; x=1733302352; darn=vger.kernel.org; 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=7GtxWVprwFSDZdPsXr7xdLKUG1hqK8KBIerN+AEHe+w=; b=SaG+uFWbVthGRlaQDdGbWy1re84TMaC3y+6sdp17lhPFY0cmVcYO/n1KwRiNWlMNhW nay75Bx7u4z4YIQHTfr4bWguSDDXa0+opFl7ct84fofAMFJXXd5Ury8RFExE/xnnBp9o V/QT5nz4lKK4bXe1q9b+XKXLcwZGzMFosttIS45jvqwmyGgdWCI1bvmj7DxD3gQSplu2 Hr0AjP7kwyerEAiPnyxckwCjlCc+8/PFIbPxX8/fuhrnTr/kGPfgReoPED0Mu/ZHswR9 mNxEZt/6ny/05x42HAQbeKCtc3fyD4wYU31FLA17R6wlKezI/YvIYV3BnrtTnVP0CjzM L5+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732697552; x=1733302352; 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=7GtxWVprwFSDZdPsXr7xdLKUG1hqK8KBIerN+AEHe+w=; b=b/HCpJZRcbMhexKGXfIy94fLUBPQddCnLB/b5npSpylf41AbDzxdTV6jp+GmRMRuc4 bF1YPMl96yjeNWn9etiP/JHie9GybO9P448c+2d/PUgj3B8p+ZBYyz3ywAAuKAe7Ec/T GCzEJb3WHHIJCwQf/oq6U00+urQ6fsi5em/M6ZQIhhpjltHnZ7flg8ajgvqKw5eR1ixC eqT99cO0ElTCLfSX7sPuSTe0D67Qc9u8tlx6iN6Ec+mDoBZXkJB8Se3dtG6lINWektuQ cYXPuWFHU2GmMzXe2WE8h2l3nVXYNknVLj7il/ulFpN3WnUueenFV6JfrgU+Cu1fEJEY m2Gg== X-Forwarded-Encrypted: i=1; AJvYcCXmYX2Oby417KgDn3cIOsZFffgqT5rlIVBpTreBHQR7lbux3DKA5CkrmWH7abqY1DNAT7fDNHTjgYLRW5Y=@vger.kernel.org X-Gm-Message-State: AOJu0Ywg+ud1EC+7LH1CEOAk54E4Z+n/zQ5+vkN/e8I0NHEtkcFhFyKK 0KoFsyYlnoQC8YdSKGK6pRbT1dnFDKbDTDXM7eM5CzMR3d8w0l/Q X-Gm-Gg: ASbGncuFtWBDlUVU6jEdKD89Yeg9Z1XV+gzcXeagwQK+C3s5AvfrFVCYRmSjOyUZzwS KwFndH9sPwqLY5Jfb+c0UJ9kXFy9Rso5u+XG/NcroDMIkt/yMy2dpnoy9+NcRa0eIpdg0q3fxyV 7YLhYKHPf3MZsxtf7JNppTN4wfHNRiFBbDmcA42tZN1VYGfCTT60znUaTgBBda315h8iExYZPwr PuLnzZ3lMqUqcChfrD8XrC6AgeK9nCsL3s0gVEuyXU/LAaVXGlWN+Zz6f76/g== X-Google-Smtp-Source: AGHT+IFWgNHtIL4lvZGnwj9qigjzUulsGL+kOLu8IJhe2WdfqgdGC624KR6Weud4TWGjUNI3BzGSWA== X-Received: by 2002:a17:90b:4d0d:b0:2ea:a7c7:1b8d with SMTP id 98e67ed59e1d1-2ee08e9f0a5mr3324430a91.1.1732697551857; Wed, 27 Nov 2024 00:52:31 -0800 (PST) Received: from localhost.localdomain ([143.92.64.17]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ee0fa60091sm960531a91.20.2024.11.27.00.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2024 00:52:31 -0800 (PST) From: "brookxu.cn" To: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, hare@suse.de Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] nvme-tcp: remove nvme_tcp_destroy_io_queues() Date: Wed, 27 Nov 2024 17:27:51 +0800 Message-Id: <9393a06d3fa651f9e68863b3cb9d952254f65e5a.1732699313.git.chunguang.xu@shopee.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Chunguang.xu" Now when destroying the IO queue we call nvme_tcp_stop_io_queues() twice, nvme_tcp_destroy_io_queues() has an unnecessary call. Here we try to remove nvme_tcp_destroy_io_queues() and merge it into nvme_tcp_teardown_io_queues(= ), simplify the code and align with nvme-rdma, make it easy to maintaince. Signed-off-by: Chunguang.xu --- drivers/nvme/host/tcp.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 28c76a3e1bd2..36c7e49af38a 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -2024,14 +2024,6 @@ static int nvme_tcp_alloc_io_queues(struct nvme_ctrl= *ctrl) return __nvme_tcp_alloc_io_queues(ctrl); } =20 -static void nvme_tcp_destroy_io_queues(struct nvme_ctrl *ctrl, bool remove) -{ - nvme_tcp_stop_io_queues(ctrl); - if (remove) - nvme_remove_io_tag_set(ctrl); - nvme_tcp_free_io_queues(ctrl); -} - static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new) { int ret, nr_queues; @@ -2170,15 +2162,17 @@ static void nvme_tcp_teardown_admin_queue(struct nv= me_ctrl *ctrl, static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl, bool remove) { - if (ctrl->queue_count <=3D 1) - return; - nvme_quiesce_io_queues(ctrl); - nvme_sync_io_queues(ctrl); - nvme_tcp_stop_io_queues(ctrl); - nvme_cancel_tagset(ctrl); - if (remove) - nvme_unquiesce_io_queues(ctrl); - nvme_tcp_destroy_io_queues(ctrl, remove); + 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); + if (remove) { + nvme_unquiesce_io_queues(ctrl); + nvme_remove_io_tag_set(ctrl); + } + nvme_tcp_free_io_queues(ctrl); + } } =20 static void nvme_tcp_reconnect_or_remove(struct nvme_ctrl *ctrl, @@ -2267,7 +2261,9 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl= , bool new) nvme_sync_io_queues(ctrl); nvme_tcp_stop_io_queues(ctrl); nvme_cancel_tagset(ctrl); - nvme_tcp_destroy_io_queues(ctrl, new); + if (new) + nvme_remove_io_tag_set(ctrl); + nvme_tcp_free_io_queues(ctrl); } destroy_admin: nvme_stop_keep_alive(ctrl); --=20 2.25.1