From 439fc06787e701d4ffbb1393667e4b8371238e5f Mon Sep 17 00:00:00 2001
From: Wei Liu <liuwei.a@oppo.com>
Date: Tue, 18 Oct 2022 10:54:02 +0800
Subject: [PATCH] ANDROID: GKI: Update symbols to symbol list

Update symbols to symbol list externed by oppo network group.

Leaf changes summary: 4 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 4 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

4 Added functions:

  [A] 'function void __rtnl_link_unregister(rtnl_link_ops*)'
  [A] 'function net_device* dev_get_by_index_rcu(net*, int)'
  [A] 'function int nf_register_net_hook(net*, const nf_hook_ops*)'
  [A] 'function void nf_unregister_net_hook(net*, const nf_hook_ops*)'

Bug: 193384408

Signed-off-by: Wei Liu <liuwei.a@oppo.com>
Change-Id: Ic2f3305c50f66abdd941941924a4207e751ef8a8
---
 android/abi_gki_aarch64.xml   | 23 +++++++++++++++++++++++
 android/abi_gki_aarch64_oplus |  4 ++++
 2 files changed, 27 insertions(+)

diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index f4d56bb1813c..2ae53a805857 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -254,6 +254,7 @@
       <elf-symbol name='__rht_bucket_nested' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd0d156e9'/>
       <elf-symbol name='__rt_mutex_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x40bbb501'/>
       <elf-symbol name='__rtc_register_device' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfd8cab20'/>
+      <elf-symbol name='__rtnl_link_unregister' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd6e267d3'/>
       <elf-symbol name='__sbitmap_queue_get' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd116ad0'/>
       <elf-symbol name='__scsi_add_device' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd55434'/>
       <elf-symbol name='__scsi_execute' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x43c24350'/>
@@ -1475,6 +1476,7 @@
       <elf-symbol name='dev_fetch_sw_netstats' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x21ce3ed1'/>
       <elf-symbol name='dev_fwnode' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x56a118a1'/>
       <elf-symbol name='dev_get_by_index' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf0549a82'/>
+      <elf-symbol name='dev_get_by_index_rcu' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8ae9d7b2'/>
       <elf-symbol name='dev_get_by_name' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe81e4e9b'/>
       <elf-symbol name='dev_get_by_name_rcu' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa912bae3'/>
       <elf-symbol name='dev_get_regmap' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xc850f9a'/>
@@ -3680,7 +3682,9 @@
       <elf-symbol name='nf_conntrack_destroy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2a18c74'/>
       <elf-symbol name='nf_ct_attach' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe4d558e6'/>
       <elf-symbol name='nf_ct_delete' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x781d4346'/>
+      <elf-symbol name='nf_register_net_hook' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5d21fccb'/>
       <elf-symbol name='nf_register_net_hooks' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd6e9ba4a'/>
+      <elf-symbol name='nf_unregister_net_hook' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7ec9d1ae'/>
       <elf-symbol name='nf_unregister_net_hooks' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd379ff8f'/>
       <elf-symbol name='nla_append' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfb1703fe'/>
       <elf-symbol name='nla_find' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xcd279169'/>
@@ -116982,6 +116986,10 @@
         <parameter type-id='5992ae83' name='rtc' filepath='drivers/rtc/class.c' line='397' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='__rtnl_link_unregister' mangled-name='__rtnl_link_unregister' filepath='net/core/rtnetlink.c' line='432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__rtnl_link_unregister'>
+        <parameter type-id='959ab461' name='ops' filepath='net/core/rtnetlink.c' line='432' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='__sbitmap_queue_get' mangled-name='__sbitmap_queue_get' filepath='lib/sbitmap.c' line='424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sbitmap_queue_get'>
         <parameter type-id='75396bad' name='sbq' filepath='lib/sbitmap.c' line='424' column='1'/>
         <return type-id='95e97e5e'/>
@@ -124384,6 +124392,11 @@
         <parameter type-id='95e97e5e' name='ifindex' filepath='net/core/dev.c' line='984' column='1'/>
         <return type-id='68a2d05b'/>
       </function-decl>
+      <function-decl name='dev_get_by_index_rcu' mangled-name='dev_get_by_index_rcu' filepath='net/core/dev.c' line='959' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_get_by_index_rcu'>
+        <parameter type-id='a2bff676' name='net' filepath='net/core/dev.c' line='959' column='1'/>
+        <parameter type-id='95e97e5e' name='ifindex' filepath='net/core/dev.c' line='959' column='1'/>
+        <return type-id='68a2d05b'/>
+      </function-decl>
       <function-decl name='dev_get_by_name' mangled-name='dev_get_by_name' filepath='net/core/dev.c' line='910' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_get_by_name'>
         <parameter type-id='a2bff676' name='net' filepath='net/core/dev.c' line='910' column='1'/>
         <parameter type-id='80f4b756' name='name' filepath='net/core/dev.c' line='910' column='1'/>
@@ -135800,12 +135813,22 @@
         <parameter type-id='95e97e5e' name='report' filepath='net/netfilter/nf_conntrack_core.c' line='655' column='1'/>
         <return type-id='b50a4934'/>
       </function-decl>
+      <function-decl name='nf_register_net_hook' mangled-name='nf_register_net_hook' filepath='net/netfilter/core.c' line='521' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nf_register_net_hook'>
+        <parameter type-id='a2bff676' name='net' filepath='net/netfilter/core.c' line='521' column='1'/>
+        <parameter type-id='27db53a1' name='reg' filepath='net/netfilter/core.c' line='521' column='1'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
       <function-decl name='nf_register_net_hooks' mangled-name='nf_register_net_hooks' filepath='net/netfilter/core.c' line='551' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nf_register_net_hooks'>
         <parameter type-id='a2bff676' name='net' filepath='net/netfilter/core.c' line='551' column='1'/>
         <parameter type-id='27db53a1' name='reg' filepath='net/netfilter/core.c' line='551' column='1'/>
         <parameter type-id='f0981eeb' name='n' filepath='net/netfilter/core.c' line='552' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='nf_unregister_net_hook' mangled-name='nf_unregister_net_hook' filepath='net/netfilter/core.c' line='493' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nf_unregister_net_hook'>
+        <parameter type-id='a2bff676' name='net' filepath='net/netfilter/core.c' line='493' column='1'/>
+        <parameter type-id='27db53a1' name='reg' filepath='net/netfilter/core.c' line='493' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='nf_unregister_net_hooks' mangled-name='nf_unregister_net_hooks' filepath='net/netfilter/core.c' line='571' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nf_unregister_net_hooks'>
         <parameter type-id='a2bff676' name='net' filepath='net/netfilter/core.c' line='571' column='1'/>
         <parameter type-id='27db53a1' name='reg' filepath='net/netfilter/core.c' line='571' column='1'/>
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index 384bdbfa612b..4479f29e3b31 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -408,6 +408,7 @@
   dev_fwnode
   __dev_get_by_index
   dev_get_by_index
+  dev_get_by_index_rcu
   dev_get_by_name
   dev_get_regmap
   dev_get_stats
@@ -1658,7 +1659,9 @@
   net_ratelimit
   nf_ct_attach
   nf_ct_delete
+  nf_register_net_hook
   nf_register_net_hooks
+  nf_unregister_net_hook
   nf_unregister_net_hooks
   nla_find
   nla_memcpy
@@ -2286,6 +2289,7 @@
   rtc_update_irq
   rtc_valid_tm
   rtnl_is_locked
+  __rtnl_link_unregister
   rtnl_lock
   rtnl_unlock
   runqueues