From nobody Thu Apr 2 15:41:43 2026 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (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 B1094BE5E for ; Sat, 28 Mar 2026 00:46:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774658765; cv=none; b=s7trdX4KwUecvEU8snW/tbQrbSj3rg5da1GMXz2n8ewM8Zkz+TQIJVOE+4mnpsoLEXgzIAvQrmqunTUmHs/vgJjbH83oVM4Z89YA3ScGMen69yvg/SdkB3x4nYmlXOVsJCnU0DGO3nsdpwMR4jNxWHQR4vVP1DKt3RIS4ofiyxs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774658765; c=relaxed/simple; bh=6cqFDrB8KRq7dnTBfZSRji5wugnlZz7D17R6KE5sxt4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TCVibPvcfdXFFa7QHzEjFnPgdWW2W95xg/cGwwkAHECj9sSmexoGc23embWw76sVaU0ho78MlyN3daVzWptczbHZfW3QdC+egiafGM784vXjUtEDHStB0Ipy41diwCY7bQsNGfYTxyoNYL9eCdKguufNjHaHJ5sC/B/zWxcGfUA= 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=G+ZujE6e; arc=none smtp.client-ip=209.85.215.181 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="G+ZujE6e" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-c73c990a96dso1321346a12.0 for ; Fri, 27 Mar 2026 17:46:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1774658763; x=1775263563; 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=/nDAL62O5QKen/7e1sgimEPwC/7mFESAeMSDPIbvcrU=; b=G+ZujE6eUcSViWruTLGOyCIG2i0eWsaG213Ujj/d5VoMGRZmIGNciKK2F2n7L5MmaV JcTcLRntthdxLnVng0Tf50i4CTxWqk03LDsvxmxtMXaB2U0iFg+Ihw5Y4EFjvE/1dIg1 4CLHz/LnpwyhGiso5VZ2skXaZUE1vKpPY+Ya2+07SdVWCv9gEmvsSgFnOmmxQBBEL/fR 1v4H6vnDoUIHuq5Y2+WBcVLGX2d1uSD5Qi0njevvJ2xZfGCRmK4lzFniXZT/k5WFQBWf 3njcgpbIU8FV8bVKUhf/lKD/zg1V6exLCCxG1zAc3By648SHqmE3lICgrzAQS0gOAOpu eHqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774658763; x=1775263563; 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=/nDAL62O5QKen/7e1sgimEPwC/7mFESAeMSDPIbvcrU=; b=IwIsTdjb9I0pGqHmge6MBFS2nXhMvb2ZkbXHbQpoy3i9JPaEs80naeJPxNIm6UDsjj SXA7Cs5chWEsusSOnU0BwBuUk0IAAGNwvaDVxsESpEV3Pv3wJYPYXPjBhJXVRmPRfp1g 7IdphwTYOcdKltH2gpYJwt9t7z5HtClIOlSQIROZQkHvyL8fCl0K6C7a/yAHYWPG1Yya lFVq5J7dLU4ZvEbtAP5mwWPNn+kywxRCe8+HuVYwewyQ6VIkAQs5aPWOUJ7KA8M6cOEX lkyvKxjcOeW+8d8w4sfYHwelAx2P5OYAkPTAs1jJxf/p4g0Ij56U0TqIj2XM2WNO3uQ3 du7g== X-Forwarded-Encrypted: i=1; AJvYcCURwB/EgFynwtU//Nxw0u4JZvzkR6xphx2ynEJa/blzvIq5oazObINj45y03hSDukyPHz8ofAJiCtvwpy4=@vger.kernel.org X-Gm-Message-State: AOJu0YymNxyrjo7qm3tPI+NMtgIvqrZChrAUQfaiyoHMoFTXj6uDh1oL izAQaiAun1DgO9FzRXOZgXRInPxkZfuSWwDFRDTCnMlcBCjKd9omizOFkcYqEKOGOsI= X-Gm-Gg: ATEYQzwZxT0qL54pLGZHgYhEkPIN0Tvl2LsHpLk7/MxUHiV5XQC5MrGqVqGASRXtAss 15NXZ+S8t/5W3Pb3c0ZvE116keixWrh7R85RxoS0DN0XKhZHo//9vxufzLpr9N/7e0aylJGNYDK yc3c2rRnjrYiamNjpukrJuKbFCTXB2Dkad+qyBVKTZE0dGiRBJY/jEZvD3HcWcnaRR3oB4VOUWg Pu5jYoYdlaGMd06b30kKmLHCVFaNfGV61AVrT9DW5N90qHNi+qqXlc5w2OxlEj13jsxy6HaTiD/ vK3NOTvanaqWhD62WnahpE3vY+VHRLhFW1Fcloz4Jc4anFga8VP2/d2hCXIgaUvoy4YVjb+j3bD NSqWk2v4y+I91OFqEdAxcuwmveORtSpVYMJqUv/lXepseIkWvrS6WR/2dGUMZze4gyuQIXXJ9Nh CYXMsY3Mc= X-Received: by 2002:a17:903:1a2f:b0:2b0:6a3d:36e9 with SMTP id d9443c01a7336-2b0cdcb73d7mr45524475ad.33.1774658762760; Fri, 27 Mar 2026 17:46:02 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2026 17:46:02 -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 09/15] nvme: Implement cross-controller reset completion Date: Fri, 27 Mar 2026 17:43:40 -0700 Message-ID: <20260328004518.1729186-10-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" An nvme source controller that issues CCR command expects to receive an NVME_AER_NOTICE_CCR_COMPLETED when pending CCR succeeds or fails. Add sctrl->ccr_work to read NVME_LOG_CCR logpage and wakeup any thread waiting on CCR completion. Signed-off-by: Mohamed Khalfella --- drivers/nvme/host/core.c | 49 +++++++++++++++++++++++++++++++++++++++- drivers/nvme/host/nvme.h | 1 + 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 5603ae36444f..793f203bfc38 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1920,7 +1920,8 @@ EXPORT_SYMBOL_GPL(nvme_set_queue_count); =20 #define NVME_AEN_SUPPORTED \ (NVME_AEN_CFG_NS_ATTR | NVME_AEN_CFG_FW_ACT | \ - NVME_AEN_CFG_ANA_CHANGE | NVME_AEN_CFG_DISC_CHANGE) + NVME_AEN_CFG_ANA_CHANGE | NVME_AEN_CFG_CCR_COMPLETE | \ + NVME_AEN_CFG_DISC_CHANGE) =20 static void nvme_enable_aen(struct nvme_ctrl *ctrl) { @@ -4873,6 +4874,47 @@ static void nvme_get_fw_slot_info(struct nvme_ctrl *= ctrl) kfree(log); } =20 +static void nvme_ccr_work(struct work_struct *work) +{ + struct nvme_ctrl *ctrl =3D container_of(work, struct nvme_ctrl, ccr_work); + struct nvme_ccr_entry *ccr; + struct nvme_ccr_log_entry *entry; + struct nvme_ccr_log *log; + unsigned long flags; + int ret, i; + + log =3D kmalloc(sizeof(*log), GFP_KERNEL); + if (!log) + return; + + ret =3D nvme_get_log(ctrl, 0, NVME_LOG_CCR, 0x01, + 0x00, log, sizeof(*log), 0); + if (ret) + goto out; + + spin_lock_irqsave(&ctrl->lock, flags); + for (i =3D 0; i < le16_to_cpu(log->ne); i++) { + entry =3D &log->entries[i]; + if (entry->ccrs =3D=3D NVME_CCR_STATUS_IN_PROGRESS) + continue; + + list_for_each_entry(ccr, &ctrl->ccr_list, list) { + struct nvme_ctrl *ictrl =3D ccr->ictrl; + + if (ictrl->cntlid !=3D le16_to_cpu(entry->icid) || + ictrl->ciu !=3D entry->ciu) + continue; + + /* Complete matching entry */ + ccr->ccrs =3D entry->ccrs; + complete(&ccr->complete); + } + } + spin_unlock_irqrestore(&ctrl->lock, flags); +out: + kfree(log); +} + static void nvme_fw_act_work(struct work_struct *work) { struct nvme_ctrl *ctrl =3D container_of(work, @@ -4949,6 +4991,9 @@ static bool nvme_handle_aen_notice(struct nvme_ctrl *= ctrl, u32 result) case NVME_AER_NOTICE_DISC_CHANGED: ctrl->aen_result =3D result; break; + case NVME_AER_NOTICE_CCR_COMPLETED: + queue_work(nvme_wq, &ctrl->ccr_work); + break; default: dev_warn(ctrl->device, "async event result %08x\n", result); } @@ -5144,6 +5189,7 @@ void nvme_stop_ctrl(struct nvme_ctrl *ctrl) nvme_stop_failfast_work(ctrl); flush_work(&ctrl->async_event_work); cancel_work_sync(&ctrl->fw_act_work); + cancel_work_sync(&ctrl->ccr_work); if (ctrl->ops->stop_ctrl) ctrl->ops->stop_ctrl(ctrl); } @@ -5267,6 +5313,7 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct dev= ice *dev, ctrl->quirks =3D quirks; ctrl->numa_node =3D NUMA_NO_NODE; INIT_WORK(&ctrl->scan_work, nvme_scan_work); + INIT_WORK(&ctrl->ccr_work, nvme_ccr_work); INIT_WORK(&ctrl->async_event_work, nvme_async_event_work); INIT_WORK(&ctrl->fw_act_work, nvme_fw_act_work); INIT_WORK(&ctrl->delete_work, nvme_delete_ctrl_work); diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index f2bcff9ccd25..776ee8aa5a93 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -419,6 +419,7 @@ struct nvme_ctrl { struct nvme_effects_log *effects; struct xarray cels; struct work_struct scan_work; + struct work_struct ccr_work; struct work_struct async_event_work; struct delayed_work ka_work; struct delayed_work failfast_work; --=20 2.52.0