Merge commit 'b5c719f94146' into android15-6.6-lts

Slow steps on the way to merging all of the current android15-6.6 tree
into android15-6.6-lts.  Commits included here are:

b5c719f ANDROID: abi_gki_aarch64_honor: whitelist symbols added for skip memcg reclaim by priority
29fd536 ANDROID: mm: add vendor hook to skip memcg reclaim by priority

Change-Id: Id5f07144f86d268f620d2b9df19384dcb832a074
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Author: gregkh

android/abi_gki_aarch64.stg

@@ -337413,6 +337413,14 @@ function {
   parameter_id: 0x1a8d1bcb
   parameter_id: 0x1a8d1bcb
 }
+function {
+  id: 0x9bc35bd0
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x1d5bae2a
+  parameter_id: 0x6720d32f
+  parameter_id: 0x11cfee5a
+}
 function {
   id: 0x9bc3617d
   return_type_id: 0x6720d32f
@@ -358368,6 +358376,15 @@ elf_symbol {
   type_id: 0x9b664ae7
   full_name: "__traceiter_android_vh_should_fault_around"
 }
+elf_symbol {
+  id: 0x2657a2e6
+  name: "__traceiter_android_vh_should_memcg_bypass"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x4bf5f50d
+  type_id: 0x9bc35bd0
+  full_name: "__traceiter_android_vh_should_memcg_bypass"
+}
 elf_symbol {
   id: 0xf3144cdc
   name: "__traceiter_android_vh_show_mapcount_pages"
@@ -364281,6 +364298,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_should_fault_around"
 }
+elf_symbol {
+  id: 0x9e76c2c4
+  name: "__tracepoint_android_vh_should_memcg_bypass"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xca39937b
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_should_memcg_bypass"
+}
 elf_symbol {
   id: 0x288e392e
   name: "__tracepoint_android_vh_show_mapcount_pages"
@@ -426360,6 +426386,7 @@ interface {
   symbol_id: 0x53263f73
   symbol_id: 0xe828d15b
   symbol_id: 0xda8424a2
+  symbol_id: 0x2657a2e6
   symbol_id: 0xf3144cdc
   symbol_id: 0x4d31a413
   symbol_id: 0xe7f6f975
@@ -427017,6 +427044,7 @@ interface {
   symbol_id: 0xd860c719
   symbol_id: 0x5b6bc3a9
   symbol_id: 0x88acddf0
+  symbol_id: 0x9e76c2c4
   symbol_id: 0x288e392e
   symbol_id: 0x823654f5
   symbol_id: 0x42ad45a3

android/abi_gki_aarch64_honor

@@ -148,6 +148,8 @@
   __tracepoint_android_vh_sk_clone_lock
   __traceiter_android_vh_cma_alloc_retry
   __tracepoint_android_vh_cma_alloc_retry
+  __tracepoint_android_vh_should_memcg_bypass
+  __traceiter_android_vh_should_memcg_bypass
   __traceiter_android_rvh_ogki_vfree_bypass
   __traceiter_android_rvh_ogki_vmalloc_node_bypass
   __traceiter_android_vh_ogki_async_psi_bypass

drivers/android/vendor_hooks.c

@@ -387,6 +387,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mm_may_oom_exit);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_vmscan_kswapd_done);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_shrink_folio_list);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_inode_lru_isolate);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_should_memcg_bypass);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_invalidate_mapping_pagevec);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_customize_alloc_gfp);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpu_capacity_show);

include/trace/hooks/vmscan.h

@@ -95,6 +95,9 @@ DECLARE_HOOK(android_vh_do_folio_trylock,
 DECLARE_HOOK(android_vh_shrink_node_memcgs,
 	TP_PROTO(struct mem_cgroup *memcg, bool *skip),
 	TP_ARGS(memcg, skip));
+DECLARE_HOOK(android_vh_should_memcg_bypass,
+	TP_PROTO(struct mem_cgroup *memcg, int priority, bool *bypass),
+	TP_ARGS(memcg, priority, bypass));
 #endif /* _TRACE_HOOK_VMSCAN_H */
 /* This part must be outside protection */
 #include <trace/define_trace.h>

mm/vmscan.c

@@ -5591,6 +5591,7 @@ static void shrink_many(struct pglist_data *pgdat, struct scan_control *sc)
 	struct lru_gen_folio *lrugen;
 	struct mem_cgroup *memcg;
 	struct hlist_nulls_node *pos;
+	bool bypass = false;
 
 	gen = get_memcg_gen(READ_ONCE(pgdat->memcg_lru.seq));
 	bin = first_bin = get_random_u32_below(MEMCG_NR_BINS);
@@ -5621,6 +5622,10 @@ static void shrink_many(struct pglist_data *pgdat, struct scan_control *sc)
 			continue;
 		}
 
+		trace_android_vh_should_memcg_bypass(memcg, sc->priority, &bypass);
+		if (bypass)
+			continue;
+
 		rcu_read_unlock();
 
 		op = shrink_one(lruvec, sc);