powerpc/pseries/iommu: Add TCEs for 16GB pages when RAM is pre-mapped
PATCH v3 1/1 powerpc/pseries/iommu: Add TCEs for 16GB pages when RAM is pre-mapped
In powerPC, if Dynamic DMA Window is big enough, RAM is pre-mapped. To determine the size of RAM, a PAPR+ property "ibm,lrdr-capacity" is used. This OF property dictates what is the max size of RAM an LPAR can have, including DR added memory.
In PowerPC, 16GB pages can be allocated at machine level and then assigned to LPARs. These 16GB pages are added to LPAR memory at the time of boot. The address range for these 16GB pages is above MAX RAM an LPAR can have (ibm,lrdr-capacity). In the current implementation, these 16GB pages are being excluded from pre-mapped TCEs. A driver can have DMA buffers allocated from 16GB pages. This results in platform to raise an EEH when DMA is attempted on buffers in 16GB memory range.
commit 6aa989ab2bd0 ("powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory")
Prior to the above patch, memblock_end_of_DRAM() was being used to determine the MAX memory of an LPAR. This included 16GB pages as well. The issue with using memblock_end_of_DRAM() is that when pmemory is converted to RAM via daxctl command, the DDW engine will incorrectly try to add TCEs for pmemory as well.
Below is the address distribution of RAM, 16GB pages and pmemory for an LPAR with max memory of 256GB, memory allocated 64GB, 2 16GB pages and assigned pmemory of 8GB.
RANGE SIZE STATE REMOVABLE BLOCK
0x0000000000000000-0x0000000fffffffff 64G online yes 0-255 0x0000004000000000-0x00000047ffffffff 32G online yes 1024-1151
cat /sys/bus/nd/devices/region0/resource0x40100000000
cat /sys/bus/nd/devices/region0/size
8589934592
The approach to fix this problem is to revert back the code changes introduced by the above patch and to stash away the MAX memory of an LPAR, including 16GB pages, at the LPAR boot time. This value is then used whenever TCEs are needed to be pre-mapped - enable_DDW() or, iommu_mem_notifier()
---
Change log:
V2 -> V3
1. Harsh: Remove R-b tags from the change log
Response: Incorporated changes
2. Harsh: Change WARN_ON() to WARN_ONCE()
Response: Incorporated changes
3. Harsh: Fix indendation
Response: Incorporated changes
4. Harsh: Replace comment with a log if limit < arg->nr_pages ?
Response: Doesn't seems to be needed since the WARN_ONCE() will log this scenario. I removed the comment instead.
V1 -> V2
1. Harsh: Not only start_pfn, but end_pfn also needs to be within allowed range, which may require clamping arg->nr_pages if crossing the limits.
Response: Incorporated changes.
arch/powerpc/platforms/pseries/iommu.c | 58 ++++++++++++++++++-------- 1 file changed, 41 insertions(+), 17 deletions(-)
arch/powerpc/platforms/pseries/iommu.c +41 -17
@@ -69,6 +69,8 @@ static struct iommu_table *iommu_pseries_alloc_table(int node)return tbl; } +static phys_addr_t pseries_ddw_max_ram; +#ifdef CONFIG_IOMMU_API static struct iommu_table_group_ops spapr_tce_table_group_ops;#endif
@@ -1285,13 +1287,17 @@ static LIST_HEAD(failed_ddw_pdn_list);static phys_addr_t ddw_memory_hotplug_max (void ) { -resource_size_t max_addr; +resource_size_t max_addr =memory_hotplug_max (); +struct device_node *memory; -#if defined(CONFIG_NUMA ) && defined(CONFIG_MEMORY_HOTPLUG ) - max_addr =hot_add_drconf_memory_max (); -#else - max_addr =memblock_end_of_DRAM (); -#endif +for_each_node_by_type (memory,"memory" ) { +struct resource res; + +if (of_address_to_resource (memory,0 , &res)) +continue ; + + max_addr =max_t (resource_size_t, max_addr, res.end +1 ); + }return max_addr; }
@@ -1446,7 +1452,7 @@ static struct property *ddw_property_create(const char *propname, u32 liobn, u64static bool enable_ddw (struct pci_dev *dev,struct device_node *pdn,u64 dma_mask) {int len =0 , ret; -int max_ram_len =order_base_2 (ddw_memory_hotplug_max ()); +int max_ram_len =order_base_2 (pseries_ddw_max_ram);struct ddw_query_response query;struct ddw_create_response create;int page_shift;
@@ -1668,7 +1674,7 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn, u64 dma_masif (direct_mapping) {/* DDW maps the whole partition, so enable direct DMA mapping */ - ret =walk_system_ram_range (0 ,ddw_memory_hotplug_max () >>PAGE_SHIFT , + ret =walk_system_ram_range (0 , pseries_ddw_max_ram >>PAGE_SHIFT , win64->value, tce_setrange_multi_pSeriesLP_walk);if (ret) { dev_info(&dev->dev, "failed to map DMA window for %pOF: %d\n",
@@ -2419,23 +2425,35 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action, {struct dma_win *window;struct memory_notify *arg = data; +unsigned long limit = arg->nr_pages; +unsigned long max_ram_pages = pseries_ddw_max_ram >>PAGE_SHIFT ;int ret =0 ;/* This notifier can get called when onlining persistent memory as well. * TCEs are not pre-mapped for persistent memory. Persistent memory will -* always be above ddw_memory_hotplug_max() +* always be above pseries_ddw_max_ram */ +if (arg->start_pfn >= max_ram_pages) +return NOTIFY_OK ; + +/* RAM is being DLPAR'ed. The range should never exceed max ram. +* Just in case, clamp the range and throw a warning. +*/ +if (arg->start_pfn + limit > max_ram_pages) { + limit = max_ram_pages - arg->start_pfn; +WARN_ONCE (1 ,"Limiting Page Range %lx - %lx to Max Mem Pages: %lx\n" , + arg->start_pfn, arg->start_pfn + arg->nr_pages, + max_ram_pages); + }switch (action) {case MEM_GOING_ONLINE :spin_lock (&dma_win_list_lock);list_for_each_entry (window, &dma_win_list, list) { -if (window->direct && (arg->start_pfn <<PAGE_SHIFT ) < -ddw_memory_hotplug_max ()) { +if (window->direct) { ret |=tce_setrange_multi_pSeriesLP (arg->start_pfn, - arg->nr_pages, window->prop); + limit, window->prop); } -/* XXX log error */ }spin_unlock (&dma_win_list_lock);break ;
@@ -2443,12 +2461,10 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action,case MEM_OFFLINE :spin_lock (&dma_win_list_lock);list_for_each_entry (window, &dma_win_list, list) { -if (window->direct && (arg->start_pfn <<PAGE_SHIFT ) < -ddw_memory_hotplug_max ()) { +if (window->direct) { ret |=tce_clearrange_multi_pSeriesLP (arg->start_pfn, - arg->nr_pages, window->prop); + limit, window->prop); } -/* XXX log error */ }spin_unlock (&dma_win_list_lock);break ;
@@ -2532,6 +2548,14 @@ void __init iommu_init_early_pSeries(void)register_memory_notifier (&iommu_mem_nb);set_pci_dma_ops (&dma_iommu_ops); + +/* During init determine the max memory an LPAR can have and set it. This +* will be used for pre-mapping RAM in DDW. memblock_end_of_DRAM() can +* change during the running of LPAR - daxctl can add pmemory as +* "system-ram". This memory range should not be pre-mapped in DDW since +* the address of pmemory can be much higher than the DDW size. +*/ + pseries_ddw_max_ram =ddw_memory_hotplug_max (); }static int __init disable_multitce (char *str)
base-commit: 6d35786de28116ecf78797a62b84e6bf3c45aa5a
Signature · 1 line
2.39.3
+ Venkat
Hi Gaurav,
Would just like to confirm if it is tested with multiple iterations of hotplug of RAM (DLPAR) as well?
Hi Venkat,
Could you please help validate the patch for above-mentioned scenario as well?
Hi Shivaprasad,
Please share your review feedback or any additional testing scenarios needed?
Thanks
Harsh
Quoted 204 lines · Gaurav Batra
In powerPC, if Dynamic DMA Window is big enough, RAM is pre-mapped. To determine the size of RAM, a PAPR+ property "ibm,lrdr-capacity" is used. This OF property dictates what is the max size of RAM an LPAR can have, including DR added memory.
In PowerPC, 16GB pages can be allocated at machine level and then assigned to LPARs. These 16GB pages are added to LPAR memory at the time of boot. The address range for these 16GB pages is above MAX RAM an LPAR can have (ibm,lrdr-capacity). In the current implementation, these 16GB pages are being excluded from pre-mapped TCEs. A driver can have DMA buffers allocated from 16GB pages. This results in platform to raise an EEH when DMA is attempted on buffers in 16GB memory range.
commit
6aa989ab2bd0("powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory")Prior to the above patch,
memblock_end_of_DRAM()was being used to determine the MAX memory of an LPAR. This included 16GB pages as well. The issue with usingmemblock_end_of_DRAM()is that when pmemory is converted to RAM via daxctl command, the DDW engine will incorrectly try to add TCEs for pmemory as well.Below is the address distribution of RAM, 16GB pages and pmemory for an LPAR with max memory of 256GB, memory allocated 64GB, 2 16GB pages and assigned pmemory of 8GB.
RANGE SIZE STATE REMOVABLE BLOCK
0x0000000000000000-0x0000000fffffffff 64G online yes 0-255 0x0000004000000000-0x00000047ffffffff 32G online yes 1024-1151cat
/sys/bus/nd/devices/region0/resource0x40100000000
cat/sys/bus/nd/devices/region0/size
8589934592The approach to fix this problem is to revert back the code changes introduced by the above patch and to stash away the MAX memory of an LPAR, including 16GB pages, at the LPAR boot time. This value is then used whenever TCEs are needed to be pre-mapped -
enable_DDW()or,iommu_mem_notifier()Fixes 6aa989ab2bd0 ("powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory")Signed-off-by Gaurav Batra <[email protected]>---
Change log:
V2 -> V3
1. Harsh: Remove R-b tags from the change log
Response: Incorporated changes
2. Harsh: Change
WARN_ON()toWARN_ONCE()Response: Incorporated changes
3. Harsh: Fix indendation
Response: Incorporated changes
4. Harsh: Replace comment with a log if limit <
arg->nr_pages?Response: Doesn't seems to be needed since the
WARN_ONCE()will log this scenario. I removed the comment instead.V1 -> V2
1. Harsh: Not only
start_pfn, butend_pfnalso needs to be within allowed range, which may require clampingarg->nr_pagesif crossing the limits.Response: Incorporated changes.
arch/powerpc/platforms/pseries/iommu.c | 58 ++++++++++++++++++-------- 1 file changed, 41 insertions(+), 17 deletions(-)arch/powerpc/platforms/pseries/iommu.c +41
-17@@ -69,6 +69,8 @@ static struct iommu_table *iommu_pseries_alloc_table(int node)return tbl; } +static phys_addr_t pseries_ddw_max_ram; +#ifdef CONFIG_IOMMU_API static struct iommu_table_group_ops spapr_tce_table_group_ops;#endif @@ -1285,13 +1287,17 @@ static LIST_HEAD(failed_ddw_pdn_list);static phys_addr_t ddw_memory_hotplug_max (void ) { -resource_size_t max_addr; +resource_size_t max_addr =memory_hotplug_max (); +struct device_node *memory; -#if defined(CONFIG_NUMA ) && defined(CONFIG_MEMORY_HOTPLUG ) - max_addr =hot_add_drconf_memory_max (); -#else - max_addr =memblock_end_of_DRAM (); -#endif +for_each_node_by_type (memory,"memory" ) { +struct resource res; + +if (of_address_to_resource (memory,0 , &res)) +continue ; + + max_addr =max_t (resource_size_t, max_addr, res.end +1 ); + }return max_addr; }@@ -1446,7 +1452,7 @@ static struct property *ddw_property_create(const char *propname, u32 liobn, u64static bool enable_ddw (struct pci_dev *dev,struct device_node *pdn,u64 dma_mask) {int len =0 , ret; -int max_ram_len =order_base_2 (ddw_memory_hotplug_max ()); +int max_ram_len =order_base_2 (pseries_ddw_max_ram);struct ddw_query_response query;struct ddw_create_response create;int page_shift;@@ -1668,7 +1674,7 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn, u64 dma_masif (direct_mapping) {/* DDW maps the whole partition, so enable direct DMA mapping */ - ret =walk_system_ram_range (0 ,ddw_memory_hotplug_max () >>PAGE_SHIFT , + ret =walk_system_ram_range (0 , pseries_ddw_max_ram >>PAGE_SHIFT , win64->value, tce_setrange_multi_pSeriesLP_walk);if (ret) { dev_info(&dev->dev, "failed to map DMA window for %pOF: %d\n",@@ -2419,23 +2425,35 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action, {struct dma_win *window;struct memory_notify *arg = data; +unsigned long limit = arg->nr_pages; +unsigned long max_ram_pages = pseries_ddw_max_ram >>PAGE_SHIFT ;int ret =0 ;/* This notifier can get called when onlining persistent memory as well. * TCEs are not pre-mapped for persistent memory. Persistent memory will -* always be above ddw_memory_hotplug_max() +* always be above pseries_ddw_max_ram */ +if (arg->start_pfn >= max_ram_pages) +return NOTIFY_OK ; + +/* RAM is being DLPAR'ed. The range should never exceed max ram. +* Just in case, clamp the range and throw a warning. +*/ +if (arg->start_pfn + limit > max_ram_pages) { + limit = max_ram_pages - arg->start_pfn; +WARN_ONCE (1 ,"Limiting Page Range %lx - %lx to Max Mem Pages: %lx\n" , + arg->start_pfn, arg->start_pfn + arg->nr_pages, + max_ram_pages); + }switch (action) {case MEM_GOING_ONLINE :spin_lock (&dma_win_list_lock);list_for_each_entry (window, &dma_win_list, list) { -if (window->direct && (arg->start_pfn <<PAGE_SHIFT ) < -ddw_memory_hotplug_max ()) { +if (window->direct) { ret |=tce_setrange_multi_pSeriesLP (arg->start_pfn, - arg->nr_pages, window->prop); + limit, window->prop); } -/* XXX log error */ }spin_unlock (&dma_win_list_lock);break ;@@ -2443,12 +2461,10 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action,case MEM_OFFLINE :spin_lock (&dma_win_list_lock);list_for_each_entry (window, &dma_win_list, list) { -if (window->direct && (arg->start_pfn <<PAGE_SHIFT ) < -ddw_memory_hotplug_max ()) { +if (window->direct) { ret |=tce_clearrange_multi_pSeriesLP (arg->start_pfn, - arg->nr_pages, window->prop); + limit, window->prop); } -/* XXX log error */ }spin_unlock (&dma_win_list_lock);break ;@@ -2532,6 +2548,14 @@ void __init iommu_init_early_pSeries(void)register_memory_notifier (&iommu_mem_nb);set_pci_dma_ops (&dma_iommu_ops); + +/* During init determine the max memory an LPAR can have and set it. This +* will be used for pre-mapping RAM in DDW. memblock_end_of_DRAM() can +* change during the running of LPAR - daxctl can add pmemory as +* "system-ram". This memory range should not be pre-mapped in DDW since +* the address of pmemory can be much higher than the DDW size. +*/ + pseries_ddw_max_ram =ddw_memory_hotplug_max (); }static int __init disable_multitce (char *str)base-commit:
6d35786de28116ecf78797a62b84e6bf3c45aa5a
Hello Harsh,
response is inline
Quoted 4 lines · Harsh Prateek Bora
+ Venkat
Hi Gaurav,
Would just like to confirm if it is tested with multiple iterations of hotplug of RAM (DLPAR) as well?
I tested the patch with both DLPAR of RAM and adapter, for 100 iterations each.
Quoted 218 lines
Hi Venkat,
Could you please help validate the patch for above-mentioned scenario as well?Hi Shivaprasad,
Please share your review feedback or any additional testing scenarios needed?Thanks
HarshQuoted 206 lines · Gaurav Batra
In powerPC, if Dynamic DMA Window is big enough, RAM is pre-mapped. To determine the size of RAM, a PAPR+ property "ibm,lrdr-capacity" is used. This OF property dictates what is the max size of RAM an LPAR can have, including DR added memory.
In PowerPC, 16GB pages can be allocated at machine level and then assigned to LPARs. These 16GB pages are added to LPAR memory at the time of boot. The address range for these 16GB pages is above MAX RAM an LPAR can have (ibm,lrdr-capacity). In the current implementation, these 16GB pages are being excluded from pre-mapped TCEs. A driver can have DMA buffers allocated from 16GB pages. This results in platform to raise an EEH when DMA is attempted on buffers in 16GB memory range.
commit
6aa989ab2bd0("powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory")Prior to the above patch,
memblock_end_of_DRAM()was being used to determine the MAX memory of an LPAR. This included 16GB pages as well. The issue with usingmemblock_end_of_DRAM()is that when pmemory is converted to RAM via daxctl command, the DDW engine will incorrectly try to add TCEs for pmemory as well.Below is the address distribution of RAM, 16GB pages and pmemory for an LPAR with max memory of 256GB, memory allocated 64GB, 2 16GB pages and assigned pmemory of 8GB.
RANGE SIZE STATE REMOVABLE BLOCK 0x0000000000000000-0x0000000fffffffff 64G online yes 0-255 0x0000004000000000-0x00000047ffffffff 32G online yes 1024-1151
cat
/sys/bus/nd/devices/region0/resource0x40100000000
cat/sys/bus/nd/devices/region0/size
8589934592The approach to fix this problem is to revert back the code changes introduced by the above patch and to stash away the MAX memory of an LPAR, including 16GB pages, at the LPAR boot time. This value is then used whenever TCEs are needed to be pre-mapped -
enable_DDW()or,iommu_mem_notifier()Fixes 6aa989ab2bd0 ("powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory")Signed-off-by Gaurav Batra <[email protected]>---
Change log:
V2 -> V3
1. Harsh: Remove R-b tags from the change log
Response: Incorporated changes
2. Harsh: Change
WARN_ON()toWARN_ONCE()Response: Incorporated changes
3. Harsh: Fix indendation
Response: Incorporated changes
4. Harsh: Replace comment with a log if limit <
arg->nr_pages?Response: Doesn't seems to be needed since the
WARN_ONCE()will log this scenario. I removed the comment instead.V1 -> V2
1. Harsh: Not only
start_pfn, butend_pfnalso needs to be within allowed range, which may require clampingarg->nr_pagesif crossing the limits.Response: Incorporated changes.
arch/powerpc/platforms/pseries/iommu.c| 58 ++++++++++++++++++--------1 file changed, 41 insertions(+), 17 deletions(-)arch/powerpc/platforms/pseries/iommu.c +1
-0@@ -69,6 +69,8 @@ static struct iommu_table *iommu_pseries_alloc_table(int node) return tbl; } +static phys_addr_t pseries_ddw_max_ram; + #ifdef CONFIG_IOMMU_API static struct iommu_table_group_ops spapr_tce_table_group_ops;#endif
arch/powerpc/platforms/pseries/iommu.c +11
-6@@ -1285,13 +1287,17 @@ static LIST_HEAD(failed_ddw_pdn_list); static phys_addr_t ddw_memory_hotplug_max(void) { - resource_size_t max_addr; + resource_size_t max_addr = memory_hotplug_max(); + struct device_node *memory; -#if defined(CONFIG_NUMA) && defined(CONFIG_MEMORY_HOTPLUG) - max_addr = hot_add_drconf_memory_max(); -#else - max_addr = memblock_end_of_DRAM(); -#endif + for_each_node_by_type(memory, "memory") { + struct resource res; + + if (of_address_to_resource(memory, 0, &res)) + continue; + + max_addr = max_t(resource_size_t, max_addr, res.end + 1); + } return max_addr; }@@ -1446,7 +1452,7 @@ static struct property *ddw_property_create(const char *propname, u32 liobn, u64 static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn, u64 dma_mask) { int len = 0, ret; - int max_ram_len = order_base_2(ddw_memory_hotplug_max()); + int max_ram_len = order_base_2(pseries_ddw_max_ram); struct ddw_query_response query; struct ddw_create_response create;int
page_shift;arch/powerpc/platforms/pseries/iommu.c +0
-0@@ -1668,7 +1674,7 @@ static bool enable_ddw(struct pci_dev *dev,struct
device_node*pdn, u64dma_mas
if (direct_mapping) {
/* DDW maps the whole partition, so enable direct DMA mapping */ - ret = walk_system_ram_range(0,ddw_memory_hotplug_max()>>PAGE_SHIFT,
+ ret = walk_system_ram_range(0,pseries_ddw_max_ram>>PAGE_SHIFT,
win64->value,tce_setrange_multi_pSeriesLP_walk); if (ret) {
dev_info(&dev->dev, "failed to map DMA window for %pOF: %d\n",arch/powerpc/platforms/pseries/iommu.c +15
-1@@ -2419,23 +2425,35 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action, { struct dma_win *window; struct memory_notify *arg = data; + unsigned long limit = arg->nr_pages; + unsigned long max_ram_pages = pseries_ddw_max_ram >> PAGE_SHIFT; int ret = 0; /* This notifier can get called when onlining persistent memory as well. * TCEs are not pre-mapped for persistent memory. Persistent memory will -* always be above ddw_memory_hotplug_max() + * always be above pseries_ddw_max_ram */ + if (arg->start_pfn >= max_ram_pages) + return NOTIFY_OK; + + /* RAM is being DLPAR'ed. The range should never exceed max ram. + * Just in case, clamp the range and throw a warning. + */ + if (arg->start_pfn + limit > max_ram_pages) { + limit = max_ram_pages - arg->start_pfn; + WARN_ONCE(1, "Limiting Page Range %lx - %lx to Max Mem Pages: %lx\n", + arg->start_pfn, arg->start_pfn + arg->nr_pages, + max_ram_pages); + } switch (action) {case
MEM_GOING_ONLINE:
spin_lock(&dma_win_list_lock);list_for_each_entry(window, &dma_win_list, list){ - if (window->direct&& (arg->start_pfn<<PAGE_SHIFT) < -ddw_memory_hotplug_max()) {
+ if (window->direct) {
ret |=tce_setrange_multi_pSeriesLP(arg->start_pfn, - arg->nr_pages, window->prop);
+ limit,window->prop);
}
- /* XXX log error */
}
spin_unlock(&dma_win_list_lock);
break;arch/powerpc/platforms/pseries/iommu.c +0
-0@@ -2443,12 +2461,10 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action,case
MEM_OFFLINE:
spin_lock(&dma_win_list_lock);list_for_each_entry(window, &dma_win_list, list){ - if (window->direct&& (arg->start_pfn<<PAGE_SHIFT) < -ddw_memory_hotplug_max()) {
+ if (window->direct) {
ret |=tce_clearrange_multi_pSeriesLP(arg->start_pfn, - arg->nr_pages, window->prop);
+ limit,window->prop);
}
- /* XXX log error */
}
spin_unlock(&dma_win_list_lock);
break;arch/powerpc/platforms/pseries/iommu.c +2
-0@@ -2532,6 +2548,14 @@ void __init iommu_init_early_pSeries(void) register_memory_notifier(&iommu_mem_nb); set_pci_dma_ops(&dma_iommu_ops); + + /* During init determine the max memory an LPAR can have and setit. This
+ * will be used for pre-mapping RAM in DDW.memblock_end_of_DRAM()can
+ * change during the running of LPAR - daxctl can add pmemory as + * "system-ram". This memory range should not be pre-mapped in DDW since
+ * the address of pmemory can be much higher than the DDW size. + */
+pseries_ddw_max_ram=ddw_memory_hotplug_max();
}
static int__initdisable_multitce(char *str)base-commit:
6d35786de28116ecf78797a62b84e6bf3c45aa5a
Harsh Prateek Bora
Reviewed-byQuoted 6 lines · Gaurav Batra
Hello Harsh,
response is inline
Quoted 6 lines
Quoted 4 lines · Harsh Prateek Bora
+ Venkat
Hi Gaurav,
Would just like to confirm if it is tested with multiple iterations of hotplug of RAM (DLPAR) as well?I tested the patch with both DLPAR of RAM and adapter, for 100 iterations each.
Thanks for confirming! Feel free to add:
Quoted 218 lines
Quoted 218 lines
Hi Venkat,
Could you please help validate the patch for above-mentioned scenario as well?Hi Shivaprasad,
Please share your review feedback or any additional testing scenarios needed?Thanks
HarshQuoted 206 lines · Gaurav Batra
In powerPC, if Dynamic DMA Window is big enough, RAM is pre-mapped. To determine the size of RAM, a PAPR+ property "ibm,lrdr-capacity" is used. This OF property dictates what is the max size of RAM an LPAR can have, including DR added memory.
In PowerPC, 16GB pages can be allocated at machine level and then assigned to LPARs. These 16GB pages are added to LPAR memory at the time of boot. The address range for these 16GB pages is above MAX RAM an LPAR can have (ibm,lrdr-capacity). In the current implementation, these 16GB pages are being excluded from pre-mapped TCEs. A driver can have DMA buffers allocated from 16GB pages. This results in platform to raise an EEH when DMA is attempted on buffers in 16GB memory range.
commit
6aa989ab2bd0("powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory")Prior to the above patch,
memblock_end_of_DRAM()was being used to determine the MAX memory of an LPAR. This included 16GB pages as well. The issue with usingmemblock_end_of_DRAM()is that when pmemory is converted to RAM via daxctl command, the DDW engine will incorrectly try to add TCEs for pmemory as well.Below is the address distribution of RAM, 16GB pages and pmemory for an LPAR with max memory of 256GB, memory allocated 64GB, 2 16GB pages and assigned pmemory of 8GB.
RANGE SIZE STATE REMOVABLE BLOCK 0x0000000000000000-0x0000000fffffffff 64G online yes 0-255 0x0000004000000000-0x00000047ffffffff 32G online yes 1024-1151
cat
/sys/bus/nd/devices/region0/resource0x40100000000
cat/sys/bus/nd/devices/region0/size
8589934592The approach to fix this problem is to revert back the code changes introduced by the above patch and to stash away the MAX memory of an LPAR, including 16GB pages, at the LPAR boot time. This value is then used whenever TCEs are needed to be pre-mapped -
enable_DDW()or,iommu_mem_notifier()Fixes 6aa989ab2bd0 ("powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory")Signed-off-by Gaurav Batra <[email protected]>---
Change log:
V2 -> V3
1. Harsh: Remove R-b tags from the change log
Response: Incorporated changes
2. Harsh: Change
WARN_ON()toWARN_ONCE()Response: Incorporated changes
3. Harsh: Fix indendation
Response: Incorporated changes
4. Harsh: Replace comment with a log if limit <
arg->nr_pages?Response: Doesn't seems to be needed since the
WARN_ONCE()will log this scenario. I removed the comment instead.V1 -> V2
1. Harsh: Not only
start_pfn, butend_pfnalso needs to be within allowed range, which may require clampingarg->nr_pagesif crossing the limits.Response: Incorporated changes.
arch/powerpc/platforms/pseries/iommu.c| 58 ++++++++++++++++++--------1 file changed, 41 insertions(+), 17 deletions(-)arch/powerpc/platforms/pseries/iommu.c +1
-0@@ -69,6 +69,8 @@ static struct iommu_table *iommu_pseries_alloc_table(int node) return tbl; } +static phys_addr_t pseries_ddw_max_ram; + #ifdef CONFIG_IOMMU_API static struct iommu_table_group_ops spapr_tce_table_group_ops;#endif
arch/powerpc/platforms/pseries/iommu.c +11
-6@@ -1285,13 +1287,17 @@ static LIST_HEAD(failed_ddw_pdn_list); static phys_addr_t ddw_memory_hotplug_max(void) { - resource_size_t max_addr; + resource_size_t max_addr = memory_hotplug_max(); + struct device_node *memory; -#if defined(CONFIG_NUMA) && defined(CONFIG_MEMORY_HOTPLUG) - max_addr = hot_add_drconf_memory_max(); -#else - max_addr = memblock_end_of_DRAM(); -#endif + for_each_node_by_type(memory, "memory") { + struct resource res; + + if (of_address_to_resource(memory, 0, &res)) + continue; + + max_addr = max_t(resource_size_t, max_addr, res.end + 1); + } return max_addr; }@@ -1446,7 +1452,7 @@ static struct property *ddw_property_create(const char *propname, u32 liobn, u64 static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn, u64 dma_mask) { int len = 0, ret; - int max_ram_len = order_base_2(ddw_memory_hotplug_max()); + int max_ram_len = order_base_2(pseries_ddw_max_ram); struct ddw_query_response query; struct ddw_create_response create;int
page_shift;arch/powerpc/platforms/pseries/iommu.c +0
-0@@ -1668,7 +1674,7 @@ static bool enable_ddw(struct pci_dev *dev,struct
device_node*pdn, u64dma_mas
if (direct_mapping) {
/* DDW maps the whole partition, so enable direct DMA mapping */ - ret = walk_system_ram_range(0,ddw_memory_hotplug_max()>>PAGE_SHIFT,
+ ret = walk_system_ram_range(0,pseries_ddw_max_ram>>PAGE_SHIFT,
win64->value,tce_setrange_multi_pSeriesLP_walk); if (ret) {
dev_info(&dev->dev, "failed to map DMA window for %pOF: %d\n",arch/powerpc/platforms/pseries/iommu.c +15
-1@@ -2419,23 +2425,35 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action, { struct dma_win *window; struct memory_notify *arg = data; + unsigned long limit = arg->nr_pages; + unsigned long max_ram_pages = pseries_ddw_max_ram >> PAGE_SHIFT; int ret = 0; /* This notifier can get called when onlining persistent memory as well. * TCEs are not pre-mapped for persistent memory. Persistent memory will -* always be above ddw_memory_hotplug_max() + * always be above pseries_ddw_max_ram */ + if (arg->start_pfn >= max_ram_pages) + return NOTIFY_OK; + + /* RAM is being DLPAR'ed. The range should never exceed max ram. + * Just in case, clamp the range and throw a warning. + */ + if (arg->start_pfn + limit > max_ram_pages) { + limit = max_ram_pages - arg->start_pfn; + WARN_ONCE(1, "Limiting Page Range %lx - %lx to Max Mem Pages: %lx\n", + arg->start_pfn, arg->start_pfn + arg->nr_pages, + max_ram_pages); + } switch (action) {case
MEM_GOING_ONLINE:
spin_lock(&dma_win_list_lock);list_for_each_entry(window, &dma_win_list, list){ - if (window->direct&& (arg->start_pfn<<PAGE_SHIFT) < -ddw_memory_hotplug_max()) {
+ if (window->direct) {
ret |=tce_setrange_multi_pSeriesLP(arg->start_pfn, - arg->nr_pages, window->prop);
+ limit,window->prop);
}
- /* XXX log error */
}
spin_unlock(&dma_win_list_lock);
break;arch/powerpc/platforms/pseries/iommu.c +0
-0@@ -2443,12 +2461,10 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action,case
MEM_OFFLINE:
spin_lock(&dma_win_list_lock);list_for_each_entry(window, &dma_win_list, list){ - if (window->direct&& (arg->start_pfn<<PAGE_SHIFT) < -ddw_memory_hotplug_max()) {
+ if (window->direct) {
ret |=tce_clearrange_multi_pSeriesLP(arg->start_pfn, - arg->nr_pages, window->prop);
+ limit,window->prop);
}
- /* XXX log error */
}
spin_unlock(&dma_win_list_lock);
break;arch/powerpc/platforms/pseries/iommu.c +2
-0@@ -2532,6 +2548,14 @@ void __init iommu_init_early_pSeries(void) register_memory_notifier(&iommu_mem_nb); set_pci_dma_ops(&dma_iommu_ops); + + /* During init determine the max memory an LPAR can have and setit. This
+ * will be used for pre-mapping RAM in DDW.memblock_end_of_DRAM()can
+ * change during the running of LPAR - daxctl can add pmemory as + * "system-ram". This memory range should not be pre-mapped in DDW since
+ * the address of pmemory can be much higher than the DDW size. + */
+pseries_ddw_max_ram=ddw_memory_hotplug_max();
}
static int__initdisable_multitce(char *str)base-commit:
6d35786de28116ecf78797a62b84e6bf3c45aa5a
Venkat Rao Bagalkote
Tested-byQuoted 7 lines · Harsh Prateek Bora
+ Venkat
Hi Gaurav,
Would just like to confirm if it is tested with multiple iterations of hotplug of RAM (DLPAR) as well?Hi Venkat,
Could you please help validate the patch for above-mentioned scenario as well?
Hi Harsh,
Thanks for looping me in on this.
I have performed DLPAR testing of memory for around 100 iterations and also carried out DLPAR of an adapter a few times.
I did not observe any issues during these tests.
Please let me know if any additional scenarios need to be validated.
Thanks again for cc’ing me and reaching out for this validation.
Please add, below tag.
Regards,
Venkat.
Quoted 216 lines
Hi Shivaprasad,
Please share your review feedback or any additional testing scenarios needed?Thanks
HarshQuoted 206 lines · Gaurav Batra
In powerPC, if Dynamic DMA Window is big enough, RAM is pre-mapped. To determine the size of RAM, a PAPR+ property "ibm,lrdr-capacity" is used. This OF property dictates what is the max size of RAM an LPAR can have, including DR added memory.
In PowerPC, 16GB pages can be allocated at machine level and then assigned to LPARs. These 16GB pages are added to LPAR memory at the time of boot. The address range for these 16GB pages is above MAX RAM an LPAR can have (ibm,lrdr-capacity). In the current implementation, these 16GB pages are being excluded from pre-mapped TCEs. A driver can have DMA buffers allocated from 16GB pages. This results in platform to raise an EEH when DMA is attempted on buffers in 16GB memory range.
commit
6aa989ab2bd0("powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory")Prior to the above patch,
memblock_end_of_DRAM()was being used to determine the MAX memory of an LPAR. This included 16GB pages as well. The issue with usingmemblock_end_of_DRAM()is that when pmemory is converted to RAM via daxctl command, the DDW engine will incorrectly try to add TCEs for pmemory as well.Below is the address distribution of RAM, 16GB pages and pmemory for an LPAR with max memory of 256GB, memory allocated 64GB, 2 16GB pages and assigned pmemory of 8GB.
RANGE SIZE STATE REMOVABLE BLOCK 0x0000000000000000-0x0000000fffffffff 64G online yes 0-255 0x0000004000000000-0x00000047ffffffff 32G online yes 1024-1151
cat
/sys/bus/nd/devices/region0/resource0x40100000000
cat/sys/bus/nd/devices/region0/size
8589934592The approach to fix this problem is to revert back the code changes introduced by the above patch and to stash away the MAX memory of an LPAR, including 16GB pages, at the LPAR boot time. This value is then used whenever TCEs are needed to be pre-mapped -
enable_DDW()or,iommu_mem_notifier()Fixes 6aa989ab2bd0 ("powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory")Signed-off-by Gaurav Batra <[email protected]>---
Change log:
V2 -> V3
1. Harsh: Remove R-b tags from the change log
Response: Incorporated changes
2. Harsh: Change
WARN_ON()toWARN_ONCE()Response: Incorporated changes
3. Harsh: Fix indendation
Response: Incorporated changes
4. Harsh: Replace comment with a log if limit <
arg->nr_pages?Response: Doesn't seems to be needed since the
WARN_ONCE()will log this scenario. I removed the comment instead.V1 -> V2
1. Harsh: Not only
start_pfn, butend_pfnalso needs to be within allowed range, which may require clampingarg->nr_pagesif crossing the limits.Response: Incorporated changes.
arch/powerpc/platforms/pseries/iommu.c| 58 ++++++++++++++++++--------1 file changed, 41 insertions(+), 17 deletions(-)arch/powerpc/platforms/pseries/iommu.c +1
-0@@ -69,6 +69,8 @@ static struct iommu_table *iommu_pseries_alloc_table(int node) return tbl; } +static phys_addr_t pseries_ddw_max_ram; + #ifdef CONFIG_IOMMU_API static struct iommu_table_group_ops spapr_tce_table_group_ops;#endif
arch/powerpc/platforms/pseries/iommu.c +11
-6@@ -1285,13 +1287,17 @@ static LIST_HEAD(failed_ddw_pdn_list); static phys_addr_t ddw_memory_hotplug_max(void) { - resource_size_t max_addr; + resource_size_t max_addr = memory_hotplug_max(); + struct device_node *memory; -#if defined(CONFIG_NUMA) && defined(CONFIG_MEMORY_HOTPLUG) - max_addr = hot_add_drconf_memory_max(); -#else - max_addr = memblock_end_of_DRAM(); -#endif + for_each_node_by_type(memory, "memory") { + struct resource res; + + if (of_address_to_resource(memory, 0, &res)) + continue; + + max_addr = max_t(resource_size_t, max_addr, res.end + 1); + } return max_addr; }@@ -1446,7 +1452,7 @@ static struct property *ddw_property_create(const char *propname, u32 liobn, u64 static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn, u64 dma_mask) { int len = 0, ret; - int max_ram_len = order_base_2(ddw_memory_hotplug_max()); + int max_ram_len = order_base_2(pseries_ddw_max_ram); struct ddw_query_response query; struct ddw_create_response create;int
page_shift;arch/powerpc/platforms/pseries/iommu.c +0
-0@@ -1668,7 +1674,7 @@ static bool enable_ddw(struct pci_dev *dev,struct
device_node*pdn, u64dma_mas
if (direct_mapping) {
/* DDW maps the whole partition, so enable direct DMA mapping */ - ret = walk_system_ram_range(0,ddw_memory_hotplug_max()>>PAGE_SHIFT,
+ ret = walk_system_ram_range(0,pseries_ddw_max_ram>>PAGE_SHIFT,
win64->value,tce_setrange_multi_pSeriesLP_walk); if (ret) {
dev_info(&dev->dev, "failed to map DMA window for %pOF: %d\n",arch/powerpc/platforms/pseries/iommu.c +15
-1@@ -2419,23 +2425,35 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action, { struct dma_win *window; struct memory_notify *arg = data; + unsigned long limit = arg->nr_pages; + unsigned long max_ram_pages = pseries_ddw_max_ram >> PAGE_SHIFT; int ret = 0; /* This notifier can get called when onlining persistent memory as well. * TCEs are not pre-mapped for persistent memory. Persistent memory will -* always be above ddw_memory_hotplug_max() + * always be above pseries_ddw_max_ram */ + if (arg->start_pfn >= max_ram_pages) + return NOTIFY_OK; + + /* RAM is being DLPAR'ed. The range should never exceed max ram. + * Just in case, clamp the range and throw a warning. + */ + if (arg->start_pfn + limit > max_ram_pages) { + limit = max_ram_pages - arg->start_pfn; + WARN_ONCE(1, "Limiting Page Range %lx - %lx to Max Mem Pages: %lx\n", + arg->start_pfn, arg->start_pfn + arg->nr_pages, + max_ram_pages); + } switch (action) {case
MEM_GOING_ONLINE:
spin_lock(&dma_win_list_lock);list_for_each_entry(window, &dma_win_list, list){ - if (window->direct&& (arg->start_pfn<<PAGE_SHIFT) < -ddw_memory_hotplug_max()) {
+ if (window->direct) {
ret |=tce_setrange_multi_pSeriesLP(arg->start_pfn, - arg->nr_pages, window->prop);
+ limit,window->prop);
}
- /* XXX log error */
}
spin_unlock(&dma_win_list_lock);
break;arch/powerpc/platforms/pseries/iommu.c +0
-0@@ -2443,12 +2461,10 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action,case
MEM_OFFLINE:
spin_lock(&dma_win_list_lock);list_for_each_entry(window, &dma_win_list, list){ - if (window->direct&& (arg->start_pfn<<PAGE_SHIFT) < -ddw_memory_hotplug_max()) {
+ if (window->direct) {
ret |=tce_clearrange_multi_pSeriesLP(arg->start_pfn, - arg->nr_pages, window->prop);
+ limit,window->prop);
}
- /* XXX log error */
}
spin_unlock(&dma_win_list_lock);
break;arch/powerpc/platforms/pseries/iommu.c +2
-0@@ -2532,6 +2548,14 @@ void __init iommu_init_early_pSeries(void) register_memory_notifier(&iommu_mem_nb); set_pci_dma_ops(&dma_iommu_ops); + + /* During init determine the max memory an LPAR can have and setit. This
+ * will be used for pre-mapping RAM in DDW.memblock_end_of_DRAM()can
+ * change during the running of LPAR - daxctl can add pmemory as + * "system-ram". This memory range should not be pre-mapped in DDW since
+ * the address of pmemory can be much higher than the DDW size. + */
+pseries_ddw_max_ram=ddw_memory_hotplug_max();
}
static int__initdisable_multitce(char *str)base-commit:
6d35786de28116ecf78797a62b84e6bf3c45aa5a
Ritesh Harjani (IBM)
reviewerThanks for the changes. Added minor comments and queries.
Quoted 6 lines · Gaurav Batra
In powerPC, if Dynamic DMA Window is big enough, RAM is pre-mapped. To determine the size of RAM, a PAPR+ property "ibm,lrdr-capacity" is used. This OF property dictates what is the max size of RAM an LPAR can have, including DR added memory.
In PowerPC, 16GB pages can be allocated at machine level and then
This will be mostly for Hash MMU correct? Which will be P9 then? Is this also possible in case of P10?
Can this 16GB pages be added via HMC? How can one test this?
Quoted 20 lines
assigned to LPARs. These 16GB pages are added to LPAR memory at the time of boot. The address range for these 16GB pages is above MAX RAM an LPAR can have (ibm,lrdr-capacity). In the current implementation, these 16GB pages are being excluded from pre-mapped TCEs. A driver can have DMA buffers allocated from 16GB pages. This results in platform to raise an EEH when DMA is attempted on buffers in 16GB memory range.
commit
6aa989ab2bd0("powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory")Prior to the above patch,
memblock_end_of_DRAM()was being used to determine the MAX memory of an LPAR. This included 16GB pages as well. The issue with usingmemblock_end_of_DRAM()is that when pmemory is converted to RAM via daxctl command, the DDW engine will incorrectly try to add TCEs for pmemory as well.Below is the address distribution of RAM, 16GB pages and pmemory for an LPAR with max memory of 256GB, memory allocated 64GB, 2 16GB pages and assigned pmemory of 8GB.
Quoted 9 lines
RANGE SIZE STATE REMOVABLE BLOCK
0x0000000000000000-0x0000000fffffffff 64G online yes 0-255 0x0000004000000000-0x00000047ffffffff 32G online yes 1024-1151cat
/sys/bus/nd/devices/region0/resource0x40100000000
cat/sys/bus/nd/devices/region0/size
8589934592
cat /proc/iomem should show the output for pmemory as well correct?
Quoted 6 lines
The approach to fix this problem is to revert back the code changes introduced by the above patch and to stash away the MAX memory of an LPAR, including 16GB pages, at the LPAR boot time. This value is then used whenever TCEs are needed to be pre-mapped -
enable_DDW()or,iommu_mem_notifier()
Was this hit in an internal testing? Is it possible to have a test around this please?
@Venkat, did we test this specific case with and w/o this patch as well? Reason for my asks is - since we will be backporting this patch to older stable kernels, it will be good to ensure this has been properly tested and if possible we should even have a unit test to ensure this doesn't break in future.
Quoted 1 line
Fixes 6aa989ab2bd0 ("powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory")
This patch was made in v6.15. Since we want this to be backported, I would suggested add a CC stable tag as well.
Quoted 39 lines
Signed-off-by Gaurav Batra <[email protected]>---
Change log:
V2 -> V3
1. Harsh: Remove R-b tags from the change log
Response: Incorporated changes
2. Harsh: Change
WARN_ON()toWARN_ONCE()Response: Incorporated changes
3. Harsh: Fix indendation
Response: Incorporated changes
4. Harsh: Replace comment with a log if limit <
arg->nr_pages?Response: Doesn't seems to be needed since the
WARN_ONCE()will log this scenario. I removed the comment instead.V1 -> V2
1. Harsh: Not only
start_pfn, butend_pfnalso needs to be within allowed range, which may require clampingarg->nr_pagesif crossing the limits.Response: Incorporated changes.
arch/powerpc/platforms/pseries/iommu.c | 58 ++++++++++++++++++-------- 1 file changed, 41 insertions(+), 17 deletions(-)arch/powerpc/platforms/pseries/iommu.c +0
-0
arch/powerpc/platforms/pseries/iommu.c static struct iommu_table *iommu_pseries_alloc_table(int node) · line 73
Quoted 5 lines
arch/powerpc/platforms/pseries/iommu.c +2
-0@@ -69,6 +69,8 @@ static struct iommu_table *iommu_pseries_alloc_table(int node)return tbl; } +static phys_addr_t pseries_ddw_max_ram; +
Since this is only set once during init and read afterwards.. Maybe we should change this to __ro_after_init?
arch/powerpc/platforms/pseries/iommu.c static LIST_HEAD(failed_ddw_pdn_list); · line 1288
Quoted 6 lines
arch/powerpc/platforms/pseries/iommu.c +0
-0#ifdef CONFIG_IOMMU_API static struct iommu_table_group_ops spapr_tce_table_group_ops;#endif @@ -1285,13 +1287,17 @@ static LIST_HEAD(failed_ddw_pdn_list);static phys_addr_t ddw_memory_hotplug_max (void )
After this change, this function only gets called from __init function. So let's mark it as __init.
Quoted 31 lines
arch/powerpc/platforms/pseries/iommu.c +11
-7{ -resource_size_t max_addr; +resource_size_t max_addr =memory_hotplug_max (); +struct device_node *memory; -#if defined(CONFIG_NUMA ) && defined(CONFIG_MEMORY_HOTPLUG ) - max_addr =hot_add_drconf_memory_max (); -#else - max_addr =memblock_end_of_DRAM (); -#endif +for_each_node_by_type (memory,"memory" ) { +struct resource res; + +if (of_address_to_resource (memory,0 , &res)) +continue ; + + max_addr =max_t (resource_size_t, max_addr, res.end +1 ); + }return max_addr; }@@ -1446,7 +1452,7 @@ static struct property *ddw_property_create(const char *propname, u32 liobn, u64static bool enable_ddw (struct pci_dev *dev,struct device_node *pdn,u64 dma_mask) {int len =0 , ret; -int max_ram_len =order_base_2 (ddw_memory_hotplug_max ()); +int max_ram_len =order_base_2 (pseries_ddw_max_ram);struct ddw_query_response query;struct ddw_create_response create;int page_shift;
arch/powerpc/platforms/pseries/iommu.c static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn, u64 dma_mas · line 1675
Quoted 2 lines
arch/powerpc/platforms/pseries/iommu.c +0
-0@@ -1668,7 +1674,7 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn, u64 dma_masif (direct_mapping) {
Outside of this patch, but I see a case where:
- pmem is present and if ddw_sz is larger than MAX_PHYSMEM_BITS, in that case we use the direct mapping (enable_ddw()).
So IMO - that path looks a bit buggy, because we say our ddw_sz is large enough even with vpmem but we only create TCE entries for system ram and not for vPMEM. So say when there is a DMA to the vpmem devdax region, then we won't find any TCE entries and that may cause EEH too right?
Quoted 11 lines
arch/powerpc/platforms/pseries/iommu.c +2
-1/* DDW maps the whole partition, so enable direct DMA mapping */ - ret =walk_system_ram_range (0 ,ddw_memory_hotplug_max () >>PAGE_SHIFT , + ret =walk_system_ram_range (0 , pseries_ddw_max_ram >>PAGE_SHIFT , win64->value, tce_setrange_multi_pSeriesLP_walk);if (ret) { dev_info(&dev->dev, "failed to map DMA window for %pOF: %d\n",@@ -2419,23 +2425,35 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action, {struct dma_win *window;struct memory_notify *arg = data; +unsigned long limit = arg->nr_pages;
arch/powerpc/platforms/pseries/iommu.c static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action, · line 2437
Quoted 10 lines
arch/powerpc/platforms/pseries/iommu.c +4
-1+unsigned long max_ram_pages = pseries_ddw_max_ram >>PAGE_SHIFT ;int ret =0 ;/* This notifier can get called when onlining persistent memory as well. * TCEs are not pre-mapped for persistent memory. Persistent memory will -* always be above ddw_memory_hotplug_max() +* always be above pseries_ddw_max_ram */ +if (arg->start_pfn >= max_ram_pages) +return NOTIFY_OK ;
This case is when we have pmem converted to system ram correct?
arch/powerpc/platforms/pseries/iommu.c static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action, · line 2447
Quoted 10 lines
arch/powerpc/platforms/pseries/iommu.c +10
-0+ +/* RAM is being DLPAR'ed. The range should never exceed max ram. +* Just in case, clamp the range and throw a warning. +*/ +if (arg->start_pfn + limit > max_ram_pages) { + limit = max_ram_pages - arg->start_pfn; +WARN_ONCE (1 ,"Limiting Page Range %lx - %lx to Max Mem Pages: %lx\n" , + arg->start_pfn, arg->start_pfn + arg->nr_pages, + max_ram_pages); + }
when would this condition hit if at all? Have we seen this happening in past anytime?
Quoted 47 lines
arch/powerpc/platforms/pseries/iommu.c +12
-8switch (action) {case MEM_GOING_ONLINE :spin_lock (&dma_win_list_lock);list_for_each_entry (window, &dma_win_list, list) { -if (window->direct && (arg->start_pfn <<PAGE_SHIFT ) < -ddw_memory_hotplug_max ()) { +if (window->direct) { ret |=tce_setrange_multi_pSeriesLP (arg->start_pfn, - arg->nr_pages, window->prop); + limit, window->prop); } -/* XXX log error */ }spin_unlock (&dma_win_list_lock);break ;@@ -2443,12 +2461,10 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action,case MEM_OFFLINE :spin_lock (&dma_win_list_lock);list_for_each_entry (window, &dma_win_list, list) { -if (window->direct && (arg->start_pfn <<PAGE_SHIFT ) < -ddw_memory_hotplug_max ()) { +if (window->direct) { ret |=tce_clearrange_multi_pSeriesLP (arg->start_pfn, - arg->nr_pages, window->prop); + limit, window->prop); } -/* XXX log error */ }spin_unlock (&dma_win_list_lock);break ;@@ -2532,6 +2548,14 @@ void __init iommu_init_early_pSeries(void)register_memory_notifier (&iommu_mem_nb);set_pci_dma_ops (&dma_iommu_ops); + +/* During init determine the max memory an LPAR can have and set it. This +* will be used for pre-mapping RAM in DDW. memblock_end_of_DRAM() can +* change during the running of LPAR - daxctl can add pmemory as +* "system-ram". This memory range should not be pre-mapped in DDW since +* the address of pmemory can be much higher than the DDW size. +*/ + pseries_ddw_max_ram =ddw_memory_hotplug_max (); }static int __init disable_multitce (char *str)
Quoted 3 lines
base-commit:
6d35786de28116ecf78797a62b84e6bf3c45aa5aSignature · 1 line
2.39.3
-ritesh
Quoted 9 lines · Ritesh Harjani (IBM)
Thanks for the changes. Added minor comments and queries.
Quoted 5 lines · Gaurav Batra
In powerPC, if Dynamic DMA Window is big enough, RAM is pre-mapped. To determine the size of RAM, a PAPR+ property "ibm,lrdr-capacity" is used. This OF property dictates what is the max size of RAM an LPAR can have, including DR added memory.
Quoted 4 lines
Quoted 1 line
In PowerPC, 16GB pages can be allocated at machine level and then
This will be mostly for Hash MMU correct? Which will be P9 then? Is this also possible in case of P10?
Can this 16GB pages be added via HMC? How can one test this?
Huge pages needs to be allocate at CEC level and then CEC rebooted.
After that, you can assign these huge pages to an LPAR. The LPAR needs to be in
hash MMU mode. Both P9 and P10 are supported.
Quoted 25 lines
Quoted 25 lines
assigned to LPARs. These 16GB pages are added to LPAR memory at the time of boot. The address range for these 16GB pages is above MAX RAM an LPAR can have (ibm,lrdr-capacity). In the current implementation, these 16GB pages are being excluded from pre-mapped TCEs. A driver can have DMA buffers allocated from 16GB pages. This results in platform to raise an EEH when DMA is attempted on buffers in 16GB memory range.
commit
6aa989ab2bd0("powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory")Prior to the above patch,
memblock_end_of_DRAM()was being used to determine the MAX memory of an LPAR. This included 16GB pages as well. The issue with usingmemblock_end_of_DRAM()is that when pmemory is converted to RAM via daxctl command, the DDW engine will incorrectly try to add TCEs for pmemory as well.Below is the address distribution of RAM, 16GB pages and pmemory for an LPAR with max memory of 256GB, memory allocated 64GB, 2 16GB pages and assigned pmemory of 8GB.
RANGE SIZE STATE REMOVABLE BLOCK
0x0000000000000000-0x0000000fffffffff 64G online yes 0-255 0x0000004000000000-0x00000047ffffffff 32G online yes 1024-1151
Quoted 6 lines
Quoted 5 lines
cat
/sys/bus/nd/devices/region0/resource0x40100000000
cat/sys/bus/nd/devices/region0/size
8589934592cat
/proc/iomemshould show the output for pmemory as well correct?
Well, it depends. If pmemory is just assigned to the LPAR, it will not show in /proc/iomem.
This is how is it in my LPAR
cat /sys/bus/nd/devices/region0/resource0x40100000000
(0) root @ ltcd41-lp10: /root
# cat /sys/bus/nd/devices/region0/size 17179869184
# cat /proc/iomem 00000000-7ffffffff : System RAM 40000000000-40001ffffff : pci@80000002900c002 40000000000-40001ffffff : c002:01:00.0 40000000000-40001ffffff : mlx5_core 40080000000-400feffffff : pci@800000020000012 40080000000-40087ffffff : 0012:01:00.1 40080000000-40087ffffff : mlx5_core 40088000000-4008fffffff : 0012:01:00.0 40088000000-4008fffffff : mlx5_core 40090000000-400900fffff : 0012:01:00.1 40090100000-400901fffff : 0012:01:00.0 44000000000-47fffffffff : pci@800000020000012
So, pmemory is assigned by not shown in /proc/iomem.
Now, if I use daxctl to convert this pmemory into regular memory it will show in /proc/iomem
# cat /proc/iomem 00000000-7ffffffff : System RAM 40000000000-40001ffffff : pci@80000002900c002 40000000000-40001ffffff : c002:01:00.0 40000000000-40001ffffff : mlx5_core 40080000000-400feffffff : pci@800000020000012 40080000000-40087ffffff : 0012:01:00.1 40080000000-40087ffffff : mlx5_core 40088000000-4008fffffff : 0012:01:00.0 40088000000-4008fffffff : mlx5_core 40090000000-400900fffff : 0012:01:00.1 40090100000-400901fffff : 0012:01:00.0 40100000000-401009fffff : namespace0.0 <---------- 40100a00000-402ffffffff : dax0.0 <-------- 44000000000-47fffffffff : pci@800000020000012
Quoted 9 lines
Quoted 7 lines
The approach to fix this problem is to revert back the code changes introduced by the above patch and to stash away the MAX memory of an LPAR, including 16GB pages, at the LPAR boot time. This value is then used whenever TCEs are needed to be pre-mapped -
enable_DDW()or,iommu_mem_notifier()Was this hit in an internal testing? Is it possible to have a test around this please?
This was hit in one of the environments by Sypre system test. They had 2 16GB pages created in CEC
and they assigned all the resources to just one LPAR. They were not aware of this configuration.
I don't have access to that LPAP any more, but, I am sure this can be recreated in the lab.
Quoted 10 lines
@Venkat, did we test this specific case with and w/o this patch as well? Reason for my asks is - since we will be backporting this patch to older stable kernels, it will be good to ensure this has been properly tested and if possible we should even have a unit test to ensure this doesn't break in future.
Quoted 1 line
Fixes 6aa989ab2bd0 ("powerpc/pseries/iommu: memory notifier incorrectly adds TCEs for pmemory")This patch was made in v6.15. Since we want this to be backported, I would suggested add a CC stable tag as well.
Will do in my next iteration of the patch
Quoted 43 lines
Quoted 43 lines
Signed-off-by Gaurav Batra <[email protected]>---
Change log:
V2 -> V3
1. Harsh: Remove R-b tags from the change log
Response: Incorporated changes
2. Harsh: Change
WARN_ON()toWARN_ONCE()Response: Incorporated changes
3. Harsh: Fix indendation
Response: Incorporated changes
4. Harsh: Replace comment with a log if limit <
arg->nr_pages?Response: Doesn't seems to be needed since the
WARN_ONCE()will log this scenario. I removed the comment instead.V1 -> V2
1. Harsh: Not only
start_pfn, butend_pfnalso needs to be within allowed range, which may require clampingarg->nr_pagesif crossing the limits.Response: Incorporated changes.
arch/powerpc/platforms/pseries/iommu.c | 58 ++++++++++++++++++-------- 1 file changed, 41 insertions(+), 17 deletions(-)arch/powerpc/platforms/pseries/iommu.c +0
-0@@ -69,6 +69,8 @@ static struct iommu_table *iommu_pseries_alloc_table(int node)return tbl; }
Quoted 4 lines
arch/powerpc/platforms/pseries/iommu.c static struct iommu_table *iommu_pseries_alloc_table(int node) · line 73
Quoted 2 lines
arch/powerpc/platforms/pseries/iommu.c +2
-0+static phys_addr_t pseries_ddw_max_ram; +Since this is only set once during init and read afterwards.. Maybe we should change this to
__ro_after_init?
Will do
Quoted 8 lines
arch/powerpc/platforms/pseries/iommu.c static LIST_HEAD(failed_ddw_pdn_list); · line 1288
Quoted 6 lines
arch/powerpc/platforms/pseries/iommu.c +0
-0#ifdef CONFIG_IOMMU_API static struct iommu_table_group_ops spapr_tce_table_group_ops;#endif @@ -1285,13 +1287,17 @@ static LIST_HEAD(failed_ddw_pdn_list);static phys_addr_t ddw_memory_hotplug_max (void )After this change, this function only gets called from
__initfunction. So let's mark it as__init.
Will do
Quoted 36 lines
Quoted 32 lines
arch/powerpc/platforms/pseries/iommu.c +11
-7{ -resource_size_t max_addr; +resource_size_t max_addr =memory_hotplug_max (); +struct device_node *memory; -#if defined(CONFIG_NUMA ) && defined(CONFIG_MEMORY_HOTPLUG ) - max_addr =hot_add_drconf_memory_max (); -#else - max_addr =memblock_end_of_DRAM (); -#endif +for_each_node_by_type (memory,"memory" ) { +struct resource res; + +if (of_address_to_resource (memory,0 , &res)) +continue ; + + max_addr =max_t (resource_size_t, max_addr, res.end +1 ); + }return max_addr; }@@ -1446,7 +1452,7 @@ static struct property *ddw_property_create(const char *propname, u32 liobn, u64static bool enable_ddw (struct pci_dev *dev,struct device_node *pdn,u64 dma_mask) {int len =0 , ret; -int max_ram_len =order_base_2 (ddw_memory_hotplug_max ()); +int max_ram_len =order_base_2 (pseries_ddw_max_ram);struct ddw_query_response query;struct ddw_create_response create;int page_shift;arch/powerpc/platforms/pseries/iommu.c static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn, u64 dma_mas · line 1675
Quoted 2 lines
arch/powerpc/platforms/pseries/iommu.c +0
-0@@ -1668,7 +1674,7 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn, u64 dma_masif (direct_mapping) {Outside of this patch, but I see a case where:
Quoted 6 lines
- pmem is present and if
ddw_szis larger thanMAX_PHYSMEM_BITS, in that case we use the direct mapping (enable_ddw()).
So IMO - that path looks a bit buggy, because we say ourddw_szis large enough even with vpmem but we only create TCE entries for system ram and not for vPMEM. So say when there is a DMA to the vpmem devdax region, then we won't find any TCE entries and that may cause EEH too right?
In this scenario, bus_dma_limit will be set to max_ram (not including vpmem). Any buffers in the
devdax region will get dynamic mapping from the 2GB default window.
Quoted 16 lines
Quoted 16 lines
arch/powerpc/platforms/pseries/iommu.c +3
-1/* DDW maps the whole partition, so enable direct DMA mapping */ - ret =walk_system_ram_range (0 ,ddw_memory_hotplug_max () >>PAGE_SHIFT , + ret =walk_system_ram_range (0 , pseries_ddw_max_ram >>PAGE_SHIFT , win64->value, tce_setrange_multi_pSeriesLP_walk);if (ret) { dev_info(&dev->dev, "failed to map DMA window for %pOF: %d\n",@@ -2419,23 +2425,35 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action, {struct dma_win *window;struct memory_notify *arg = data; +unsigned long limit = arg->nr_pages; +unsigned long max_ram_pages = pseries_ddw_max_ram >>PAGE_SHIFT ;int ret =0 ;
Quoted 8 lines
arch/powerpc/platforms/pseries/iommu.c static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action, · line 2437
Quoted 7 lines
arch/powerpc/platforms/pseries/iommu.c +3
-1/* This notifier can get called when onlining persistent memory as well. * TCEs are not pre-mapped for persistent memory. Persistent memory will -* always be above ddw_memory_hotplug_max() +* always be above pseries_ddw_max_ram */ +if (arg->start_pfn >= max_ram_pages) +return NOTIFY_OK ;This case is when we have pmem converted to system ram correct?
right
Quoted 13 lines
arch/powerpc/platforms/pseries/iommu.c static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action, · line 2447
Quoted 11 lines
arch/powerpc/platforms/pseries/iommu.c +10
-0+ +/* RAM is being DLPAR'ed. The range should never exceed max ram. +* Just in case, clamp the range and throw a warning. +*/ +if (arg->start_pfn + limit > max_ram_pages) { + limit = max_ram_pages - arg->start_pfn; +WARN_ONCE (1 ,"Limiting Page Range %lx - %lx to Max Mem Pages: %lx\n" , + arg->start_pfn, arg->start_pfn + arg->nr_pages, + max_ram_pages); + }when would this condition hit if at all? Have we seen this happening in past anytime?
I don't think we will have this condition hit at all. notifier handler will be called during DLPAR of RAM
or, vpmem getting converted to dax. So, there is no way this will cross the RAM/vpmem boundary in the same
invocation of iommu_mem_notifier()
Quoted 51 lines
Quoted 47 lines
arch/powerpc/platforms/pseries/iommu.c +12
-8switch (action) {case MEM_GOING_ONLINE :spin_lock (&dma_win_list_lock);list_for_each_entry (window, &dma_win_list, list) { -if (window->direct && (arg->start_pfn <<PAGE_SHIFT ) < -ddw_memory_hotplug_max ()) { +if (window->direct) { ret |=tce_setrange_multi_pSeriesLP (arg->start_pfn, - arg->nr_pages, window->prop); + limit, window->prop); } -/* XXX log error */ }spin_unlock (&dma_win_list_lock);break ;@@ -2443,12 +2461,10 @@ static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action,case MEM_OFFLINE :spin_lock (&dma_win_list_lock);list_for_each_entry (window, &dma_win_list, list) { -if (window->direct && (arg->start_pfn <<PAGE_SHIFT ) < -ddw_memory_hotplug_max ()) { +if (window->direct) { ret |=tce_clearrange_multi_pSeriesLP (arg->start_pfn, - arg->nr_pages, window->prop); + limit, window->prop); } -/* XXX log error */ }spin_unlock (&dma_win_list_lock);break ;@@ -2532,6 +2548,14 @@ void __init iommu_init_early_pSeries(void)register_memory_notifier (&iommu_mem_nb);set_pci_dma_ops (&dma_iommu_ops); + +/* During init determine the max memory an LPAR can have and set it. This +* will be used for pre-mapping RAM in DDW. memblock_end_of_DRAM() can +* change during the running of LPAR - daxctl can add pmemory as +* "system-ram". This memory range should not be pre-mapped in DDW since +* the address of pmemory can be much higher than the DDW size. +*/ + pseries_ddw_max_ram =ddw_memory_hotplug_max (); }static int __init disable_multitce (char *str)Quoted 3 lines
base-commit:
6d35786de28116ecf78797a62b84e6bf3c45aa5aSignature · 1 line
2.39.3-ritesh