diff --git a/gki/aarch64/abi.stg b/gki/aarch64/abi.stg
index dc6e73a3954b..5abbe9c5adf4 100644
--- a/gki/aarch64/abi.stg
+++ b/gki/aarch64/abi.stg
@@ -355765,6 +355765,14 @@ function {
   parameter_id: 0x18bd6530
   parameter_id: 0x3a5262d4
 }
+function {
+  id: 0x9bd62b1f
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x11b57133
+  parameter_id: 0xfc0e1dbd
+  parameter_id: 0x11cfee5a
+}
 function {
   id: 0x9bd67f28
   return_type_id: 0x6720d32f
@@ -356384,6 +356392,12 @@ function {
   parameter_id: 0x18bd6530
   parameter_id: 0x11cfee5a
 }
+function {
+  id: 0x9be96fa7
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x11b57133
+}
 function {
   id: 0x9be9dd69
   return_type_id: 0x6720d32f
@@ -356461,6 +356475,14 @@ function {
   parameter_id: 0x18ea6ae3
   parameter_id: 0x120540d1
 }
+function {
+  id: 0x9bf2774f
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x11b57133
+  parameter_id: 0x6d7f5ff6
+  parameter_id: 0x11cfee5a
+}
 function {
   id: 0x9bf2ff2c
   return_type_id: 0x6720d32f
@@ -373218,6 +373240,15 @@ elf_symbol {
   type_id: 0x9ba47b26
   full_name: "__traceiter_android_rvh_panic_unhandled"
 }
+elf_symbol {
+  id: 0x21c681ad
+  name: "__traceiter_android_rvh_percpu_rwsem_wait_complete"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x31fbf21b
+  type_id: 0x9bd62b1f
+  full_name: "__traceiter_android_rvh_percpu_rwsem_wait_complete"
+}
 elf_symbol {
   id: 0x097e467e
   name: "__traceiter_android_rvh_place_entity"
@@ -375621,6 +375652,24 @@ elf_symbol {
   type_id: 0x9bb62df9
   full_name: "__traceiter_android_vh_pagetypeinfo_show"
 }
+elf_symbol {
+  id: 0x13b0736e
+  name: "__traceiter_android_vh_percpu_rwsem_down_read"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd9a18c2a
+  type_id: 0x9bf2774f
+  full_name: "__traceiter_android_vh_percpu_rwsem_down_read"
+}
+elf_symbol {
+  id: 0xc72f2012
+  name: "__traceiter_android_vh_percpu_rwsem_up_write"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x891ff8fd
+  type_id: 0x9be96fa7
+  full_name: "__traceiter_android_vh_percpu_rwsem_up_write"
+}
 elf_symbol {
   id: 0xd14f3adb
   name: "__traceiter_android_vh_percpu_rwsem_wq_add"
@@ -378312,6 +378361,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_rvh_panic_unhandled"
 }
+elf_symbol {
+  id: 0xee3719e3
+  name: "__tracepoint_android_rvh_percpu_rwsem_wait_complete"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x7c5aa8a7
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_rvh_percpu_rwsem_wait_complete"
+}
 elf_symbol {
   id: 0x448fc4e4
   name: "__tracepoint_android_rvh_place_entity"
@@ -380715,6 +380773,24 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_pagetypeinfo_show"
 }
+elf_symbol {
+  id: 0xa4c454d8
+  name: "__tracepoint_android_vh_percpu_rwsem_down_read"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x7c5aa8a7
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_percpu_rwsem_down_read"
+}
+elf_symbol {
+  id: 0x7d42b7c8
+  name: "__tracepoint_android_vh_percpu_rwsem_up_write"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x7c5aa8a7
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_percpu_rwsem_up_write"
+}
 elf_symbol {
   id: 0x3d63616d
   name: "__tracepoint_android_vh_percpu_rwsem_wq_add"
@@ -445251,6 +445327,7 @@ interface {
   symbol_id: 0x0d22882d
   symbol_id: 0xb51338de
   symbol_id: 0xc463ba81
+  symbol_id: 0x21c681ad
   symbol_id: 0x097e467e
   symbol_id: 0xfad1d9f5
   symbol_id: 0xeccbc3c1
@@ -445518,6 +445595,8 @@ interface {
   symbol_id: 0x3246acbb
   symbol_id: 0xb4d5ffdc
   symbol_id: 0x3c5e668a
+  symbol_id: 0x13b0736e
+  symbol_id: 0xc72f2012
   symbol_id: 0xd14f3adb
   symbol_id: 0xd440595c
   symbol_id: 0x5983841b
@@ -445817,6 +445896,7 @@ interface {
   symbol_id: 0x62726c6f
   symbol_id: 0xdf21a7cc
   symbol_id: 0xeea6bf23
+  symbol_id: 0xee3719e3
   symbol_id: 0x448fc4e4
   symbol_id: 0x121537db
   symbol_id: 0x50605d97
@@ -446084,6 +446164,8 @@ interface {
   symbol_id: 0x4a5e6e41
   symbol_id: 0x352038ba
   symbol_id: 0x2f61d5a4
+  symbol_id: 0xa4c454d8
+  symbol_id: 0x7d42b7c8
   symbol_id: 0x3d63616d
   symbol_id: 0x1051f336
   symbol_id: 0xab37fc55
diff --git a/gki/aarch64/symbols/vivo b/gki/aarch64/symbols/vivo
index a45bfc11ad72..119539b355c7 100644
--- a/gki/aarch64/symbols/vivo
+++ b/gki/aarch64/symbols/vivo
@@ -86,6 +86,7 @@
   __traceiter_android_rvh_udp_sendmsg
   __traceiter_android_rvh_udpv6_recvmsg
   __traceiter_android_rvh_udpv6_sendmsg
+  __traceiter_android_rvh_percpu_rwsem_wait_complete
   __traceiter_android_vh_alter_mutex_list_add
   __traceiter_android_vh_alter_rwsem_list_add
   __traceiter_android_vh_bd_link_disk_holder
@@ -121,6 +122,8 @@
   __traceiter_android_vh_shrink_node_memcgs_bypass
   __traceiter_android_vh_sk_alloc
   __traceiter_android_vh_sk_free
+  __traceiter_android_vh_percpu_rwsem_down_read
+  __traceiter_android_vh_percpu_rwsem_up_write
   __traceiter_android_vh_sync_txn_recvd
   __traceiter_android_vh_tcp_rtt_estimator
   __traceiter_android_vh_udp_enqueue_schedule_skb
@@ -151,6 +154,7 @@
   __tracepoint_android_rvh_udp_sendmsg
   __tracepoint_android_rvh_udpv6_recvmsg
   __tracepoint_android_rvh_udpv6_sendmsg
+  __tracepoint_android_rvh_percpu_rwsem_wait_complete
   __tracepoint_android_vh_alter_mutex_list_add
   __tracepoint_android_vh_alter_rwsem_list_add
   __tracepoint_android_vh_bd_link_disk_holder
@@ -189,6 +193,8 @@
   __tracepoint_android_vh_sync_txn_recvd
   __tracepoint_android_vh_tcp_rtt_estimator
   __tracepoint_android_vh_udp_enqueue_schedule_skb
+  __tracepoint_android_vh_percpu_rwsem_down_read
+  __tracepoint_android_vh_percpu_rwsem_up_write
   __tracepoint_cpu_frequency_limits
   __tracepoint_sched_switch
   __tracepoint_sched_waking