Allow bigger 64bit window by removing default DMA window
v5 cover Allow bigger 64bit window by removing default DMA window
There are some devices in which a hypervisor may only allow 1 DMA window to exist at a time, and in those cases, a DDW is never created to them, since the default DMA window keeps using this resource.
LoPAR recommends this procedure:
1. Remove the default DMA window,
2. Query for which configs the DDW can be created,
3. Create a DDW.
Patch #1:
Create defines for outputs of ibm,ddw-applicable, so it's easier to identify them.
Patch #2:
- After LoPAR level 2.8, there is an extension that can make ibm,query-pe-dma-windows to have 6 outputs instead of 5. This changes the order of the outputs, and that can cause some trouble.
- query_ddw() was updated to check how many outputs the ibm,query-pe-dma-windows is supposed to have, update the rtas_call() and deal correctly with the outputs in both cases.
- This patch looks somehow unrelated to the series, but it can avoid future problems on DDW creation.
Patch #3 moves the window-removing code from remove_ddw() to remove_dma_window(), creating a way to delete any DMA window, so it can be used to delete the default DMA window.
Patch #4 makes use of the remove_dma_window() from patch #3 to remove the default DMA window before query_ddw(). It also implements a new rtas call to recover the default DMA window, in case anything fails after it was removed, and a DDW couldn't be created.
---
Changes since v4:
- Removed patches 5+ in order to deal with a feature at a time
- Remove unnecessary parentesis in patch #4
- Changed patch #4 title from
"Remove default DMA window before creating DDW"
- Included David Dai tested-by
- v4 link: http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=190051&state=%2A&archive=both
Changes since v3:
- Introduces new patch #5, to prepare for an important change in #6
- struct iommu_table was not being updated, so include a way to do this
in patch #6.
- Improved patch #4 based in a suggestion from Alexey, to make code
more easily understandable
- v3 link: http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=187348&state=%2A&archive=both
Changes since v2:
- Change the way ibm,ddw-extensions is accessed, using a proper function
instead of doing this inline everytime it's used.
- Remove previous patch #6, as it doesn't look like it would be useful.
- Add new patch, for changing names from direct* to dma*, as indirect
mapping can be used from now on.
- Fix some typos, corrects some define usage.
- v2 link: http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=185433&state=%2A&archive=both
Changes since v1:
- Add defines for ibm,ddw-applicable and ibm,ddw-extensions outputs
- Merge aux function query_ddw_out_sz() into query_ddw()
- Merge reset_dma_window() patch (prev. #2) into remove default DMA
window patch (#4).
- Keep device_node *np name instead of using pdn in remove_*()
- Rename 'device_node *pdn' into 'parent' in new functions
- Rename dfl_win to default_win
- Only remove the default DMA window if there is no window available
in first query.
- Check if default DMA window can be restored before removing it.
- Fix 'unitialized use' (found by travis mpe:ci-test)
- New patches #5 and #6
- v1 link: http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=184420&state=%2A&archive=both
Special thanks for Alexey Kardashevskiy, Brian King and Oliver O'Halloran for the feedback provided!
Leonardo Bras (4):
powerpc/pseries/iommu: Create defines for operations in
ibm,ddw-applicable
powerpc/pseries/iommu: Update call to ibm,query-pe-dma-windows powerpc/pseries/iommu: Move window-removing part of remove_ddw into
remove_dma_window
powerpc/pseries/iommu: Allow bigger 64bit window by removing default
DMA window
arch/powerpc/platforms/pseries/iommu.c | 242 ++++++++++++++++++++----- 1 file changed, 195 insertions(+), 47 deletions(-)
Signature · 1 line
2.25.4
PATCH v5 1/4 powerpc/pseries/iommu: Create defines for operations in ibm,ddw-applicable
Create defines to help handling ibm,ddw-applicable values, avoiding confusion about the index of given operations.
--- arch/powerpc/platforms/pseries/iommu.c | 43 ++++++++++++++++---------- 1 file changed, 26 insertions(+), 17 deletions(-)
arch/powerpc/platforms/pseries/iommu.c +26 -17
@@ -39,6 +39,14 @@#include "pseries.h" +enum { +DDW_QUERY_PE_DMA_WIN =0 , +DDW_CREATE_PE_DMA_WIN =1 , +DDW_REMOVE_PE_DMA_WIN =2 , + +DDW_APPLICABLE_SIZE +}; +static struct iommu_table_group *iommu_pseries_alloc_group (int node) {struct iommu_table_group *table_group;
@@ -771,12 +779,12 @@ static void remove_ddw(struct device_node *np, bool remove_prop) {struct dynamic_dma_window_prop *dwp;struct property *win64; -u32 ddw_avail[3 ]; +u32 ddw_avail[DDW_APPLICABLE_SIZE ];u64 liobn;int ret =0 ; ret =of_property_read_u32_array (np,"ibm,ddw-applicable" , - &ddw_avail[0 ],3 ); + &ddw_avail[0 ],DDW_APPLICABLE_SIZE ); win64 =of_find_property (np,DIRECT64_PROPNAME ,NULL );if (!win64)
@@ -798,15 +806,15 @@ static void remove_ddw(struct device_node *np, bool remove_prop)pr_debug ("%pOF successfully cleared tces in window.\n" , np); - ret =rtas_call (ddw_avail[2 ],1 ,1 ,NULL , liobn); + ret =rtas_call (ddw_avail[DDW_REMOVE_PE_DMA_WIN ],1 ,1 ,NULL , liobn);if (ret)pr_warn ("%pOF: failed to remove direct window: rtas returned " "%d to ibm,remove-pe-dma-window(%x) %llx\n" , - np, ret, ddw_avail[2 ], liobn); + np, ret, ddw_avail[DDW_REMOVE_PE_DMA_WIN ], liobn);else pr_debug ("%pOF: successfully removed direct window: rtas returned " "%d to ibm,remove-pe-dma-window(%x) %llx\n" , - np, ret, ddw_avail[2 ], liobn); + np, ret, ddw_avail[DDW_REMOVE_PE_DMA_WIN ], liobn); delprop:if (remove_prop)
@@ -889,11 +897,11 @@ static int query_ddw(struct pci_dev *dev, const u32 *ddw_avail, buid = pdn->phb->buid; cfg_addr = ((pdn->busno <<16 ) | (pdn->devfn <<8 )); - ret =rtas_call (ddw_avail[0 ],3 ,5 , (u32 *)query, - cfg_addr,BUID_HI (buid),BUID_LO (buid)); + ret =rtas_call (ddw_avail[DDW_QUERY_PE_DMA_WIN ],3 ,5 , (u32 *)query, + cfg_addr,BUID_HI (buid),BUID_LO (buid));dev_info (&dev->dev,"ibm,query-pe-dma-windows(%x) %x %x %x" -" returned %d\n" , ddw_avail[0 ], cfg_addr,BUID_HI (buid), -BUID_LO (buid), ret); +" returned %d\n" , ddw_avail[DDW_QUERY_PE_DMA_WIN ], cfg_addr, +BUID_HI (buid),BUID_LO (buid), ret);return ret; }
@@ -920,15 +928,16 @@ static int create_ddw(struct pci_dev *dev, const u32 *ddw_avail,do {/* extra outputs are LIOBN and dma-addr (hi, lo) */ - ret =rtas_call (ddw_avail[1 ],5 ,4 , (u32 *)create, - cfg_addr,BUID_HI (buid),BUID_LO (buid), - page_shift, window_shift); + ret =rtas_call (ddw_avail[DDW_CREATE_PE_DMA_WIN ],5 ,4 , + (u32 *)create, cfg_addr,BUID_HI (buid), +BUID_LO (buid), page_shift, window_shift); }while (rtas_busy_delay (ret));dev_info (&dev->dev,"ibm,create-pe-dma-window(%x) %x %x %x %x %x returned %d " -"(liobn = 0x%x starting addr = %x %x)\n" , ddw_avail[1 ], - cfg_addr,BUID_HI (buid),BUID_LO (buid), page_shift, - window_shift, ret, create->liobn, create->addr_hi, create->addr_lo); +"(liobn = 0x%x starting addr = %x %x)\n" , + ddw_avail[DDW_CREATE_PE_DMA_WIN ], cfg_addr,BUID_HI (buid), +BUID_LO (buid), page_shift, window_shift, ret, create->liobn, + create->addr_hi, create->addr_lo);return ret; }
@@ -996,7 +1005,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)int page_shift;u64 dma_addr, max_addr;struct device_node *dn; -u32 ddw_avail[3 ]; +u32 ddw_avail[DDW_APPLICABLE_SIZE ];struct direct_window *window;struct property *win64;struct dynamic_dma_window_prop *ddwprop;
@@ -1029,7 +1038,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)* the property is actually in the parent, not the PE */ ret =of_property_read_u32_array (pdn,"ibm,ddw-applicable" , - &ddw_avail[0 ],3 ); + &ddw_avail[0 ],DDW_APPLICABLE_SIZE );if (ret) goto out_failed;
Signature · 1 line
2.25.4
Re: [PATCH v5 1/4] powerpc/pseries/iommu: Create defines for operations in ibm,ddw-applicable
Quoted 5 lines · Leonardo Bras
Create defines to help handling ibm,ddw-applicable values, avoiding confusion about the index of given operations.
Signed-off-by Leonardo Bras <[email protected]>Tested-by David Dai <[email protected]>
Quoted 115 lines
--- arch/powerpc/platforms/pseries/iommu.c | 43 ++++++++++++++++---------- 1 file changed, 26 insertions(+), 17 deletions(-)arch/powerpc/platforms/pseries/iommu.c +26
-17@@ -39,6 +39,14 @@#include "pseries.h" +enum { +DDW_QUERY_PE_DMA_WIN =0 , +DDW_CREATE_PE_DMA_WIN =1 , +DDW_REMOVE_PE_DMA_WIN =2 , + +DDW_APPLICABLE_SIZE +}; +static struct iommu_table_group *iommu_pseries_alloc_group (int node) {struct iommu_table_group *table_group;@@ -771,12 +779,12 @@ static void remove_ddw(struct device_node *np, bool remove_prop) {struct dynamic_dma_window_prop *dwp;struct property *win64; -u32 ddw_avail[3 ]; +u32 ddw_avail[DDW_APPLICABLE_SIZE ];u64 liobn;int ret =0 ; ret =of_property_read_u32_array (np,"ibm,ddw-applicable" , - &ddw_avail[0 ],3 ); + &ddw_avail[0 ],DDW_APPLICABLE_SIZE ); win64 =of_find_property (np,DIRECT64_PROPNAME ,NULL );if (!win64)@@ -798,15 +806,15 @@ static void remove_ddw(struct device_node *np, bool remove_prop)pr_debug ("%pOF successfully cleared tces in window.\n" , np); - ret =rtas_call (ddw_avail[2 ],1 ,1 ,NULL , liobn); + ret =rtas_call (ddw_avail[DDW_REMOVE_PE_DMA_WIN ],1 ,1 ,NULL , liobn);if (ret)pr_warn ("%pOF: failed to remove direct window: rtas returned " "%d to ibm,remove-pe-dma-window(%x) %llx\n" , - np, ret, ddw_avail[2 ], liobn); + np, ret, ddw_avail[DDW_REMOVE_PE_DMA_WIN ], liobn);else pr_debug ("%pOF: successfully removed direct window: rtas returned " "%d to ibm,remove-pe-dma-window(%x) %llx\n" , - np, ret, ddw_avail[2 ], liobn); + np, ret, ddw_avail[DDW_REMOVE_PE_DMA_WIN ], liobn); delprop:if (remove_prop)@@ -889,11 +897,11 @@ static int query_ddw(struct pci_dev *dev, const u32 *ddw_avail, buid = pdn->phb->buid; cfg_addr = ((pdn->busno <<16 ) | (pdn->devfn <<8 )); - ret =rtas_call (ddw_avail[0 ],3 ,5 , (u32 *)query, - cfg_addr,BUID_HI (buid),BUID_LO (buid)); + ret =rtas_call (ddw_avail[DDW_QUERY_PE_DMA_WIN ],3 ,5 , (u32 *)query, + cfg_addr,BUID_HI (buid),BUID_LO (buid));dev_info (&dev->dev,"ibm,query-pe-dma-windows(%x) %x %x %x" -" returned %d\n" , ddw_avail[0 ], cfg_addr,BUID_HI (buid), -BUID_LO (buid), ret); +" returned %d\n" , ddw_avail[DDW_QUERY_PE_DMA_WIN ], cfg_addr, +BUID_HI (buid),BUID_LO (buid), ret);return ret; }@@ -920,15 +928,16 @@ static int create_ddw(struct pci_dev *dev, const u32 *ddw_avail,do {/* extra outputs are LIOBN and dma-addr (hi, lo) */ - ret =rtas_call (ddw_avail[1 ],5 ,4 , (u32 *)create, - cfg_addr,BUID_HI (buid),BUID_LO (buid), - page_shift, window_shift); + ret =rtas_call (ddw_avail[DDW_CREATE_PE_DMA_WIN ],5 ,4 , + (u32 *)create, cfg_addr,BUID_HI (buid), +BUID_LO (buid), page_shift, window_shift); }while (rtas_busy_delay (ret));dev_info (&dev->dev,"ibm,create-pe-dma-window(%x) %x %x %x %x %x returned %d " -"(liobn = 0x%x starting addr = %x %x)\n" , ddw_avail[1 ], - cfg_addr,BUID_HI (buid),BUID_LO (buid), page_shift, - window_shift, ret, create->liobn, create->addr_hi, create->addr_lo); +"(liobn = 0x%x starting addr = %x %x)\n" , + ddw_avail[DDW_CREATE_PE_DMA_WIN ], cfg_addr,BUID_HI (buid), +BUID_LO (buid), page_shift, window_shift, ret, create->liobn, + create->addr_hi, create->addr_lo);return ret; }@@ -996,7 +1005,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)int page_shift;u64 dma_addr, max_addr;struct device_node *dn; -u32 ddw_avail[3 ]; +u32 ddw_avail[DDW_APPLICABLE_SIZE ];struct direct_window *window;struct property *win64;struct dynamic_dma_window_prop *ddwprop;@@ -1029,7 +1038,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)* the property is actually in the parent, not the PE */ ret =of_property_read_u32_array (pdn,"ibm,ddw-applicable" , - &ddw_avail[0 ],3 ); + &ddw_avail[0 ],DDW_APPLICABLE_SIZE );if (ret) goto out_failed;
Signature · 1 line
Alexey
PATCH v5 2/4 powerpc/pseries/iommu: Update call to ibm,query-pe-dma-windows
In reply to Leonardo BrasFrom LoPAR level 2.8, "ibm,ddw-extensions" index 3 can make the number of outputs from "ibm,query-pe-dma-windows" go from 5 to 6.
This change of output size is meant to expand the address size of largest_available_block PE TCE from 32-bit to 64-bit, which ends up shifting page_size and migration_capable.
This ends up requiring the update of ddw_query_response->largest_available_block from u32 to u64, and manually assigning the values from the buffer into this struct, according to output size.
Also, a routine was created for helping reading the ddw extensions as suggested by LoPAR: First reading the size of the extension array from index 0, checking if the property exists, and then returning it's value.
--- arch/powerpc/platforms/pseries/iommu.c | 91 +++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 10 deletions(-)
arch/powerpc/platforms/pseries/iommu.c +81 -10
@@ -47,6 +47,12 @@ enum { DDW_APPLICABLE_SIZE }; +enum { +DDW_EXT_SIZE =0 , +DDW_EXT_RESET_DMA_WIN =1 , +DDW_EXT_QUERY_OUT_SIZE =2 +}; +static struct iommu_table_group *iommu_pseries_alloc_group (int node) {struct iommu_table_group *table_group;
@@ -342,7 +348,7 @@ struct direct_window {/* Dynamic DMA Window support */ struct ddw_query_response {u32 windows_available; -u32 largest_available_block; +u64 largest_available_block;u32 page_size;u32 migration_capable; };
@@ -877,14 +883,62 @@ static int find_existing_ddw_windows(void) }machine_arch_initcall (pseries, find_existing_ddw_windows); +/** +* ddw_read_ext - Get the value of an DDW extension +* @np: device node from which the extension value is to be read. +* @extnum: index number of the extension. +* @value: pointer to return value, modified when extension is available. +* +* Checks if "ibm,ddw-extensions" exists for this node, and get the value +* on index 'extnum'. +* It can be used only to check if a property exists, passing value == NULL. +* +* Returns: +* 0 if extension successfully read +* -EINVAL if the "ibm,ddw-extensions" does not exist, +* -ENODATA if "ibm,ddw-extensions" does not have a value, and +* -EOVERFLOW if "ibm,ddw-extensions" does not contain this extension. +*/ +static inline int ddw_read_ext (const struct device_node *np,int extnum, +u32 *value) +{ +static const char propname[] ="ibm,ddw-extensions" ; +u32 count; +int ret; + + ret =of_property_read_u32_index (np, propname,DDW_EXT_SIZE , &count); +if (ret) +return ret; + +if (count < extnum) +return -EOVERFLOW ; + +if (!value) + value = &count; + +return of_property_read_u32_index (np, propname, extnum, value); +} +static int query_ddw (struct pci_dev *dev,const u32 *ddw_avail, -struct ddw_query_response *query) +struct ddw_query_response *query, +struct device_node *parent) {struct device_node *dn;struct pci_dn *pdn; -u32 cfg_addr; +u32 cfg_addr, ext_query, query_out[5 ];u64 buid; -int ret; +int ret, out_sz; + +/* +* From LoPAR level 2.8, "ibm,ddw-extensions" index 3 can rule how many +* output parameters ibm,query-pe-dma-windows will have, ranging from +* 5 to 6. +*/ + ret =ddw_read_ext (parent,DDW_EXT_QUERY_OUT_SIZE , &ext_query); +if (!ret && ext_query ==1 ) + out_sz =6 ; +else + out_sz =5 ;/* * Get the config address and phb buid of the PE window.
@@ -897,11 +951,28 @@ static int query_ddw(struct pci_dev *dev, const u32 *ddw_avail, buid = pdn->phb->buid; cfg_addr = ((pdn->busno <<16 ) | (pdn->devfn <<8 )); - ret =rtas_call (ddw_avail[DDW_QUERY_PE_DMA_WIN ],3 ,5 , (u32 *)query, + ret =rtas_call (ddw_avail[DDW_QUERY_PE_DMA_WIN ],3 , out_sz, query_out, cfg_addr,BUID_HI (buid),BUID_LO (buid)); -dev_info (&dev->dev,"ibm,query-pe-dma-windows(%x) %x %x %x" -" returned %d\n" , ddw_avail[DDW_QUERY_PE_DMA_WIN ], cfg_addr, -BUID_HI (buid),BUID_LO (buid), ret); +dev_info (&dev->dev,"ibm,query-pe-dma-windows(%x) %x %x %x returned %d\n" , + ddw_avail[DDW_QUERY_PE_DMA_WIN ], cfg_addr,BUID_HI (buid), +BUID_LO (buid), ret); + +switch (out_sz) { +case 5 : + query->windows_available = query_out[0 ]; + query->largest_available_block = query_out[1 ]; + query->page_size = query_out[2 ]; + query->migration_capable = query_out[3 ]; +break ; +case 6 : + query->windows_available = query_out[0 ]; + query->largest_available_block = ((u64 )query_out[1 ] <<32 ) | + query_out[2 ]; + query->page_size = query_out[3 ]; + query->migration_capable = query_out[4 ]; +break ; + } +return ret; }
@@ -1049,7 +1120,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)* of page sizes: supported and supported for migrate-dma. */ dn =pci_device_to_OF_node (dev); - ret =query_ddw (dev, ddw_avail, &query); + ret =query_ddw (dev, ddw_avail, &query, pdn);if (ret !=0 ) goto out_failed;
@@ -1077,7 +1148,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)/* check largest block * page size > max memory hotplug addr */ max_addr =ddw_memory_hotplug_max ();if (query.largest_available_block < (max_addr >> page_shift)) { -dev_dbg (&dev->dev,"can't map partition max 0x%llx with %u " +dev_dbg (&dev->dev,"can't map partition max 0x%llx with %llu " "%llu-sized pages\n" , max_addr, query.largest_available_block,1ULL << page_shift); goto out_failed;
Signature · 1 line
2.25.4
Re: [PATCH v5 2/4] powerpc/pseries/iommu: Update call to ibm,query-pe-dma-windows
Quoted 12 lines · Leonardo Bras
From LoPAR level 2.8, "ibm,ddw-extensions" index 3 can make the number of outputs from "ibm,query-pe-dma-windows" go from 5 to 6.
This change of output size is meant to expand the address size of
largest_available_blockPE TCE from 32-bit to 64-bit, which ends up shiftingpage_sizeandmigration_capable.This ends up requiring the update of
ddw_query_response->largest_available_blockfrom u32 to u64, and manually assigning the values from the buffer into this struct, according to output size.
Quoted 6 lines
Also, a routine was created for helping reading the ddw extensions as suggested by LoPAR: First reading the size of the extension array from index 0, checking if the property exists, and then returning it's value.
Signed-off-by Leonardo Bras <[email protected]>Tested-by David Dai <[email protected]>
Quoted 148 lines
--- arch/powerpc/platforms/pseries/iommu.c | 91 +++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 10 deletions(-)arch/powerpc/platforms/pseries/iommu.c +81
-10@@ -47,6 +47,12 @@ enum { DDW_APPLICABLE_SIZE }; +enum { +DDW_EXT_SIZE =0 , +DDW_EXT_RESET_DMA_WIN =1 , +DDW_EXT_QUERY_OUT_SIZE =2 +}; +static struct iommu_table_group *iommu_pseries_alloc_group (int node) {struct iommu_table_group *table_group;@@ -342,7 +348,7 @@ struct direct_window {/* Dynamic DMA Window support */ struct ddw_query_response {u32 windows_available; -u32 largest_available_block; +u64 largest_available_block;u32 page_size;u32 migration_capable; };@@ -877,14 +883,62 @@ static int find_existing_ddw_windows(void) }machine_arch_initcall (pseries, find_existing_ddw_windows); +/** +* ddw_read_ext - Get the value of an DDW extension +* @np: device node from which the extension value is to be read. +* @extnum: index number of the extension. +* @value: pointer to return value, modified when extension is available. +* +* Checks if "ibm,ddw-extensions" exists for this node, and get the value +* on index 'extnum'. +* It can be used only to check if a property exists, passing value == NULL. +* +* Returns: +* 0 if extension successfully read +* -EINVAL if the "ibm,ddw-extensions" does not exist, +* -ENODATA if "ibm,ddw-extensions" does not have a value, and +* -EOVERFLOW if "ibm,ddw-extensions" does not contain this extension. +*/ +static inline int ddw_read_ext (const struct device_node *np,int extnum, +u32 *value) +{ +static const char propname[] ="ibm,ddw-extensions" ; +u32 count; +int ret; + + ret =of_property_read_u32_index (np, propname,DDW_EXT_SIZE , &count); +if (ret) +return ret; + +if (count < extnum) +return -EOVERFLOW ; + +if (!value) + value = &count; + +return of_property_read_u32_index (np, propname, extnum, value); +} +static int query_ddw (struct pci_dev *dev,const u32 *ddw_avail, -struct ddw_query_response *query) +struct ddw_query_response *query, +struct device_node *parent) {struct device_node *dn;struct pci_dn *pdn; -u32 cfg_addr; +u32 cfg_addr, ext_query, query_out[5 ];u64 buid; -int ret; +int ret, out_sz; + +/* +* From LoPAR level 2.8, "ibm,ddw-extensions" index 3 can rule how many +* output parameters ibm,query-pe-dma-windows will have, ranging from +* 5 to 6. +*/ + ret =ddw_read_ext (parent,DDW_EXT_QUERY_OUT_SIZE , &ext_query); +if (!ret && ext_query ==1 ) + out_sz =6 ; +else + out_sz =5 ;/* * Get the config address and phb buid of the PE window. @@ -897,11 +951,28 @@ static int query_ddw(struct pci_dev *dev, const u32 *ddw_avail, buid = pdn->phb->buid; cfg_addr = ((pdn->busno <<16 ) | (pdn->devfn <<8 )); - ret =rtas_call (ddw_avail[DDW_QUERY_PE_DMA_WIN ],3 ,5 , (u32 *)query, + ret =rtas_call (ddw_avail[DDW_QUERY_PE_DMA_WIN ],3 , out_sz, query_out, cfg_addr,BUID_HI (buid),BUID_LO (buid)); -dev_info (&dev->dev,"ibm,query-pe-dma-windows(%x) %x %x %x" -" returned %d\n" , ddw_avail[DDW_QUERY_PE_DMA_WIN ], cfg_addr, -BUID_HI (buid),BUID_LO (buid), ret); +dev_info (&dev->dev,"ibm,query-pe-dma-windows(%x) %x %x %x returned %d\n" , + ddw_avail[DDW_QUERY_PE_DMA_WIN ], cfg_addr,BUID_HI (buid), +BUID_LO (buid), ret); + +switch (out_sz) { +case 5 : + query->windows_available = query_out[0 ]; + query->largest_available_block = query_out[1 ]; + query->page_size = query_out[2 ]; + query->migration_capable = query_out[3 ]; +break ; +case 6 : + query->windows_available = query_out[0 ]; + query->largest_available_block = ((u64 )query_out[1 ] <<32 ) | + query_out[2 ]; + query->page_size = query_out[3 ]; + query->migration_capable = query_out[4 ]; +break ; + } +return ret; }@@ -1049,7 +1120,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)* of page sizes: supported and supported for migrate-dma. */ dn =pci_device_to_OF_node (dev); - ret =query_ddw (dev, ddw_avail, &query); + ret =query_ddw (dev, ddw_avail, &query, pdn);if (ret !=0 ) goto out_failed;@@ -1077,7 +1148,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)/* check largest block * page size > max memory hotplug addr */ max_addr =ddw_memory_hotplug_max ();if (query.largest_available_block < (max_addr >> page_shift)) { -dev_dbg (&dev->dev,"can't map partition max 0x%llx with %u " +dev_dbg (&dev->dev,"can't map partition max 0x%llx with %llu " "%llu-sized pages\n" , max_addr, query.largest_available_block,1ULL << page_shift); goto out_failed;
Signature · 1 line
Alexey
PATCH v5 3/4 powerpc/pseries/iommu: Move window-removing part of remove_ddw into remove_dma_window
In reply to Leonardo BrasMove the window-removing part of remove_ddw into a new function (remove_dma_window), so it can be used to remove other DMA windows.
It's useful for removing DMA windows that don't create DIRECT64_PROPNAME property, like the default DMA window from the device, which uses "ibm,dma-window".
--- arch/powerpc/platforms/pseries/iommu.c | 45 +++++++++++++++----------- 1 file changed, 27 insertions(+), 18 deletions(-)
arch/powerpc/platforms/pseries/iommu.c +27 -18
@@ -781,25 +781,14 @@ static int __init disable_ddw_setup(char *str)early_param ("disable_ddw" , disable_ddw_setup); -static void remove_ddw (struct device_node *np,bool remove_prop) +static void remove_dma_window (struct device_node *np,u32 *ddw_avail, +struct property *win) {struct dynamic_dma_window_prop *dwp; -struct property *win64; -u32 ddw_avail[DDW_APPLICABLE_SIZE ];u64 liobn; -int ret =0 ; - - ret =of_property_read_u32_array (np,"ibm,ddw-applicable" , - &ddw_avail[0 ],DDW_APPLICABLE_SIZE ); - - win64 =of_find_property (np,DIRECT64_PROPNAME ,NULL ); -if (!win64) -return ; - -if (ret || win64->length <sizeof (*dwp)) - goto delprop; +int ret; - dwp = win64->value; + dwp = win->value; liobn = (u64 )be32_to_cpu (dwp->liobn);/* clear the whole window, note the arg is in kernel pages */
@@ -821,10 +810,30 @@ static void remove_ddw(struct device_node *np, bool remove_prop)pr_debug ("%pOF: successfully removed direct window: rtas returned " "%d to ibm,remove-pe-dma-window(%x) %llx\n" , np, ret, ddw_avail[DDW_REMOVE_PE_DMA_WIN ], liobn); +} + +static void remove_ddw (struct device_node *np,bool remove_prop) +{ +struct property *win; +u32 ddw_avail[DDW_APPLICABLE_SIZE ]; +int ret =0 ; + + ret =of_property_read_u32_array (np,"ibm,ddw-applicable" , + &ddw_avail[0 ],DDW_APPLICABLE_SIZE ); +if (ret) +return ; + + win =of_find_property (np,DIRECT64_PROPNAME ,NULL ); +if (!win) +return ; + +if (win->length >=sizeof (struct dynamic_dma_window_prop )) +remove_dma_window (np, ddw_avail, win); + +if (!remove_prop) +return ; -delprop: -if (remove_prop) - ret =of_remove_property (np, win64); + ret =of_remove_property (np, win);if (ret)pr_warn ("%pOF: failed to remove direct window property: %d\n" , np, ret);
Signature · 1 line
2.25.4
Re: [PATCH v5 3/4] powerpc/pseries/iommu: Move window-removing part of remove_ddw into remove_dma_window
Quoted 9 lines · Leonardo Bras
Move the window-removing part of
remove_ddwinto a new function (remove_dma_window), so it can be used to remove other DMA windows.It's useful for removing DMA windows that don't create
DIRECT64_PROPNAMEproperty, like the default DMA window from the device, which uses "ibm,dma-window".Signed-off-by Leonardo Bras <[email protected]>Tested-by David Dai <[email protected]>
Quoted 73 lines
--- arch/powerpc/platforms/pseries/iommu.c | 45 +++++++++++++++----------- 1 file changed, 27 insertions(+), 18 deletions(-)arch/powerpc/platforms/pseries/iommu.c +27
-18@@ -781,25 +781,14 @@ static int __init disable_ddw_setup(char *str)early_param ("disable_ddw" , disable_ddw_setup); -static void remove_ddw (struct device_node *np,bool remove_prop) +static void remove_dma_window (struct device_node *np,u32 *ddw_avail, +struct property *win) {struct dynamic_dma_window_prop *dwp; -struct property *win64; -u32 ddw_avail[DDW_APPLICABLE_SIZE ];u64 liobn; -int ret =0 ; - - ret =of_property_read_u32_array (np,"ibm,ddw-applicable" , - &ddw_avail[0 ],DDW_APPLICABLE_SIZE ); - - win64 =of_find_property (np,DIRECT64_PROPNAME ,NULL ); -if (!win64) -return ; - -if (ret || win64->length <sizeof (*dwp)) - goto delprop; +int ret; - dwp = win64->value; + dwp = win->value; liobn = (u64 )be32_to_cpu (dwp->liobn);/* clear the whole window, note the arg is in kernel pages */ @@ -821,10 +810,30 @@ static void remove_ddw(struct device_node *np, bool remove_prop)pr_debug ("%pOF: successfully removed direct window: rtas returned " "%d to ibm,remove-pe-dma-window(%x) %llx\n" , np, ret, ddw_avail[DDW_REMOVE_PE_DMA_WIN ], liobn); +} + +static void remove_ddw (struct device_node *np,bool remove_prop) +{ +struct property *win; +u32 ddw_avail[DDW_APPLICABLE_SIZE ]; +int ret =0 ; + + ret =of_property_read_u32_array (np,"ibm,ddw-applicable" , + &ddw_avail[0 ],DDW_APPLICABLE_SIZE ); +if (ret) +return ; + + win =of_find_property (np,DIRECT64_PROPNAME ,NULL ); +if (!win) +return ; + +if (win->length >=sizeof (struct dynamic_dma_window_prop )) +remove_dma_window (np, ddw_avail, win); + +if (!remove_prop) +return ; -delprop: -if (remove_prop) - ret =of_remove_property (np, win64); + ret =of_remove_property (np, win);if (ret)pr_warn ("%pOF: failed to remove direct window property: %d\n" , np, ret);
Signature · 1 line
Alexey
PATCH v5 4/4 powerpc/pseries/iommu: Allow bigger 64bit window by removing default DMA window
In reply to Leonardo BrasOn LoPAR "DMA Window Manipulation Calls", it's recommended to remove the default DMA window for the device, before attempting to configure a DDW, in order to make the maximum resources available for the next DDW to be created.
This is a requirement for using DDW on devices in which hypervisor allows only one DMA window.
If setting up a new DDW fails anywhere after the removal of this default DMA window, it's needed to restore the default DMA window. For this, an implementation of ibm,reset-pe-dma-windows rtas call is needed:
Platforms supporting the DDW option starting with LoPAR level 2.7 implement ibm,ddw-extensions. The first extension available (index 2) carries the token for ibm,reset-pe-dma-windows rtas call, which is used to restore the default DMA window for a device, if it has been deleted.
It does so by resetting the TCE table allocation for the PE to it's boot time value, available in "ibm,dma-window" device tree node.
--- arch/powerpc/platforms/pseries/iommu.c | 73 +++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 7 deletions(-)
arch/powerpc/platforms/pseries/iommu.c +66 -7
@@ -1066,6 +1066,38 @@ static phys_addr_t ddw_memory_hotplug_max(void)return max_addr; } +/* +* Platforms supporting the DDW option starting with LoPAR level 2.7 implement +* ibm,ddw-extensions, which carries the rtas token for +* ibm,reset-pe-dma-windows. +* That rtas-call can be used to restore the default DMA window for the device. +*/ +static void reset_dma_window (struct pci_dev *dev,struct device_node *par_dn) +{ +int ret; +u32 cfg_addr, reset_dma_win; +u64 buid; +struct device_node *dn; +struct pci_dn *pdn; + + ret =ddw_read_ext (par_dn,DDW_EXT_RESET_DMA_WIN , &reset_dma_win); +if (ret) +return ; + + dn =pci_device_to_OF_node (dev); + pdn =PCI_DN (dn); + buid = pdn->phb->buid; + cfg_addr = (pdn->busno <<16 ) | (pdn->devfn <<8 ); + + ret =rtas_call (reset_dma_win,3 ,1 ,NULL , cfg_addr,BUID_HI (buid), +BUID_LO (buid)); +if (ret) +dev_info (&dev->dev, +"ibm,reset-pe-dma-windows(%x) %x %x %x returned %d " , + reset_dma_win, cfg_addr,BUID_HI (buid),BUID_LO (buid), + ret); +} +/* * If the PE supports dynamic dma windows, and there is space for a table * that can map all pages in a linear offset, then setup such a table,
@@ -1090,6 +1122,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)struct property *win64;struct dynamic_dma_window_prop *ddwprop;struct failed_ddw_pdn *fpdn; +bool default_win_removed = false;mutex_lock (&direct_window_init_mutex);
@@ -1133,14 +1166,38 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)if (ret !=0 ) goto out_failed; +/* +* If there is no window available, remove the default DMA window, +* if it's present. This will make all the resources available to the +* new DDW window. +* If anything fails after this, we need to restore it, so also check +* for extensions presence. +*/ if (query.windows_available ==0 ) { -/* -* no additional windows are available for this device. -* We might be able to reallocate the existing window, -* trading in for a larger page size. -*/ -dev_dbg (&dev->dev,"no free dynamic windows" ); - goto out_failed; +struct property *default_win; +int reset_win_ext; + + default_win =of_find_property (pdn,"ibm,dma-window" ,NULL ); +if (!default_win) + goto out_failed; + + reset_win_ext =ddw_read_ext (pdn,DDW_EXT_RESET_DMA_WIN ,NULL ); +if (reset_win_ext) + goto out_failed; + +remove_dma_window (pdn, ddw_avail, default_win); + default_win_removed = true; + +/* Query again, to check if the window is available */ + ret =query_ddw (dev, ddw_avail, &query, pdn); +if (ret !=0 ) + goto out_failed; + +if (query.windows_available ==0 ) { +/* no windows are available for this device. */ +dev_dbg (&dev->dev,"no free dynamic windows" ); + goto out_failed; + } }if (query.page_size &4 ) { page_shift =24 ;/* 16MB */
@@ -1231,6 +1288,8 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)kfree (win64); out_failed: +if (default_win_removed) +reset_dma_window (dev, pdn); fpdn =kzalloc (sizeof (*fpdn),GFP_KERNEL );if (!fpdn)
Signature · 1 line
2.25.4
Re: [PATCH v5 4/4] powerpc/pseries/iommu: Allow bigger 64bit window by removing default DMA window
Quoted 18 lines · Leonardo Bras
On LoPAR "DMA Window Manipulation Calls", it's recommended to remove the default DMA window for the device, before attempting to configure a DDW, in order to make the maximum resources available for the next DDW to be created.
This is a requirement for using DDW on devices in which hypervisor allows only one DMA window.
If setting up a new DDW fails anywhere after the removal of this default DMA window, it's needed to restore the default DMA window. For this, an implementation of ibm,reset-pe-dma-windows rtas call is needed:
Platforms supporting the DDW option starting with LoPAR level 2.7 implement ibm,ddw-extensions. The first extension available (index 2) carries the token for ibm,reset-pe-dma-windows rtas call, which is used to restore the default DMA window for a device, if it has been deleted.
Quoted 5 lines
It does so by resetting the TCE table allocation for the PE to it's boot time value, available in "ibm,dma-window" device tree node.
Signed-off-by Leonardo Bras <[email protected]>Tested-by David Dai <[email protected]>
Quoted 111 lines
--- arch/powerpc/platforms/pseries/iommu.c | 73 +++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 7 deletions(-)arch/powerpc/platforms/pseries/iommu.c +66
-7@@ -1066,6 +1066,38 @@ static phys_addr_t ddw_memory_hotplug_max(void)return max_addr; } +/* +* Platforms supporting the DDW option starting with LoPAR level 2.7 implement +* ibm,ddw-extensions, which carries the rtas token for +* ibm,reset-pe-dma-windows. +* That rtas-call can be used to restore the default DMA window for the device. +*/ +static void reset_dma_window (struct pci_dev *dev,struct device_node *par_dn) +{ +int ret; +u32 cfg_addr, reset_dma_win; +u64 buid; +struct device_node *dn; +struct pci_dn *pdn; + + ret =ddw_read_ext (par_dn,DDW_EXT_RESET_DMA_WIN , &reset_dma_win); +if (ret) +return ; + + dn =pci_device_to_OF_node (dev); + pdn =PCI_DN (dn); + buid = pdn->phb->buid; + cfg_addr = (pdn->busno <<16 ) | (pdn->devfn <<8 ); + + ret =rtas_call (reset_dma_win,3 ,1 ,NULL , cfg_addr,BUID_HI (buid), +BUID_LO (buid)); +if (ret) +dev_info (&dev->dev, +"ibm,reset-pe-dma-windows(%x) %x %x %x returned %d " , + reset_dma_win, cfg_addr,BUID_HI (buid),BUID_LO (buid), + ret); +} +/* * If the PE supports dynamic dma windows, and there is space for a table * that can map all pages in a linear offset, then setup such a table, @@ -1090,6 +1122,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)struct property *win64;struct dynamic_dma_window_prop *ddwprop;struct failed_ddw_pdn *fpdn; +bool default_win_removed = false;mutex_lock (&direct_window_init_mutex);@@ -1133,14 +1166,38 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)if (ret !=0 ) goto out_failed; +/* +* If there is no window available, remove the default DMA window, +* if it's present. This will make all the resources available to the +* new DDW window. +* If anything fails after this, we need to restore it, so also check +* for extensions presence. +*/ if (query.windows_available ==0 ) { -/* -* no additional windows are available for this device. -* We might be able to reallocate the existing window, -* trading in for a larger page size. -*/ -dev_dbg (&dev->dev,"no free dynamic windows" ); - goto out_failed; +struct property *default_win; +int reset_win_ext; + + default_win =of_find_property (pdn,"ibm,dma-window" ,NULL ); +if (!default_win) + goto out_failed; + + reset_win_ext =ddw_read_ext (pdn,DDW_EXT_RESET_DMA_WIN ,NULL ); +if (reset_win_ext) + goto out_failed; + +remove_dma_window (pdn, ddw_avail, default_win); + default_win_removed = true; + +/* Query again, to check if the window is available */ + ret =query_ddw (dev, ddw_avail, &query, pdn); +if (ret !=0 ) + goto out_failed; + +if (query.windows_available ==0 ) { +/* no windows are available for this device. */ +dev_dbg (&dev->dev,"no free dynamic windows" ); + goto out_failed; + } }if (query.page_size &4 ) { page_shift =24 ;/* 16MB */ @@ -1231,6 +1288,8 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)kfree (win64); out_failed: +if (default_win_removed) +reset_dma_window (dev, pdn); fpdn =kzalloc (sizeof (*fpdn),GFP_KERNEL );if (!fpdn)
Signature · 1 line
Alexey
Travis reported successful compilation with mpe/merge:
https://travis-ci.org/github/LeoBras/linux-ppc/builds/715028857
Hello Michael,
Do you suggest any change for this patchset?
Any chance it can get in this merge window?
Best regards,
Leonardo Bras
Quoted 89 lines · Leonardo Bras
There are some devices in which a hypervisor may only allow 1 DMA window to exist at a time, and in those cases, a DDW is never created to them, since the default DMA window keeps using this resource.
LoPAR recommends this procedure:
1. Remove the default DMA window,
2. Query for which configs the DDW can be created,
3. Create a DDW.Patch #1:
Create defines for outputs of ibm,ddw-applicable, so it's easier to identify them.Patch #2:
- After LoPAR level 2.8, there is an extension that can make ibm,query-pe-dma-windows to have 6 outputs instead of 5. This changes the order of the outputs, and that can cause some trouble.
-query_ddw()was updated to check how many outputs the ibm,query-pe-dma-windows is supposed to have, update thertas_call()and deal correctly with the outputs in both cases.
- This patch looks somehow unrelated to the series, but it can avoid future problems on DDW creation.Patch #3 moves the window-removing code from
remove_ddw()toremove_dma_window(), creating a way to delete any DMA window, so it can be used to delete the default DMA window.Patch #4 makes use of the
remove_dma_window()from patch #3 to remove the default DMA window beforequery_ddw(). It also implements a new rtas call to recover the default DMA window, in case anything fails after it was removed, and a DDW couldn't be created.---
Changes since v4:
- Removed patches 5+ in order to deal with a feature at a time
- Remove unnecessary parentesis in patch #4
- Changed patch #4 title from
"Remove default DMA window before creating DDW"
- Included David Dai tested-by
- v4 link: http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=190051&state=%2A&archive=bothChanges since v3:
- Introduces new patch #5, to prepare for an important change in #6
- structiommu_tablewas not being updated, so include a way to do this
in patch #6.
- Improved patch #4 based in a suggestion from Alexey, to make code
more easily understandable
- v3 link: http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=187348&state=%2A&archive=bothChanges since v2:
- Change the way ibm,ddw-extensions is accessed, using a proper function
instead of doing this inline everytime it's used.
- Remove previous patch #6, as it doesn't look like it would be useful.
- Add new patch, for changing names from direct* to dma*, as indirect
mapping can be used from now on.
- Fix some typos, corrects some define usage.
- v2 link: http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=185433&state=%2A&archive=bothChanges since v1:
- Add defines for ibm,ddw-applicable and ibm,ddw-extensions outputs
- Merge aux functionquery_ddw_out_sz()intoquery_ddw()
- Mergereset_dma_window()patch (prev. #2) into remove default DMA
window patch (#4).
- Keepdevice_node*np name instead of using pdn in remove_*()
- Rename 'device_node*pdn' into 'parent' in new functions
- Renamedfl_wintodefault_win
- Only remove the default DMA window if there is no window available
in first query.
- Check if default DMA window can be restored before removing it.
- Fix 'unitialized use' (found by travis mpe:ci-test)
- New patches #5 and #6
- v1 link: http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=184420&state=%2A&archive=bothSpecial thanks for Alexey Kardashevskiy, Brian King and Oliver O'Halloran for the feedback provided!
Leonardo Bras (4):
powerpc/pseries/iommu: Create defines for operations in
ibm,ddw-applicable
powerpc/pseries/iommu: Update call to ibm,query-pe-dma-windows powerpc/pseries/iommu: Move window-removing part ofremove_ddwinto
remove_dma_window
powerpc/pseries/iommu: Allow bigger 64bit window by removing default
DMA windowarch/powerpc/platforms/pseries/iommu.c | 242 ++++++++++++++++++++----- 1 file changed, 195 insertions(+), 47 deletions(-)
Michael Ellerman
AppliedQuoted 10 lines · Leonardo Bras
There are some devices in which a hypervisor may only allow 1 DMA window to exist at a time, and in those cases, a DDW is never created to them, since the default DMA window keeps using this resource.
LoPAR recommends this procedure:
1. Remove the default DMA window,
2. Query for which configs the DDW can be created,
3. Create a DDW.[...]
Applied to powerpc/next.
[1/4] powerpc/pseries/iommu: Create defines for operations in ibm, ddw-applicable
https://git.kernel.org/powerpc/c/cac3e629086f1b2e31c87a6c9b0130d29843ae86 [2/4] powerpc/pseries/iommu: Update call to ibm, query-pe-dma-windows https://git.kernel.org/powerpc/c/80f0251231131d164eddab78d2b6c1b8e37d0093 [3/4] powerpc/pseries/iommu: Move window-removing part of remove_ddw into remove_dma_window https://git.kernel.org/powerpc/c/74d0b3994e147a2b503170b5e02f1d07dc086586 [4/4] powerpc/pseries/iommu: Allow bigger 64bit window by removing default DMA window https://git.kernel.org/powerpc/c/8c0d51592f6f0123953633d1ecf21e843fce0bfd
cheers