From e341d2312c5faec4b5652650a87f2c2e8ef8e818 Mon Sep 17 00:00:00 2001
From: xieliujie <xieliujie@oppo.com>
Date: Mon, 31 Jul 2023 09:49:44 +0800
Subject: [PATCH] ANDROID: ABI: Update oplus symbol list

3 function symbol(s) added
  'int __traceiter_android_rvh_rtmutex_force_update(void*, struct task_struct*, struct task_struct*, int*)'
  'int __traceiter_android_vh_rtmutex_waiter_prio(void*, struct task_struct*, int*)'
  'int __traceiter_android_vh_task_blocks_on_rtmutex(void*, struct rt_mutex_base*, struct rt_mutex_waiter*, struct task_struct*, struct ww_acquire_ctx*, unsigned int*)'

3 variable symbol(s) added
  'struct tracepoint __tracepoint_android_rvh_rtmutex_force_update'
  'struct tracepoint __tracepoint_android_vh_rtmutex_waiter_prio'
  'struct tracepoint __tracepoint_android_vh_task_blocks_on_rtmutex'

Bug: 290585456
Change-Id: I4af3d1c8df44822b7f5fd5d5682e65d7c6c4dcc3
Signed-off-by: xieliujie <xieliujie@oppo.com>
---
 android/abi_gki_aarch64.stg   | 85 +++++++++++++++++++++++++++++++++++
 android/abi_gki_aarch64_oplus | 16 ++++---
 2 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 1e43b6fb21c5..8e0c51ae4146 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -308677,6 +308677,14 @@ function {
   parameter_id: 0x1d19a9d5
   parameter_id: 0x1c3dbe5a
 }
+function {
+  id: 0x9bdcd7ce
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x1d19a9d5
+  parameter_id: 0x1d19a9d5
+  parameter_id: 0x13580d6c
+}
 function {
   id: 0x9bdcf60d
   return_type_id: 0x6720d32f
@@ -308783,6 +308791,13 @@ function {
   parameter_id: 0x1d5bae2a
   parameter_id: 0x11cfee5a
 }
+function {
+  id: 0x9bdf0ac7
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x1d19a9d5
+  parameter_id: 0x13580d6c
+}
 function {
   id: 0x9bdfa419
   return_type_id: 0x6720d32f
@@ -308877,6 +308892,16 @@ function {
   parameter_id: 0x2a670b41
   parameter_id: 0x1c898f28
 }
+function {
+  id: 0x9be67f35
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x1013df15
+  parameter_id: 0x27d4bd81
+  parameter_id: 0x1d19a9d5
+  parameter_id: 0x2c32dd96
+  parameter_id: 0x1bf16028
+}
 function {
   id: 0x9be6a9ad
   return_type_id: 0x6720d32f
@@ -323116,6 +323141,15 @@ elf_symbol {
   type_id: 0x9b427bba
   full_name: "__traceiter_android_rvh_revert_creds"
 }
+elf_symbol {
+  id: 0xf0ffb4d4
+  name: "__traceiter_android_rvh_rtmutex_force_update"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe3eba434
+  type_id: 0x9bdcd7ce
+  full_name: "__traceiter_android_rvh_rtmutex_force_update"
+}
 elf_symbol {
   id: 0xd90a9a58
   name: "__traceiter_android_rvh_rtmutex_prepare_setprio"
@@ -324754,6 +324788,15 @@ elf_symbol {
   type_id: 0x9beff51f
   full_name: "__traceiter_android_vh_rtmutex_wait_start"
 }
+elf_symbol {
+  id: 0xc56d7179
+  name: "__traceiter_android_vh_rtmutex_waiter_prio"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x40a0002c
+  type_id: 0x9bdf0ac7
+  full_name: "__traceiter_android_vh_rtmutex_waiter_prio"
+}
 elf_symbol {
   id: 0x5858f827
   name: "__traceiter_android_vh_rwsem_can_spin_on_owner"
@@ -325060,6 +325103,15 @@ elf_symbol {
   type_id: 0x9bcd4ff7
   full_name: "__traceiter_android_vh_sysrq_crash"
 }
+elf_symbol {
+  id: 0xdd9dd67b
+  name: "__traceiter_android_vh_task_blocks_on_rtmutex"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x698af67b
+  type_id: 0x9be67f35
+  full_name: "__traceiter_android_vh_task_blocks_on_rtmutex"
+}
 elf_symbol {
   id: 0x6befbf23
   name: "__traceiter_android_vh_thermal_power_cap"
@@ -326293,6 +326345,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_rvh_revert_creds"
 }
+elf_symbol {
+  id: 0xf2fd13ea
+  name: "__tracepoint_android_rvh_rtmutex_force_update"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xa86a5262
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_rvh_rtmutex_force_update"
+}
 elf_symbol {
   id: 0x69e37d02
   name: "__tracepoint_android_rvh_rtmutex_prepare_setprio"
@@ -327931,6 +327992,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_rtmutex_wait_start"
 }
+elf_symbol {
+  id: 0xeaebbadf
+  name: "__tracepoint_android_vh_rtmutex_waiter_prio"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x0fbb21e2
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_rtmutex_waiter_prio"
+}
 elf_symbol {
   id: 0xe471b8d5
   name: "__tracepoint_android_vh_rwsem_can_spin_on_owner"
@@ -328237,6 +328307,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_sysrq_crash"
 }
+elf_symbol {
+  id: 0xe5bf742d
+  name: "__tracepoint_android_vh_task_blocks_on_rtmutex"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x5494b8bf
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_task_blocks_on_rtmutex"
+}
 elf_symbol {
   id: 0x6f25dd05
   name: "__tracepoint_android_vh_thermal_power_cap"
@@ -380735,6 +380814,7 @@ interface {
   symbol_id: 0xe3e24295
   symbol_id: 0xaedef3a2
   symbol_id: 0xde725472
+  symbol_id: 0xf0ffb4d4
   symbol_id: 0xd90a9a58
   symbol_id: 0xbf64b0b6
   symbol_id: 0xb25ca194
@@ -380917,6 +380997,7 @@ interface {
   symbol_id: 0x91384eff
   symbol_id: 0x3ef508a2
   symbol_id: 0xfb1b8d64
+  symbol_id: 0xc56d7179
   symbol_id: 0x5858f827
   symbol_id: 0xb1847a6f
   symbol_id: 0x958d8cdb
@@ -380951,6 +381032,7 @@ interface {
   symbol_id: 0x58e7556b
   symbol_id: 0x2ecf85e9
   symbol_id: 0x34a01a22
+  symbol_id: 0xdd9dd67b
   symbol_id: 0x6befbf23
   symbol_id: 0x226cc38b
   symbol_id: 0xeecc1529
@@ -381088,6 +381170,7 @@ interface {
   symbol_id: 0x18bac297
   symbol_id: 0x1a849f34
   symbol_id: 0x3f328d3c
+  symbol_id: 0xf2fd13ea
   symbol_id: 0x69e37d02
   symbol_id: 0xeda5c5b0
   symbol_id: 0x3cd58ada
@@ -381270,6 +381353,7 @@ interface {
   symbol_id: 0x3fc5ffc9
   symbol_id: 0xa3915d70
   symbol_id: 0xf01f02ea
+  symbol_id: 0xeaebbadf
   symbol_id: 0xe471b8d5
   symbol_id: 0x84628825
   symbol_id: 0x8d0ce77d
@@ -381304,6 +381388,7 @@ interface {
   symbol_id: 0x39e68fed
   symbol_id: 0xefb9e5a3
   symbol_id: 0x3fe0157c
+  symbol_id: 0xe5bf742d
   symbol_id: 0x6f25dd05
   symbol_id: 0xa5c71571
   symbol_id: 0xfa3284c7
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index e06e98d72020..ea61781c1543 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -86,6 +86,7 @@
   tcf_exts_validate
   tcf_queue_work
   __traceiter_android_rvh_post_init_entity_util_avg
+  __traceiter_android_rvh_rtmutex_force_update
   __traceiter_android_vh_account_process_tick_gran
   __traceiter_android_vh_account_task_time
   __traceiter_android_vh_do_futex
@@ -99,11 +100,6 @@
   __traceiter_android_vh_record_pcpu_rwsem_starttime
   __traceiter_android_vh_record_rtmutex_lock_starttime
   __traceiter_android_vh_record_rwsem_lock_starttime
-  __tracepoint_android_vh_record_mutex_lock_starttime
-  __tracepoint_android_vh_record_pcpu_rwsem_starttime
-  __tracepoint_android_vh_record_rtmutex_lock_starttime
-  __tracepoint_android_vh_record_rwsem_lock_starttime
-  __trace_puts
   __traceiter_android_vh_alter_mutex_list_add
   __traceiter_android_vh_binder_free_proc
   __traceiter_android_vh_binder_has_work_ilocked
@@ -136,6 +132,7 @@
   __traceiter_android_vh_cleanup_old_buffers_bypass
   __traceiter_android_vh_dm_bufio_shrink_scan_bypass
   __traceiter_android_vh_mutex_unlock_slowpath
+  __traceiter_android_vh_rtmutex_waiter_prio
   __traceiter_android_vh_rwsem_can_spin_on_owner
   __traceiter_android_vh_rwsem_opt_spin_finish
   __traceiter_android_vh_rwsem_opt_spin_start
@@ -143,6 +140,7 @@
   __traceiter_android_vh_sched_stat_runtime_rt
   __traceiter_android_vh_shrink_node_memcgs
   __traceiter_android_vh_sync_txn_recvd
+  __traceiter_android_vh_task_blocks_on_rtmutex
   __traceiter_block_bio_queue
   __traceiter_block_getrq
   __traceiter_block_rq_complete
@@ -157,6 +155,7 @@
   __traceiter_sched_waking
   __traceiter_task_rename
   __tracepoint_android_rvh_post_init_entity_util_avg
+  __tracepoint_android_rvh_rtmutex_force_update
   __tracepoint_android_vh_account_process_tick_gran
   __tracepoint_android_vh_account_task_time
   __tracepoint_android_vh_alter_mutex_list_add
@@ -198,6 +197,11 @@
   __tracepoint_android_vh_cleanup_old_buffers_bypass
   __tracepoint_android_vh_dm_bufio_shrink_scan_bypass
   __tracepoint_android_vh_mutex_unlock_slowpath
+  __tracepoint_android_vh_record_mutex_lock_starttime
+  __tracepoint_android_vh_record_pcpu_rwsem_starttime
+  __tracepoint_android_vh_record_rtmutex_lock_starttime
+  __tracepoint_android_vh_record_rwsem_lock_starttime
+  __tracepoint_android_vh_rtmutex_waiter_prio
   __tracepoint_android_vh_rwsem_can_spin_on_owner
   __tracepoint_android_vh_rwsem_opt_spin_finish
   __tracepoint_android_vh_rwsem_opt_spin_start
@@ -205,6 +209,7 @@
   __tracepoint_android_vh_sched_stat_runtime_rt
   __tracepoint_android_vh_shrink_node_memcgs
   __tracepoint_android_vh_sync_txn_recvd
+  __tracepoint_android_vh_task_blocks_on_rtmutex
   __tracepoint_block_bio_queue
   __tracepoint_block_getrq
   __tracepoint_block_rq_complete
@@ -218,6 +223,7 @@
   __tracepoint_sched_stat_wait
   __tracepoint_sched_waking
   __tracepoint_task_rename
+  __trace_puts
   try_to_free_mem_cgroup_pages
   typec_mux_get_drvdata
   unregister_memory_notifier