diff --git a/BUILD.bazel b/BUILD.bazel index bce2e4ff8b04..01c48ab458ba 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -188,6 +188,7 @@ filegroup( "gki/aarch64/symbols/pixel", "gki/aarch64/symbols/qcom", "gki/aarch64/symbols/trusty", + "gki/aarch64/symbols/type_visibility", "gki/aarch64/symbols/unisoc", "gki/aarch64/symbols/virtual_device", "gki/aarch64/symbols/vivo", diff --git a/gki/aarch64/abi.stg b/gki/aarch64/abi.stg index e94c31f6cb1d..5e5770fbc257 100644 --- a/gki/aarch64/abi.stg +++ b/gki/aarch64/abi.stg @@ -35648,6 +35648,11 @@ qualified { qualifier: CONST qualified_type_id: 0x53a55dfd } +qualified { + id: 0xc9099682 + qualifier: CONST + qualified_type_id: 0x5461ec82 +} qualified { id: 0xc93afee2 qualifier: CONST @@ -36488,6 +36493,11 @@ qualified { qualifier: CONST qualified_type_id: 0x2ba676fa } +qualified { + id: 0xd700b6f9 + qualifier: CONST + qualified_type_id: 0x2c456d6d +} qualified { id: 0xd7024b8e qualifier: CONST @@ -304285,6 +304295,45 @@ enumeration { } } } +enumeration { + id: 0x5461ec82 + name: "memcg_stat_item" + definition { + underlying_type_id: 0x4585663f + enumerator { + name: "MEMCG_SWAP" + value: 46 + } + enumerator { + name: "MEMCG_SOCK" + value: 47 + } + enumerator { + name: "MEMCG_PERCPU_B" + value: 48 + } + enumerator { + name: "MEMCG_VMALLOC" + value: 49 + } + enumerator { + name: "MEMCG_KMEM" + value: 50 + } + enumerator { + name: "MEMCG_ZSWAP_B" + value: 51 + } + enumerator { + name: "MEMCG_ZSWAPPED" + value: 52 + } + enumerator { + name: "MEMCG_NR_STAT" + value: 53 + } + } +} enumeration { id: 0x3843f4e3 name: "memory_type" @@ -326334,6 +326383,12 @@ function { return_type_id: 0x48b5725f parameter_id: 0x9fe5c5a6 } +function { + id: 0x3766a595 + return_type_id: 0x33756485 + parameter_id: 0x1d5bae2a + parameter_id: 0x6720d32f +} function { id: 0x37677261 return_type_id: 0x33756485 @@ -361544,6 +361599,24 @@ function { return_type_id: 0x6d7f5ff6 parameter_id: 0x0562c566 } +elf_symbol { + id: 0x698a526c + name: "ANDROID_GKI_memcg_stat_item" + is_defined: true + symbol_type: OBJECT + crc: 0xaebcaf80 + type_id: 0xc9099682 + full_name: "ANDROID_GKI_memcg_stat_item" +} +elf_symbol { + id: 0x4203f861 + name: "ANDROID_GKI_node_stat_item" + is_defined: true + symbol_type: OBJECT + crc: 0xf9ee4ddc + type_id: 0xd700b6f9 + full_name: "ANDROID_GKI_node_stat_item" +} elf_symbol { id: 0x2dddbe52 name: "I_BDEV" @@ -403018,6 +403091,15 @@ elf_symbol { type_id: 0x8e47c273 full_name: "memcg_kmem_online_key" } +elf_symbol { + id: 0x79d24533 + name: "memcg_page_state" + is_defined: true + symbol_type: FUNCTION + crc: 0xc567fe2c + type_id: 0x3766a595 + full_name: "memcg_page_state" +} elf_symbol { id: 0xbf158d63 name: "memcg_sockets_enabled_key" @@ -433676,6 +433758,8 @@ elf_symbol { } interface { id: 0x84ea5130 + symbol_id: 0x698a526c + symbol_id: 0x4203f861 symbol_id: 0x2dddbe52 symbol_id: 0x7c322a62 symbol_id: 0x38116da8 @@ -438283,6 +438367,7 @@ interface { symbol_id: 0x01e78001 symbol_id: 0x746374fa symbol_id: 0x73553ac1 + symbol_id: 0x79d24533 symbol_id: 0xbf158d63 symbol_id: 0xaa97e158 symbol_id: 0x0b518e04 diff --git a/gki/aarch64/symbols/oplus b/gki/aarch64/symbols/oplus index 9b611e02700e..f0bad70f03e4 100644 --- a/gki/aarch64/symbols/oplus +++ b/gki/aarch64/symbols/oplus @@ -101,6 +101,7 @@ lock_rename lookup_one_len_unlocked memcg_kmem_online_key + memcg_page_state mem_cgroup_from_id mem_cgroup_update_lru_size memory_cgrp_subsys @@ -208,6 +209,7 @@ __traceiter_android_rvh_post_init_entity_util_avg __traceiter_android_rvh_place_entity __traceiter_android_rvh_set_cpus_allowed_comm + __traceiter_android_rvh_set_balance_anon_file_reclaim __traceiter_android_rvh_try_to_wake_up_success __traceiter_android_vh_adjust_alloc_flags __traceiter_android_vh_adjust_kvmalloc_flags @@ -342,6 +344,7 @@ __tracepoint_android_rvh_place_entity __tracepoint_android_rvh_post_init_entity_util_avg __tracepoint_android_rvh_set_cpus_allowed_comm + __tracepoint_android_rvh_set_balance_anon_file_reclaim __tracepoint_android_rvh_try_to_wake_up_success __tracepoint_android_vh_adjust_alloc_flags __tracepoint_android_vh_adjust_kvmalloc_flags diff --git a/gki/aarch64/symbols/type_visibility b/gki/aarch64/symbols/type_visibility new file mode 100644 index 000000000000..b3e9ecdb5db7 --- /dev/null +++ b/gki/aarch64/symbols/type_visibility @@ -0,0 +1,5 @@ +[abi_symbol_list] + +# for type visibility + ANDROID_GKI_node_stat_item + ANDROID_GKI_memcg_stat_item