SUNLIGHT: Stable 12/27/2023 - ANDROID

Description:
 - Stable 12/27/2023 - ANDROID

Change-Id: Ibbf721de834478c26e521c261c09c8c29618bca1
Signed-off-by: Ionut Nechita <ionut_n2001@yahoo.com>

Author: ionutnechita

drivers/android/vendor_hooks.c

@@ -34,6 +34,7 @@
 #include <trace/hooks/remoteproc.h>
 #include <trace/hooks/timer.h>
 #include <trace/hooks/fpsimd.h>
+#include <trace/hooks/mm.h>
 
 /*
  * Export tracepoints that act as a bare tracehook (ie: have no trace event
@@ -88,3 +89,5 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rproc_recovery);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rproc_recovery_set);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_timer_calc_index);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_is_fpsimd_save);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_slab_folio_alloced);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_kmalloc_large_alloced);

include/trace/hooks/mm.h

@@ -21,6 +21,12 @@ DECLARE_RESTRICTED_HOOK(android_rvh_set_readahead_gfp_mask,
 			TP_ARGS(flags), 1);
 
 */
+DECLARE_HOOK(android_vh_slab_folio_alloced,
+	TP_PROTO(unsigned int order, gfp_t flags),
+	TP_ARGS(order, flags));
+DECLARE_HOOK(android_vh_kmalloc_large_alloced,
+	TP_PROTO(struct page *page, unsigned int order, gfp_t flags),
+	TP_ARGS(page, order, flags));
 #endif /* _TRACE_HOOK_MM_H */
 
 /* This part must be outside protection */

mm/slab_common.c

@@ -33,6 +33,8 @@
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/kmem.h>
+#undef CREATE_TRACE_POINTS
+#include <trace/hooks/mm.h>
 
 enum slab_state slab_state;
 LIST_HEAD(slab_caches);
@@ -1171,6 +1173,8 @@ static void *__kmalloc_large_node(size_t size, gfp_t flags, int node)
 				      PAGE_SIZE << order);
 	}
 
+	trace_android_vh_kmalloc_large_alloced(page, order, flags);
+
 	ptr = kasan_kmalloc_large(ptr, size, flags);
 	/* As ptr might get tagged, call kmemleak hook after KASAN. */
 	kmemleak_alloc(ptr, size, 1, flags);

mm/slub.c

@@ -44,6 +44,7 @@
 
 #include <linux/debugfs.h>
 #include <trace/events/kmem.h>
+#include <trace/hooks/mm.h>
 
 #include "internal.h"
 
@@ -1881,6 +1882,8 @@ static inline struct slab *alloc_slab_page(gfp_t flags, int node,
 	if (folio_is_pfmemalloc(folio))
 		slab_set_pfmemalloc(slab);
 
+	trace_android_vh_slab_folio_alloced(order, flags);
+
 	return slab;
 }