From 300d1ff660bee3625303ab4a4a29c7206952cdef Mon Sep 17 00:00:00 2001
From: Pratyush Brahma <quic_pbrahma@quicinc.com>
Date: Mon, 21 Aug 2023 14:48:15 +0530
Subject: [PATCH] ANDROID: GKI: Update abi_gki_aarch64_qcom for page_owner
 symbols

Update abi_gki_aarch64_qcom to include __set_page_owner
and page_owner_inited symbols.

Bug: 296348400
Change-Id: I3dec65fb596764e51897dd0251aada539a34feca
Signed-off-by: Pratyush Brahma <quic_pbrahma@quicinc.com>
---
 android/abi_gki_aarch64.xml  | 15 ++++++++++++---
 android/abi_gki_aarch64_qcom |  2 ++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 105201c59166..eb2020aed4b0 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -271,6 +271,7 @@
       <elf-symbol name='__serio_register_port' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x195dc13f'/>
       <elf-symbol name='__set_page_dirty_buffers' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3a13ccf5'/>
       <elf-symbol name='__set_page_dirty_nobuffers' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x13363289'/>
+      <elf-symbol name='__set_page_owner' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x18ed2a68'/>
       <elf-symbol name='__sg_page_iter_dma_next' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xcc445ceb'/>
       <elf-symbol name='__sg_page_iter_next' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7c9ca58f'/>
       <elf-symbol name='__sg_page_iter_start' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xccd4c999'/>
@@ -6969,6 +6970,7 @@
       <elf-symbol name='of_root' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfdee4fc'/>
       <elf-symbol name='oops_in_progress' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb1c3a01a'/>
       <elf-symbol name='overflowuid' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8b618d08'/>
+      <elf-symbol name='page_owner_inited' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xda1512e5'/>
       <elf-symbol name='page_pinner_inited' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xacfe4142'/>
       <elf-symbol name='panic_notifier_list' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7ceeac9'/>
       <elf-symbol name='panic_timeout' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1f8544b8'/>
@@ -118078,6 +118080,12 @@
         <parameter type-id='02f11ed4' name='page' filepath='mm/page-writeback.c' line='2479' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='__set_page_owner' mangled-name='__set_page_owner' filepath='mm/page_owner.c' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__set_page_owner'>
+        <parameter type-id='02f11ed4' name='page' filepath='mm/page_owner.c' line='212' column='1'/>
+        <parameter type-id='f0981eeb' name='order' filepath='mm/page_owner.c' line='212' column='1'/>
+        <parameter type-id='3eb7c31c' name='gfp_mask' filepath='mm/page_owner.c' line='213' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='__sg_page_iter_dma_next' mangled-name='__sg_page_iter_dma_next' filepath='lib/scatterlist.c' line='722' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sg_page_iter_dma_next'>
         <parameter type-id='f1397bef' name='dma_iter' filepath='lib/scatterlist.c' line='722' column='1'/>
         <return type-id='b50a4934'/>
@@ -132544,9 +132552,9 @@
         <parameter type-id='7292109c' name='ints' filepath='lib/cmdline.c' line='87' column='1'/>
         <return type-id='26a90f95'/>
       </function-decl>
-      <function-decl name='get_page_owner_handle' mangled-name='get_page_owner_handle' filepath='mm/page_owner.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_page_owner_handle'>
-        <parameter type-id='459ae684' name='page_ext' filepath='mm/page_owner.c' line='108' column='1'/>
-        <parameter type-id='7359adad' name='pfn' filepath='mm/page_owner.c' line='108' column='1'/>
+      <function-decl name='get_page_owner_handle' mangled-name='get_page_owner_handle' filepath='mm/page_owner.c' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_page_owner_handle'>
+        <parameter type-id='459ae684' name='page_ext' filepath='mm/page_owner.c' line='109' column='1'/>
+        <parameter type-id='7359adad' name='pfn' filepath='mm/page_owner.c' line='109' column='1'/>
         <return type-id='613ae993'/>
       </function-decl>
       <function-decl name='get_pelt_halflife' mangled-name='get_pelt_halflife' filepath='kernel/sched/pelt.c' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_pelt_halflife'>
@@ -138577,6 +138585,7 @@
         <parameter type-id='02f11ed4' name='page' filepath='mm/rmap.c' line='1002' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <var-decl name='page_owner_inited' type-id='237c0d27' mangled-name='page_owner_inited' visibility='default' filepath='mm/page_owner.c' line='35' column='1' elf-symbol-id='page_owner_inited'/>
       <var-decl name='page_pinner_inited' type-id='237c0d27' mangled-name='page_pinner_inited' visibility='default' filepath='mm/page_pinner.c' line='59' column='1' elf-symbol-id='page_pinner_inited'/>
       <function-decl name='page_pool_alloc_pages' mangled-name='page_pool_alloc_pages' filepath='net/core/page_pool.c' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='page_pool_alloc_pages'>
         <parameter type-id='a832c6b9' name='pool' filepath='net/core/page_pool.c' line='247' column='1'/>
diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index b269c937101c..3f4e8ded9169 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -1659,6 +1659,7 @@
   overflowuid
   page_endio
   page_mapping
+  page_owner_inited
   __page_pinner_migration_failed
   __pagevec_release
   panic
@@ -2187,6 +2188,7 @@
   set_normalized_timespec64
   set_page_dirty_lock
   __SetPageMovable
+  __set_page_owner
   set_task_cpu
   set_user_nice
   sg_alloc_table