mm/nvdimm: Use correct #defines instead of opencoding
Subsystems (2)
PATCH 1/1 mm/nvdimm: Use correct #defines instead of opencoding
The nfpn related change is needed to fix the kernel message
"number of pfns truncated from 2617344 to 163584"
The change makes sure the nfpns stored in the superblock is right value.
--- drivers/nvdimm/pfn_devs.c | 6 +++--- drivers/nvdimm/region_devs.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/nvdimm/pfn_devs.c +3 -3
@@ -777,8 +777,8 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)* when populating the vmemmap. This *should* be equal to * PMD_SIZE for most architectures. */ - offset =ALIGN (start + reserve +64 * npfns, -max (nd_pfn->align,PMD_SIZE )) - start; + offset =ALIGN (start + reserve +sizeof (struct page ) * npfns, +max (nd_pfn->align,PMD_SIZE )) - start; }else if (nd_pfn->mode ==PFN_MODE_RAM ) offset =ALIGN (start + reserve, nd_pfn->align) - start;else
@@ -790,7 +790,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)return -ENXIO ; } - npfns = (size - offset - start_pad - end_trunc) /SZ_4K ; + npfns = (size - offset - start_pad - end_trunc) /PAGE_SIZE ; pfn_sb->mode =cpu_to_le32 (nd_pfn->mode); pfn_sb->dataoff =cpu_to_le64 (offset); pfn_sb->npfns =cpu_to_le64 (npfns);
drivers/nvdimm/region_devs.c +4 -4
@@ -994,10 +994,10 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,struct nd_mapping_desc *mapping = &ndr_desc->mapping[i];struct nvdimm *nvdimm = mapping->nvdimm; -if ((mapping->start | mapping->size) %SZ_4K ) { -dev_err (&nvdimm_bus->dev,"%s: %s mapping%d is not 4K aligned\n" , - caller,dev_name (&nvdimm->dev), i); - +if ((mapping->start | mapping->size) %PAGE_SIZE ) { +dev_err (&nvdimm_bus->dev, +"%s: %s mapping%d is not 4K aligned\n" , + caller,dev_name (&nvdimm->dev), i);return NULL ; }
Signature · 6 lines
2.21.0 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 18 lines · Aneesh Kumar K.V
The nfpn related change is needed to fix the kernel message
"number of pfns truncated from 2617344 to 163584"
The change makes sure the nfpns stored in the superblock is right value.
Signed-off-by Aneesh Kumar K.V <[email protected]>--- drivers/nvdimm/pfn_devs.c | 6 +++--- drivers/nvdimm/region_devs.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)drivers/nvdimm/pfn_devs.c +0
-0
drivers/nvdimm/pfn_devs.c static int nd_pfn_init(struct nd_pfn *nd_pfn) · line 781
Quoted 7 lines
drivers/nvdimm/pfn_devs.c +2
-2@@ -777,8 +777,8 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)* when populating the vmemmap. This *should* be equal to * PMD_SIZE for most architectures. */ - offset =ALIGN (start + reserve +64 * npfns, -max (nd_pfn->align,PMD_SIZE )) - start; + offset =ALIGN (start + reserve +sizeof (struct page ) * npfns, +max (nd_pfn->align,PMD_SIZE )) - start;
No, I think we need to record the page-size into the superblock format otherwise this breaks in debug builds where the struct-page size is extended.
drivers/nvdimm/pfn_devs.c static int nd_pfn_init(struct nd_pfn *nd_pfn) · line 793
Quoted 9 lines
drivers/nvdimm/pfn_devs.c +1
-1}else if (nd_pfn->mode ==PFN_MODE_RAM ) offset =ALIGN (start + reserve, nd_pfn->align) - start;else @@ -790,7 +790,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)return -ENXIO ; } - npfns = (size - offset - start_pad - end_trunc) /SZ_4K ; + npfns = (size - offset - start_pad - end_trunc) /PAGE_SIZE ;
Similar comment, if the page size is variable then the superblock needs to explicitly account for it.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 39 lines · Dan Williams
Quoted 18 lines · Aneesh Kumar K.V
The nfpn related change is needed to fix the kernel message
"number of pfns truncated from 2617344 to 163584"
The change makes sure the nfpns stored in the superblock is right value.
Signed-off-by Aneesh Kumar K.V <[email protected]>--- drivers/nvdimm/pfn_devs.c | 6 +++--- drivers/nvdimm/region_devs.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)drivers/nvdimm/pfn_devs.c +0
-0drivers/nvdimm/pfn_devs.c static int nd_pfn_init(struct nd_pfn *nd_pfn) · line 781
Quoted 7 lines
drivers/nvdimm/pfn_devs.c +2
-2@@ -777,8 +777,8 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)* when populating the vmemmap. This *should* be equal to * PMD_SIZE for most architectures. */ - offset =ALIGN (start + reserve +64 * npfns, -max (nd_pfn->align,PMD_SIZE )) - start; + offset =ALIGN (start + reserve +sizeof (struct page ) * npfns, +max (nd_pfn->align,PMD_SIZE )) - start;No, I think we need to record the page-size into the superblock format otherwise this breaks in debug builds where the struct-page size is extended.
Quoted 7 lines
drivers/nvdimm/pfn_devs.c +0
-0}else if (nd_pfn->mode ==PFN_MODE_RAM ) offset =ALIGN (start + reserve, nd_pfn->align) - start;else @@ -790,7 +790,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)return -ENXIO ; }
Quoted 6 lines
drivers/nvdimm/pfn_devs.c static int nd_pfn_init(struct nd_pfn *nd_pfn) · line 793
Quoted 2 lines
drivers/nvdimm/pfn_devs.c +1
-1- npfns = (size - offset - start_pad - end_trunc) /SZ_4K ; + npfns = (size - offset - start_pad - end_trunc) /PAGE_SIZE ;Similar comment, if the page size is variable then the superblock needs to explicitly account for it.
PAGE_SIZE is not really variable. What we can run into is the issue you mentioned above. The size of struct page can change which means the reserved space for keeping vmemmap in device may not be sufficient for certain kernel builds.
I was planning to add another patch that fails namespace init if we don't have enough space to keep the struct page.
Why do you suggest we need to have PAGE_SIZE as part of pfn superblock?
-aneesh
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 53 lines · Aneesh Kumar K.V
Quoted 39 lines · Dan Williams
Quoted 18 lines · Aneesh Kumar K.V
The nfpn related change is needed to fix the kernel message
"number of pfns truncated from 2617344 to 163584"
The change makes sure the nfpns stored in the superblock is right value.
Signed-off-by Aneesh Kumar K.V <[email protected]>--- drivers/nvdimm/pfn_devs.c | 6 +++--- drivers/nvdimm/region_devs.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)drivers/nvdimm/pfn_devs.c +0
-0drivers/nvdimm/pfn_devs.c static int nd_pfn_init(struct nd_pfn *nd_pfn) · line 781
Quoted 7 lines
drivers/nvdimm/pfn_devs.c +2
-2@@ -777,8 +777,8 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)* when populating the vmemmap. This *should* be equal to * PMD_SIZE for most architectures. */ - offset =ALIGN (start + reserve +64 * npfns, -max (nd_pfn->align,PMD_SIZE )) - start; + offset =ALIGN (start + reserve +sizeof (struct page ) * npfns, +max (nd_pfn->align,PMD_SIZE )) - start;No, I think we need to record the page-size into the superblock format otherwise this breaks in debug builds where the struct-page size is extended.
Quoted 7 lines
drivers/nvdimm/pfn_devs.c +0
-0}else if (nd_pfn->mode ==PFN_MODE_RAM ) offset =ALIGN (start + reserve, nd_pfn->align) - start;else @@ -790,7 +790,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)return -ENXIO ; }Quoted 6 lines
drivers/nvdimm/pfn_devs.c static int nd_pfn_init(struct nd_pfn *nd_pfn) · line 793
Quoted 2 lines
drivers/nvdimm/pfn_devs.c +1
-1- npfns = (size - offset - start_pad - end_trunc) /SZ_4K ; + npfns = (size - offset - start_pad - end_trunc) /PAGE_SIZE ;Similar comment, if the page size is variable then the superblock needs to explicitly account for it.
PAGE_SIZEis not really variable. What we can run into is the issue you mentioned above. The size of struct page can change which means the reserved space for keeping vmemmap in device may not be sufficient for certain kernel builds.
Quoted 4 lines
I was planning to add another patch that fails namespace init if we don't have enough space to keep the struct page.
Why do you suggest we need to have
PAGE_SIZEas part of pfn superblock?
So that the kernel has a chance to identify cases where the superblock it is handling was created on a system with different PAGE_SIZE assumptions.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 55 lines · Dan Williams
Quoted 53 lines · Aneesh Kumar K.V
Quoted 39 lines · Dan Williams
Quoted 18 lines · Aneesh Kumar K.V
The nfpn related change is needed to fix the kernel message
"number of pfns truncated from 2617344 to 163584"
The change makes sure the nfpns stored in the superblock is right value.
Signed-off-by Aneesh Kumar K.V <[email protected]>--- drivers/nvdimm/pfn_devs.c | 6 +++--- drivers/nvdimm/region_devs.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)drivers/nvdimm/pfn_devs.c +0
-0drivers/nvdimm/pfn_devs.c static int nd_pfn_init(struct nd_pfn *nd_pfn) · line 781
Quoted 7 lines
drivers/nvdimm/pfn_devs.c +2
-2@@ -777,8 +777,8 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)* when populating the vmemmap. This *should* be equal to * PMD_SIZE for most architectures. */ - offset =ALIGN (start + reserve +64 * npfns, -max (nd_pfn->align,PMD_SIZE )) - start; + offset =ALIGN (start + reserve +sizeof (struct page ) * npfns, +max (nd_pfn->align,PMD_SIZE )) - start;No, I think we need to record the page-size into the superblock format otherwise this breaks in debug builds where the struct-page size is extended.
Quoted 7 lines
drivers/nvdimm/pfn_devs.c +0
-0}else if (nd_pfn->mode ==PFN_MODE_RAM ) offset =ALIGN (start + reserve, nd_pfn->align) - start;else @@ -790,7 +790,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)return -ENXIO ; }Quoted 6 lines
drivers/nvdimm/pfn_devs.c static int nd_pfn_init(struct nd_pfn *nd_pfn) · line 793
Quoted 2 lines
drivers/nvdimm/pfn_devs.c +1
-1- npfns = (size - offset - start_pad - end_trunc) /SZ_4K ; + npfns = (size - offset - start_pad - end_trunc) /PAGE_SIZE ;Similar comment, if the page size is variable then the superblock needs to explicitly account for it.
PAGE_SIZEis not really variable. What we can run into is the issue you mentioned above. The size of struct page can change which means the reserved space for keeping vmemmap in device may not be sufficient for certain kernel builds.
Quoted 9 lines
Quoted 4 lines
I was planning to add another patch that fails namespace init if we don't have enough space to keep the struct page.
Why do you suggest we need to have
PAGE_SIZEas part of pfn superblock?So that the kernel has a chance to identify cases where the superblock it is handling was created on a system with different
PAGE_SIZEassumptions.
The reason to do that is we don't have enough space to keep struct page backing the total number of pfns? If so, what i suggested above should handle that.
or are you finding any other reason why we should fail a namespace init with a different PAGE_SIZE value?
My another patch handle the details w.r.t devdax alignment for which devdax got created with PAGE_SIZE 4K but we are now trying to load that in a kernel with PAGE_SIZE 64k.
-aneesh
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 67 lines · Aneesh Kumar K.V
Quoted 55 lines · Dan Williams
Quoted 53 lines · Aneesh Kumar K.V
Quoted 39 lines · Dan Williams
Quoted 18 lines · Aneesh Kumar K.V
The nfpn related change is needed to fix the kernel message
"number of pfns truncated from 2617344 to 163584"
The change makes sure the nfpns stored in the superblock is right value.
Signed-off-by Aneesh Kumar K.V <[email protected]>--- drivers/nvdimm/pfn_devs.c | 6 +++--- drivers/nvdimm/region_devs.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)drivers/nvdimm/pfn_devs.c +0
-0drivers/nvdimm/pfn_devs.c static int nd_pfn_init(struct nd_pfn *nd_pfn) · line 781
Quoted 7 lines
drivers/nvdimm/pfn_devs.c +2
-2@@ -777,8 +777,8 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)* when populating the vmemmap. This *should* be equal to * PMD_SIZE for most architectures. */ - offset =ALIGN (start + reserve +64 * npfns, -max (nd_pfn->align,PMD_SIZE )) - start; + offset =ALIGN (start + reserve +sizeof (struct page ) * npfns, +max (nd_pfn->align,PMD_SIZE )) - start;No, I think we need to record the page-size into the superblock format otherwise this breaks in debug builds where the struct-page size is extended.
Quoted 7 lines
drivers/nvdimm/pfn_devs.c +0
-0}else if (nd_pfn->mode ==PFN_MODE_RAM ) offset =ALIGN (start + reserve, nd_pfn->align) - start;else @@ -790,7 +790,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)return -ENXIO ; }Quoted 6 lines
drivers/nvdimm/pfn_devs.c static int nd_pfn_init(struct nd_pfn *nd_pfn) · line 793
Quoted 2 lines
drivers/nvdimm/pfn_devs.c +1
-1- npfns = (size - offset - start_pad - end_trunc) /SZ_4K ; + npfns = (size - offset - start_pad - end_trunc) /PAGE_SIZE ;Similar comment, if the page size is variable then the superblock needs to explicitly account for it.
PAGE_SIZEis not really variable. What we can run into is the issue you mentioned above. The size of struct page can change which means the reserved space for keeping vmemmap in device may not be sufficient for certain kernel builds.Quoted 9 lines
Quoted 4 lines
I was planning to add another patch that fails namespace init if we don't have enough space to keep the struct page.
Why do you suggest we need to have
PAGE_SIZEas part of pfn superblock?So that the kernel has a chance to identify cases where the superblock it is handling was created on a system with different
PAGE_SIZEassumptions.
Quoted 6 lines
The reason to do that is we don't have enough space to keep struct page backing the total number of pfns? If so, what i suggested above should handle that.
or are you finding any other reason why we should fail a namespace init with a different
PAGE_SIZEvalue?
I want the kernel to be able to start understand cross-architecture and cross-configuration geometries. Which to me means incrementing the info-block version and recording PAGE_SIZE and sizeof(struct page) in the info-block directly.
Quoted 3 lines
My another patch handle the details w.r.t devdax alignment for which devdax got created with
PAGE_SIZE4K but we are now trying to load that in a kernel withPAGE_SIZE64k.
Sure, but what about the reverse? These info-block format assumptions are as fundamental as the byte-order of the info-block, it needs to be cross-arch compatible and the x86 assumptions need to be fully lifted.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 81 lines · Dan Williams
Quoted 67 lines · Aneesh Kumar K.V
Quoted 55 lines · Dan Williams
Quoted 53 lines · Aneesh Kumar K.V
Quoted 39 lines · Dan Williams
Quoted 18 lines · Aneesh Kumar K.V
The nfpn related change is needed to fix the kernel message
"number of pfns truncated from 2617344 to 163584"
The change makes sure the nfpns stored in the superblock is right value.
Signed-off-by Aneesh Kumar K.V <[email protected]>--- drivers/nvdimm/pfn_devs.c | 6 +++--- drivers/nvdimm/region_devs.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)drivers/nvdimm/pfn_devs.c +0
-0drivers/nvdimm/pfn_devs.c static int nd_pfn_init(struct nd_pfn *nd_pfn) · line 781
Quoted 7 lines
drivers/nvdimm/pfn_devs.c +2
-2@@ -777,8 +777,8 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)* when populating the vmemmap. This *should* be equal to * PMD_SIZE for most architectures. */ - offset =ALIGN (start + reserve +64 * npfns, -max (nd_pfn->align,PMD_SIZE )) - start; + offset =ALIGN (start + reserve +sizeof (struct page ) * npfns, +max (nd_pfn->align,PMD_SIZE )) - start;No, I think we need to record the page-size into the superblock format otherwise this breaks in debug builds where the struct-page size is extended.
Quoted 7 lines
drivers/nvdimm/pfn_devs.c +0
-0}else if (nd_pfn->mode ==PFN_MODE_RAM ) offset =ALIGN (start + reserve, nd_pfn->align) - start;else @@ -790,7 +790,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)return -ENXIO ; }Quoted 6 lines
drivers/nvdimm/pfn_devs.c static int nd_pfn_init(struct nd_pfn *nd_pfn) · line 793
Quoted 2 lines
drivers/nvdimm/pfn_devs.c +1
-1- npfns = (size - offset - start_pad - end_trunc) /SZ_4K ; + npfns = (size - offset - start_pad - end_trunc) /PAGE_SIZE ;Similar comment, if the page size is variable then the superblock needs to explicitly account for it.
PAGE_SIZEis not really variable. What we can run into is the issue you mentioned above. The size of struct page can change which means the reserved space for keeping vmemmap in device may not be sufficient for certain kernel builds.Quoted 9 lines
Quoted 4 lines
I was planning to add another patch that fails namespace init if we don't have enough space to keep the struct page.
Why do you suggest we need to have
PAGE_SIZEas part of pfn superblock?So that the kernel has a chance to identify cases where the superblock it is handling was created on a system with different
PAGE_SIZEassumptions.Quoted 6 lines
The reason to do that is we don't have enough space to keep struct page backing the total number of pfns? If so, what i suggested above should handle that.
or are you finding any other reason why we should fail a namespace init with a different
PAGE_SIZEvalue?I want the kernel to be able to start understand cross-architecture and cross-configuration geometries. Which to me means incrementing the info-block version and recording
PAGE_SIZEand sizeof(struct page) in the info-block directly.
Quoted 7 lines
Quoted 3 lines
My another patch handle the details w.r.t devdax alignment for which devdax got created with
PAGE_SIZE4K but we are now trying to load that in a kernel withPAGE_SIZE64k.Sure, but what about the reverse? These info-block format assumptions are as fundamental as the byte-order of the info-block, it needs to be cross-arch compatible and the x86 assumptions need to be fully lifted.
Something like the below (Not tested). I am not sure what we will init the page_size for minor version < 3. This will mark the namespace disabled if the PAGE_SIZE and sizeof(struct page) doesn't match with the values used during namespace create.
drivers/nvdimm/pfn.h +3 -0
@@ -36,6 +36,9 @@ struct nd_pfn_sb {__le32 end_trunc;/* minor-version-2 record the base alignment of the mapping */ __le32 align; +/* minor-version-3 record the page size and struct page size */ +__le32 page_size; +__le32 page_struct_size;u8 padding[4000 ];__le64 checksum; };
drivers/nvdimm/pfn_devs.c +16 -1
@@ -477,6 +477,15 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig)if (__le16_to_cpu (pfn_sb->version_minor) <2 ) pfn_sb->align =0 ; +if (__le16_to_cpu (pfn_sb->version_minor) <3 ) { +/* +* For a large part we use PAGE_SIZE. But we +* do have some accounting code using SIZE_4K. +*/ + pfn_sb->page_size =cpu_to_le32 (PAGE_SIZE ); + pfn_sb->page_struct_size =cpu_to_le32 (64 ); + } +switch (le32_to_cpu (pfn_sb->mode)) {case PFN_MODE_RAM :case PFN_MODE_PMEM :
@@ -504,6 +513,12 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig)return -EOPNOTSUPP ; } +if (le32_to_cpu (pfn_sb->page_size) !=PAGE_SIZE ) +return -EOPNOTSUPP ; + +if (le32_to_cpu (pfn_sb->page_struct_size) !=sizeof (struct page )) +return -EOPNOTSUPP ; +if (!nd_pfn->uuid) {/* * When probing a namepace via nd_pfn_probe() the uuid
@@ -798,7 +813,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)memcpy (pfn_sb->uuid, nd_pfn->uuid,16 );memcpy (pfn_sb->parent_uuid,nd_dev_to_uuid (&ndns->dev),16 ); pfn_sb->version_major =cpu_to_le16 (1 ); - pfn_sb->version_minor =cpu_to_le16 (2 ); + pfn_sb->version_minor =cpu_to_le16 (3 ); pfn_sb->start_pad =cpu_to_le32 (start_pad); pfn_sb->end_trunc =cpu_to_le32 (end_trunc); pfn_sb->align =cpu_to_le32 (nd_pfn->align);
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 9 lines
-----Original Message-----
From: Linux-nvdimm <[email protected]> On Behalf Of Aneesh Kumar K.V
Sent: Tuesday, May 21, 2019 4:51 AM
Subject: Re: [PATCH] mm/nvdimm: Use correct #defines instead of opencoding
...
Quoted 11 lines
drivers/nvdimm/pfn.h +3
-0@@ -36,6 +36,9 @@ struct nd_pfn_sb {__le32 end_trunc;/* minor-version-2 record the base alignment of the mapping */ __le32 align; +/* minor-version-3 record the page size and struct page size */ +__le32 page_size; +__le32 page_struct_size;u8 padding[4000 ];__le64 checksum;};
You might need to reduce the padding size to offset the extra added fields.
Quoted 88 lines · Aneesh Kumar K.V
Quoted 85 lines · Dan Williams
Quoted 67 lines · Aneesh Kumar K.V
Quoted 55 lines · Dan Williams
Quoted 53 lines · Aneesh Kumar K.V
Quoted 39 lines · Dan Williams
Quoted 18 lines · Aneesh Kumar K.V
The nfpn related change is needed to fix the kernel message
"number of pfns truncated from 2617344 to 163584"
The change makes sure the nfpns stored in the superblock is right value.
Signed-off-by Aneesh Kumar K.V <[email protected]>--- drivers/nvdimm/pfn_devs.c | 6 +++--- drivers/nvdimm/region_devs.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)drivers/nvdimm/pfn_devs.c +0
-0drivers/nvdimm/pfn_devs.c static int nd_pfn_init(struct nd_pfn *nd_pfn) · line 781
Quoted 7 lines
drivers/nvdimm/pfn_devs.c +2
-2@@ -777,8 +777,8 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)* when populating the vmemmap. This *should* be equal to * PMD_SIZE for most architectures. */ - offset =ALIGN (start + reserve +64 * npfns, -max (nd_pfn->align,PMD_SIZE )) - start; + offset =ALIGN (start + reserve +sizeof (struct page ) * npfns, +max (nd_pfn->align,PMD_SIZE )) - start;No, I think we need to record the page-size into the superblock format otherwise this breaks in debug builds where the struct-page size is extended.
Quoted 7 lines
drivers/nvdimm/pfn_devs.c +0
-0}else if (nd_pfn->mode ==PFN_MODE_RAM ) offset =ALIGN (start + reserve, nd_pfn->align) - start;else @@ -790,7 +790,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)return -ENXIO ; }Quoted 6 lines
drivers/nvdimm/pfn_devs.c static int nd_pfn_init(struct nd_pfn *nd_pfn) · line 793
Quoted 2 lines
drivers/nvdimm/pfn_devs.c +1
-1- npfns = (size - offset - start_pad - end_trunc) /SZ_4K ; + npfns = (size - offset - start_pad - end_trunc) /PAGE_SIZE ;Similar comment, if the page size is variable then the superblock needs to explicitly account for it.
PAGE_SIZEis not really variable. What we can run into is the issue you mentioned above. The size of struct page can change which means the reserved space for keeping vmemmap in device may not be sufficient for certain kernel builds.Quoted 9 lines
Quoted 4 lines
I was planning to add another patch that fails namespace init if we don't have enough space to keep the struct page.
Why do you suggest we need to have
PAGE_SIZEas part of pfn superblock?So that the kernel has a chance to identify cases where the superblock it is handling was created on a system with different
PAGE_SIZEassumptions.Quoted 6 lines
The reason to do that is we don't have enough space to keep struct page backing the total number of pfns? If so, what i suggested above should handle that.
or are you finding any other reason why we should fail a namespace init with a different
PAGE_SIZEvalue?I want the kernel to be able to start understand cross-architecture and cross-configuration geometries. Which to me means incrementing the info-block version and recording
PAGE_SIZEand sizeof(struct page) in the info-block directly.Quoted 3 lines
My another patch handle the details w.r.t devdax alignment for which devdax got created with
PAGE_SIZE4K but we are now trying to load that in a kernel withPAGE_SIZE64k.
Quoted 8 lines
Quoted 3 lines
Sure, but what about the reverse? These info-block format assumptions are as fundamental as the byte-order of the info-block, it needs to be cross-arch compatible and the x86 assumptions need to be fully lifted.
Something like the below (Not tested). I am not sure what we will init the
page_sizefor minor version < 3. This will mark the namespace disabled if thePAGE_SIZEand sizeof(struct page) doesn't match with the values used during namespace create.
Yes, this is on the right track.
I would special-case page_size == 0 as 4096 and page_struct_size == 0 as 64. If either of those is non-zero then the info-block version needs to be revved and it needs to be crafted to make older kernels fail to parse it.
There was an earlier attempt to implement minimum info-block versions here:
...but that was dropped in favor of the the "sub-section" patches.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 2 lines · Dan Williams
On Tue, May 21, 2019 at 2:51 AM Aneesh Kumar K.V
<[email protected]> wrote:
....
Quoted 6 lines
Quoted 5 lines
Something like the below (Not tested). I am not sure what we will init the
page_sizefor minor version < 3. This will mark the namespace disabled if thePAGE_SIZEand sizeof(struct page) doesn't match with the values used during namespace create.
Quoted 7 lines
Yes, this is on the right track.
I would special-case
page_size== 0 as 4096 andpage_struct_size== 0 as 64. If either of those is non-zero then the info-block version needs to be revved and it needs to be crafted to make older kernels fail to parse it.
page_size = SZ_4K implies we fail to enable namesepaces created on ppc64 till now. We do work fine with page_size = PAGE_SIZE. It is a few error check and pfn_sb->npfns that got wrong values. We do reserve the correct space for the required pfns even when we recorded wrong pfn_sb->npfs.
Quoted 6 lines
There was an earlier attempt to implement minimum info-block versions here:
...but that was dropped in favor of the the "sub-section" patches.
Ok i will pick that too.
-aneesh
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm