From nobody Tue Dec 2 02:43:35 2025 Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47676320A30 for ; Wed, 19 Nov 2025 07:53:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=203.254.224.34 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763538801; cv=none; b=TS3LUeUJuebWOv5eE12n+v0crJWls+02vI17tDIIDp+iHHJxjQVJ8iElD3fZlvJkfNFzrpvCbh+NvN19EZGUj2l751Zz6F7i0C/8iZ7VHqaxE+GR8m/LrPZeqd9ukiYaeGAnDXVC5l9qexi3TO5qY40DpK3cDWikhr62UdDCcwo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763538801; c=relaxed/simple; bh=ypMhn0Q0GMQSRpsgJClAhQxdV8HA9KvCwIobkNtECag=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:MIME-Version: Content-Type:References; b=QJRvKzy7Ga7xz2pARbjB1cPt02EkEoZ8UZ+v8DmRo3Jf6CUr8/Wj0W1gSciUgXyfa2UZIi74MEqAkG89sFp/D+y4SKztNdIRxN+SWJIA7wRb7XmMHkITCNF8U5Y23tHienuLsDQ/nWV1Y6fdsrwRgWiSBtc+550jJ3oy0FwTa7M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=samsung.com; spf=pass smtp.mailfrom=samsung.com; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b=QkEYtrig; arc=none smtp.client-ip=203.254.224.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=samsung.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="QkEYtrig" Received: from epcas5p3.samsung.com (unknown [182.195.41.41]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20251119075315epoutp04bf64aad19ca704653751d878be9e7a41~5WTDRRsb_1410114101epoutp04k for ; Wed, 19 Nov 2025 07:53:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20251119075315epoutp04bf64aad19ca704653751d878be9e7a41~5WTDRRsb_1410114101epoutp04k DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1763538795; bh=JoE3B/f5qTuEWVTLKcRVyuWCSq09YuW6AptM39kalGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QkEYtrighD6kRsK4T6Er2aOQrLxOTnVzmXtWbUo47VtrQpTn1g3VK2YrtB1JDw+bm oS+A7yVsQfpzjqA2IfJ8u7KKOZd4vI/ySIJsIIKSl1uTWc3sxkfqq/rSf8We8hIy8l 5uLdcy9smWC3RzfvNKmccc6+ZqQQc+Anb4TFaaPo= Received: from epsnrtp02.localdomain (unknown [182.195.42.154]) by epcas5p4.samsung.com (KnoxPortal) with ESMTPS id 20251119075314epcas5p4a84690f4df31dee3ede003d5c6209768~5WTC2EUtE0334103341epcas5p4E; Wed, 19 Nov 2025 07:53:14 +0000 (GMT) Received: from epcas5p2.samsung.com (unknown [182.195.38.86]) by epsnrtp02.localdomain (Postfix) with ESMTP id 4dBDHY5M1cz2SSKm; Wed, 19 Nov 2025 07:53:13 +0000 (GMT) Received: from epsmtip1.samsung.com (unknown [182.195.34.30]) by epcas5p2.samsung.com (KnoxPortal) with ESMTPA id 20251119075313epcas5p2db0de2ac270e4676b12730e10281ef83~5WTBXxxkl0175501755epcas5p2A; Wed, 19 Nov 2025 07:53:13 +0000 (GMT) Received: from test-PowerEdge-R740xd.samsungds.net (unknown [107.99.41.79]) by epsmtip1.samsung.com (KnoxPortal) with ESMTPA id 20251119075311epsmtip11482b0fd17a1d14c79056d2ee5a4ff1f~5WS-thM6e2605226052epsmtip1Q; Wed, 19 Nov 2025 07:53:11 +0000 (GMT) From: Neeraj Kumar To: linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev, linux-kernel@vger.kernel.org, gost.dev@samsung.com Cc: a.manzanares@samsung.com, vishak.g@samsung.com, neeraj.kernel@gmail.com, Neeraj Kumar Subject: [PATCH V4 04/17] nvdimm/label: Include region label in slot validation Date: Wed, 19 Nov 2025 13:22:42 +0530 Message-Id: <20251119075255.2637388-5-s.neeraj@samsung.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251119075255.2637388-1-s.neeraj@samsung.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 X-CMS-MailID: 20251119075313epcas5p2db0de2ac270e4676b12730e10281ef83 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" CMS-TYPE: 105P cpgsPolicy: CPGSC10-542,Y X-CFilter-Loop: Reflected X-CMS-RootMailID: 20251119075313epcas5p2db0de2ac270e4676b12730e10281ef83 References: <20251119075255.2637388-1-s.neeraj@samsung.com> Prior to LSA 2.1 Support, label in slot means only namespace label. But with LSA 2.1 a label can be either namespace or region label. Slot validation routine validates label slot by calculating label checksum. It was only validating namespace label. This changeset also validates region label if present. In previous patch to_lsa_label() was introduced along with to_label(). to_label() returns only namespace label whereas to_lsa_label() returns union nd_lsa_label* In this patch We have converted all usage of to_label() to to_lsa_label() Reviewed-by: Jonathan Cameron Signed-off-by: Neeraj Kumar Reviewed-by: Dave Jiang --- drivers/nvdimm/label.c | 94 ++++++++++++++++++++++++++++-------------- drivers/nvdimm/nd.h | 5 +++ 2 files changed, 69 insertions(+), 30 deletions(-) diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c index 0d587a5b9f7e..6ccc51552822 100644 --- a/drivers/nvdimm/label.c +++ b/drivers/nvdimm/label.c @@ -312,16 +312,6 @@ static union nd_lsa_label *to_lsa_label(struct nvdimm_= drvdata *ndd, int slot) return (union nd_lsa_label *) label; } =20 -static struct nd_namespace_label *to_label(struct nvdimm_drvdata *ndd, int= slot) -{ - unsigned long label, base; - - base =3D (unsigned long) nd_label_base(ndd); - label =3D base + sizeof_namespace_label(ndd) * slot; - - return (struct nd_namespace_label *) label; -} - #define for_each_clear_bit_le(bit, addr, size) \ for ((bit) =3D find_next_zero_bit_le((addr), (size), 0); \ (bit) < (size); \ @@ -382,7 +372,7 @@ static bool nsl_validate_checksum(struct nvdimm_drvdata= *ndd, { u64 sum, sum_save; =20 - if (!ndd->cxl && !efi_namespace_label_has(ndd, checksum)) + if (!efi_namespace_label_has(ndd, checksum)) return true; =20 sum_save =3D nsl_get_checksum(ndd, nd_label); @@ -397,13 +387,25 @@ static void nsl_calculate_checksum(struct nvdimm_drvd= ata *ndd, { u64 sum; =20 - 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 =3D nd_fletcher64(nd_label, sizeof_namespace_label(ndd), 1); nsl_set_checksum(ndd, nd_label, sum); } =20 +static bool region_label_validate_checksum(struct nvdimm_drvdata *ndd, + struct cxl_region_label *region_label) +{ + u64 sum, sum_save; + + sum_save =3D region_label_get_checksum(region_label); + region_label_set_checksum(region_label, 0); + sum =3D nd_fletcher64(region_label, sizeof_namespace_label(ndd), 1); + region_label_set_checksum(region_label, sum_save); + return sum =3D=3D sum_save; +} + static void region_label_calculate_checksum(struct nvdimm_drvdata *ndd, struct cxl_region_label *region_label) { @@ -415,16 +417,34 @@ static void region_label_calculate_checksum(struct nv= dimm_drvdata *ndd, } =20 static bool slot_valid(struct nvdimm_drvdata *ndd, - struct nd_namespace_label *nd_label, u32 slot) + union nd_lsa_label *lsa_label, u32 slot) { + struct cxl_region_label *region_label =3D &lsa_label->region_label; + struct nd_namespace_label *nd_label =3D &lsa_label->ns_label; + enum label_type type; bool valid; + static const char * const label_name[] =3D { + [RG_LABEL_TYPE] =3D "region", + [NS_LABEL_TYPE] =3D "namespace", + }; =20 /* check that we are written where we expect to be written */ - if (slot !=3D nsl_get_slot(ndd, nd_label)) - return false; - valid =3D nsl_validate_checksum(ndd, nd_label); + if (is_region_label(ndd, lsa_label)) { + type =3D RG_LABEL_TYPE; + if (slot !=3D region_label_get_slot(region_label)) + return false; + valid =3D region_label_validate_checksum(ndd, region_label); + } else { + type =3D NS_LABEL_TYPE; + if (slot !=3D nsl_get_slot(ndd, nd_label)) + return false; + valid =3D nsl_validate_checksum(ndd, nd_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[type], slot); + return valid; } =20 @@ -440,14 +460,16 @@ int nd_label_reserve_dpa(struct nvdimm_drvdata *ndd) for_each_clear_bit_le(slot, free, nslot) { struct nd_namespace_label *nd_label; struct nd_region *nd_region =3D NULL; + union nd_lsa_label *lsa_label; struct nd_label_id label_id; struct resource *res; uuid_t label_uuid; u32 flags; =20 - nd_label =3D to_label(ndd, slot); + lsa_label =3D to_lsa_label(ndd, slot); + nd_label =3D &lsa_label->ns_label; =20 - if (!slot_valid(ndd, nd_label, slot)) + if (!slot_valid(ndd, lsa_label, slot)) continue; =20 nsl_get_uuid(ndd, nd_label, &label_uuid); @@ -598,18 +620,30 @@ int nd_label_active_count(struct nvdimm_drvdata *ndd) return 0; =20 for_each_clear_bit_le(slot, free, nslot) { + struct cxl_region_label *region_label; struct nd_namespace_label *nd_label; - - nd_label =3D to_label(ndd, slot); - - if (!slot_valid(ndd, nd_label, slot)) { - u32 label_slot =3D nsl_get_slot(ndd, nd_label); - u64 size =3D nsl_get_rawsize(ndd, nd_label); - u64 dpa =3D nsl_get_dpa(ndd, nd_label); + union nd_lsa_label *lsa_label; + u32 lslot; + u64 size, dpa; + + lsa_label =3D to_lsa_label(ndd, slot); + nd_label =3D &lsa_label->ns_label; + region_label =3D &lsa_label->region_label; + + if (!slot_valid(ndd, lsa_label, slot)) { + if (is_region_label(ndd, lsa_label)) { + lslot =3D __le32_to_cpu(region_label->slot); + size =3D __le64_to_cpu(region_label->rawsize); + dpa =3D __le64_to_cpu(region_label->dpa); + } else { + lslot =3D nsl_get_slot(ndd, nd_label); + size =3D nsl_get_rawsize(ndd, nd_label); + dpa =3D nsl_get_dpa(ndd, nd_label); + } =20 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++; @@ -627,10 +661,10 @@ union nd_lsa_label *nd_label_active(struct nvdimm_drv= data *ndd, int n) return NULL; =20 for_each_clear_bit_le(slot, free, nslot) { - struct nd_namespace_label *nd_label; + union nd_lsa_label *lsa_label; =20 - nd_label =3D to_label(ndd, slot); - if (!slot_valid(ndd, nd_label, slot)) + lsa_label =3D to_lsa_label(ndd, slot); + if (!slot_valid(ndd, lsa_label, slot)) continue; =20 if (n-- =3D=3D 0) diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h index 5fd69c28ffe7..30c7262d8a26 100644 --- a/drivers/nvdimm/nd.h +++ b/drivers/nvdimm/nd.h @@ -346,6 +346,11 @@ region_label_uuid_equal(struct cxl_region_label *regio= n_label, return uuid_equal((uuid_t *) region_label->uuid, uuid); } =20 +static inline u32 region_label_get_slot(struct cxl_region_label *region_la= bel) +{ + return __le32_to_cpu(region_label->slot); +} + static inline u64 region_label_get_checksum(struct cxl_region_label *region_label) { --=20 2.34.1