From b283f9b41fc5f3032916637442e3e818ca42fcbc Mon Sep 17 00:00:00 2001
From: huzhanyuan <huzhanyuan@oppo.com>
Date: Fri, 28 Jul 2023 20:44:15 +0800
Subject: [PATCH] ANDROID: oplus: Update the ABI xml and symbol list

INFO: ABI DIFFERENCES HAVE BEEN DETECTED!
INFO: 4 function symbol(s) added
'int __traceiter_android_vh_check_folio_look_around_ref(void*, struct folio*,int*)'
'int __traceiter_android_vh_look_around(void*, struct page_vma_mapped_walk*,struct folio*, struct vm_area_struct*, int*)'
'int __traceiter_android_vh_look_around_migrate_folio(void*, struct folio*, struct folio*)'
'int __traceiter_android_vh_test_clear_look_around_ref(void*, struct page*)'

4 variable symbol(s) added
'struct tracepoint __tracepoint_android_vh_check_folio_look_around_ref'
'struct tracepoint __tracepoint_android_vh_look_around'
'struct tracepoint __tracepoint_android_vh_look_around_migrate_folio'
'struct tracepoint __tracepoint_android_vh_test_clear_look_around_ref'

Bug: 292051411
Change-Id: I25fff4eefc6773d3e1130bd0ff3f3cc21d6c0964
signed-off-by: Zhanyuan Hu <huzhanyuan@oppo.com>
---
 android/abi_gki_aarch64.stg   | 172 ++++++++++++++++++++++++++++++++++
 android/abi_gki_aarch64_oplus |   8 ++
 2 files changed, 180 insertions(+)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 85fe49d8c144..df6a890d2ac2 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -8483,6 +8483,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x79e2d3b1
 }
+pointer_reference {
+  id: 0x14f37d47
+  kind: POINTER
+  pointee_type_id: 0x798d1382
+}
 pointer_reference {
   id: 0x14fb0ab0
   kind: POINTER
@@ -42793,6 +42798,12 @@ member {
   type_id: 0x33756485
   offset: 512
 }
+member {
+  id: 0x30e26822
+  name: "address"
+  type_id: 0x33756485
+  offset: 256
+}
 member {
   id: 0x30e26c68
   name: "address"
@@ -131796,6 +131807,12 @@ member {
   type_id: 0xfc0e1dbd
   offset: 768
 }
+member {
+  id: 0xe3b1b19e
+  name: "nr_pages"
+  type_id: 0x33756485
+  offset: 64
+}
 member {
   id: 0xe3b1b2b8
   name: "nr_pages"
@@ -142461,6 +142478,11 @@ member {
   type_id: 0x03913382
   offset: 52352
 }
+member {
+  id: 0x64bb7964
+  name: "pfn"
+  type_id: 0x33756485
+}
 member {
   id: 0xeb463452
   name: "pfn_base"
@@ -144349,6 +144371,12 @@ member {
   type_id: 0x21082bfc
   offset: 384
 }
+member {
+  id: 0x56639dd1
+  name: "pmd"
+  type_id: 0x21082bfc
+  offset: 320
+}
 member {
   id: 0x569cedab
   name: "pmd"
@@ -150421,11 +150449,23 @@ member {
   type_id: 0x32bee099
   offset: 704
 }
+member {
+  id: 0xa17fe2dc
+  name: "pte"
+  type_id: 0x32bee099
+  offset: 384
+}
 member {
   id: 0xa18e706b
   name: "pte"
   type_id: 0xc32dc55c
 }
+member {
+  id: 0xce4422cd
+  name: "ptl"
+  type_id: 0x3654c061
+  offset: 448
+}
 member {
   id: 0xce442d14
   name: "ptl"
@@ -196497,6 +196537,12 @@ member {
   type_id: 0x04fd6761
   offset: 1280
 }
+member {
+  id: 0x239192da
+  name: "vma"
+  type_id: 0x0a134144
+  offset: 192
+}
 member {
   id: 0x23919a13
   name: "vma"
@@ -236307,6 +236353,23 @@ struct_union {
     member_id: 0xb59c78b7
   }
 }
+struct_union {
+  id: 0x798d1382
+  kind: STRUCT
+  name: "page_vma_mapped_walk"
+  definition {
+    bytesize: 72
+    member_id: 0x64bb7964
+    member_id: 0xe3b1b19e
+    member_id: 0xadfdef1c
+    member_id: 0x239192da
+    member_id: 0x30e26822
+    member_id: 0x56639dd1
+    member_id: 0xa17fe2dc
+    member_id: 0xce4422cd
+    member_id: 0x2d2d0a20
+  }
+}
 struct_union {
   id: 0x3844dda9
   kind: STRUCT
@@ -305815,6 +305878,13 @@ function {
   parameter_id: 0x1b8590a8
   parameter_id: 0x107606b0
 }
+function {
+  id: 0x9b222516
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x2170d06d
+  parameter_id: 0x2170d06d
+}
 function {
   id: 0x9b2239e7
   return_type_id: 0x6720d32f
@@ -305961,6 +306031,13 @@ function {
   parameter_id: 0x21069feb
   parameter_id: 0x1a6ea392
 }
+function {
+  id: 0x9b2eaf21
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x2170d06d
+  parameter_id: 0x13580d6c
+}
 function {
   id: 0x9b2eba1d
   return_type_id: 0x6720d32f
@@ -307749,6 +307826,12 @@ function {
   parameter_id: 0x11cfee5a
   parameter_id: 0x11cfee5a
 }
+function {
+  id: 0x9bb5b719
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x06835e9c
+}
 function {
   id: 0x9bb5c5c3
   return_type_id: 0x6720d32f
@@ -309018,6 +309101,15 @@ function {
   parameter_id: 0x1b2ca025
   parameter_id: 0x2e2c982d
 }
+function {
+  id: 0x9bf40739
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x14f37d47
+  parameter_id: 0x2170d06d
+  parameter_id: 0x0a134144
+  parameter_id: 0x13580d6c
+}
 function {
   id: 0x9bf6c118
   return_type_id: 0x6720d32f
@@ -323956,6 +324048,15 @@ elf_symbol {
   type_id: 0x9b4b913b
   full_name: "__traceiter_android_vh_check_file_open"
 }
+elf_symbol {
+  id: 0x6aac0cf8
+  name: "__traceiter_android_vh_check_folio_look_around_ref"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa2856bd1
+  type_id: 0x9b2eaf21
+  full_name: "__traceiter_android_vh_check_folio_look_around_ref"
+}
 elf_symbol {
   id: 0x96d1c9c4
   name: "__traceiter_android_vh_check_hibernation_swap"
@@ -324460,6 +324561,24 @@ elf_symbol {
   type_id: 0x9a36ff29
   full_name: "__traceiter_android_vh_kswapd_per_node"
 }
+elf_symbol {
+  id: 0xe19d2bf8
+  name: "__traceiter_android_vh_look_around"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x4d18aae7
+  type_id: 0x9bf40739
+  full_name: "__traceiter_android_vh_look_around"
+}
+elf_symbol {
+  id: 0x993f42ff
+  name: "__traceiter_android_vh_look_around_migrate_folio"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xbed1988a
+  type_id: 0x9b222516
+  full_name: "__traceiter_android_vh_look_around_migrate_folio"
+}
 elf_symbol {
   id: 0xfb6a92a8
   name: "__traceiter_android_vh_madvise_cold_pageout_skip"
@@ -325153,6 +325272,15 @@ elf_symbol {
   type_id: 0x9be67f35
   full_name: "__traceiter_android_vh_task_blocks_on_rtmutex"
 }
+elf_symbol {
+  id: 0x48f0cf25
+  name: "__traceiter_android_vh_test_clear_look_around_ref"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x6a7e50c3
+  type_id: 0x9bb5b719
+  full_name: "__traceiter_android_vh_test_clear_look_around_ref"
+}
 elf_symbol {
   id: 0x6befbf23
   name: "__traceiter_android_vh_thermal_power_cap"
@@ -327160,6 +327288,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_check_file_open"
 }
+elf_symbol {
+  id: 0xca5cbc9a
+  name: "__tracepoint_android_vh_check_folio_look_around_ref"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xdaaccf03
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_check_folio_look_around_ref"
+}
 elf_symbol {
   id: 0xaa072f92
   name: "__tracepoint_android_vh_check_hibernation_swap"
@@ -327664,6 +327801,24 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_kswapd_per_node"
 }
+elf_symbol {
+  id: 0xda2d53f2
+  name: "__tracepoint_android_vh_look_around"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x738994e9
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_look_around"
+}
+elf_symbol {
+  id: 0x50a5a949
+  name: "__tracepoint_android_vh_look_around_migrate_folio"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x8b32227d
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_look_around_migrate_folio"
+}
 elf_symbol {
   id: 0xcb34ca12
   name: "__tracepoint_android_vh_madvise_cold_pageout_skip"
@@ -328357,6 +328512,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_task_blocks_on_rtmutex"
 }
+elf_symbol {
+  id: 0x4ef2c337
+  name: "__tracepoint_android_vh_test_clear_look_around_ref"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x4ffca4ae
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_test_clear_look_around_ref"
+}
 elf_symbol {
   id: 0x6f25dd05
   name: "__tracepoint_android_vh_thermal_power_cap"
@@ -380959,6 +381123,7 @@ interface {
   symbol_id: 0x33c527ab
   symbol_id: 0x5012fcd8
   symbol_id: 0x67bab494
+  symbol_id: 0x6aac0cf8
   symbol_id: 0x96d1c9c4
   symbol_id: 0x42428033
   symbol_id: 0x005c7625
@@ -381015,6 +381180,8 @@ interface {
   symbol_id: 0x4dca46cc
   symbol_id: 0xf83fbd26
   symbol_id: 0x18fde973
+  symbol_id: 0xe19d2bf8
+  symbol_id: 0x993f42ff
   symbol_id: 0xfb6a92a8
   symbol_id: 0xa94ef105
   symbol_id: 0x0e1f9e23
@@ -381092,6 +381259,7 @@ interface {
   symbol_id: 0x2ecf85e9
   symbol_id: 0x34a01a22
   symbol_id: 0xdd9dd67b
+  symbol_id: 0x48f0cf25
   symbol_id: 0x6befbf23
   symbol_id: 0x226cc38b
   symbol_id: 0xeecc1529
@@ -381315,6 +381483,7 @@ interface {
   symbol_id: 0x6f146fe1
   symbol_id: 0x678bb5ba
   symbol_id: 0xf1ec5ef2
+  symbol_id: 0xca5cbc9a
   symbol_id: 0xaa072f92
   symbol_id: 0x9620eac1
   symbol_id: 0x5cc4ca5b
@@ -381371,6 +381540,8 @@ interface {
   symbol_id: 0x62c13726
   symbol_id: 0xafbca760
   symbol_id: 0x586a06d1
+  symbol_id: 0xda2d53f2
+  symbol_id: 0x50a5a949
   symbol_id: 0xcb34ca12
   symbol_id: 0x2f768c2b
   symbol_id: 0xc34a5545
@@ -381448,6 +381619,7 @@ interface {
   symbol_id: 0xefb9e5a3
   symbol_id: 0x3fe0157c
   symbol_id: 0xe5bf742d
+  symbol_id: 0x4ef2c337
   symbol_id: 0x6f25dd05
   symbol_id: 0xa5c71571
   symbol_id: 0xfa3284c7
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index ea61781c1543..afe0f5c8aa05 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -117,8 +117,11 @@
   __traceiter_android_vh_binder_thread_release
   __traceiter_android_vh_binder_wait_for_work
   __traceiter_android_vh_cgroup_set_task
+  __traceiter_android_vh_check_folio_look_around_ref
   __traceiter_android_vh_dup_task_struct
   __traceiter_android_vh_exit_signal
+  __traceiter_android_vh_look_around
+  __traceiter_android_vh_look_around_migrate_folio
   __traceiter_android_vh_mem_cgroup_id_remove
   __traceiter_android_vh_mem_cgroup_css_offline
   __traceiter_android_vh_mem_cgroup_css_online
@@ -154,6 +157,7 @@
   __traceiter_sched_stat_wait
   __traceiter_sched_waking
   __traceiter_task_rename
+  __traceiter_android_vh_test_clear_look_around_ref
   __tracepoint_android_rvh_post_init_entity_util_avg
   __tracepoint_android_rvh_rtmutex_force_update
   __tracepoint_android_vh_account_process_tick_gran
@@ -175,6 +179,7 @@
   __tracepoint_android_vh_binder_thread_release
   __tracepoint_android_vh_binder_wait_for_work
   __tracepoint_android_vh_cgroup_set_task
+  __tracepoint_android_vh_check_folio_look_around_ref
   __tracepoint_android_vh_do_futex
   __tracepoint_android_vh_dup_task_struct
   __tracepoint_android_vh_exit_signal
@@ -190,6 +195,8 @@
   __tracepoint_android_vh_futex_wake_traverse_plist
   __tracepoint_android_vh_futex_wake_up_q_finish
   __tracepoint_android_vh_irqtime_account_process_tick
+  __tracepoint_android_vh_look_around
+  __tracepoint_android_vh_look_around_migrate_folio
   __tracepoint_android_vh_mutex_can_spin_on_owner
   __tracepoint_android_vh_mutex_opt_spin_finish
   __tracepoint_android_vh_mutex_opt_spin_start
@@ -210,6 +217,7 @@
   __tracepoint_android_vh_shrink_node_memcgs
   __tracepoint_android_vh_sync_txn_recvd
   __tracepoint_android_vh_task_blocks_on_rtmutex
+  __tracepoint_android_vh_test_clear_look_around_ref
   __tracepoint_block_bio_queue
   __tracepoint_block_getrq
   __tracepoint_block_rq_complete