From 5bdef2817ade8ff82fd9b2730f1266189f689adf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=BE=89?=
 <yanghui10@xiaomi.corp-partner.google.com>
Date: Wed, 23 Oct 2024 18:47:24 +0800
Subject: [PATCH] ANDROID: ABI: update gki symbol list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update the symbol list with new vendor hooks used by xiaomi

2 function symbol(s) added
int __traceiter_android_vh_alloc_flags_cma_adjust(gfp_t gfp_mask,
unsigned int *alloc_flags)
int __traceiter_android_vh_rmqueue_cma_fallback(struct zone *zone,
unsigned int order, struct page **page)

Bug: 374857413
Change-Id: If7ff8cef7d65a4f913afb32d3ff0ef5e56732035
Signed-off-by: 杨辉 <yanghui10@xiaomi.corp-partner.google.com>
---
 android/abi_gki_aarch64.stg    | 55 ++++++++++++++++++++++++++++++++++
 android/abi_gki_aarch64_xiaomi |  4 +++
 2 files changed, 59 insertions(+)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 01ae96b96a33..3777a0dbf17a 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -321566,6 +321566,13 @@ function {
   parameter_id: 0x0b30ee00
   parameter_id: 0x2cacacc0
 }
+function {
+  id: 0x986fdd44
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0xf1a6dfed
+  parameter_id: 0x1bf16028
+}
 function {
   id: 0x987085c9
   return_type_id: 0x6720d32f
@@ -327318,6 +327325,14 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0x2e18f543
 }
+function {
+  id: 0x9b977b1f
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x0a63398f
+  parameter_id: 0x4585663f
+  parameter_id: 0x0b30ee00
+}
 function {
   id: 0x9b999c4a
   return_type_id: 0x6720d32f
@@ -345995,6 +346010,15 @@ elf_symbol {
   type_id: 0x9bf594ed
   full_name: "__traceiter_android_vh_aes_expandkey"
 }
+elf_symbol {
+  id: 0x666f7184
+  name: "__traceiter_android_vh_alloc_flags_cma_adjust"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x5ad2b656
+  type_id: 0x986fdd44
+  full_name: "__traceiter_android_vh_alloc_flags_cma_adjust"
+}
 elf_symbol {
   id: 0xd0b4a794
   name: "__traceiter_android_vh_alloc_oem_binder_struct"
@@ -347948,6 +347972,15 @@ elf_symbol {
   type_id: 0x9abcf489
   full_name: "__traceiter_android_vh_rmqueue_bulk_bypass"
 }
+elf_symbol {
+  id: 0x2a3fd420
+  name: "__traceiter_android_vh_rmqueue_cma_fallback"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xc59620af
+  type_id: 0x9b977b1f
+  full_name: "__traceiter_android_vh_rmqueue_cma_fallback"
+}
 elf_symbol {
   id: 0x8d62858f
   name: "__traceiter_android_vh_rmqueue_smallest_bypass"
@@ -350846,6 +350879,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_aes_expandkey"
 }
+elf_symbol {
+  id: 0x74cce3b2
+  name: "__tracepoint_android_vh_alloc_flags_cma_adjust"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x1a999a97
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_alloc_flags_cma_adjust"
+}
 elf_symbol {
   id: 0xd7f9868e
   name: "__tracepoint_android_vh_alloc_oem_binder_struct"
@@ -352799,6 +352841,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_rmqueue_bulk_bypass"
 }
+elf_symbol {
+  id: 0x10139f4a
+  name: "__tracepoint_android_vh_rmqueue_cma_fallback"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xeb80dd16
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_rmqueue_cma_fallback"
+}
 elf_symbol {
   id: 0x04365139
   name: "__tracepoint_android_vh_rmqueue_smallest_bypass"
@@ -415932,6 +415983,7 @@ interface {
   symbol_id: 0x0556c9b1
   symbol_id: 0xa3ddabd2
   symbol_id: 0xf78be1c5
+  symbol_id: 0x666f7184
   symbol_id: 0xd0b4a794
   symbol_id: 0x33f9278c
   symbol_id: 0x2e343246
@@ -416149,6 +416201,7 @@ interface {
   symbol_id: 0xf10ce16f
   symbol_id: 0xa8cef421
   symbol_id: 0xd6100bd9
+  symbol_id: 0x2a3fd420
   symbol_id: 0x8d62858f
   symbol_id: 0xcef5d79f
   symbol_id: 0x91384eff
@@ -416471,6 +416524,7 @@ interface {
   symbol_id: 0x58e7634f
   symbol_id: 0x3a519484
   symbol_id: 0x7ea1f05b
+  symbol_id: 0x74cce3b2
   symbol_id: 0xd7f9868e
   symbol_id: 0x37776872
   symbol_id: 0xfc735654
@@ -416688,6 +416742,7 @@ interface {
   symbol_id: 0xd6904c6d
   symbol_id: 0xcad24ea3
   symbol_id: 0xfebada43
+  symbol_id: 0x10139f4a
   symbol_id: 0x04365139
   symbol_id: 0xd94bc301
   symbol_id: 0x3fc5ffc9
diff --git a/android/abi_gki_aarch64_xiaomi b/android/abi_gki_aarch64_xiaomi
index 9ead59c27520..af5c77dcdce8 100644
--- a/android/abi_gki_aarch64_xiaomi
+++ b/android/abi_gki_aarch64_xiaomi
@@ -116,6 +116,10 @@
   __tracepoint_android_rvh_check_preempt_tick
   __tracepoint_android_rvh_dequeue_entity
   __tracepoint_android_rvh_enqueue_entity
+  __traceiter_android_vh_alloc_flags_cma_adjust
+  __traceiter_android_vh_rmqueue_cma_fallback
+  __tracepoint_android_vh_alloc_flags_cma_adjust
+  __tracepoint_android_vh_rmqueue_cma_fallback
   console_printk
   __traceiter_android_vh_binder_transaction_init
   __tracepoint_android_vh_binder_transaction_init