From 98e5fb34d1137987cb2551d79082dc4c794795d4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 24 Aug 2022 17:06:03 +0200 Subject: [PATCH] Revert "ANDROID: add for tuning readahead size" This reverts commit f06daa5a0bc6c8b524b53671fce40e0a14c4f9af. The hook android_vh_ra_tuning_max_page is not used by any vendor, so remove it to help with merge issues with future LTS releases. If this is needed by any real user, it can easily be reverted to add it back and then the symbol should be added to the abi list at the same time to prevent it from being removed again later. Bug: 203756332 Bug: 229839032 Cc: liang zhang Signed-off-by: Greg Kroah-Hartman Change-Id: Id9211dfd9e1fa19d2ccb14302c60f0d55579f59d --- drivers/android/vendor_hooks.c | 1 - include/trace/hooks/mm.h | 3 --- mm/readahead.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 5b48337b53a1..a678c2fe440a 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -428,7 +428,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_has_work_ilocked); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_read_done); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_handle_tlb_conf); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_shrink_node_memcgs); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ra_tuning_max_page); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_tune_memcg_scan_type); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_handle_pte_fault_end); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cow_user_page); diff --git a/include/trace/hooks/mm.h b/include/trace/hooks/mm.h index 8b0225ce7ced..8a95d32a0706 100644 --- a/include/trace/hooks/mm.h +++ b/include/trace/hooks/mm.h @@ -189,9 +189,6 @@ DECLARE_HOOK(android_vh_pcplist_add_cma_pages_bypass, DECLARE_HOOK(android_vh_subpage_dma_contig_alloc, TP_PROTO(bool *allow_subpage_alloc, struct device *dev, size_t *size), TP_ARGS(allow_subpage_alloc, dev, size)); -DECLARE_HOOK(android_vh_ra_tuning_max_page, - TP_PROTO(struct readahead_control *ractl, unsigned long *max_page), - TP_ARGS(ractl, max_page)); DECLARE_HOOK(android_vh_handle_pte_fault_end, TP_PROTO(struct vm_fault *vmf, unsigned long highest_memmap_pfn), TP_ARGS(vmf, highest_memmap_pfn)); diff --git a/mm/readahead.c b/mm/readahead.c index a95364c99487..a6bfa987a04a 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -459,8 +459,6 @@ static void ondemand_readahead(struct readahead_control *ractl, if (req_size > max_pages && bdi->io_pages > max_pages) max_pages = min(req_size, bdi->io_pages); - trace_android_vh_ra_tuning_max_page(ractl, &max_pages); - /* * start of file */