From: Neeraj Kumar <s.neeraj@samsung.com>
To: dan.j.williams@intel.com, dave@stgolabs.net,
jonathan.cameron@huawei.com, dave.jiang@intel.com,
alison.schofield@intel.com, vishal.l.verma@intel.com,
ira.weiny@intel.com
Cc: a.manzanares@samsung.com, nifan.cxl@gmail.com,
anisa.su@samsung.com, vishak.g@samsung.com,
krish.reddy@samsung.com, arun.george@samsung.com,
alok.rathore@samsung.com, s.neeraj@samsung.com,
neeraj.kernel@gmail.com, linux-kernel@vger.kernel.org,
linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev,
gost.dev@samsung.com, cpgs@samsung.com
Subject: [RFC PATCH 08/20] nvdimm/label: Include region label in slot validation
Date: Tue, 17 Jun 2025 18:09:32 +0530 [thread overview]
Message-ID: <148912029.181750165204802.JavaMail.epsvc@epcpadp1new> (raw)
In-Reply-To: <20250617123944.78345-1-s.neeraj@samsung.com>
slot validation routine validates label slot by calculating label
checksum. It was only validating namespace label. This changeset also
validates region label if present.
Also validate and calculate lsa v2.1 namespace label checksum
Signed-off-by: Neeraj Kumar <s.neeraj@samsung.com>
---
drivers/nvdimm/label.c | 52 ++++++++++++++++++++++++++++++++++--------
drivers/nvdimm/nd.h | 21 +++++++++++++++++
2 files changed, 63 insertions(+), 10 deletions(-)
diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c
index 108100c4bf44..22e13db1ca20 100644
--- a/drivers/nvdimm/label.c
+++ b/drivers/nvdimm/label.c
@@ -359,7 +359,7 @@ static bool nsl_validate_checksum(struct nvdimm_drvdata *ndd,
{
u64 sum, sum_save;
- if (!ndd->cxl && !efi_namespace_label_has(ndd, checksum))
+ if (!efi_namespace_label_has(ndd, checksum))
return true;
sum_save = nsl_get_checksum(ndd, nd_label);
@@ -374,13 +374,25 @@ static void nsl_calculate_checksum(struct nvdimm_drvdata *ndd,
{
u64 sum;
- if (!ndd->cxl && !efi_namespace_label_has(ndd, checksum))
+ if (!efi_namespace_label_has(ndd, checksum))
return;
nsl_set_checksum(ndd, nd_label, 0);
sum = nd_fletcher64(nd_label, sizeof_namespace_label(ndd), 1);
nsl_set_checksum(ndd, nd_label, sum);
}
+static bool rgl_validate_checksum(struct nvdimm_drvdata *ndd,
+ struct cxl_region_label *rg_label)
+{
+ u64 sum, sum_save;
+
+ sum_save = rgl_get_checksum(rg_label);
+ rgl_set_checksum(rg_label, 0);
+ sum = nd_fletcher64(rg_label, sizeof_namespace_label(ndd), 1);
+ rgl_set_checksum(rg_label, sum_save);
+ return sum == sum_save;
+}
+
static void rgl_calculate_checksum(struct nvdimm_drvdata *ndd,
struct cxl_region_label *rg_label)
{
@@ -395,13 +407,25 @@ static bool slot_valid(struct nvdimm_drvdata *ndd,
struct nd_lsa_label *nd_label, u32 slot)
{
bool valid;
+ char *label_name;
/* check that we are written where we expect to be written */
- if (slot != nsl_get_slot(ndd, &nd_label->ns_label))
- return false;
- valid = nsl_validate_checksum(ndd, &nd_label->ns_label);
+ if (is_region_label(ndd, nd_label)) {
+ label_name = "rg";
+ if (slot != rgl_get_slot(&nd_label->rg_label))
+ return false;
+ valid = rgl_validate_checksum(ndd, &nd_label->rg_label);
+ } else {
+ label_name = "ns";
+ if (slot != nsl_get_slot(ndd, &nd_label->ns_label))
+ return false;
+ valid = nsl_validate_checksum(ndd, &nd_label->ns_label);
+ }
+
if (!valid)
- dev_dbg(ndd->dev, "fail checksum. slot: %d\n", slot);
+ dev_dbg(ndd->dev, "%s label checksum fail. slot: %d\n",
+ label_name, slot);
+
return valid;
}
@@ -577,17 +601,25 @@ int nd_label_active_count(struct nvdimm_drvdata *ndd)
for_each_clear_bit_le(slot, free, nslot) {
struct nd_lsa_label *nd_label;
+ u32 lslot;
+ u64 size, dpa;
nd_label = to_label(ndd, slot);
if (!slot_valid(ndd, nd_label, slot)) {
- u32 label_slot = nsl_get_slot(ndd, &nd_label->ns_label);
- u64 size = nsl_get_rawsize(ndd, &nd_label->ns_label);
- u64 dpa = nsl_get_dpa(ndd, &nd_label->ns_label);
+ if (is_region_label(ndd, nd_label)) {
+ lslot = __le32_to_cpu(nd_label->rg_label.slot);
+ size = __le64_to_cpu(nd_label->rg_label.rawsize);
+ dpa = __cpu_to_le64(nd_label->rg_label.dpa);
+ } else {
+ lslot = nsl_get_slot(ndd, &nd_label->ns_label);
+ size = nsl_get_rawsize(ndd, &nd_label->ns_label);
+ dpa = nsl_get_dpa(ndd, &nd_label->ns_label);
+ }
dev_dbg(ndd->dev,
"slot%d invalid slot: %d dpa: %llx size: %llx\n",
- slot, label_slot, dpa, size);
+ slot, lslot, dpa, size);
continue;
}
count++;
diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h
index 1e5a68013735..ca8256b31472 100644
--- a/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@ -331,6 +331,22 @@ static inline bool nsl_region_uuid_equal(struct nd_namespace_label *ns_label,
return uuid_equal(&tmp, uuid);
}
+static inline bool is_region_label(struct nvdimm_drvdata *ndd,
+ struct nd_lsa_label *nd_label)
+{
+ uuid_t ns_type, region_type;
+
+ if (ndd->cxl) {
+ uuid_parse(CXL_REGION_UUID, ®ion_type);
+ import_uuid(&ns_type, nd_label->ns_label.cxl.type);
+ if (uuid_equal(®ion_type, &ns_type))
+ return true;
+ else
+ return false;
+ } else
+ return false;
+}
+
static inline bool rgl_uuid_equal(struct cxl_region_label *rg_label,
const uuid_t *uuid)
{
@@ -340,6 +356,11 @@ static inline bool rgl_uuid_equal(struct cxl_region_label *rg_label,
return uuid_equal(&tmp, uuid);
}
+static inline u32 rgl_get_slot(struct cxl_region_label *rg_label)
+{
+ return __le32_to_cpu(rg_label->slot);
+}
+
static inline u64 rgl_get_checksum(struct cxl_region_label *rg_label)
{
return __le64_to_cpu(rg_label->checksum);
--
2.34.1
next prev parent reply other threads:[~2025-06-17 13:00 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20250617123944.78345-1-s.neeraj@samsung.com>
[not found] ` <CGME20250617124008epcas5p2e702f786645d44ceb1cdd980a914ce8e@epcas5p2.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 01/20] nvdimm/label: Introduce NDD_CXL_LABEL flag to set cxl label format Neeraj Kumar
2025-06-20 16:40 ` Jonathan Cameron
2025-06-26 9:48 ` Neeraj Kumar
2025-07-02 18:02 ` Ira Weiny
2025-07-03 9:58 ` Neeraj Kumar
2025-07-09 22:57 ` Dave Jiang
2025-07-18 12:13 ` Neeraj Kumar
[not found] ` <CGME20250617124011epcas5p2264e30ec58977907f80d311083265641@epcas5p2.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 02/20] nvdimm/label: Prep patch to accommodate cxl lsa 2.1 support Neeraj Kumar
2025-06-23 10:53 ` Jonathan Cameron
2025-06-26 9:51 ` Neeraj Kumar
2025-07-02 17:55 ` Ira Weiny
2025-07-03 10:04 ` Neeraj Kumar
[not found] ` <CGME20250617124013epcas5p3c241c626448fcf7851a100fdf2816160@epcas5p3.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 03/20] nvdimm/namespace_label: Add namespace label changes as per CXL LSA v2.1 Neeraj Kumar
[not found] ` <CGME20250617124016epcas5p20b04482f41a58c7f83484aa2b8b0c33c@epcas5p2.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 04/20] nvdimm/label: CXL labels skip the need for 'interleave-set cookie' Neeraj Kumar
[not found] ` <CGME20250617124019epcas5p39815cc0f2b175aee40c194625166695c@epcas5p3.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 05/20] nvdimm/region_label: Add region label updation routine Neeraj Kumar
2025-06-23 9:05 ` Jonathan Cameron
2025-06-26 9:54 ` Neeraj Kumar
2025-07-17 22:53 ` Fabio M. De Francesco
2025-07-18 13:00 ` Neeraj Kumar
[not found] ` <CGME20250617124022epcas5p2441d6c5dfaeceb744b5fc00add7ceae0@epcas5p2.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 06/20] nvdimm/region_label: Add region label deletion routine Neeraj Kumar
2025-06-23 9:09 ` Jonathan Cameron
2025-06-26 9:55 ` Neeraj Kumar
[not found] ` <CGME20250617124025epcas5p1ce6656fed9ef1175812f80574048cd7a@epcas5p1.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 07/20] nvdimm/namespace_label: Update namespace init_labels and its region_uuid Neeraj Kumar
2025-06-23 9:11 ` Jonathan Cameron
2025-06-26 9:58 ` Neeraj Kumar
[not found] ` <CGME20250617124028epcas5p2bb45182c91359a16efc5b1561927abce@epcas5p2.samsung.com>
2025-06-17 12:39 ` Neeraj Kumar [this message]
2025-06-23 9:13 ` [RFC PATCH 08/20] nvdimm/label: Include region label in slot validation Jonathan Cameron
2025-06-26 10:00 ` Neeraj Kumar
[not found] ` <CGME20250617124031epcas5p3542c2fc6d946f3cdcbc06dbfc65743e2@epcas5p3.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 09/20] nvdimm/namespace_label: Skip region label during ns label DPA reservation Neeraj Kumar
[not found] ` <CGME20250617124034epcas5p2f53c3cc21c51b7c176ad580d5d954c64@epcas5p2.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 10/20] nvdimm/region_label: Preserve cxl region information from region label Neeraj Kumar
[not found] ` <CGME20250617124037epcas5p2efa5e8ac19df70cdeb7330404eed385f@epcas5p2.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 11/20] nvdimm/region_label: Export routine to fetch region information Neeraj Kumar
[not found] ` <CGME20250617124040epcas5p3be044cbdc5b33b0b8465d84870a5b280@epcas5p3.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 12/20] nvdimm/namespace_label: Skip region label during namespace creation Neeraj Kumar
2025-06-23 9:17 ` Jonathan Cameron
2025-06-26 10:02 ` Neeraj Kumar
[not found] ` <CGME20250617124043epcas5p21e5b77aa3a6acfa7e01847ffd58350ed@epcas5p2.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 13/20] cxl/mem: Refactor cxl pmem region auto-assembling Neeraj Kumar
2025-06-23 9:20 ` Jonathan Cameron
2025-06-26 10:03 ` Neeraj Kumar
2025-07-10 0:38 ` Dave Jiang
2025-07-18 12:30 ` Neeraj Kumar
2025-07-21 18:11 ` Dave Jiang
[not found] ` <CGME20250617124046epcas5p16a45d2afe3b41ca08994a5cca09bfb68@epcas5p1.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 14/20] cxl/region: Add cxl pmem region creation routine for region persistency Neeraj Kumar
2025-06-23 9:43 ` Jonathan Cameron
2025-06-26 10:23 ` Neeraj Kumar
2025-07-10 15:59 ` Dave Jiang
2025-07-18 12:45 ` Neeraj Kumar
[not found] ` <CGME20250617124049epcas5p1de7eeee3b5ddd12ea221ca3ebf22f6e8@epcas5p1.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 15/20] cxl: Add a routine to find cxl root decoder on cxl bus Neeraj Kumar
2025-06-23 9:44 ` Jonathan Cameron
2025-06-26 10:38 ` Neeraj Kumar
2025-06-26 19:19 ` Alison Schofield
2025-06-27 9:03 ` Neeraj Kumar
2025-07-10 16:23 ` Dave Jiang
2025-07-18 12:48 ` Neeraj Kumar
[not found] ` <CGME20250617124052epcas5p24aace8321ed09af8bdd1e8c30c20cd84@epcas5p2.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 16/20] cxl/mem: Preserve cxl root decoder during mem probe Neeraj Kumar
[not found] ` <CGME20250617124055epcas5p4978a3c139128bf5873c60ca0a10f5199@epcas5p4.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 17/20] cxl/pmem: Preserve region information into nd_set Neeraj Kumar
[not found] ` <CGME20250617124058epcas5p2324bd3b1bf95d47f553d90fdc727e50d@epcas5p2.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 18/20] cxl/pmem: Add support of cxl lsa 2.1 support in cxl pmem Neeraj Kumar
2025-06-23 9:48 ` Jonathan Cameron
2025-06-26 10:41 ` Neeraj Kumar
2025-07-10 17:18 ` Dave Jiang
2025-07-18 12:51 ` Neeraj Kumar
2025-07-21 17:44 ` Dave Jiang
[not found] ` <CGME20250617124101epcas5p4d54f34ebc5161b7cb816e352d144d9a1@epcas5p4.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 19/20] cxl/pmem_region: Prep patch to accommodate pmem_region attributes Neeraj Kumar
2025-06-23 9:53 ` Jonathan Cameron
2025-06-26 10:45 ` Neeraj Kumar
[not found] ` <CGME20250617124104epcas5p41105ad63af456b5cdb041e174a99925e@epcas5p4.samsung.com>
2025-06-17 12:39 ` [RFC PATCH 20/20] cxl/pmem_region: Add cxl region label updation and deletion device attributes Neeraj Kumar
2025-06-23 9:56 ` Jonathan Cameron
2025-06-26 10:48 ` Neeraj Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=148912029.181750165204802.JavaMail.epsvc@epcpadp1new \
--to=s.neeraj@samsung.com \
--cc=a.manzanares@samsung.com \
--cc=alison.schofield@intel.com \
--cc=alok.rathore@samsung.com \
--cc=anisa.su@samsung.com \
--cc=arun.george@samsung.com \
--cc=cpgs@samsung.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=dave@stgolabs.net \
--cc=gost.dev@samsung.com \
--cc=ira.weiny@intel.com \
--cc=jonathan.cameron@huawei.com \
--cc=krish.reddy@samsung.com \
--cc=linux-cxl@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=neeraj.kernel@gmail.com \
--cc=nifan.cxl@gmail.com \
--cc=nvdimm@lists.linux.dev \
--cc=vishak.g@samsung.com \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).