iommu/iova: Retry from last rb tree node if iova search fails
Subsystems (2)
PATCH v4 1/2 iommu/iova: Retry from last rb tree node if iova search fails
From: Vijayanand Jitta <[email protected]>
When ever a new iova alloc request comes iova is always searched from the cached node and the nodes which are previous to cached node. So, even if there is free iova space available in the nodes which are next to the cached node iova allocation can still fail because of this approach.
Consider the following sequence of iova alloc and frees on 1GB of iova space
1) alloc - 500MB
2) alloc - 12MB
3) alloc - 499MB
4) free - 12MB which was allocated in step 2
5) alloc - 13MB
After the above sequence we will have 12MB of free iova space and cached node will be pointing to the iova pfn of last alloc of 13MB which will be the lowest iova pfn of that iova space. Now if we get an alloc request of 2MB we just search from cached node and then look for lower iova pfn's for free iova and as they aren't any, iova alloc fails though there is 12MB of free iova space.
To avoid such iova search failures do a retry from the last rb tree node when iova search fails, this will search the entire tree and get an iova if its available.
--- drivers/iommu/iova.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
drivers/iommu/iova.c +17 -6
@@ -184,8 +184,9 @@ static int __alloc_and_insert_iova_range(struct iova_domain *iovad,struct rb_node *curr, *prev;struct iova *curr_iova;unsigned long flags; -unsigned long new_pfn; +unsigned long new_pfn, retry_pfn;unsigned long align_mask = ~0UL ; +unsigned long high_pfn = limit_pfn, low_pfn = iovad->start_pfn;if (size_aligned) align_mask <<=fls_long (size -1 );
@@ -198,15 +199,25 @@ static int __alloc_and_insert_iova_range(struct iova_domain *iovad, curr =__get_cached_rbnode (iovad, limit_pfn); curr_iova = rb_entry(curr, struct iova, node); + retry_pfn = curr_iova->pfn_hi +1 ; + +retry:do { - limit_pfn =min (limit_pfn, curr_iova->pfn_lo); - new_pfn = (limit_pfn - size) & align_mask; + high_pfn =min (high_pfn, curr_iova->pfn_lo); + new_pfn = (high_pfn - size) & align_mask; prev = curr; curr =rb_prev (curr); curr_iova = rb_entry(curr, struct iova, node); - }while (curr && new_pfn <= curr_iova->pfn_hi); - -if (limit_pfn < size || new_pfn < iovad->start_pfn) { + }while (curr && new_pfn <= curr_iova->pfn_hi && new_pfn >= low_pfn); + +if (high_pfn < size || new_pfn < low_pfn) { +if (low_pfn == iovad->start_pfn && retry_pfn < limit_pfn) { + high_pfn = limit_pfn; + low_pfn = retry_pfn; + curr = &iovad->anchor.node; + curr_iova = rb_entry(curr, struct iova, node); + goto retry; + } iovad->max32_alloc_size = size; goto iova32_full; }
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation 2.7.4
PATCH v4 2/2 iommu/iova: Free global iova rcache on iova alloc failure
From: Vijayanand Jitta <[email protected]>
When ever an iova alloc request fails we free the iova ranges present in the percpu iova rcaches and then retry but the global iova rcache is not freed as a result we could still see iova alloc failure even after retry as global rcache is holding the iova's which can cause fragmentation. So, free the global iova rcache as well and then go for the retry.
--- drivers/iommu/iova.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
drivers/iommu/iova.c +22 -0
@@ -442,6 +442,7 @@ alloc_iova_fast(struct iova_domain *iovad, unsigned long size, flush_rcache = false;for_each_online_cpu (cpu)free_cpu_cached_iovas (cpu, iovad); +free_global_cached_iovas (iovad); goto retry; }
@@ -1057,5 +1058,26 @@ void free_cpu_cached_iovas(unsigned int cpu, struct iova_domain *iovad) } } +/* +* free all the IOVA ranges of global cache +*/ +static void free_global_cached_iovas (struct iova_domain *iovad) +{ +struct iova_rcache *rcache; +unsigned long flags; +int i, j; + +for (i =0 ; i <IOVA_RANGE_CACHE_MAX_SIZE ; ++i) { + rcache = &iovad->rcaches[i]; +spin_lock_irqsave (&rcache->lock, flags); +for (j =0 ; j < rcache->depot_size; ++j) { +iova_magazine_free_pfns (rcache->depot[j], iovad); +iova_magazine_free (rcache->depot[j]); + rcache->depot[j] =NULL ; + } + rcache->depot_size =0 ; +spin_unlock_irqrestore (&rcache->lock, flags); + } +}MODULE_AUTHOR ("Anil S Keshavamurthy <[email protected]>" );MODULE_LICENSE ("GPL" );
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation 2.7.4