libnvdimm, pfn: use size is enough
PATCH 1/2 libnvdimm, pfn: use size is enough
When trying to see whether current nd_region intersects with others, we have already calculated the *size* to be expanded to SECTION size.
So just pass size is enough.
--- drivers/nvdimm/pfn_devs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvdimm/pfn_devs.c +1 -1
@@ -686,7 +686,7 @@ static void trim_pfn_device(struct nd_pfn *nd_pfn, u32 *start_pad, u32 *end_trunif (region_intersects (start, size,IORESOURCE_SYSTEM_RAM ,IORES_DESC_NONE ) ==REGION_MIXED || !IS_ALIGNED (end, nd_pfn->align) - ||nd_region_conflict (nd_region, start, size + adjust)) + ||nd_region_conflict (nd_region, start, size)) *end_trunc = end -phys_pmem_align_down (nd_pfn, end); }
Signature · 6 lines
2.19.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
PATCH 2/2 libnvdimm, pfn: use PAGE_SIZE to calculate npfns
There are two places to calculate npfns in nd_pfn_init(), while they use difference size to calculate.
Use PAGE_SIZE would be more proper for calculation.
--- drivers/nvdimm/pfn_devs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvdimm/pfn_devs.c +1 -1
@@ -770,7 +770,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);
Signature · 6 lines
2.19.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [PATCH 2/2] libnvdimm, pfn: use PAGE_SIZE to calculate npfns
Quoted 5 lines · Wei Yang
There are two places to calculate npfns in
nd_pfn_init(), while they use difference size to calculate.Use
PAGE_SIZEwould be more proper for calculation.
No, this would make the kernel have different output based on PAGE_SIZE. It should be possible for a PAGE_SIZE==64K system to create a valid info-block for PAGE_SIZE==4K system. This would need to encode the PAGE_SIZE in the info-block if it were to ever support non-4K PAGE_SIZE systems.
Another consideration is that a PAGE_SIZE==4K infoblock is compatible with a PAGE_SIZE==64K system. All that happens is that the memmap reserve area is oversized and portions go unused. The reverse is not true.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [PATCH 2/2] libnvdimm, pfn: use PAGE_SIZE to calculate npfns
Quoted 5 lines · Dan Williams
Quoted 4 lines · Wei Yang
There are two places to calculate npfns in
nd_pfn_init(), while they use difference size to calculate.
Quoted 8 lines
Quoted 1 line
Use
PAGE_SIZEwould be more proper for calculation.No, this would make the kernel have different output based on
PAGE_SIZE. It should be possible for a PAGE_SIZE==64K system to create a valid info-block for PAGE_SIZE==4K system. This would need to encode thePAGE_SIZEin the info-block if it were to ever support non-4KPAGE_SIZEsystems.
I am confused.
Generally, npfns is used in two functions: nd_pfn_init() and __nvdimm_setup_pfn().
The code flow looks like this:
nvdimm_setup_pfn()
nd_pfn_init()
npfns = SECTION_ALIGN(trim_size / PAGE_SIZE)
offset = start + npfns * page_struct
npfns = (trim_size - offset) / SZ_4K
pfn_sb->npfns
__nvdimm_setup_pfn()
nd_pfn->npfns = pfn_sb->npfns
or
nd_pfn->npfns = (trim_size - offset) / PAGE_SIZEMy questions are:
1. offset = start + npfns * page_struct
This means the number of page struct we reserve in meta-data area is calculated with PAGE_SIZE page.
But we set pfn_sb->npfns = (trim_size - offset) / SZ_4K, which means we tell hardware the number of pages is calculated with 4K size.
Would this be a conflict? Or at least we need to reserve more meta-data area to hold page struct?
2. When mode == PFN_MODE_PMEM and PAGE_SIZE == 64K, nd_pfn->pfn_sb->npfns is sure to be bigger than nd_pfn->npfns. Because nd_pfn->pfn_sb->npfns = (trim_size - offset) / 4K
nd_pfn->npfns = (trim_size - offset) / 64K
If we are sure for the final result, why we would like to have this calculation again?
Quoted 4 lines
Another consideration is that a PAGE_SIZE==4K infoblock is compatible with a PAGE_SIZE==64K system. All that happens is that the memmap reserve area is oversized and portions go unused. The reverse is not true.
The oversized memap reserve area is SECTION size aligned? If so, it looks we took that into consideration when we calculate offset.
Signature · 6 lines
Wei Yang Help you, Help me _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 16 lines · Wei Yang
When trying to see whether current
nd_regionintersects with others, we have already calculated the *size* to be expanded to SECTION size.So just pass size is enough.
Signed-off-by Wei Yang <[email protected]>--- drivers/nvdimm/pfn_devs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/nvdimm/pfn_devs.c +0
-0
drivers/nvdimm/pfn_devs.c static void trim_pfn_device(struct nd_pfn *nd_pfn, u32 *start_pad, u32 *end_trun · line 689
Quoted 5 lines
drivers/nvdimm/pfn_devs.c +1
-1@@ -686,7 +686,7 @@ static void trim_pfn_device(struct nd_pfn *nd_pfn, u32 *start_pad, u32 *end_trunif (region_intersects (start, size,IORESOURCE_SYSTEM_RAM ,IORES_DESC_NONE ) ==REGION_MIXED || !IS_ALIGNED (end, nd_pfn->align) - ||nd_region_conflict (nd_region, start, size + adjust)) + ||nd_region_conflict (nd_region, start, size))
Good catch, thanks. I fixed up the changelog a bit and applied this:
libnvdimm, pfn: Fix over-trim in trim_pfn_device()
When trying to see whether current nd_region intersects with others, trim_pfn_device() has already calculated the *size* to be expanded to SECTION size.
Do not double append 'adjust' to 'size' when calculating whether the end of a region collides with the next pmem region.
to other regions"
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 25 lines · Dan Williams
Quoted 16 lines · Wei Yang
When trying to see whether current
nd_regionintersects with others, we have already calculated the *size* to be expanded to SECTION size.So just pass size is enough.
Signed-off-by Wei Yang <[email protected]>--- drivers/nvdimm/pfn_devs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/nvdimm/pfn_devs.c +0
-0drivers/nvdimm/pfn_devs.c static void trim_pfn_device(struct nd_pfn *nd_pfn, u32 *start_pad, u32 *end_trun · line 689
Quoted 5 lines
drivers/nvdimm/pfn_devs.c +1
-1@@ -686,7 +686,7 @@ static void trim_pfn_device(struct nd_pfn *nd_pfn, u32 *start_pad, u32 *end_trunif (region_intersects (start, size,IORESOURCE_SYSTEM_RAM ,IORES_DESC_NONE ) ==REGION_MIXED || !IS_ALIGNED (end, nd_pfn->align) - ||nd_region_conflict (nd_region, start, size + adjust)) + ||nd_region_conflict (nd_region, start, size))Good catch, thanks. I fixed up the changelog a bit and applied this:
Quoted 8 lines
libnvdimm, pfn: Fix over-trim in
trim_pfn_device()When trying to see whether current
nd_regionintersects with others,trim_pfn_device()has already calculated the *size* to be expanded to SECTION size.Do not double append 'adjust' to 'size' when calculating whether the end of a region collides with the next pmem region.
Looks much better :-)
Thanks
Quoted 6 lines
Fixes ae86cbfef381 "libnvdimm, pfn: Pad pfn namespaces relativeto other regions"
Cc <[email protected]>Signed-off-by Wei Yang <[email protected]>Signed-off-by Dan Williams <[email protected]>
Signature · 6 lines
Wei Yang Help you, Help me _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 12 lines · Dan Williams
Quoted 11 lines · Wei Yang
When trying to see whether current
nd_regionintersects with others, we have already calculated the *size* to be expanded to SECTION size.So just pass size is enough.
Signed-off-by Wei Yang <[email protected]>--- drivers/nvdimm/pfn_devs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 11 lines
drivers/nvdimm/pfn_devs.c static void trim_pfn_device(struct nd_pfn *nd_pfn, u32 *start_pad, u32 *end_trun · line 689
Quoted 10 lines
drivers/nvdimm/pfn_devs.c +1
-1@@ -686,7 +686,7 @@ static void trim_pfn_device(struct nd_pfn *nd_pfn, u32 *start_pad, u32 *end_trunif (region_intersects (start, size,IORESOURCE_SYSTEM_RAM ,IORES_DESC_NONE ) ==REGION_MIXED || !IS_ALIGNED (end, nd_pfn->align) - ||nd_region_conflict (nd_region, start, size + adjust)) + ||nd_region_conflict (nd_region, start, size))
Hi, Dan,
I got a question about the trim on start.
We check the alignment of nd_pfn->align on end, while we don't do this for start. I lost why we would like to have this behavior.
Would we align start with nd_pfn->align too?
Quoted 16 lines
Good catch, thanks. I fixed up the changelog a bit and applied this:
libnvdimm, pfn: Fix over-trim in
trim_pfn_device()When trying to see whether current
nd_regionintersects with others,trim_pfn_device()has already calculated the *size* to be expanded to SECTION size.Do not double append 'adjust' to 'size' when calculating whether the end of a region collides with the next pmem region.
Fixes ae86cbfef381 "libnvdimm, pfn: Pad pfn namespaces relativeto other regions"
Cc <[email protected]>Signed-off-by Wei Yang <[email protected]>Signed-off-by Dan Williams <[email protected]>
Signature · 6 lines
Wei Yang Help you, Help me _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm