From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 C90C1367B88 for ; Sun, 12 Jul 2026 02:25:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783823131; cv=none; b=MfssaBPFl9WkdROqioGVfr45gKpQIoiEmI1L6OaC0bqmZAtmz7PqceOtdf9XoL/T//SIthcv0i8yMo3hzI6eIjiy3Opc8/JE21R3iZa7gt3JrutCz4CV7BZzmjmkEhPGnKmaPk4DZMM1YI7MR3qnmqSo/yMZKDYTB3CC7TdGisE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783823131; c=relaxed/simple; bh=bR/WWEGBNigQyDc1HBm7rHqpF+EJnHcuajOKW9WjEQI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lQQiuF/cQey8tn+6CVTX8DQ5w7q6HS3ORaooDwORchaTTFoG7crO48jNwd9EFao5gnOM8yVwFXfXcXuFDwo6I3/OKvvGql9+NonbbbcQJhrmM6B4ltbSGYhtyefI4QRB6NPmtQQr+BKVH1rGWO39sEhebde+/dUx1QbZQCi0rK8= 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=I/D4vCCL; arc=none smtp.client-ip=209.85.216.50 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="I/D4vCCL" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-3856d6fbcb3so1774150a91.2 for ; Sat, 11 Jul 2026 19:25:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1783823127; x=1784427927; 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=Jt+jFO6RlYQHUjzVHCgosSICrSZ2jTFk9UEpM3tYb70=; b=I/D4vCCLCOIa/vCji3l6CgsO3KJ2j0NYZGZWUbHmsuZfZLJsF8a5K94nlIGfryeW0I Emm0xKCMF04XJf7t++lkeLBV213a31gdup8Z6BV+R1UTTUuGk1g8WT+nA/l9vfAwCfHV Q4yZluf6nDcwcJ1lrsbhCPXisQXSx6LUnuISHrDzrTLdxGJKIXTpl8p4Rv6U0R01L9M5 1lh6nqIzAq4gM5jlc2Svx8DMLwxsNEhp68G6SLELEVApBTiGzocC+xnX7NeLGmEwA5l1 ZYFJAmUkeUInFdNBKrASnaZ4+Z2XxRW1x8AqNKIRPlQ/Gg5e14sqdrMrPk7Jeqx6AhfH VUsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783823127; x=1784427927; 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=Jt+jFO6RlYQHUjzVHCgosSICrSZ2jTFk9UEpM3tYb70=; b=aUZPI9letVQTWuqMHyI5uB0PBZBrNn62d9W4tqP4t+/OJvE+zCZFTpIYDlcaVE9XPx wpmhaaxF63lV7dVkzFHJuVzif2QKF4DyjeStbSx2zJPZJL74TKU6sWJMDil8bSf6V808 SNZxRcdBWl1hAxefJtPcEyLMfnn7ITm0pOK2gyliuIFMcJpzqTr632fFx1JJt31ARrh+ tSE7RKxEtpj1m7ZffWvt6+FjRlW1n19HnRAKxF2zqi8tBg/n4Pi6FsetW5TYqjg8lCsk Mvnrwt6C4XnLUoSsLKaQFnpLvLYiUHnUCjSGC68OtT13WAZzwzQK8g2eLwKmD1dUr/K3 0Kaw== X-Forwarded-Encrypted: i=1; AHgh+Ro7jhXJ48AVEFrSP/qO7wMGY6ywpYFJrO7b3o4XSoFjaL/hAIYa/HlJatqJUB91hbPtAyyiPOB2SCpHcvQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4ytnR44sJ5aTTSSDrDvlZneUUkZxi8jJKycB4JcvnXvr4vqKH muvu1AElPJPzEG+HSCEzC+vC0ostEMEP3vQFRut2S3TWpS4sF4Cykhj5ErDg6yeuUCc= X-Gm-Gg: AfdE7clf7RUXX+k8mrMZByhBD+2TRrw6ZEBPPQveJKjO9DwaIcCh9PdwmxUBlABl3Kq VVeXNGsujQlSykk3sqVzBhmmoCIrxOc7jadVh1Kh5CB63dcCMpmkbvP7pSMkkhWJ1tKF1+uX7wj v5J5OPmgSAEDWh9gXQHrysf+lrcnIBVbQJgYTjy8+i+SFaXP2FXykf2Kh9S8SlbuWezwVIrqeld T8gGjGQmgcHCC+ajNG9g1HWIln4PBuN57Tm8tr/x4x+dZVb8lvIZujHDrVq+Le008rqS14Y6K5O fSBZUhBL/nTZEylUyS0VagRG5wovZi8Ar1kqB84HlHSZYdjSSW2UlwxHMrvuHLubY2GQwPqDime Pg/Qp8UXX/3nIqKlAD6C31RCL9FqSXP6NvLJarBJc0JMVyGpeKGwaHs8LGRv5xc5fkdBS5yTzY8 DFenyz X-Received: by 2002:a17:90b:3502:b0:387:e0db:bc32 with SMTP id 98e67ed59e1d1-38dc7bbdb04mr4091119a91.40.1783823126896; Sat, 11 Jul 2026 19:25:26 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 19:25:26 -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 06/16] nvme: Rapid Path Failure Recovery read controller identify fields Date: Sat, 11 Jul 2026 19:23:27 -0700 Message-ID: <20260712022437.3743117-7-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 TP8028 Rapid Path Failure added new fields to controller identify response. Read CIU (Controller Instance Uniquifier), CIRN (Controller Instance Random Number), and CCRL (Cross-Controller Reset Limit) from controller identify response. Expose CIU and CIRN as sysfs attributes so the values can be used directly by user if needed. Also add the nvme_fence_timeout_ms() helper that derives a fencing timeout from the controller keep-alive timeout (kato). Signed-off-by: Mohamed Khalfella Reviewed-by: Hannes Reinecke Reviewed-by: Sagi Grimberg --- drivers/nvme/host/core.c | 4 ++++ drivers/nvme/host/nvme.h | 10 ++++++++++ drivers/nvme/host/sysfs.c | 23 +++++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index db0c8ad4628a..203ecafc1aec 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3643,6 +3643,10 @@ static int nvme_init_identify(struct nvme_ctrl *ctrl) ctrl->crdt[1] = le16_to_cpu(id->crdt2); ctrl->crdt[2] = le16_to_cpu(id->crdt3); + ctrl->ciu = id->ciu; + ctrl->cirn = le64_to_cpu(id->cirn); + ctrl->ccrl = id->ccrl; + ctrl->oacs = le16_to_cpu(id->oacs); ctrl->oncs = le16_to_cpu(id->oncs); ctrl->mtfa = le16_to_cpu(id->mtfa); diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index a679a4c61462..9b071076c9f4 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -384,11 +384,14 @@ struct nvme_ctrl { u16 crdt[3]; u16 oncs; u8 dmrl; + u8 ciu; u32 dmrsl; + u64 cirn; u16 oacs; u16 sqsize; u32 max_namespaces; atomic_t abort_limit; + u8 ccrl; u8 vwc; u32 vs; u32 sgls; @@ -1313,4 +1316,11 @@ static inline bool nvme_multi_css(struct nvme_ctrl *ctrl) return (ctrl->ctrl_config & NVME_CC_CSS_MASK) == NVME_CC_CSS_CSI; } +static inline unsigned long nvme_fence_timeout_ms(struct nvme_ctrl *ctrl) +{ + if (ctrl->ctratt & NVME_CTRL_ATTR_TBKAS) + return 3 * ctrl->kato * 1000; + return 2 * ctrl->kato * 1000; +} + #endif /* _NVME_H */ diff --git a/drivers/nvme/host/sysfs.c b/drivers/nvme/host/sysfs.c index abf8edaae371..dd48c0989301 100644 --- a/drivers/nvme/host/sysfs.c +++ b/drivers/nvme/host/sysfs.c @@ -487,6 +487,27 @@ nvme_show_int_function(queue_count); nvme_show_int_function(sqsize); nvme_show_int_function(kato); +static ssize_t nvme_sysfs_ciu_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct nvme_ctrl *ctrl = dev_get_drvdata(dev); + + return sysfs_emit(buf, "%02x\n", ctrl->ciu); +} +static DEVICE_ATTR(ciu, S_IRUSR, nvme_sysfs_ciu_show, NULL); + +static ssize_t nvme_sysfs_cirn_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct nvme_ctrl *ctrl = dev_get_drvdata(dev); + + return sysfs_emit(buf, "%016llx\n", ctrl->cirn); +} +static DEVICE_ATTR(cirn, S_IRUSR, nvme_sysfs_cirn_show, NULL); + + static ssize_t nvme_sysfs_delete(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) @@ -941,6 +962,8 @@ static struct attribute *nvme_dev_attrs[] = { &dev_attr_numa_node.attr, &dev_attr_queue_count.attr, &dev_attr_sqsize.attr, + &dev_attr_ciu.attr, + &dev_attr_cirn.attr, &dev_attr_hostnqn.attr, &dev_attr_hostid.attr, &dev_attr_ctrl_loss_tmo.attr, -- 2.54.0