From nobody Mon Feb 9 13:58:43 2026 Received: from mail-dl1-f49.google.com (mail-dl1-f49.google.com [74.125.82.49]) (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 E262438A9BB for ; Fri, 30 Jan 2026 22:36:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769812599; cv=none; b=jkWNAy9dE+vBbLUeEp7EiBTRf2JcomSz8T2JNUlFEeBmC5tar2JwgIYWUJlbqCv3Bzu8Ud6cr3FFcbUkYTZLA/nhnfX1rYPEpMeEDOQhZVQy9i0TyMq59ewTbnyhQpOpeJ7lzkO92EgZ1z67QTOAvXWm2CNh3pN9pzAHE2Za3GI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769812599; c=relaxed/simple; bh=kPyEV+2h+j3BgxBngQrzBVVOKqZ7gKJgCU7qZ5evXnE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bMxBWIJs0Oyex60CFPFYxl6eKS092WiSi38ilUV6GW8Sl/rxVVykDOkwliyqnUBa/6ydvopm/e3GYjWCjgXt2M6szHma4mWaspynffxoYTcRtQfMF5/eWDWNROguwoovSU1BB7/kmuUuFAVUKlJ6baAzDe10b8Ykc00kCbr2k/w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject 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=B+ImF6wP; arc=none smtp.client-ip=74.125.82.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject 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="B+ImF6wP" Received: by mail-dl1-f49.google.com with SMTP id a92af1059eb24-124566b6693so2426788c88.0 for ; Fri, 30 Jan 2026 14:36:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1769812592; x=1770417392; 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=ZjQY91Zj2Uen3s+F0p7lNd7qUdF+rUOyKxsGPKTZUoQ=; b=B+ImF6wPOKAk7mPh3TNvqMJVAROhcRb6eHZoHhZRP+7MLjL7fnrcmvsRUZaGyXeODI kqNM4hc1pW8t6Mg3q6ryVvHZCH0X00RbUjH/xh3c9CgyFeJzG4crUtnzbWmgVcynzAcY S9uYlNpGkV5kmwrBGdKyMmKIOhTIcNzYLzeWwyigIvlfLDyRzjJvaeC69qgcVt2gZBuZ WhWGQMZxAPm97AZXvA++Ve6Ldu6cvTQ+7vcPXlscuJ0UNR16nB781kY9TtUnFJJzTyuq koV12OTkzQMzPFugs78acgn7CTxCReIJZdAapQUZL9Hqpeo15Z+rNFCO5aICrU1I/47B P1dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769812592; x=1770417392; 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=ZjQY91Zj2Uen3s+F0p7lNd7qUdF+rUOyKxsGPKTZUoQ=; b=ENqily8mIbXyjxAdql74AwPkOv2IMd7sLekTbM0n3q8TuaT5SaABv2Ms/xyhT+wMnO irlxDH98bw4dLlFgaj92lq7LP1O3my1Leoh07w2JM9+K/3pTHON63MpnEM5WXEz1StXS qzhv2je0L8oqTZuDwvUrjpPtO0R/AXmCwLuOY5kgH+za1vF3vrbuVdlc+eTp2Hlk+C0v API5XfhMtoptsLbs3pe1IFfPSIo68JEvSUqPArqZb42+/+vPQwFLhMOWAwc8HMLdcSnG /dK9q2wAAmNcK0UBFhavLSU6trM35DnyKPZx7p+GYHhtkBtK/UUuUnQPOigdvmb8gqV4 TDlg== X-Forwarded-Encrypted: i=1; AJvYcCVuwCjWn216AeMK5sss9ByR7ARpikcrPr4Den08IM83nxi4prKfbiAV0rEl6L0Z/ZRaycg5GWE7EwD9mcM=@vger.kernel.org X-Gm-Message-State: AOJu0YzTTXaHWe9ZAoek9t8W56a/qHtTnYiZNwXY8usw7n5kWwM1c9+y R7R9bG49VfVpdV9Wa4KE0GRrMS5vXzkZZJLa5wlEMFKWeuyrc/mQA+IgSajjZtGa844= X-Gm-Gg: AZuq6aLHwDXM4MUO496RHsbOqKx39dyI+oGj64n7GMdaZN/L55IxYeZMxAsv9O2WkVW HzC4n1qij3QWOATiWGaf5kyDlvBVeHWqcBH9M49t4wwgvwkmnrYbcfw5T2JIBkSMy/Chk27Py7F Zw47JopwcfkO2p6L1lUpT7NFz7ODCtjlkyEf9yCG9sr5CeJY0C27KJlF5kFmoe9h6Sk3+umeNle dUuKnzlle7T5x9R9BAsXe+wR5bXHelDgnWZ/SYDIDg2a7qf22Ut27f3BjWP+4SMK6TRSwgsfBLY FF+iqpQr4vyVsC0rRhzO+O5mbI03c6LKMgH83RoDC3cTX1VibvjizVUkRHfG0c1CYoLZb2AImaR 3IZ3rrg8JNaM23csQr55l19g7mEmnu0DLch3jl3VPRohWq9bBDnZK3jn0N8Q5p/lAPn1WC72aIY O200Zm0EV7wkPFmHBp2fxNmwa1zXJ3fI85hQ== X-Received: by 2002:a05:7022:e02:b0:11b:9386:a3be with SMTP id a92af1059eb24-125c103f66dmr2278348c88.41.1769812592008; Fri, 30 Jan 2026 14:36:32 -0800 (PST) Received: from apollo.purestorage.com ([208.88.152.253]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-124a9d6b906sm13161717c88.4.2026.01.30.14.36.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 14:36:31 -0800 (PST) From: Mohamed Khalfella To: Justin Tee , Naresh Gottumukkala , Paul Ely , Chaitanya Kulkarni , Christoph Hellwig , Jens Axboe , Keith Busch , Sagi Grimberg Cc: Aaron Dailey , Randy Jennings , Dhaval Giani , Hannes Reinecke , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Mohamed Khalfella Subject: [PATCH v2 09/14] nvme: Implement cross-controller reset completion Date: Fri, 30 Jan 2026 14:34:13 -0800 Message-ID: <20260130223531.2478849-10-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260130223531.2478849-1-mkhalfella@purestorage.com> References: <20260130223531.2478849-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 13e0775d56b4..0f90feb46369 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1901,7 +1901,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) { @@ -4866,6 +4867,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, @@ -4942,6 +4984,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); } @@ -5131,6 +5176,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); } @@ -5254,6 +5300,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 fa18f580d76a..a7f382e35821 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -366,6 +366,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