IOMMU: Some more IOVA code tidy-up
Subsystems (2)
cover IOMMU: Some more IOVA code tidy-up
Based on arm64 for-next/iommu/core
I'll try to bunch this sort of stuff more in future, Thanks
John Garry (3):
iova: Make has_iova_flush_queue() private
iova: Delete copy_reserved_iova()
iova: Stop exporting some more functions
drivers/iommu/iova.c | 36 +----------------------------------- include/linux/iova.h | 12 ------------ 2 files changed, 1 insertion(+), 47 deletions(-)
Signature · 6 lines
2.26.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 1/3 iova: Make has_iova_flush_queue() private
Function has_iova_flush_queue() has no users outside iova.c, so make it private.
--- drivers/iommu/iova.c | 2 +- include/linux/iova.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-)
drivers/iommu/iova.c +1 -1
@@ -55,7 +55,7 @@ init_iova_domain(struct iova_domain *iovad, unsigned long granule, }EXPORT_SYMBOL_GPL (init_iova_domain); -bool has_iova_flush_queue (struct iova_domain *iovad) +static bool has_iova_flush_queue (struct iova_domain *iovad) {return !!iovad->fq; }
include/linux/iova.h +0 -6
@@ -153,7 +153,6 @@ struct iova *reserve_iova(struct iova_domain *iovad, unsigned long pfn_lo,void copy_reserved_iova (struct iova_domain *from,struct iova_domain *to);void init_iova_domain (struct iova_domain *iovad,unsigned long granule,unsigned long start_pfn); -bool has_iova_flush_queue (struct iova_domain *iovad);int init_iova_flush_queue (struct iova_domain *iovad,iova_flush_cb flush_cb,iova_entry_dtor entry_dtor);struct iova *find_iova (struct iova_domain *iovad,unsigned long pfn);
@@ -223,11 +222,6 @@ static inline void init_iova_domain(struct iova_domain *iovad, { } -static inline bool has_iova_flush_queue (struct iova_domain *iovad) -{ -return false; -} -static inline int init_iova_flush_queue (struct iova_domain *iovad,iova_flush_cb flush_cb,iova_entry_dtor entry_dtor)
Signature · 6 lines
2.26.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 2/3 iova: Delete copy_reserved_iova()
In reply to John GarrySince commit c588072bba6b ("iommu/vt-d: Convert intel iommu driver to the iommu ops"), function copy_reserved_iova() is not referenced, so delete it.
--- drivers/iommu/iova.c | 30 ------------------------------ include/linux/iova.h | 6 ------ 2 files changed, 36 deletions(-)
drivers/iommu/iova.c +0 -30
@@ -710,36 +710,6 @@ reserve_iova(struct iova_domain *iovad, }EXPORT_SYMBOL_GPL (reserve_iova); -/** -* copy_reserved_iova - copies the reserved between domains -* @from: - source doamin from where to copy -* @to: - destination domin where to copy -* This function copies reserved iova's from one doamin to -* other. -*/ -void -copy_reserved_iova (struct iova_domain *from,struct iova_domain *to) -{ -unsigned long flags; -struct rb_node *node; - -spin_lock_irqsave (&from->iova_rbtree_lock, flags); -for (node =rb_first (&from->rbroot); node; node =rb_next (node)) { - struct iova *iova = rb_entry(node, struct iova, node); -struct iova *new_iova; - -if (iova->pfn_lo ==IOVA_ANCHOR ) -continue ; - - new_iova =reserve_iova (to, iova->pfn_lo, iova->pfn_hi); -if (!new_iova) -pr_err ("Reserve iova range %lx@%lx failed\n" , - iova->pfn_lo, iova->pfn_lo); - } -spin_unlock_irqrestore (&from->iova_rbtree_lock, flags); -} -EXPORT_SYMBOL_GPL (copy_reserved_iova); -/* * Magazine caches for IOVA ranges. For an introduction to magazines, * see the USENIX 2001 paper "Magazines and Vmem: Extending the Slab
include/linux/iova.h +0 -6
@@ -150,7 +150,6 @@ unsigned long alloc_iova_fast(struct iova_domain *iovad, unsigned long size, unsigned long limit_pfn, bool flush_rcache);struct iova *reserve_iova (struct iova_domain *iovad,unsigned long pfn_lo,unsigned long pfn_hi); -void copy_reserved_iova (struct iova_domain *from,struct iova_domain *to);void init_iova_domain (struct iova_domain *iovad,unsigned long granule,unsigned long start_pfn); int init_iova_flush_queue(struct iova_domain *iovad,
@@ -211,11 +210,6 @@ static inline struct iova *reserve_iova(struct iova_domain *iovad,return NULL ; } -static inline void copy_reserved_iova (struct iova_domain *from, -struct iova_domain *to) -{ -} -static inline void init_iova_domain (struct iova_domain *iovad,unsigned long granule,unsigned long start_pfn)
Signature · 6 lines
2.26.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 3/3 iova: Stop exporting some more functions
In reply to John GarryThe following functions are not referenced outside dma-iommu.c (apart from iova.c), which can only be built-in:
- init_iova_flush_queue()
- free_iova_fast()
- queue_iova()
- alloc_iova_fast()
So stop exporting them.
--- drivers/iommu/iova.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/iommu/iova.c +0 -4
@@ -112,7 +112,6 @@ int init_iova_flush_queue(struct iova_domain *iovad,return 0 ; } -EXPORT_SYMBOL_GPL (init_iova_flush_queue);static struct rb_node *__get_cached_rbnode (struct iova_domain *iovad,unsigned long limit_pfn)
@@ -451,7 +450,6 @@ alloc_iova_fast(struct iova_domain *iovad, unsigned long size,return new_iova->pfn_lo; } -EXPORT_SYMBOL_GPL (alloc_iova_fast);/** * free_iova_fast - free iova pfn range into rcache
@@ -469,7 +467,6 @@ free_iova_fast(struct iova_domain *iovad, unsigned long pfn, unsigned long size)free_iova (iovad, pfn); } -EXPORT_SYMBOL_GPL (free_iova_fast);#define fq_ring_for_each (i, fq) \ for ((i) = (fq)->head; (i) != (fq)->tail; (i) = ((i) + 1) % IOVA_FQ_SIZE)
@@ -598,7 +595,6 @@ void queue_iova(struct iova_domain *iovad,mod_timer (&iovad->fq_timer, jiffies +msecs_to_jiffies (IOVA_FQ_TIMEOUT )); } -EXPORT_SYMBOL_GPL (queue_iova);/** * put_iova_domain - destroys the iova doamin
Signature · 6 lines
2.26.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu