From mboxrd@z Thu Jan 1 00:00:00 1970 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 87CAC367F4A for ; Sun, 12 Jul 2026 02:25:31 +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=1783823136; cv=none; b=iiM8+t5OAzhbY4DtBC6W4YK4muSVOuHvSExZkQTPBPQLkiRIZajQNhtzafUTF5IH1a9+x9PPoxr4spLJH8vujmM6QsPKsh+ZGFQfqhu096P2PSg/MbDxcfOP1tk5eDoxtu6Qu93lGjh+p68f1EQmY82UGe8NW24Kc8KTusOOklM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783823136; c=relaxed/simple; bh=ruQEphFFQrlsHc+qKLQTbpvRhPge3WKoRvGLsVvlSc0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mQ2A7vrmh+rYS4sVSlopi5GzKT2Y2Zherb057LFTkulXjKJNAaxRz2itw459RnQ8/KuBWtyPjvtqrw68VHwzUzDNl2oWOogAZfVTtBZ8HP+KoqKWcYMQGR/aWibtlJn7aKQnH0MGSVDaMkurh9mai5j7ocisto4o6uT+Y8U5hMY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com; spf=pass smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=DNwu06hU; arc=none smtp.client-ip=209.85.215.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=pass 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="DNwu06hU" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-ca97d139d5fso1510761a12.0 for ; Sat, 11 Jul 2026 19:25:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1783823131; x=1784427931; 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:content-type; bh=mVbEu2+Mr7kV1EL18RxKM6hBIrgT5eJTpURd1PTGGYY=; b=DNwu06hUhfnH9q3R6gAGqztztTRQswXIu3gNXK3p8XeEqjwjmTpPy6F6GPIjSJ0PPH Gmerzgp1bSTRaTH+WteA0jgoASZC9Vcf1Yu2KyIwIlkrFhJsvIzvUKFCJe8PR+ZWpp2M 0isjRprgeLiivNiCBcR5IH/yOqc1VsVWyOrav2MkZQdrWKGc0efQ11QnDbxfxobVr2Y0 68n70hcw8pwrxpkBAk49zI3OFax4Du4Kr2oT8nQiEsN3+yVlXkiYqU2eAHxM8bmDEDdF pLZazkThCJNVAd1pOf1XHeWaQRRsnssbZAa1v2RnEDhliL1A3upiRH8W0Y5U2MRgd6OT 4ivg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783823131; x=1784427931; 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:content-type; bh=mVbEu2+Mr7kV1EL18RxKM6hBIrgT5eJTpURd1PTGGYY=; b=qDv/LppyDr6vrND5slWCjRkRG2//kI86+r0qPdB5cZtF8dqgkKJzK1tJBgYqeiuCe1 xhF6xgay04yOBeOWExissJaamYJxBY/zzEgdb0SbHM3E9u67qq/SOVmd4XB3znGayarN erzcTIXf2uCeony3gc4DHA5nAiSI8U/5YxsvwHlkQGhVGx6+9d6q9NsojzP69dXWre4l kfdyFn04k4w4KqAkTD7xzCJM4LHfYYMkj/D5bW9xzJQA6z8HuRL9TS4P3XiR0NvCjM6k kWTFNEskK+RiF2Rq3o0U82kEhCN61DWsGoE1Fm7DzTv04JPGHl1FeySjpecg13CXiLcR MD6A== X-Forwarded-Encrypted: i=1; AHgh+RqNbhQTq+K1E0wQgMt8cmgfdjtyOSFOqH/lziKcDVQ9fcYKP/PYZfGgMH+TbdLYTCYfUr03MKJsHLJhv+U=@vger.kernel.org X-Gm-Message-State: AOJu0YxfiK9wjuv3UFiCtvKISoHIQLH+CgWBogO1MKJmVqizehq2fdwq lxpda0AdKeNTHS+rHUf78SWJjuXNQOO6k/z3iVP6CErNKOsZHc2WCEIvjEGXrh4Qnw9isPb/0cs hYWRM X-Gm-Gg: AfdE7cnAQmjKvRCVrFDvcxaEFrGeSRVlOIPz0xk83YHtpfzfEFTBQfmJSi/opPccddv 6GZKDwEYgPRxYdCfDP/SEIBqvML2euZgoRej6R+ySSPoZTobXyQnIbLd+z7Sd41pGhc6V3WUcT7 BoCO8xqlRCcSHLMOPL/o1XKUv9/Dz8XQUnLCs77kUPcMx44UfT86nA88Y0LydRh347T1RvIaPxh TsIFiR61owm6Y8pkiMfY1s5zp+RSbg+jSdE8xg7uwDYAPJ34Er7bYE8b5MQ3As+BG8CtUJ4HGzr d3QsH29yKngaqSOfFFfAlu/N+KEE7JR7Xg9uyoZU2NCKxAEI1WJjgDfIigwSXJcV02wTtFRGeIS NS4TXc6LGVanRasOVqQtu+1z9UrM7mYimfD7arTll91lSqvkF+dUhAzcJrsSoR8zqklTG4thGE8 7DAD0K X-Received: by 2002:a17:90b:1848:b0:381:b1ad:c9e4 with SMTP id 98e67ed59e1d1-38dc7755a44mr4819914a91.26.1783823130537; Sat, 11 Jul 2026 19:25:30 -0700 (PDT) Received: from ceto.lan ([2607:fb90:9c20:2264::1c31]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-3117462f5c7sm60704693eec.0.2026.07.11.19.25.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 19:25:29 -0700 (PDT) From: Mohamed Khalfella To: Justin Tee , Naresh Gottumukkala , Paul Ely , Chaitanya Kulkarni , Christoph Hellwig , Jens Axboe , Keith Busch , Sagi Grimberg , James Smart , Hannes Reinecke , Randy Jennings , Dhaval Giani Cc: Aaron Dailey , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Mohamed Khalfella Subject: [PATCH v5 08/16] nvme: Implement cross-controller reset recovery Date: Sat, 11 Jul 2026 19:23:29 -0700 Message-ID: <20260712022437.3743117-9-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260712022437.3743117-1-mkhalfella@purestorage.com> References: <20260712022437.3743117-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: 8bit A host that has more than one path connecting to an nvme subsystem typically has an nvme controller associated with every path. This is mostly applicable to nvmeof. If one path goes down, inflight IOs on that path should not be retried immediately on another path because this could lead to data corruption as described in TP4129. TP8028 defines cross-controller reset mechanism that can be used by host to terminate IOs on the failed path using one of the remaining healthy paths. Only after IOs are terminated, or long enough time passes as defined by TP4129, inflight IOs should be retried on another path. Implement core cross-controller reset shared logic to be used by the transports. Signed-off-by: Mohamed Khalfella --- drivers/nvme/host/constants.c | 1 + drivers/nvme/host/core.c | 152 ++++++++++++++++++++++++++++++++++ drivers/nvme/host/nvme.h | 10 +++ 3 files changed, 163 insertions(+) diff --git a/drivers/nvme/host/constants.c b/drivers/nvme/host/constants.c index dc90df9e13a2..f679efd5110e 100644 --- a/drivers/nvme/host/constants.c +++ b/drivers/nvme/host/constants.c @@ -46,6 +46,7 @@ static const char * const nvme_admin_ops[] = { [nvme_admin_virtual_mgmt] = "Virtual Management", [nvme_admin_nvme_mi_send] = "NVMe Send MI", [nvme_admin_nvme_mi_recv] = "NVMe Receive MI", + [nvme_admin_cross_ctrl_reset] = "Cross Controller Reset", [nvme_admin_dbbuf] = "Doorbell Buffer Config", [nvme_admin_format_nvm] = "Format NVM", [nvme_admin_security_send] = "Security Send", diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 1ef4dc38f755..a1deffc3cc00 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -571,6 +571,157 @@ void nvme_cancel_admin_tagset(struct nvme_ctrl *ctrl) } EXPORT_SYMBOL_GPL(nvme_cancel_admin_tagset); +static struct nvme_ctrl *nvme_find_ctrl_ccr(struct nvme_ctrl *ictrl, + u32 min_cntlid) +{ + struct nvme_subsystem *subsys = ictrl->subsys; + struct nvme_ctrl *ctrl, *sctrl = NULL; + unsigned long flags; + int ccr_used; + + mutex_lock(&nvme_subsystems_lock); + list_for_each_entry(ctrl, &subsys->ctrls, subsys_entry) { + if (ctrl->cntlid < min_cntlid) + continue; + + spin_lock_irqsave(&ctrl->lock, flags); + if (nvme_ctrl_state(ctrl) != NVME_CTRL_LIVE) { + spin_unlock_irqrestore(&ctrl->lock, flags); + continue; + } + + ccr_used = atomic_inc_return(&ctrl->ccr_used); + if (ccr_used > ctrl->ccrl) { + atomic_dec(&ctrl->ccr_used); + spin_unlock_irqrestore(&ctrl->lock, flags); + continue; + } + + /* + * We got a good candidate source controller that is locked and + * LIVE. However, no guarantee ctrl will not be deleted after + * ctrl->lock is released. Get a ref of both ctrl and admin_q + * so they do not disappear until we are done with them. + */ + WARN_ON_ONCE(!blk_get_queue(ctrl->admin_q)); + nvme_get_ctrl(ctrl); + spin_unlock_irqrestore(&ctrl->lock, flags); + sctrl = ctrl; + break; + } + mutex_unlock(&nvme_subsystems_lock); + return sctrl; +} + +static void nvme_put_ctrl_ccr(struct nvme_ctrl *sctrl) +{ + atomic_dec(&sctrl->ccr_used); + blk_put_queue(sctrl->admin_q); + nvme_put_ctrl(sctrl); +} + +static int nvme_issue_wait_ccr(struct nvme_ctrl *sctrl, struct nvme_ctrl *ictrl, + unsigned long deadline) +{ + struct nvme_ccr_entry ccr = { }; + union nvme_result res = { 0 }; + struct nvme_command c = { }; + unsigned long flags, now, tmo = 0; + bool completed = false; + int ret = 0; + u32 result; + + init_completion(&ccr.complete); + ccr.ictrl = ictrl; + + spin_lock_irqsave(&sctrl->lock, flags); + list_add_tail(&ccr.list, &sctrl->ccr_list); + spin_unlock_irqrestore(&sctrl->lock, flags); + + c.ccr.opcode = nvme_admin_cross_ctrl_reset; + c.ccr.ciu = ictrl->ciu; + c.ccr.icid = cpu_to_le16(ictrl->cntlid); + c.ccr.cirn = cpu_to_le64(ictrl->cirn); + ret = __nvme_submit_sync_cmd(sctrl->admin_q, &c, &res, + NULL, 0, NVME_QID_ANY, 0); + if (ret) { + ret = -EIO; + goto out; + } + + result = le32_to_cpu(res.u32); + if (result & 0x01) /* Immediate Reset Successful */ + goto out; + + now = jiffies; + if (time_before(now, deadline)) + tmo = min_t(unsigned long, + secs_to_jiffies(ictrl->kato), deadline - now); + + if (!wait_for_completion_timeout(&ccr.complete, tmo)) { + ret = -ETIMEDOUT; + goto out; + } + + completed = true; + +out: + spin_lock_irqsave(&sctrl->lock, flags); + list_del(&ccr.list); + spin_unlock_irqrestore(&sctrl->lock, flags); + if (completed) { + if (ccr.ccrs == NVME_CCR_STATUS_SUCCESS) + return 0; + return -EREMOTEIO; + } + return ret; +} + +unsigned long nvme_fence_ctrl(struct nvme_ctrl *ictrl) +{ + unsigned long now, deadline, timeout; + struct nvme_ctrl *sctrl; + u32 min_cntlid = 0; + int ret; + + timeout = nvme_fence_timeout_ms(ictrl); + dev_info(ictrl->device, "attempting CCR, timeout %lums\n", timeout); + + now = jiffies; + deadline = jiffies + msecs_to_jiffies(timeout); + while (time_before(now, deadline)) { + sctrl = nvme_find_ctrl_ccr(ictrl, min_cntlid); + if (!sctrl) { + dev_dbg(ictrl->device, + "failed to find source controller\n"); + return deadline - now; + } + + ret = nvme_issue_wait_ccr(sctrl, ictrl, deadline); + if (!ret) { + dev_info(ictrl->device, "CCR succeeded using %s\n", + dev_name(sctrl->device)); + nvme_put_ctrl_ccr(sctrl); + return 0; + } + + /* + * CCR command or CCR operation failed on this path. + * Try another path as long as we have time. + */ + dev_err(ictrl->device, "CCR failed using %s, ret = %d\n", + dev_name(sctrl->device), ret); + min_cntlid = sctrl->cntlid + 1; + nvme_put_ctrl_ccr(sctrl); + now = jiffies; + } + + /* Fencing timed out call it done */ + dev_info(ictrl->device, "fencing timeout\n"); + return 0; +} +EXPORT_SYMBOL_GPL(nvme_fence_ctrl); + bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, enum nvme_ctrl_state new_state) { @@ -5205,6 +5356,7 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, mutex_init(&ctrl->scan_lock); INIT_LIST_HEAD(&ctrl->namespaces); + INIT_LIST_HEAD(&ctrl->ccr_list); xa_init(&ctrl->cels); ctrl->dev = dev; ctrl->ops = ops; diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index e558a19781bd..90b989302e21 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -333,6 +333,13 @@ enum nvme_ctrl_flags { NVME_CTRL_FROZEN = 6, }; +struct nvme_ccr_entry { + struct list_head list; + struct completion complete; + struct nvme_ctrl *ictrl; + u8 ccrs; +}; + struct nvme_ctrl { bool comp_seen; bool identified; @@ -350,6 +357,7 @@ struct nvme_ctrl { struct blk_mq_tag_set *tagset; struct blk_mq_tag_set *admin_tagset; struct list_head namespaces; + struct list_head ccr_list; struct mutex namespaces_lock; struct srcu_struct srcu; struct device ctrl_device; @@ -393,6 +401,7 @@ struct nvme_ctrl { u16 sqsize; u32 max_namespaces; atomic_t abort_limit; + atomic_t ccr_used; u8 ccrl; u8 vwc; u32 vs; @@ -887,6 +896,7 @@ blk_status_t nvme_host_path_error(struct request *req); bool nvme_cancel_request(struct request *req, void *data); void nvme_cancel_tagset(struct nvme_ctrl *ctrl); void nvme_cancel_admin_tagset(struct nvme_ctrl *ctrl); +unsigned long nvme_fence_ctrl(struct nvme_ctrl *ctrl); bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, enum nvme_ctrl_state new_state); int nvme_disable_ctrl(struct nvme_ctrl *ctrl, bool shutdown); -- 2.54.0