On Thu, Mar 02, 2017 at 01:44:43PM -0800, Laura Abbott wrote:
Currently, all heaps are compiled in all the time. In switching to a better platform model, let's allow these to be compiled out for good measure.
Signed-off-by: Laura Abbott labbott@redhat.com
I'm not the biggest fan of making everything Kconfig-selectable. And the #ifdef stuff doesn't look all that pretty. If we'd also use this opportunity to split each heap into their own file I think this patch here would be a lot more useful.
Anyway, no real opinion from me on this, just an idea. -Daniel
drivers/staging/android/ion/Kconfig | 32 ++++++++++++++++++++ drivers/staging/android/ion/Makefile | 8 +++-- drivers/staging/android/ion/ion_priv.h | 53 ++++++++++++++++++++++++++++++++-- 3 files changed, 87 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig index 0c91b2b..2e97990 100644 --- a/drivers/staging/android/ion/Kconfig +++ b/drivers/staging/android/ion/Kconfig @@ -17,3 +17,35 @@ config ION_TEST Choose this option to create a device that can be used to test the kernel and device side ION functions. +config ION_SYSTEM_HEAP
- bool "Ion system heap"
- depends on ION
- help
Choose this option to enable the Ion system heap. The system heapis backed by pages from the buddy allocator. If in doubt, say Y.+config ION_CARVEOUT_HEAP
- bool "Ion carveout heap support"
- depends on ION
- help
Choose this option to enable carveout heaps with Ion. Carveout heapsare backed by memory reserved from the system. Allocation times aretypically faster at the cost of memory not being used. Unless youknow your system has these regions, you should say N here.+config ION_CHUNK_HEAP
- bool "Ion chunk heap support"
- depends on ION
- help
Choose this option to enable chunk heaps with Ion. This heap issimilar in function the carveout heap but memory is broken downinto smaller chunk sizes, typically corresponding to a TLB size.Unless you know your system has these regions, you should say N here.+config ION_CMA_HEAP
- bool "Ion CMA heap support"
- depends on ION && CMA
- help
Choose this option to enable CMA heaps with Ion. This heap is backedby the Contiguous Memory Allocator (CMA). If your system has theseregions, you should say Y here.diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile index 9457090..eef022b 100644 --- a/drivers/staging/android/ion/Makefile +++ b/drivers/staging/android/ion/Makefile @@ -1,6 +1,8 @@ -obj-$(CONFIG_ION) += ion.o ion-ioctl.o ion_heap.o \
ion_page_pool.o ion_system_heap.o \ion_carveout_heap.o ion_chunk_heap.o ion_cma_heap.o+obj-$(CONFIG_ION) += ion.o ion-ioctl.o ion_heap.o +obj-$(CONFIG_ION_SYSTEM_HEAP) += ion_system_heap.o ion_page_pool.o +obj-$(CONFIG_ION_CARVEOUT_HEAP) += ion_carveout_heap.o +obj-$(CONFIG_ION_CHUNK_HEAP) += ion_chunk_heap.o +obj-$(CONFIG_ION_CMA_HEAP) += ion_cma_heap.o obj-$(CONFIG_ION_TEST) += ion_test.o ifdef CONFIG_COMPAT obj-$(CONFIG_ION) += compat_ion.o diff --git a/drivers/staging/android/ion/ion_priv.h b/drivers/staging/android/ion/ion_priv.h index b09bc7c..6eafe0d 100644 --- a/drivers/staging/android/ion/ion_priv.h +++ b/drivers/staging/android/ion/ion_priv.h @@ -369,21 +369,68 @@ size_t ion_heap_freelist_size(struct ion_heap *heap);
- heaps as appropriate.
*/
struct ion_heap *ion_heap_create(struct ion_platform_heap *heap_data); void ion_heap_destroy(struct ion_heap *heap);
+#ifdef CONFIG_ION_SYSTEM_HEAP struct ion_heap *ion_system_heap_create(struct ion_platform_heap *unused); void ion_system_heap_destroy(struct ion_heap *heap);
struct ion_heap *ion_system_contig_heap_create(struct ion_platform_heap *heap); void ion_system_contig_heap_destroy(struct ion_heap *heap);
+#else +static inline struct ion_heap * ion_system_heap_create(
- struct ion_platform_heap *unused)
+{
- return ERR_PTR(-ENODEV);
+} +static inline void ion_system_heap_destroy(struct ion_heap *heap) { }
+static inline struct ion_heap *ion_system_contig_heap_create(
- struct ion_platform_heap *heap)
+{
- return ERR_PTR(-ENODEV);
+}
+static inline void ion_system_contig_heap_destroy(struct ion_heap *heap) { } +#endif
+#ifdef CONFIG_ION_CARVEOUT_HEAP struct ion_heap *ion_carveout_heap_create(struct ion_platform_heap *heap_data); void ion_carveout_heap_destroy(struct ion_heap *heap);
+#else +static inline struct ion_heap *ion_carveout_heap_create(
- struct ion_platform_heap *heap_data)
+{
- return ERR_PTR(-ENODEV);
+} +static inline void ion_carveout_heap_destroy(struct ion_heap *heap) { } +#endif
+#ifdef CONFIG_ION_CHUNK_HEAP struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data); void ion_chunk_heap_destroy(struct ion_heap *heap); +#else +static inline struct ion_heap *ion_chunk_heap_create(
- struct ion_platform_heap *heap_data)
+{
- return ERR_PTR(-ENODEV);
+} +static inline void ion_chunk_heap_destroy(struct ion_heap *heap) { }
+#endif
+#ifdef CONFIG_ION_CMA_HEAP struct ion_heap *ion_cma_heap_create(struct ion_platform_heap *data); void ion_cma_heap_destroy(struct ion_heap *heap); +#else +static inline struct ion_heap *ion_cma_heap_create(
- struct ion_platform_heap *data)
+{
- return ERR_PTR(-ENODEV);
+} +static inline void ion_cma_heap_destroy(struct ion_heap *heap) { } +#endif /**
- functions for creating and destroying a heap pool -- allows you
-- 2.7.4
-- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>