From 6da02f91017480cf77c492c9de0fa145e4f13728 Mon Sep 17 00:00:00 2001 From: Weichao Guo Date: Thu, 1 Jun 2023 11:26:31 +0800 Subject: [PATCH] ANDROID: GKI: Update symbols to abi_gki_aarch64_oplus for extend copy & fbarrier feature 8 function symbol(s) added 'int __blkdev_issue_discard(struct block_device*, sector_t, sector_t, gfp_t, struct bio**)' 'unsigned long __page_file_index(struct page*)' 'void address_space_init_once(struct address_space*)' 'void blk_finish_plug(struct blk_plug*)' 'void blk_start_plug(struct blk_plug*)' 'bool prepare_to_wait_exclusive(struct wait_queue_head*, struct wait_queue_entry*, int)' 'void** radix_tree_lookup_slot(const struct xarray*, unsigned long)' 'void radix_tree_replace_slot(struct xarray*, void**, void*)' Bug: 283021230 Change-Id: Iec663ed6ed23c8c3245b609c3d8748919fa34471 Signed-off-by: Weichao Guo --- android/abi_gki_aarch64.stg | 124 ++++++++++++++++++++++++++++++++++ android/abi_gki_aarch64_oplus | 8 +++ 2 files changed, 132 insertions(+) diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg index ff8faf07cfc5..3509e6c17021 100644 --- a/android/abi_gki_aarch64.stg +++ b/android/abi_gki_aarch64.stg @@ -7601,6 +7601,11 @@ pointer_reference { kind: POINTER pointee_type_id: 0x15a35eaa } +pointer_reference { + id: 0x0ff8f9af + kind: POINTER + pointee_type_id: 0x15a30023 +} pointer_reference { id: 0x0ffdb990 kind: POINTER @@ -283072,6 +283077,13 @@ function { return_type_id: 0x48b5725f parameter_id: 0x2a653aa6 } +function { + id: 0x1a04ad27 + return_type_id: 0x48b5725f + parameter_id: 0x2aa0b9bb + parameter_id: 0x0cbf60eb + parameter_id: 0x18bd6530 +} function { id: 0x1a0b4b72 return_type_id: 0x48b5725f @@ -286122,6 +286134,11 @@ function { return_type_id: 0x48b5725f parameter_id: 0x38fdd541 } +function { + id: 0x1eabf44d + return_type_id: 0x48b5725f + parameter_id: 0x38ce9779 +} function { id: 0x1eaf1d5f return_type_id: 0x48b5725f @@ -287722,6 +287739,11 @@ function { parameter_id: 0x37cc6bab parameter_id: 0xf1a6dfed } +function { + id: 0x300c1af4 + return_type_id: 0x33756485 + parameter_id: 0x06835e9c +} function { id: 0x302279c2 return_type_id: 0x0483e6f8 @@ -289075,6 +289097,12 @@ function { parameter_id: 0x397d00ab parameter_id: 0x6720d32f } +function { + id: 0x4abfefa4 + return_type_id: 0x0cbf60eb + parameter_id: 0x359862c8 + parameter_id: 0x33756485 +} function { id: 0x4acfd9c5 return_type_id: 0x0cbf60eb @@ -310146,6 +310174,15 @@ function { return_type_id: 0x6720d32f parameter_id: 0x01f1fcec } +function { + id: 0x9dfe427d + return_type_id: 0x6720d32f + parameter_id: 0x0c2e195c + parameter_id: 0xd0b3a203 + parameter_id: 0xd0b3a203 + parameter_id: 0xf1a6dfed + parameter_id: 0x0ff8f9af +} function { id: 0x9dff0bbb return_type_id: 0x6720d32f @@ -316368,6 +316405,13 @@ function { parameter_id: 0x1582ab06 parameter_id: 0x2170d06d } +function { + id: 0xfb68644e + return_type_id: 0x6d7f5ff6 + parameter_id: 0x172847a8 + parameter_id: 0x07f9a52e + parameter_id: 0x6720d32f +} function { id: 0xfb7cfa37 return_type_id: 0x6d7f5ff6 @@ -317154,6 +317198,15 @@ elf_symbol { type_id: 0x9fae3c48 full_name: "__blk_rq_map_sg" } +elf_symbol { + id: 0xc8eb813d + name: "__blkdev_issue_discard" + is_defined: true + symbol_type: FUNCTION + crc: 0x38eb4754 + type_id: 0x9dfe427d + full_name: "__blkdev_issue_discard" +} elf_symbol { id: 0x7bf707d4 name: "__blkg_prfill_rwstat" @@ -318973,6 +319026,15 @@ elf_symbol { type_id: 0x026c1696 full_name: "__of_reset_control_get" } +elf_symbol { + id: 0x4d1e5aba + name: "__page_file_index" + is_defined: true + symbol_type: FUNCTION + crc: 0x7b4c1a5a + type_id: 0x300c1af4 + full_name: "__page_file_index" +} elf_symbol { id: 0x057c7766 name: "__page_frag_cache_drain" @@ -326218,6 +326280,15 @@ elf_symbol { type_id: 0x9e6d2eab full_name: "addrconf_prefix_rcv_add_addr" } +elf_symbol { + id: 0x7f488498 + name: "address_space_init_once" + is_defined: true + symbol_type: FUNCTION + crc: 0x84cf269f + type_id: 0x15f8fb52 + full_name: "address_space_init_once" +} elf_symbol { id: 0x09cd7a68 name: "adjust_managed_page_count" @@ -327231,6 +327302,15 @@ elf_symbol { type_id: 0x168d2c88 full_name: "blk_execute_rq_nowait" } +elf_symbol { + id: 0xc0d4821a + name: "blk_finish_plug" + is_defined: true + symbol_type: FUNCTION + crc: 0xce402f0a + type_id: 0x1eabf44d + full_name: "blk_finish_plug" +} elf_symbol { id: 0xaea1564a name: "blk_mq_alloc_request" @@ -327771,6 +327851,15 @@ elf_symbol { type_id: 0x98e82327 full_name: "blk_rq_unmap_user" } +elf_symbol { + id: 0xcb1ad79b + name: "blk_start_plug" + is_defined: true + symbol_type: FUNCTION + crc: 0xcef4f6c4 + type_id: 0x1eabf44d + full_name: "blk_start_plug" +} elf_symbol { id: 0xb78983c5 name: "blk_stat_enable_accounting" @@ -357133,6 +357222,15 @@ elf_symbol { type_id: 0xa2ec04d3 full_name: "prepare_to_wait_event" } +elf_symbol { + id: 0xe8fde451 + name: "prepare_to_wait_exclusive" + is_defined: true + symbol_type: FUNCTION + crc: 0xc622556f + type_id: 0xfb68644e + full_name: "prepare_to_wait_exclusive" +} elf_symbol { id: 0xda3d90c9 name: "print_hex_dump" @@ -357853,6 +357951,15 @@ elf_symbol { type_id: 0x5b3d7cd1 full_name: "radix_tree_lookup" } +elf_symbol { + id: 0x32b0de3e + name: "radix_tree_lookup_slot" + is_defined: true + symbol_type: FUNCTION + crc: 0x41efdeaf + type_id: 0x4abfefa4 + full_name: "radix_tree_lookup_slot" +} elf_symbol { id: 0x88fdaf2f name: "radix_tree_maybe_preload" @@ -357880,6 +357987,15 @@ elf_symbol { type_id: 0xa1e954d4 full_name: "radix_tree_preload" } +elf_symbol { + id: 0x69d73c4e + name: "radix_tree_replace_slot" + is_defined: true + symbol_type: FUNCTION + crc: 0x69049cd2 + type_id: 0x1a04ad27 + full_name: "radix_tree_replace_slot" +} elf_symbol { id: 0x9653ad6f name: "radix_tree_tagged" @@ -375139,6 +375255,7 @@ interface { symbol_id: 0x4df0b385 symbol_id: 0x35aa1afd symbol_id: 0x5a6afeee + symbol_id: 0xc8eb813d symbol_id: 0x7bf707d4 symbol_id: 0xbf1d0365 symbol_id: 0x2057d4fc @@ -375341,6 +375458,7 @@ interface { symbol_id: 0x38c74e33 symbol_id: 0xcbeef20f symbol_id: 0x10e977be + symbol_id: 0x4d1e5aba symbol_id: 0x057c7766 symbol_id: 0x8d43f7e0 symbol_id: 0xe595f8f9 @@ -376146,6 +376264,7 @@ interface { symbol_id: 0xac3dec68 symbol_id: 0xf9bb4624 symbol_id: 0x60b70858 + symbol_id: 0x7f488498 symbol_id: 0x09cd7a68 symbol_id: 0x294249c0 symbol_id: 0x6a3cf7b4 @@ -376259,6 +376378,7 @@ interface { symbol_id: 0x528ef002 symbol_id: 0x90bf9007 symbol_id: 0xd76a9123 + symbol_id: 0xc0d4821a symbol_id: 0xaea1564a symbol_id: 0x0d1fc920 symbol_id: 0xd34c6466 @@ -376319,6 +376439,7 @@ interface { symbol_id: 0xf744d7a6 symbol_id: 0x835f3bf3 symbol_id: 0xdc30e4d6 + symbol_id: 0xcb1ad79b symbol_id: 0xb78983c5 symbol_id: 0xe6192860 symbol_id: 0xf40ec9b3 @@ -379580,6 +379701,7 @@ interface { symbol_id: 0xd46a0ddb symbol_id: 0x49317a7a symbol_id: 0xd780999c + symbol_id: 0xe8fde451 symbol_id: 0xda3d90c9 symbol_id: 0x85643cba symbol_id: 0x10599707 @@ -379660,9 +379782,11 @@ interface { symbol_id: 0xda033b26 symbol_id: 0xfc5b9a92 symbol_id: 0xd1f648be + symbol_id: 0x32b0de3e symbol_id: 0x88fdaf2f symbol_id: 0x23d99f29 symbol_id: 0xf65a8574 + symbol_id: 0x69d73c4e symbol_id: 0x9653ad6f symbol_id: 0xbc5e2f91 symbol_id: 0x05375661 diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus index 3a024b883569..540e10d8adc7 100644 --- a/android/abi_gki_aarch64_oplus +++ b/android/abi_gki_aarch64_oplus @@ -1,9 +1,13 @@ [abi_symbol_list] + address_space_init_once bio_add_page bio_associate_blkg bio_put + __blkdev_issue_discard + blk_finish_plug blk_rq_map_user blk_rq_map_user_iov + blk_start_plug console_printk cpufreq_frequency_table_get_index cpufreq_policy_transition_delay_us @@ -42,10 +46,14 @@ nf_register_net_hooks nf_unregister_net_hooks of_css + __page_file_index __page_mapcount pm_get_active_wakeup_sources __printk_ratelimit + prepare_to_wait_exclusive proc_symlink + radix_tree_lookup_slot + radix_tree_replace_slot _raw_write_trylock reciprocal_value register_tcf_proto_ops