From 0b200357782495594d8f5cc94f76efe905e34832 Mon Sep 17 00:00:00 2001 From: lvwenhuan Date: Fri, 15 Sep 2023 20:03:10 +0800 Subject: [PATCH] ANDROID: vendor_hooks: Add hooks for adjusting alloc_flags the reason why we add a vendor hook adjusting alloc_flags: 1 the user only pass parameter size and gfp_flags once. if we mask the __GFP_RECLAIM, we can't distinguish high-order and low-order, they all will not rise reclaim behavior, it's wrong. 2 for __iommu_dma_alloc_pages, there is a loop to try to alloc pages from high-order to low-order fallback, and we add hook callsite to only change the high-order( > costly order) alloc behavior(which high probability will result more overhead than benifit). which allow low order alloc to do reclaim behavior still, otherwise may end up with alloc fail. 3 in android ION(drivers/dma-buf/heaps/system_heap.c ) there is same logic, high-order alloc will not do reclaim behavior. so this change and a vendor hook for adjusting alloc_flags, and add a callsite in __iommu_dma_alloc_pages to turn the reclaim behavior. Bug: 300857012 Change-Id: I30bd634d8ede1cc29c83d52bdd9276c8cf72ac1e Signed-off-by: lvwenhuan (cherry picked from commit d6c24c3a63567676de818011403abe5b9b3d38b0) --- drivers/android/vendor_hooks.c | 1 + drivers/iommu/dma-iommu.c | 1 + include/trace/hooks/iommu.h | 3 +++ 3 files changed, 5 insertions(+) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index e77be685ae9a..5b13dce50c13 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -253,6 +253,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_set_readahead_gfp_mask); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_mutex_list_add); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mutex_unlock_slowpath); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_wake_finish); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_adjust_alloc_flags); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_looper_state_registered); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_thread_read); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_free_proc); diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 89c2c55aa690..cb0dc831834c 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -779,6 +779,7 @@ static struct page **__iommu_dma_alloc_pages(struct device *dev, order_size = 1U << order; if (order_mask > order_size) alloc_flags |= __GFP_NORETRY; + trace_android_vh_adjust_alloc_flags(order, &alloc_flags); page = alloc_pages_node(nid, alloc_flags, order); if (!page) continue; diff --git a/include/trace/hooks/iommu.h b/include/trace/hooks/iommu.h index 604dbf00cf6a..7629ca915ecd 100644 --- a/include/trace/hooks/iommu.h +++ b/include/trace/hooks/iommu.h @@ -44,6 +44,9 @@ DECLARE_RESTRICTED_HOOK(android_rvh_iommu_limit_align_shift, DECLARE_HOOK(android_vh_bus_iommu_probe, TP_PROTO(struct iommu_device *iommu, struct bus_type *bus, bool *skip), TP_ARGS(iommu, bus, skip)); +DECLARE_HOOK(android_vh_adjust_alloc_flags, + TP_PROTO(unsigned int order, gfp_t *alloc_flags), + TP_ARGS(order, alloc_flags)); #endif /* _TRACE_HOOK_IOMMU_H */