libnvdimm, btt: BTT updates for UEFI 2.7 format
Vishal Verma
maintainerPATCH v4 1/1 libnvdimm, btt: BTT updates for UEFI 2.7 format
The UEFI 2.7 specification defines an updated BTT metadata format, bumping the revision to 2.0. Add support for the new format, while retaining compatibility for the old 1.1 format.
---
v4:
- Fix up dereferencing of nd_region->mappings (Dan)
- Check all the mappings for label consistency (Dan)
- Refactor figuring out the BTT claim class into its own helper (Dan)
v3:
- Add athe actual BTT2 guid from the UEFI spec, and plumb a new claim class for it (Dan)
v2:
- Don't enforce new BTTs being v2, base that decision on the holder class (Dan)
- Refactor nd_btt_version slightly, and get rid of the version enum.
drivers/nvdimm/btt.c | 28 ++++++++++++++------ drivers/nvdimm/btt.h | 2 ++ drivers/nvdimm/btt_devs.c | 46 +++++++++++++++++++++++++++++---- drivers/nvdimm/claim.c | 1 + drivers/nvdimm/label.c | 6 +++++ drivers/nvdimm/label.h | 1 + drivers/nvdimm/namespace_devs.c | 57 +++++++++++++++++++++++++++++++++++++++-- drivers/nvdimm/nd.h | 3 +++ include/linux/nd.h | 1 + 9 files changed, 130 insertions(+), 15 deletions(-)
drivers/nvdimm/btt.c +20 -8
@@ -37,8 +37,8 @@ static int arena_read_bytes(struct arena_info *arena, resource_size_t offset,struct nd_btt *nd_btt = arena->nd_btt;struct nd_namespace_common *ndns = nd_btt->ndns; -/* arena offsets are 4K from the base of the device */ - offset +=SZ_4K ; +/* arena offsets may be shifted from the base of the device */ + offset += arena->nd_btt->initial_offset;return nvdimm_read_bytes (ndns, offset, buf, n, flags); }
@@ -48,8 +48,8 @@ static int arena_write_bytes(struct arena_info *arena, resource_size_t offset,struct nd_btt *nd_btt = arena->nd_btt;struct nd_namespace_common *ndns = nd_btt->ndns; -/* arena offsets are 4K from the base of the device */ - offset +=SZ_4K ; +/* arena offsets may be shifted from the base of the device */ + offset += arena->nd_btt->initial_offset;return nvdimm_write_bytes (ndns, offset, buf, n, flags); }
@@ -576,8 +576,8 @@ static struct arena_info *alloc_arena(struct btt *btt, size_t size, arena->internal_lbasize =roundup (arena->external_lbasize,INT_LBASIZE_ALIGNMENT ); arena->nfree =BTT_DEFAULT_NFREE ; - arena->version_major =1 ; - arena->version_minor =1 ; + arena->version_major = btt->nd_btt->version_major; + arena->version_minor = btt->nd_btt->version_minor;if (available %BTT_PG_SIZE ) available -= (available %BTT_PG_SIZE );
@@ -1425,6 +1425,7 @@ int nvdimm_namespace_attach_btt(struct nd_namespace_common *ndns) {struct nd_btt *nd_btt =to_nd_btt (ndns->claim);struct nd_region *nd_region; +struct btt_sb *btt_sb;struct btt *btt;size_t rawsize;
@@ -1433,10 +1434,21 @@ int nvdimm_namespace_attach_btt(struct nd_namespace_common *ndns)return -ENODEV ; } - rawsize =nvdimm_namespace_capacity (ndns) -SZ_4K ; + btt_sb =devm_kzalloc (&nd_btt->dev,sizeof (*btt_sb),GFP_KERNEL ); + +/* +* If this returns < 0, that is ok as it just means there wasn't +* an existing BTT, and we're creating a new one. We still need to +* call this as we need the version dependent fields in nd_btt to be +* set correctly based on the holder class +*/ +nd_btt_version (nd_btt, ndns, btt_sb); + + rawsize =nvdimm_namespace_capacity (ndns) - nd_btt->initial_offset;if (rawsize <ARENA_MIN_SIZE ) {dev_dbg (&nd_btt->dev,"%s must be at least %ld bytes\n" , -dev_name (&ndns->dev),ARENA_MIN_SIZE +SZ_4K ); +dev_name (&ndns->dev), +ARENA_MIN_SIZE + nd_btt->initial_offset);return -ENXIO ; } nd_region =to_nd_region (nd_btt->dev.parent);
drivers/nvdimm/btt.h +2 -0
@@ -184,5 +184,7 @@ struct btt { };bool nd_btt_arena_is_valid (struct nd_btt *nd_btt,struct btt_sb *super); +int nd_btt_version (struct nd_btt *nd_btt,struct nd_namespace_common *ndns, +struct btt_sb *btt_sb);#endif
drivers/nvdimm/btt_devs.c +41 -5
67 lines not on this page · raw message
drivers/nvdimm/claim.c +1 -0
@@ -189,6 +189,7 @@ ssize_t nd_namespace_store(struct device *dev,case NVDIMM_CCLASS_NONE :break ;case NVDIMM_CCLASS_BTT : +case NVDIMM_CCLASS_BTT2 :if (!is_nd_btt (dev)) { len = -EBUSY ; goto out_attach;
drivers/nvdimm/label.c +6 -0
@@ -21,6 +21,7 @@#include "nd.h" static guid_t nvdimm_btt_guid; +static guid_t nvdimm_btt2_guid;static guid_t nvdimm_pfn_guid;static guid_t nvdimm_dax_guid;
@@ -578,6 +579,8 @@ enum nvdimm_claim_class to_nvdimm_cclass(guid_t *guid) {if (guid_equal (guid, &nvdimm_btt_guid))return NVDIMM_CCLASS_BTT ; +else if (guid_equal (guid, &nvdimm_btt2_guid)) +return NVDIMM_CCLASS_BTT2 ;else if (guid_equal (guid, &nvdimm_pfn_guid))return NVDIMM_CCLASS_PFN ;else if (guid_equal (guid, &nvdimm_dax_guid))
@@ -593,6 +596,8 @@ static const guid_t *to_abstraction_guid(enum nvdimm_claim_class claim_class, {if (claim_class ==NVDIMM_CCLASS_BTT )return &nvdimm_btt_guid; +else if (claim_class ==NVDIMM_CCLASS_BTT2 ) +return &nvdimm_btt2_guid;else if (claim_class ==NVDIMM_CCLASS_PFN )return &nvdimm_pfn_guid;else if (claim_class ==NVDIMM_CCLASS_DAX )
@@ -1158,6 +1163,7 @@ int nd_blk_namespace_label_update(struct nd_region *nd_region,int __init nd_label_init (void ) {WARN_ON (guid_parse (NVDIMM_BTT_GUID , &nvdimm_btt_guid)); +WARN_ON (guid_parse (NVDIMM_BTT2_GUID , &nvdimm_btt2_guid));WARN_ON (guid_parse (NVDIMM_PFN_GUID , &nvdimm_pfn_guid));WARN_ON (guid_parse (NVDIMM_DAX_GUID , &nvdimm_dax_guid));
drivers/nvdimm/label.h +1 -0
@@ -113,6 +113,7 @@ struct nd_namespace_label { };#define NVDIMM_BTT_GUID "8aed63a2-29a2-4c66-8b12-f05d15d3922a" +#define NVDIMM_BTT2_GUID "18633bfc-1735-4217-8ac9-17239282d3f8"#define NVDIMM_PFN_GUID "266400ba-fb9f-4677-bcb0-968f11d0d225"#define NVDIMM_DAX_GUID "97a86d9c-3cdd-4eda-986f-5068b4f80088"
drivers/nvdimm/namespace_devs.c +55 -2
75 lines not on this page · raw message
drivers/nvdimm/nd.h +3 -0
@@ -194,6 +194,9 @@ struct nd_btt {u64 size;u8 *uuid;int id; +int initial_offset; +u16 version_major; +u16 version_minor; };enum nd_pfn_mode {
include/linux/nd.h +1 -0
@@ -24,6 +24,7 @@ enum nvdimm_event {enum nvdimm_claim_class {NVDIMM_CCLASS_NONE ,NVDIMM_CCLASS_BTT , +NVDIMM_CCLASS_BTT2 ,NVDIMM_CCLASS_PFN ,NVDIMM_CCLASS_DAX ,NVDIMM_CCLASS_UNKNOWN ,
Signature · 6 lines
2.9.3 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 8 lines · Vishal Verma
The UEFI 2.7 specification defines an updated BTT metadata format, bumping the revision to 2.0. Add support for the new format, while retaining compatibility for the old 1.1 format.
Cc Toshi Kani <[email protected]>Cc Linda Knippers <[email protected]>Cc Dan Williams <[email protected]>Signed-off-by Vishal Verma <[email protected]>
[..]
Quoted 48 lines
drivers/nvdimm/namespace_devs.c +40
-0@@ -1411,6 +1411,58 @@ static ssize_t dpa_extents_show(struct device *dev, }static DEVICE_ATTR_RO (dpa_extents); +static int btt_claim_class (struct device *dev) +{ +struct nd_region *nd_region =to_nd_region (dev->parent); +int i, loop_bitmask =0 ; + +for (i =0 ; i < nd_region->ndr_mappings; i++) { +struct nd_mapping *nd_mapping = &nd_region->mapping[i]; +struct nvdimm_drvdata *ndd =to_ndd (nd_mapping); +struct nd_namespace_index *nsindex; + + nsindex =to_namespace_index (ndd, ndd->ns_current); +if (nsindex ==NULL ) + loop_bitmask |=1 ; +else { +/* check whether existing labels are v1.1 or v1.2 */ +if (__le16_to_cpu (nsindex->major) ==1 + &&__le16_to_cpu (nsindex->minor) ==1 ) + loop_bitmask |=2 ; +else + loop_bitmask |=4 ; + } + } +/* +* If nsindex is null loop_bitmask's bit 0 will be set, and if an index +* block is found, a v1.1 label for any mapping will set bit 1, and a +* v1.2 label will set bit 2. +* +* At the end of the loop, only one of the three bits must be set. +* If multiple bits were set, it means the different mappings disagree +* about their labels, and this must be cleaned up first. +* +* If all the label index blocks are found to agree, nsindex of NULL +* implies labels haven't been initialized yet, and when they will, +* they will be of the 1.2 format, so we can assume BTT2.0 +* +* If 1.1 labels are found, we enforce BTT1.1, and if 1.2 labels are +* found, we enforce BTT2.0 +* +* If the loop was never entered, default to BTT1.1 (legacy namespaces) +*/
drivers/nvdimm/namespace_devs.c static ssize_t dpa_extents_show(struct device *dev, · line 1463
Quoted 10 lines
drivers/nvdimm/namespace_devs.c +10
-0+switch (loop_bitmask) { +case 0 : +case 2 : +return NVDIMM_CCLASS_BTT ; +case 1 : +case 4 : +return NVDIMM_CCLASS_BTT2 ; +default : +return -ENXIO ; + }
Clever, looks good to me. I'll get this queued.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Verma, Vishal L
maintainerQuoted 84 lines · Dan Williams
Quoted 8 lines · Vishal Verma
The UEFI 2.7 specification defines an updated BTT metadata format, bumping the revision to 2.0. Add support for the new format, while retaining compatibility for the old 1.1 format.
Cc Toshi Kani <[email protected]>Cc Linda Knippers <[email protected]>Cc Dan Williams <[email protected]>Signed-off-by Vishal Verma <[email protected]>[..]
Quoted 63 lines
drivers/nvdimm/namespace_devs.c +15
-0@@ -1411,6 +1411,58 @@ static ssize_t dpa_extents_show(struct device *dev, } static DEVICE_ATTR_RO(dpa_extents); +static int btt_claim_class (struct device *dev) +{ + struct nd_region *nd_region = to_nd_region(dev->parent); + int i, loop_bitmask = 0; + + for (i = 0; i < nd_region->ndr_mappings; i++) { + struct nd_mapping *nd_mapping = &nd_region- >mapping[i]; + struct nvdimm_drvdata *ndd = to_ndd(nd_mapping); + struct nd_namespace_index *nsindex; + + nsindex = to_namespace_index(ndd, ndd->ns_current); + if (nsindex == NULL) + loop_bitmask |= 1; + else { + /* check whether existing labels are v1.1 orv1.2 */
+ if (__le16_to_cpu(nsindex->major)== 1 + && __le16_to_cpu(nsindex-Quoted 1 line
minor) == 1)
+ loop_bitmask |= 2;
+ else
+ loop_bitmask |= 4;
+ }
+ }
+ /*
+ * If nsindex is null loop_bitmask's bit 0 will be set, and if an index
+ * block is found, a v1.1 label for any mapping will set bit 1, and a
+ * v1.2 label will set bit 2.
+ *
+ * At the end of the loop, only one of the three bits must be set.
+ * If multiple bits were set, it means the different mappings disagree
+ * about their labels, and this must be cleaned up first. + *
+ * If all the label index blocks are found to agree, nsindex of NULL
+ * implies labels haven't been initialized yet, and when they will,
+ * they will be of the 1.2 format, so we can assume BTT2.0 + *
+ * If 1.1 labels are found, we enforce BTT1.1, and if 1.2 labels are
+ * found, we enforce BTT2.0
+ *
+ * If the loop was never entered, default to BTT1.1 (legacy namespaces)
+ */
+ switch (loop_bitmask) {
+ case 0:Quoted 8 lines
+ case 2:
+ returnNVDIMM_CCLASS_BTT;
+ case 1:
+ case 4:
+ returnNVDIMM_CCLASS_BTT2;
+ default:
+ return-ENXIO;
+ }
Quoted 1 line
Clever, looks good to me. I'll get this queued.
Err Hold on, I just noticed I forgot to properly propagate the ENXIO in __holder_class_store.
v5 incoming.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm