From 31d0967a3a3d92f71787dd3016303d0ae339e730 Mon Sep 17 00:00:00 2001
From: Will McVicker <willmcvicker@google.com>
Date: Wed, 8 Mar 2023 16:32:37 -0800
Subject: [PATCH] ANDROID: Update the ABI symbol list

Adding the following symbols:
  - cleancache_register_ops
  - cma_get_size
  - csum_partial
  - __xa_erase
  - xa_load
  - xas_find
  - xas_pause
  - __xa_store

Bug: 236887352
Change-Id: Id9d93a83fec9a35e219a1702081982bc204ce049
Signed-off-by: Will McVicker <willmcvicker@google.com>
---
 android/abi_gki_aarch64.stg   | 385 ++++++++++++++++++++++++++++++++++
 android/abi_gki_aarch64_pixel |   8 +
 2 files changed, 393 insertions(+)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index d6eee4666edb..672e34acf718 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -1930,6 +1930,21 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x0a52df14
 }
+pointer_reference {
+  id: 0x080d391b
+  kind: POINTER
+  pointee_type_id: 0x0a7402f1
+}
+pointer_reference {
+  id: 0x080d3f98
+  kind: POINTER
+  pointee_type_id: 0x0a7418fc
+}
+pointer_reference {
+  id: 0x080e08ce
+  kind: POINTER
+  pointee_type_id: 0x0a78c5a5
+}
 pointer_reference {
   id: 0x080fbe64
   kind: POINTER
@@ -2060,6 +2075,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x08b52b5b
 }
+pointer_reference {
+  id: 0x08c420f1
+  kind: POINTER
+  pointee_type_id: 0x09506558
+}
 pointer_reference {
   id: 0x08dcfb76
   kind: POINTER
@@ -4305,6 +4325,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1fee56e5
 }
+pointer_reference {
+  id: 0x0d6c28a3
+  kind: POINTER
+  pointee_type_id: 0x1ff04410
+}
 pointer_reference {
   id: 0x0d6dc297
   kind: POINTER
@@ -9490,6 +9515,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x533e9463
 }
+pointer_reference {
+  id: 0x1e62d0f5
+  kind: POINTER
+  pointee_type_id: 0x53cba54b
+}
 pointer_reference {
   id: 0x1e7a7830
   kind: POINTER
@@ -10240,6 +10270,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xa0fdf9dd
 }
+pointer_reference {
+  id: 0x22b357e9
+  kind: POINTER
+  pointee_type_id: 0xa08db938
+}
 pointer_reference {
   id: 0x22b3ece7
   kind: POINTER
@@ -10380,6 +10415,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xa405746d
 }
+pointer_reference {
+  id: 0x239187d3
+  kind: POINTER
+  pointee_type_id: 0xa406f9d2
+}
 pointer_reference {
   id: 0x239cbb42
   kind: POINTER
@@ -11700,6 +11740,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x86a9103f
 }
+pointer_reference {
+  id: 0x2b4b15b4
+  kind: POINTER
+  pointee_type_id: 0x876cb04d
+}
 pointer_reference {
   id: 0x2b584612
   kind: POINTER
@@ -14365,6 +14410,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x99c11430
 }
+pointer_reference {
+  id: 0x2ce2190b
+  kind: POINTER
+  pointee_type_id: 0x99c882b3
+}
 pointer_reference {
   id: 0x2ce315c4
   kind: POINTER
@@ -20590,6 +20640,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xe2a728bc
 }
+pointer_reference {
+  id: 0x323d798e
+  kind: POINTER
+  pointee_type_id: 0xe2b500a6
+}
 pointer_reference {
   id: 0x3247ae94
   kind: POINTER
@@ -26315,6 +26370,11 @@ typedef {
   name: "guid_t"
   referred_type_id: 0x0b526877
 }
+typedef {
+  id: 0xee72cbfc
+  name: "ino_t"
+  referred_type_id: 0x21d43a7b
+}
 typedef {
   id: 0x5171d297
   name: "int32_t"
@@ -27395,6 +27455,11 @@ typedef {
   name: "xa_mark_t"
   referred_type_id: 0x4585663f
 }
+typedef {
+  id: 0xa7efd65a
+  name: "xa_update_node_t"
+  referred_type_id: 0x0d6c28a3
+}
 typedef {
   id: 0x313397f7
   name: "xfrm_address_t"
@@ -29015,6 +29080,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0xfa2455af
 }
+qualified {
+  id: 0xe2b500a6
+  qualifier: CONST
+  qualified_type_id: 0xfa93b413
+}
 qualified {
   id: 0xe2f2d7b1
   qualifier: CONST
@@ -32193,6 +32263,11 @@ array {
   number_of_elements: 1
   element_type_id: 0xb740a439
 }
+array {
+  id: 0x982afc69
+  number_of_elements: 6
+  element_type_id: 0xe62ebf07
+}
 array {
   id: 0x99300838
   number_of_elements: 1
@@ -42172,6 +42247,12 @@ member {
   type_id: 0x92233392
   offset: 2048
 }
+member {
+  id: 0xd671c19a
+  name: "android_oem_data1"
+  type_id: 0x92233392
+  offset: 448
+}
 member {
   id: 0xd671c1bd
   name: "android_oem_data1"
@@ -77962,6 +78043,11 @@ member {
   type_id: 0x070fb3ab
   offset: 768
 }
+member {
+  id: 0x4e824c05
+  name: "fh"
+  type_id: 0x982afc69
+}
 member {
   id: 0x2db4a0d8
   name: "fh_list"
@@ -85716,6 +85802,12 @@ member {
   type_id: 0x0cbb9c80
   offset: 384
 }
+member {
+  id: 0xcf06c106
+  name: "get_page"
+  type_id: 0x2b4b15b4
+  offset: 128
+}
 member {
   id: 0xcf22b6e3
   name: "get_page"
@@ -95696,6 +95788,11 @@ member {
   type_id: 0x295c7202
   offset: 128
 }
+member {
+  id: 0xedc364a3
+  name: "init_fs"
+  type_id: 0x22b357e9
+}
 member {
   id: 0x35f4d7c6
   name: "init_fs_context"
@@ -95797,6 +95894,12 @@ member {
   type_id: 0x3292450a
   offset: 64
 }
+member {
+  id: 0xcc9b87bc
+  name: "init_shared_fs"
+  type_id: 0x2ce2190b
+  offset: 64
+}
 member {
   id: 0x4a0fb6bd
   name: "init_state"
@@ -96081,6 +96184,11 @@ member {
   type_id: 0xd5df6730
   offset: 256
 }
+member {
+  id: 0x0ca7cb72
+  name: "ino"
+  type_id: 0xee72cbfc
+}
 member {
   id: 0x0cdb9a21
   name: "ino"
@@ -97027,6 +97135,18 @@ member {
   type_id: 0x92233392
   offset: 192
 }
+member {
+  id: 0x6a15223b
+  name: "invalidate_fs"
+  type_id: 0x08c420f1
+  offset: 384
+}
+member {
+  id: 0x6f43a794
+  name: "invalidate_inode"
+  type_id: 0x080e08ce
+  offset: 320
+}
 member {
   id: 0x17dabd89
   name: "invalidate_lock"
@@ -97039,6 +97159,12 @@ member {
   type_id: 0x475137a2
   offset: 576
 }
+member {
+  id: 0x107f64d3
+  name: "invalidate_page"
+  type_id: 0x080d3f98
+  offset: 256
+}
 member {
   id: 0x6e9b1c0d
   name: "invalidate_range"
@@ -100755,6 +100881,11 @@ member {
   type_id: 0x92233392
   offset: 576
 }
+member {
+  id: 0x20c5e9f7
+  name: "key"
+  type_id: 0x93e3596e
+}
 member {
   id: 0x20c661f5
   name: "key"
@@ -139845,6 +139976,12 @@ member {
   type_id: 0x0f3dfb90
   offset: 256
 }
+member {
+  id: 0x68c6881b
+  name: "put_page"
+  type_id: 0x080d391b
+  offset: 192
+}
 member {
   id: 0xc9a46e38
   name: "put_prev_task"
@@ -177219,6 +177356,11 @@ member {
   type_id: 0x5574fba9
   offset: 128
 }
+member {
+  id: 0xec2a9cea
+  name: "u"
+  type_id: 0x55c087bf
+}
 member {
   id: 0xec2ecdca
   name: "u"
@@ -187068,6 +187210,11 @@ member {
   type_id: 0x5d8155a5
   offset: 1472
 }
+member {
+  id: 0x2d4312a7
+  name: "xa"
+  type_id: 0x2aa0b9bb
+}
 member {
   id: 0x2de9701e
   name: "xa"
@@ -187079,6 +187226,12 @@ member {
   type_id: 0x80c20070
   offset: 64
 }
+member {
+  id: 0x4487c243
+  name: "xa_alloc"
+  type_id: 0x3da0560e
+  offset: 256
+}
 member {
   id: 0x8c0b8c3b
   name: "xa_flags"
@@ -187091,11 +187244,53 @@ member {
   type_id: 0x18bd6530
   offset: 64
 }
+member {
+  id: 0x443272df
+  name: "xa_index"
+  type_id: 0x33756485
+  offset: 64
+}
 member {
   id: 0x310049ee
   name: "xa_lock"
   type_id: 0xf313e71a
 }
+member {
+  id: 0xa6e487bd
+  name: "xa_node"
+  type_id: 0x3da0560e
+  offset: 192
+}
+member {
+  id: 0xade1378e
+  name: "xa_offset"
+  type_id: 0x5d8155a5
+  offset: 144
+}
+member {
+  id: 0xb6a1c909
+  name: "xa_pad"
+  type_id: 0x5d8155a5
+  offset: 152
+}
+member {
+  id: 0xfbb0a625
+  name: "xa_shift"
+  type_id: 0x5d8155a5
+  offset: 128
+}
+member {
+  id: 0xb55e6ff0
+  name: "xa_sibs"
+  type_id: 0x5d8155a5
+  offset: 136
+}
+member {
+  id: 0x1ec9237c
+  name: "xa_update"
+  type_id: 0xa7efd65a
+  offset: 320
+}
 member {
   id: 0xefcc01d9
   name: "xarray"
@@ -192668,6 +192863,16 @@ struct_union {
     member_id: 0xa0d5322b
   }
 }
+struct_union {
+  id: 0x55c087bf
+  kind: UNION
+  definition {
+    bytesize: 24
+    member_id: 0x0ca7cb72
+    member_id: 0x4e824c05
+    member_id: 0x20c5e9f7
+  }
+}
 struct_union {
   id: 0x56037e9c
   kind: UNION
@@ -200165,6 +200370,31 @@ struct_union {
     member_id: 0xd0a3be49
   }
 }
+struct_union {
+  id: 0xca283f54
+  kind: STRUCT
+  name: "cleancache_filekey"
+  definition {
+    bytesize: 24
+    member_id: 0xec2a9cea
+  }
+}
+struct_union {
+  id: 0xfa93b413
+  kind: STRUCT
+  name: "cleancache_ops"
+  definition {
+    bytesize: 64
+    member_id: 0xedc364a3
+    member_id: 0xcc9b87bc
+    member_id: 0xcf06c106
+    member_id: 0x68c6881b
+    member_id: 0x107f64d3
+    member_id: 0x6f43a794
+    member_id: 0x6a15223b
+    member_id: 0xd671c19a
+  }
+}
 struct_union {
   id: 0xdd7b47eb
   kind: STRUCT
@@ -242716,6 +242946,23 @@ struct_union {
     member_id: 0x38c4c69b
   }
 }
+struct_union {
+  id: 0xa406f9d2
+  kind: STRUCT
+  name: "xa_state"
+  definition {
+    bytesize: 48
+    member_id: 0x2d4312a7
+    member_id: 0x443272df
+    member_id: 0xfbb0a625
+    member_id: 0xb55e6ff0
+    member_id: 0xade1378e
+    member_id: 0xb6a1c909
+    member_id: 0xa6e487bd
+    member_id: 0x4487c243
+    member_id: 0x1ec9237c
+  }
+}
 struct_union {
   id: 0x80c20070
   kind: STRUCT
@@ -260265,6 +260512,27 @@ function {
   return_type_id: 0x3829c378
   parameter_id: 0x0c0dfa25
 }
+function {
+  id: 0x0a7402f1
+  return_type_id: 0x48b5725f
+  parameter_id: 0x6720d32f
+  parameter_id: 0xca283f54
+  parameter_id: 0x33756485
+  parameter_id: 0x06835e9c
+}
+function {
+  id: 0x0a7418fc
+  return_type_id: 0x48b5725f
+  parameter_id: 0x6720d32f
+  parameter_id: 0xca283f54
+  parameter_id: 0x33756485
+}
+function {
+  id: 0x0a78c5a5
+  return_type_id: 0x48b5725f
+  parameter_id: 0x6720d32f
+  parameter_id: 0xca283f54
+}
 function {
   id: 0x0a9e8df2
   return_type_id: 0x079ff791
@@ -264524,6 +264792,11 @@ function {
   parameter_id: 0x3267a784
   parameter_id: 0x0483e6f8
 }
+function {
+  id: 0x187c3067
+  return_type_id: 0x48b5725f
+  parameter_id: 0x239187d3
+}
 function {
   id: 0x187d7a7f
   return_type_id: 0x48b5725f
@@ -268770,6 +269043,11 @@ function {
   parameter_id: 0x3e10b518
   parameter_id: 0xa52a0930
 }
+function {
+  id: 0x1ff04410
+  return_type_id: 0x48b5725f
+  parameter_id: 0x3da0560e
+}
 function {
   id: 0x1ff7ecc0
   return_type_id: 0xd5cc9c9a
@@ -269397,6 +269675,13 @@ function {
   parameter_id: 0x3399c453
   parameter_id: 0x331b9666
 }
+function {
+  id: 0x35b105f3
+  return_type_id: 0xa9403390
+  parameter_id: 0x391f15ea
+  parameter_id: 0x6720d32f
+  parameter_id: 0xa9403390
+}
 function {
   id: 0x361bd1c4
   return_type_id: 0x0490bb4a
@@ -269824,6 +270109,11 @@ function {
   parameter_id: 0x391f15ea
   parameter_id: 0xf435685e
 }
+function {
+  id: 0x3f62e135
+  return_type_id: 0x33756485
+  parameter_id: 0x3b38b19b
+}
 function {
   id: 0x3f83d490
   return_type_id: 0x33756485
@@ -271296,6 +271586,12 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0xa28f9420
 }
+function {
+  id: 0x5ebf0597
+  return_type_id: 0x18bd6530
+  parameter_id: 0x239187d3
+  parameter_id: 0x33756485
+}
 function {
   id: 0x5ed273d9
   return_type_id: 0x18bd6530
@@ -272555,6 +272851,14 @@ function {
   parameter_id: 0x21003da7
   parameter_id: 0x21530c77
 }
+function {
+  id: 0x876cb04d
+  return_type_id: 0x6720d32f
+  parameter_id: 0x6720d32f
+  parameter_id: 0xca283f54
+  parameter_id: 0x33756485
+  parameter_id: 0x06835e9c
+}
 function {
   id: 0x87739e97
   return_type_id: 0x3a583251
@@ -273675,6 +273979,11 @@ function {
   parameter_id: 0xf435685e
   parameter_id: 0x0ab1f084
 }
+function {
+  id: 0x910fbd4c
+  return_type_id: 0x6720d32f
+  parameter_id: 0x323d798e
+}
 function {
   id: 0x91117703
   return_type_id: 0x6720d32f
@@ -281214,6 +281523,12 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x111ee6f8
 }
+function {
+  id: 0x99c882b3
+  return_type_id: 0x6720d32f
+  parameter_id: 0x1e62d0f5
+  parameter_id: 0xf435685e
+}
 function {
   id: 0x99ccb18c
   return_type_id: 0x6720d32f
@@ -288775,6 +289090,11 @@ function {
   parameter_id: 0x0aa6efc8
   parameter_id: 0x33756485
 }
+function {
+  id: 0xa08db938
+  return_type_id: 0x6720d32f
+  parameter_id: 0xf435685e
+}
 function {
   id: 0xa08f5503
   return_type_id: 0xfc0e1dbd
@@ -298651,6 +298971,15 @@ elf_symbol {
   type_id: 0x1a0b4b72
   full_name: "class_unregister"
 }
+elf_symbol {
+  id: 0xd156aa2c
+  name: "cleancache_register_ops"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x183a0fdd
+  type_id: 0x910fbd4c
+  full_name: "cleancache_register_ops"
+}
 elf_symbol {
   id: 0xb63845e5
   name: "clear_page"
@@ -299045,6 +299374,15 @@ elf_symbol {
   type_id: 0x9c8a3bc5
   full_name: "cma_get_name"
 }
+elf_symbol {
+  id: 0x4e0f0ce0
+  name: "cma_get_size"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x7e420416
+  type_id: 0x3f62e135
+  full_name: "cma_get_size"
+}
 elf_symbol {
   id: 0xab62b21c
   name: "cma_release"
@@ -300476,6 +300814,15 @@ elf_symbol {
   type_id: 0x148b9359
   full_name: "csum_ipv6_magic"
 }
+elf_symbol {
+  id: 0x554af0ba
+  name: "csum_partial"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe113bbbc
+  type_id: 0x35b105f3
+  full_name: "csum_partial"
+}
 elf_symbol {
   id: 0xbb54c900
   name: "csum_tcpudp_nofold"
@@ -327846,6 +328193,24 @@ elf_symbol {
   type_id: 0x5cf6a3cf
   full_name: "xa_store"
 }
+elf_symbol {
+  id: 0xb5ba02d4
+  name: "xas_find"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xde09a94d
+  type_id: 0x5ebf0597
+  full_name: "xas_find"
+}
+elf_symbol {
+  id: 0x0fe35b07
+  name: "xas_pause"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x61ae1d2d
+  type_id: 0x187c3067
+  full_name: "xas_pause"
+}
 elf_symbol {
   id: 0xebb799b4
   name: "xdp_convert_zc_to_xdp_frame"
@@ -331063,6 +331428,10 @@ symbols {
     key: "class_unregister"
     value: 0xf91cb171
   }
+  symbol {
+    key: "cleancache_register_ops"
+    value: 0xd156aa2c
+  }
   symbol {
     key: "clear_page"
     value: 0xb63845e5
@@ -331239,6 +331608,10 @@ symbols {
     key: "cma_get_name"
     value: 0x966a7c42
   }
+  symbol {
+    key: "cma_get_size"
+    value: 0x4e0f0ce0
+  }
   symbol {
     key: "cma_release"
     value: 0xab62b21c
@@ -331875,6 +332248,10 @@ symbols {
     key: "csum_ipv6_magic"
     value: 0x81bdacc5
   }
+  symbol {
+    key: "csum_partial"
+    value: 0x554af0ba
+  }
   symbol {
     key: "csum_tcpudp_nofold"
     value: 0xbb54c900
@@ -344043,6 +344420,14 @@ symbols {
     key: "xa_store"
     value: 0x9b05d33a
   }
+  symbol {
+    key: "xas_find"
+    value: 0xb5ba02d4
+  }
+  symbol {
+    key: "xas_pause"
+    value: 0x0fe35b07
+  }
   symbol {
     key: "xdp_convert_zc_to_xdp_frame"
     value: 0xebb799b4
diff --git a/android/abi_gki_aarch64_pixel b/android/abi_gki_aarch64_pixel
index 6c77872268ac..5f1333f0d2a3 100644
--- a/android/abi_gki_aarch64_pixel
+++ b/android/abi_gki_aarch64_pixel
@@ -162,6 +162,7 @@
   class_interface_unregister
   __class_register
   class_unregister
+  cleancache_register_ops
   clear_page
   __ClearPageMovable
   clk_disable
@@ -188,6 +189,7 @@
   cma_alloc
   cma_for_each_area
   cma_get_name
+  cma_get_size
   cma_release
   compat_ptr_ioctl
   complete
@@ -292,6 +294,7 @@
   crypto_skcipher_setkey
   __crypto_xor
   csum_ipv6_magic
+  csum_partial
   csum_tcpudp_nofold
   _ctype
   debugfs_attr_read
@@ -2424,6 +2427,11 @@
   wireless_nlevent_flush
   woken_wake_function
   work_busy
+  __xa_erase
+  xa_load
+  xas_find
+  xas_pause
+  __xa_store
   __xfrm_state_destroy
   xfrm_state_lookup_byspi
   xfrm_stateonly_find