From nobody Thu Apr 2 23:54:50 2026 Received: from mail-dl1-f45.google.com (mail-dl1-f45.google.com [74.125.82.45]) (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 994542D2486 for ; Sat, 14 Feb 2026 04:28:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771043314; cv=none; b=tneYEZl5jKMOBM/12ppV6jppFXcrjpisbwkyrIiRIBwt6eODRpRd+bKO/EiJ7MF6jksnSOIbLWI0Fe+RvsDd65FYtE9TG5nXN9a4P0aLHv0ZVoPkYh8rTZaO6GTw9UWdNIHz6K0KjQ2QpYBjj/FQeufuBpWOtOTkJ6uG7DhSbnc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771043314; c=relaxed/simple; bh=hOIRy5DghCbHb3N7TV2jNNldDPImTiDgSxqhK5YSxUk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Eyai0lYU1kn71nQKC7mNN6766jdWOtv0f08Mm68Bj1vffPz+ayb9PF46NxgV8of6TVi0HJ0K9r2gLvDVH7KyDTiuaLaaPD+xozWF3jeGJAG7gSLjGgVP2SGEtCHIIOvGDi68uXYSxvi33Hg+TN5o+OuKSmTsTqhLskgFpd6XfkA= 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=GiCcB3xX; arc=none smtp.client-ip=74.125.82.45 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="GiCcB3xX" Received: by mail-dl1-f45.google.com with SMTP id a92af1059eb24-1273349c56bso2148204c88.0 for ; Fri, 13 Feb 2026 20:28:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1771043309; x=1771648109; 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=edwDbFdh37sKWpDzCd1wbhpALgQ620l1aL8E/Iy7bHY=; b=GiCcB3xXpKgjavoLedh6rmzLjEFwxO7Q1p8oFv7uTZw9yM5HKlUgljafivCM6wz3pj mSqrHQK7LYvRNEk9LCgk9cjl7BJCzx5Zgca8qRuX4F8sYHSXEFoMVnIJhODGomXWo16z uQ1W+EdIgbH9jg7IyYUqaEGnxuj9/RPQ7PTIpC9RnT8jriwcsZzKCa5ve31Ubgq3iudz 2Dl0SCgs6U4/Ht90W0A7JrY4JaJ8aQUhW6MAYBTmjaImw5YZ3lJEf4xJ95FX9OeFZZ8K ynaSfJIK4c/rweiy8eCdtP2Jdf22j/LK1mcI22VbMzksaIwcuZQoB0l/dBDLe4cmqwyt TjUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771043309; x=1771648109; 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=edwDbFdh37sKWpDzCd1wbhpALgQ620l1aL8E/Iy7bHY=; b=pdkzUqGa/BV5J4hQJRZn5JsGxpbrKLsYXJZGJeGgk16PzDSiQ8DZO954kJZ8nVJQPL S0Qo+p9GVhabfZ6MJA25neWBITjEif+EC55DksCfyapprT7NMZhRPA8VUKkvQWADAvKF NVMf9E2QWWNlr7ivLC7dCEktkOE81uyRSZd7dfmt/ZIUvblXZV29Zn1UUVj1uw5hH9Xm zfXQIOqKpbcxN0Nr2LjKzgGrFXGaUOdV7bvvs4uHincU86DH6hew8ysH9GUQiymlEAG7 qz+AxDZbcMBHZLKuEBHbG97gWqfNzvQHB0PWxcLJv6VvhBQB8dYBAnqwF9LsNAFmkGuC HUow== X-Forwarded-Encrypted: i=1; AJvYcCWf077gDnngsXrrnX5UVRtte+s0Tc1TVT2i5VVgmDITAepKgNUpWDgDJU11cQDhdDfmm0lu7uE1d1VcutM=@vger.kernel.org X-Gm-Message-State: AOJu0YyvZhjffudUsE1t5mNQ3rY31zOsjChc5h1I5qjWYJRaDchy3UEZ 6CS4YTjM9BKdZ2gB9izNJIPJiTRIdvB39SmfkEBUCZuvSzpjw/APCgKmsLEp8onWdYo= X-Gm-Gg: AZuq6aLFKI7fteMKOLxx0nd4haIUcumBLpfzeYYEDIcHqK5dSzvERatggDkQNhkouHi vI3zPmWtMR7Pep8tINSD462VkhIS0qBYn2s8k7twccoJxhQqHimaHu1Dr+TcxTEq6tp5KF6Reub tGqtMxTWGNKYxz6tF895a1D4iqpd5hfa8g0mSdWmeiYPuDMWnz725Bi1VPO5dnqhUZIwsPxhUdG HFhTgptQQRlsF5Xjny/kgb5Yp6JqKorF4HMP4eYyzPNjl1gSAswmz46znC0651yJR/SH5wAQ2Sf yvZZwOucBORV2khsU4MkCZKMeheFSzC0g692hbTUuUAl5YCGqVjW12o+l7B4NcRe6uFHQR6V1rH qq0xSo+Qd7soNtk3iH0q6DtjfM53Rih3JchIzN+1Q9Oz83CrZTeekbD+WJLbazAiJASAKL1V31R h+u4N76SLFezVhxbj7QnHy92/70LQFytrUFodlQpkGuRBqgA== X-Received: by 2002:a05:7022:249d:b0:123:2d38:928e with SMTP id a92af1059eb24-12741bd5d74mr633497c88.35.1771043308556; Fri, 13 Feb 2026 20:28:28 -0800 (PST) Received: from apollo.purestorage.com ([208.88.152.253]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-12742cbc900sm1021042c88.14.2026.02.13.20.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 20:28:28 -0800 (PST) From: Mohamed Khalfella To: Justin Tee , Naresh Gottumukkala , Paul Ely , Chaitanya Kulkarni , Christoph Hellwig , 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 v3 09/21] nvme: Implement cross-controller reset completion Date: Fri, 13 Feb 2026 20:25:10 -0800 Message-ID: <20260214042753.4073668-10-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260214042753.4073668-1-mkhalfella@purestorage.com> References: <20260214042753.4073668-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 765b1524b3ed..a9fcde1b411b 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1916,7 +1916,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) { @@ -4880,6 +4881,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, @@ -4956,6 +4998,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); } @@ -5145,6 +5190,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); } @@ -5268,6 +5314,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 f3ab9411cac5..af6a4e83053e 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -365,6 +365,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