From 2cfefe22b999a24970508dc43ae9079673af419b Mon Sep 17 00:00:00 2001
From: Liujie Xie <xieliujie@oppo.com>
Date: Wed, 27 Oct 2021 14:11:36 +0800
Subject: [PATCH] ANDROID: GKI: Add symbols to abi_gki_aarch64_oplus

Add some file nodes to control and tune the memcg status in the memory
cgroup, need add some symbols to abi_gki_aarch64_oplus.

Leaf changes summary: 5 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 3 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 2 Added variables

3 Added functions:

  [A] 'function int cgroup_add_legacy_cftypes(cgroup_subsys*, cftype*)'
  [A] 'function mem_cgroup* mem_cgroup_from_id(unsigned short int)'
  [A] 'function void unregister_memory_notifier(notifier_block*)'

2 Added variables:

  [A] 'cgroup_subsys memory_cgrp_subsys'
  [A] 'static_key_true memory_cgrp_subsys_enabled_key'

Bug: 204860045
Signed-off-by: Liujie Xie <xieliujie@oppo.com>
Change-Id: I69805dcdfbe363c13031ae0a9556761b71a67428
---
 android/abi_gki_aarch64.xml   | 20 ++++++++++++++++++++
 android/abi_gki_aarch64_oplus |  7 +++++++
 2 files changed, 27 insertions(+)

diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index f621d304fe1b..cac6507ea5d7 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -947,6 +947,7 @@
       <elf-symbol name='cec_transmit_attempt_done_ts' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf0e3cb34'/>
       <elf-symbol name='cec_transmit_done_ts' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x6de41e89'/>
       <elf-symbol name='cec_unregister_adapter' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9c8d8606'/>
+      <elf-symbol name='cgroup_add_legacy_cftypes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xaa120638'/>
       <elf-symbol name='cgroup_path_ns' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x35df6fa8'/>
       <elf-symbol name='cgroup_taskset_first' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x19f55823'/>
       <elf-symbol name='cgroup_taskset_next' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf9fabfc2'/>
@@ -3042,6 +3043,7 @@
       <elf-symbol name='media_request_get_by_fd' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x715e1e31'/>
       <elf-symbol name='media_request_object_complete' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xc8c9eb59'/>
       <elf-symbol name='media_request_put' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x95df91f1'/>
+      <elf-symbol name='mem_cgroup_from_id' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2450c381'/>
       <elf-symbol name='memblock_end_of_DRAM' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4c894766'/>
       <elf-symbol name='memblock_free' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9f0ec720'/>
       <elf-symbol name='memchr' type='func-type' binding='weak-binding' visibility='default-visibility' is-defined='yes' crc='0xa07a37f0'/>
@@ -5050,6 +5052,7 @@
       <elf-symbol name='unregister_inetaddr_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfe029963'/>
       <elf-symbol name='unregister_kprobe' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x18b23dc5'/>
       <elf-symbol name='unregister_kretprobe' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8ea54251'/>
+      <elf-symbol name='unregister_memory_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x26e298e0'/>
       <elf-symbol name='unregister_module_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x6a5ecb18'/>
       <elf-symbol name='unregister_net_sysctl_table' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd53c67b3'/>
       <elf-symbol name='unregister_netdev' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7f1cc889'/>
@@ -6042,6 +6045,8 @@
       <elf-symbol name='kstat' size='48' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x38869d88'/>
       <elf-symbol name='loops_per_jiffy' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xba497f13'/>
       <elf-symbol name='memcg_kmem_enabled_key' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd3543063'/>
+      <elf-symbol name='memory_cgrp_subsys' size='240' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xaf09b210'/>
+      <elf-symbol name='memory_cgrp_subsys_enabled_key' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf352023f'/>
       <elf-symbol name='memstart_addr' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9688de8b'/>
       <elf-symbol name='names_cachep' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3096be16'/>
       <elf-symbol name='nd_tbl' size='568' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5023214d'/>
@@ -118675,6 +118680,11 @@
         <parameter type-id='b94a2f7c' name='adap' filepath='drivers/media/cec/core/cec-core.c' line='377' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='cgroup_add_legacy_cftypes' mangled-name='cgroup_add_legacy_cftypes' filepath='kernel/cgroup/cgroup.c' line='4118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cgroup_add_legacy_cftypes'>
+        <parameter type-id='dc91d125' name='ss' filepath='kernel/cgroup/cgroup.c' line='4118' column='1'/>
+        <parameter type-id='03054cfa' name='cfts' filepath='kernel/cgroup/cgroup.c' line='4118' column='1'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
       <function-decl name='cgroup_path_ns' mangled-name='cgroup_path_ns' filepath='kernel/cgroup/cgroup.c' line='2243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cgroup_path_ns'>
         <parameter type-id='46ff135d' name='cgrp' filepath='kernel/cgroup/cgroup.c' line='2243' column='1'/>
         <parameter type-id='26a90f95' name='buf' filepath='kernel/cgroup/cgroup.c' line='2243' column='1'/>
@@ -129621,6 +129631,10 @@
         <parameter type-id='ac429605' name='req' filepath='drivers/media/mc/mc-request.c' line='79' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='mem_cgroup_from_id' mangled-name='mem_cgroup_from_id' filepath='mm/memcontrol.c' line='5193' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mem_cgroup_from_id'>
+        <parameter type-id='8efea9e5' name='id' filepath='mm/memcontrol.c' line='5193' column='1'/>
+        <return type-id='223696fb'/>
+      </function-decl>
       <function-decl name='memblock_end_of_DRAM' mangled-name='memblock_end_of_DRAM' filepath='mm/memblock.c' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memblock_end_of_DRAM'>
         <return type-id='2522883d'/>
       </function-decl>
@@ -129649,6 +129663,8 @@
       <function-decl name='memory_block_size_bytes' mangled-name='memory_block_size_bytes' filepath='drivers/base/memory.c' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memory_block_size_bytes'>
         <return type-id='7359adad'/>
       </function-decl>
+      <var-decl name='memory_cgrp_subsys' type-id='1d115fd5' mangled-name='memory_cgrp_subsys' visibility='default' filepath='mm/memcontrol.c' line='6581' column='1' elf-symbol-id='memory_cgrp_subsys'/>
+      <var-decl name='memory_cgrp_subsys_enabled_key' type-id='49a0ad34' mangled-name='memory_cgrp_subsys_enabled_key' visibility='default' filepath='include/linux/cgroup_subsys.h' line='29' column='1' elf-symbol-id='memory_cgrp_subsys_enabled_key'/>
       <function-decl name='memory_read_from_buffer' mangled-name='memory_read_from_buffer' filepath='fs/libfs.c' line='787' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memory_read_from_buffer'>
         <parameter type-id='eaa32e2f' name='to' filepath='fs/libfs.c' line='787' column='1'/>
         <parameter type-id='b59d7dce' name='count' filepath='fs/libfs.c' line='787' column='1'/>
@@ -139889,6 +139905,10 @@
         <parameter type-id='d15edd25' name='rp' filepath='kernel/kprobes.c' line='2192' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='unregister_memory_notifier' mangled-name='unregister_memory_notifier' filepath='drivers/base/memory.c' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_memory_notifier'>
+        <parameter type-id='d504f73d' name='nb' filepath='drivers/base/memory.c' line='93' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='unregister_module_notifier' mangled-name='unregister_module_notifier' filepath='kernel/module.c' line='315' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_module_notifier'>
         <parameter type-id='d504f73d' name='nb' filepath='kernel/module.c' line='315' column='1'/>
         <return type-id='95e97e5e'/>
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index 5476614fa58e..793058c27644 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -134,6 +134,7 @@
   cdev_device_del
   cdev_init
   __cfi_slowpath
+  cgroup_add_legacy_cftypes
   cgroup_path_ns
   cgroup_taskset_first
   cgroup_taskset_next
@@ -1421,6 +1422,7 @@
   memblock_end_of_DRAM
   __memcat_p
   memcg_kmem_enabled_key
+  mem_cgroup_from_id
   memchr
   memchr_inv
   memcmp
@@ -1430,6 +1432,8 @@
   memdup_user
   memmove
   memory_block_size_bytes
+  memory_cgrp_subsys
+  memory_cgrp_subsys_enabled_key
   memory_read_from_buffer
   memparse
   mempool_alloc
@@ -1575,6 +1579,7 @@
   of_count_phandle_with_args
   of_cpufreq_cooling_register
   of_cpu_node_to_id
+  of_css
   of_devfreq_cooling_register
   of_device_get_match_data
   of_device_is_available
@@ -2898,6 +2903,7 @@
   trace_seq_putc
   tracing_off
   try_module_get
+  try_to_free_mem_cgroup_pages
   try_wait_for_completion
   tty_flip_buffer_push
   __tty_insert_flip_char
@@ -2991,6 +2997,7 @@
   unregister_inetaddr_notifier
   unregister_kprobe
   unregister_kretprobe
+  unregister_memory_notifier
   unregister_module_notifier
   unregister_netdev
   unregister_netdevice_many