| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1346223335-31455-2-git-send-email-hdoyu@nvidia.com>
Date: Wed, 29 Aug 2012 09:55:31 +0300
From: Hiroshi Doyu <hdoyu@...dia.com>
To: <m.szyprowski@...sung.com>
CC: <iommu@...ts.linux-foundation.org>,
Hiroshi Doyu <hdoyu@...dia.com>,
<linux-arm-kernel@...ts.infradead.org>,
<linaro-mm-sig@...ts.linaro.org>, <linux-mm@...ck.org>,
<linux-kernel@...r.kernel.org>, <kyungmin.park@...sung.com>,
<arnd@...db.de>, <linux@....linux.org.uk>,
<chunsang.jeong@...aro.org>, <vdumpa@...dia.com>,
<subashrp@...il.com>, <minchan@...nel.org>,
<pullip.cho@...sung.com>, <konrad.wilk@...cle.com>,
<linux-tegra@...r.kernel.org>
Subject: [RFC 1/5] ARM: dma-mapping: New dma_map_ops->iova_get_free_{total,max} functions
->iova>_get_free_total() returns the sum of available free areas.
->iova>_get_free_max() returns the largest available free area size.
Signed-off-by: Hiroshi Doyu <hdoyu@...dia.com>
---
arch/arm/include/asm/dma-mapping.h | 16 ++++++++++
arch/arm/mm/dma-mapping.c | 54 ++++++++++++++++++++++++++++++++++++
include/linux/dma-mapping.h | 3 ++
3 files changed, 73 insertions(+), 0 deletions(-)
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index 2300484..1cbd279 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -170,6 +170,22 @@ static inline void dma_free_attrs(struct device *dev, size_t size,
ops->free(dev, size, cpu_addr, dma_handle, attrs);
}
+static inline size_t dma_iova_get_free_total(struct device *dev)
+{
+ struct dma_map_ops *ops = get_dma_ops(dev);
+ BUG_ON(!ops);
+
+ return ops->iova_get_free_total(dev);
+}
+
+static inline size_t dma_iova_get_free_max(struct device *dev)
+{
+ struct dma_map_ops *ops = get_dma_ops(dev);
+ BUG_ON(!ops);
+
+ return ops->iova_get_free_max(dev);
+}
+
/**
* arm_dma_mmap - map a coherent DMA allocation into user space
* @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index e4746b7..db17338 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1001,6 +1001,57 @@ fs_initcall(dma_debug_do_init);
/* IOMMU */
+static size_t arm_iommu_iova_get_free_total(struct device *dev)
+{
+ struct dma_iommu_mapping *mapping = dev->archdata.mapping;
+ unsigned long flags;
+ size_t size = 0;
+ unsigned long start = 0;
+
+ BUG_ON(!dev);
+ BUG_ON(!mapping);
+
+ spin_lock_irqsave(&mapping->lock, flags);
+ while (1) {
+ unsigned long end;
+
+ start = bitmap_find_next_zero_area(mapping->bitmap,
+ mapping->bits, start, 1, 0);
+ if (start > mapping->bits)
+ break;
+
+ end = find_next_bit(mapping->bitmap, mapping->bits, start);
+ size += end - start;
+ start = end;
+ }
+ spin_unlock_irqrestore(&mapping->lock, flags);
+ return size << (mapping->order + PAGE_SHIFT);
+}
+
+static size_t arm_iommu_iova_get_free_max(struct device *dev)
+{
+ struct dma_iommu_mapping *mapping = dev->archdata.mapping;
+ unsigned long flags;
+ size_t max_free = 0;
+ unsigned long start = 0;
+
+ spin_lock_irqsave(&mapping->lock, flags);
+ while (1) {
+ unsigned long end;
+
+ start = bitmap_find_next_zero_area(mapping->bitmap,
+ mapping->bits, start, 1, 0);
+ if (start > mapping->bits)
+ break;
+
+ end = find_next_bit(mapping->bitmap, mapping->bits, start);
+ max_free = max_t(size_t, max_free, end - start);
+ start = end;
+ }
+ spin_unlock_irqrestore(&mapping->lock, flags);
+ return max_free << (mapping->order + PAGE_SHIFT);
+}
+
static inline dma_addr_t __alloc_iova(struct dma_iommu_mapping *mapping,
size_t size)
{
@@ -1721,6 +1772,9 @@ struct dma_map_ops iommu_ops = {
.unmap_sg = arm_iommu_unmap_sg,
.sync_sg_for_cpu = arm_iommu_sync_sg_for_cpu,
.sync_sg_for_device = arm_iommu_sync_sg_for_device,
+
+ .iova_get_free_total = arm_iommu_iova_get_free_total,
+ .iova_get_free_max = arm_iommu_iova_get_free_max,
};
struct dma_map_ops iommu_coherent_ops = {
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 94af418..0337182 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -53,6 +53,9 @@ struct dma_map_ops {
#ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK
u64 (*get_required_mask)(struct device *dev);
#endif
+ size_t (*iova_get_free_total)(struct device *dev);
+ size_t (*iova_get_free_max)(struct device *dev);
+
int is_phys;
};
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists