From nobody Thu Apr 2 15:41:43 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 B72AC1DE2A5 for ; Sat, 28 Mar 2026 00:46:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774658776; cv=none; b=DUPIg47kYn6+QNGMxi+4ILOxGZMu204lcsYJFGySCKnrgIwHptkiJRTyv4wKhw9HZEQxgnV4PS6g+etypNgZIoHuLiBsJ5zBHVC1qDccJPiEm8RFjArsns3t3ZCLOiBJ1ZRkOIR2p18NHqkhHUes96CoOkCIj+zEA5FrkXNphRg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774658776; c=relaxed/simple; bh=D7dzV4y0LsCNzRrDfHsQxqPYHM8cBs83Gn2MzKuxd3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hiWb7WHBh2HbETOWlK/TVru7ejaF833JbBKBexQXUBPQnhBT5zKAwD6vmspgtSJUpeLUTwBMleh0ivlN2EEcHh02qAHfd58rdgT0Fxu2RJ0Gp1lbXE0yVqX47TS4zV5pGG1tyAreW7165KX+vHoYfMbRw1VydHwXvuyKAws4blE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=Cyl1uew1; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="Cyl1uew1" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2a871daa98fso20934195ad.1 for ; Fri, 27 Mar 2026 17:46:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1774658773; x=1775263573; 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=5zI5jX/tvcIMUGp5fm4rmIBCKjqdOpV/MaWj1qN2SKQ=; b=Cyl1uew1snnO+HlHfP+tyDq7NEHYKC/IVo6sl+AvhBrsoIGYEZ+pZ9C/Kdhpgpgmce 1jLCVbe8ajp3pw2JrdBfpzKYXcJAzISgw1Pu0RGflme23Ks5tIco5QvUiNYDdWkYhpkP J80po/guTE2JxhQ9+AmblYlBZ5DBDizHFh/NQcu1Ib5EmRmm5REutldW2T2uqz5LXstE 4JeO5efDW8VEYMJZiHvdOFEFKXqSaeVfzmKWYzB+jLt67RPsERF50ctP6BGlO2fUsLwa wSWFrdjDXmhlXweAZwm1jOj6yCG0aKNIX3Cod9jSvmxGkyyFxXvG66mdPJysTPOkS+bO tomA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774658773; x=1775263573; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5zI5jX/tvcIMUGp5fm4rmIBCKjqdOpV/MaWj1qN2SKQ=; b=i7mX/P+NiMAWzeFea24GlCMfQggdzHgLk/TgQ8XrD8f51t+Z1LcHXfW6qThi+EyS5e Q7YV56qe2uGJGAsDq/sbKHPGcdlpzXEEvGG4SbhRvgjNH5LSqf28qWOT4urA42SuB3FM HxvH2XH6zUoPujC5Oy0w0ycduzbmxKT6b+Y4qqWg4WVwR1b/a5iGr/e5qphcQLfg2V6C JIn6iT2WQUh3RBMZpE0r/TM3mMjuw2iDsnfUasLJrKgdL5kN22jKzDQ9z0RwQmLfxmlA WkUJFYjaSkxlYxbKgU3s3ctJQeZjnHqt+OYEgS/vy9UADssEOiVqODZ7oJa2cFquNwva 9W/A== X-Forwarded-Encrypted: i=1; AJvYcCXW1v5YwXixMxND5jV8nufkRJ3uUq2tTRbLdr6CKrx0tdygqhbQ3sbsHQl7y3fZlPblLBB2f9OfdTdUz7Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yzv6xpKiwWgjjgVQIvDYZ6C70Bof6m0LLj93uxzkvZ6qDgpryVn UnAznpWY3oD9Gag1FjaZ8+GfLimqUgcFkLUW5AHhV9WeQwFHn9d3CB5IfUAkwHboWjs= X-Gm-Gg: ATEYQzyXXODDRdcBl6N9r5m45WtR78z/9Dami7xcSlVQqKS2YIMKvoN3gUR5irW3nPJ xU2O3TOFbA4u9lOXLApDRw9LEiToMV+19hks8WxTGVQpwAlCOmY9PE0yG3BpLVcmLrxB/S7krW+ GeOHnEYTNQ2UFZc3mcGisLWnikV5gzZ53Y482YfKNlkmj+wH+yI9jV8cgGVT7Wn6HDkzt/4xVQ4 DQ26ry6b6kQB88facjTHgfst4bLJyoor3s8qXlrlwGn/QYLrTLQpktsnz1qK6CdYCPiXSLZCcmB TGiOC2VUDAyJo5l5nNwUvXFtcKB5+ScJk1PYQ7+8rxIAbMBgYEgs+ttMfPKBU3Ou1yvm551YfHJ 9avBjNb7cGI2kE6n0ZYjI27Y2msrzl0mJSioEOOIzhAkaXijyXFw40BcdrkNCkqwzIaqzisL1xq B2NnD1Css= X-Received: by 2002:a17:902:cf03:b0:2b0:c90f:44b2 with SMTP id d9443c01a7336-2b0cdc1027amr46114045ad.12.1774658772780; Fri, 27 Mar 2026 17:46:12 -0700 (PDT) Received: from ceto ([2601:640:8202:6fb0::9c63]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-2b242683064sm5342705ad.33.2026.03.27.17.46.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2026 17:46:12 -0700 (PDT) From: Mohamed Khalfella To: Justin Tee , Naresh Gottumukkala , Paul Ely , Chaitanya Kulkarni , Jens Axboe , Keith Busch , Sagi Grimberg , James Smart , Hannes Reinecke Cc: Aaron Dailey , Randy Jennings , Dhaval Giani , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Mohamed Khalfella Subject: [PATCH v4 15/15] nvme-fc: Do not cancel requests in io taget before it is initialized Date: Fri, 27 Mar 2026 17:43:46 -0700 Message-ID: <20260328004518.1729186-16-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260328004518.1729186-1-mkhalfella@purestorage.com> References: <20260328004518.1729186-1-mkhalfella@purestorage.com> 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" A new nvme-fc controller in CONNECTING state sees admin request timeout schedules ctrl->ioerr_work to abort inflight requests. This ends up calling __nvme_fc_abort_outstanding_ios() which aborts requests in both admin and io tagsets. In case fc_ctrl->tag_set was not initialized we see the warning below. This is because ctrl.queue_count is initialized early in nvme_fc_alloc_ctrl(). nvme nvme0: NVME-FC{0}: starting error recovery Connectivity Loss INFO: trying to register non-static key. The code is fine but needs lockdep annotation, or maybe lpfc 0000:ab:00.0: queue 0 connect admin queue failed (-6). you didn't initialize this object before use? turning off the locking correctness validator. Workqueue: nvme-reset-wq nvme_fc_ctrl_ioerr_work [nvme_fc] Call Trace: dump_stack_lvl+0x57/0x80 register_lock_class+0x567/0x580 __lock_acquire+0x330/0xb90 lock_acquire.part.0+0xad/0x210 blk_mq_tagset_busy_iter+0xf9/0xc00 __nvme_fc_abort_outstanding_ios+0x23f/0x320 [nvme_fc] nvme_fc_ctrl_ioerr_work+0x172/0x210 [nvme_fc] process_one_work+0x82c/0x1450 worker_thread+0x5ee/0xfd0 kthread+0x3a0/0x750 ret_from_fork+0x439/0x670 ret_from_fork_asm+0x1a/0x30 Update the check in __nvme_fc_abort_outstanding_ios() confirm that io tagset was created before iterating over busy requests. Also make sure to cancel ctrl->ioerr_work before removing io tagset. Signed-off-by: Mohamed Khalfella Signed-off-by: James Smart --- drivers/nvme/host/fc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index eea5a90d936b..e342d522145a 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2554,7 +2554,7 @@ __nvme_fc_abort_outstanding_ios(struct nvme_fc_ctrl *= ctrl, bool start_queues) * io requests back to the block layer as part of normal completions * (but with error status). */ - if (ctrl->ctrl.queue_count > 1) { + if (ctrl->ctrl.queue_count > 1 && ctrl->ctrl.tagset) { nvme_quiesce_io_queues(&ctrl->ctrl); nvme_sync_io_queues(&ctrl->ctrl); blk_mq_tagset_busy_iter(&ctrl->tag_set, @@ -2951,6 +2951,11 @@ nvme_fc_create_io_queues(struct nvme_fc_ctrl *ctrl) out_delete_hw_queues: nvme_fc_delete_hw_io_queues(ctrl); out_cleanup_tagset: + /* + * In CONNECTING state ctrl->ioerr_work will abort both admin + * and io tagsets. Cancel it first before removing io tagset. + */ + cancel_work_sync(&ctrl->ioerr_work); nvme_remove_io_tag_set(&ctrl->ctrl); nvme_fc_free_io_queues(ctrl); =20 --=20 2.52.0