Revert "ANDROID: mm: add vendor hook for __alloc_pages()"

Revert submission 3981670

Reason for revert: Droidmonitor created revert due to b/492208304. Will be verifying through ABTD before submission.

Fix: 492208304

Reverted changes: /q/submissionid:3981670

Change-Id: Ic6ac482f60cde18779146b5fe55e6304a20137d5
Signed-off-by: Priyanka Advani <padvani@google.com>
Bug: 489485148

drivers/android/vendor_hooks.c

diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c
index faf9c25..8ca33924 100644
--- a/drivers/android/vendor_hooks.c
+++ b/drivers/android/vendor_hooks.c
@@ -514,5 +514,3 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_create_worker);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_fas_gpu_qos_update_tracer);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_nr_pcp_alloc);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_pcp_alloc_factor_adjust);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alloc_pages_start);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alloc_pages_end);

include/trace/hooks/mm.h

diff --git a/include/trace/hooks/mm.h b/include/trace/hooks/mm.h
index 3c2136e..f9fc116 100644
--- a/include/trace/hooks/mm.h
+++ b/include/trace/hooks/mm.h
@@ -353,12 +353,6 @@ DECLARE_HOOK(android_vh_pcp_alloc_factor_adjust,
 		struct per_cpu_pages *pcp, struct page *page, int migratetype,
 		unsigned int order),
 	TP_ARGS(zone, pad, pcp, page, migratetype, order));
-DECLARE_HOOK(android_vh_alloc_pages_start,
-	TP_PROTO(u64 *stime),
-	TP_ARGS(stime));
-DECLARE_HOOK(android_vh_alloc_pages_end,
-	TP_PROTO(unsigned int order, gfp_t alloc_gfp, u64 stime),
-	TP_ARGS(order, alloc_gfp, stime));
 #endif /* _TRACE_HOOK_MM_H */
 
 /* This part must be outside protection */

mm/page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 6bcaba8..b8d6ce8 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5862,7 +5862,6 @@ struct page *__alloc_pages(gfp_t gfp, unsigned int order, int preferred_nid,
 	unsigned int alloc_flags = ALLOC_WMARK_LOW;
 	gfp_t alloc_gfp; /* The gfp_t that was actually used for allocation */
 	struct alloc_context ac = { };
-	u64 stime = 0;
 
 	/*
 	 * There are several places where we assume that the order value is sane
@@ -5871,8 +5870,6 @@ struct page *__alloc_pages(gfp_t gfp, unsigned int order, int preferred_nid,
 	if (WARN_ON_ONCE_GFP(order >= MAX_ORDER, gfp))
 		return NULL;
 
-	trace_android_vh_alloc_pages_start(&stime);
-
 	gfp &= gfp_allowed_mask;
 	/*
 	 * Apply scoped allocation constraints. This is mainly about GFP_NOFS
@@ -5921,7 +5918,6 @@ struct page *__alloc_pages(gfp_t gfp, unsigned int order, int preferred_nid,
 
 	trace_mm_page_alloc(page, order, alloc_gfp, ac.migratetype);
 	kmsan_alloc_page(page, order, alloc_gfp);
-	trace_android_vh_alloc_pages_end(order, alloc_gfp, stime);
 
 	return page;
 }