From 5f814d6bb4626aa0e59c08e51ac7c604601b8a4b Mon Sep 17 00:00:00 2001 From: Seiya Wang Date: Thu, 14 Nov 2024 10:33:01 +0800 Subject: [PATCH] ANDROID: GKI: Update symbol list for mtk 9 function symbol(s) added 'int sock_copy_user_timeval(struct __kernel_sock_timeval*, sockptr_t, int, bool)' 'int sock_get_timeout(long, void*, bool)' 'bool vsock_addr_bound(const struct sockaddr_vm*)' 'int vsock_addr_cast(const struct sockaddr*, size_t, struct sockaddr_vm**)' 'bool vsock_addr_equals_addr(const struct sockaddr_vm*, const struct sockaddr_vm*)' 'void vsock_addr_init(struct sockaddr_vm*, u32, u32)' 'void vsock_addr_unbind(struct sockaddr_vm*)' 'int vsock_addr_validate(const struct sockaddr_vm*)' 'void vsock_deliver_tap(struct sk_buff*(*)(void*), void*)' Bug: 378967808 Change-Id: I0c8fe511bb499030efd9bd817da0603147f102fd Signed-off-by: Seiya Wang --- android/abi_gki_aarch64.stg | 207 ++++++++++++++++++++++++++++++++++++ android/abi_gki_aarch64_mtk | 12 +++ 2 files changed, 219 insertions(+) diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg index 1aa787ffbe62..da19e1cb2ddd 100644 --- a/android/abi_gki_aarch64.stg +++ b/android/abi_gki_aarch64.stg @@ -2598,6 +2598,11 @@ pointer_reference { kind: POINTER pointee_type_id: 0x0fc94b61 } +pointer_reference { + id: 0x0972005b + kind: POINTER + pointee_type_id: 0x0f88e7f2 +} pointer_reference { id: 0x097315c2 kind: POINTER @@ -5638,6 +5643,11 @@ pointer_reference { kind: POINTER pointee_type_id: 0x1dbe4538 } +pointer_reference { + id: 0x0e00970a + kind: POINTER + pointee_type_id: 0x1242bab6 +} pointer_reference { id: 0x0e00c9b9 kind: POINTER @@ -8243,6 +8253,11 @@ pointer_reference { kind: POINTER pointee_type_id: 0x6ea91ece } +pointer_reference { + id: 0x113c61bc + kind: POINTER + pointee_type_id: 0x6eb1606d +} pointer_reference { id: 0x1148ae81 kind: POINTER @@ -23653,6 +23668,11 @@ pointer_reference { kind: POINTER pointee_type_id: 0xedb84b9b } +pointer_reference { + id: 0x32049d01 + kind: POINTER + pointee_type_id: 0xe2529298 +} pointer_reference { id: 0x320871e3 kind: POINTER @@ -28798,6 +28818,11 @@ pointer_reference { kind: POINTER pointee_type_id: 0xd9065242 } +pointer_reference { + id: 0x3cd2755a + kind: POINTER + pointee_type_id: 0xd90933f7 +} pointer_reference { id: 0x3cd81844 kind: POINTER @@ -33873,6 +33898,11 @@ qualified { qualifier: CONST qualified_type_id: 0x13b5a562 } +qualified { + id: 0xd90933f7 + qualifier: CONST + qualified_type_id: 0x14637955 +} qualified { id: 0xd93664b2 qualifier: CONST @@ -34463,6 +34493,11 @@ qualified { qualifier: CONST qualified_type_id: 0xf865cc2f } +qualified { + id: 0xe2529298 + qualifier: CONST + qualified_type_id: 0xf90dfce8 +} qualified { id: 0xe28bb7e5 qualifier: CONST @@ -198565,6 +198600,11 @@ member { type_id: 0xe62ebf07 offset: 128 } +member { + id: 0x59ba4787 + name: "tv_sec" + type_id: 0xdd6eef0a +} member { id: 0x59dcca01 name: "tv_sec" @@ -198605,6 +198645,12 @@ member { type_id: 0x68035002 offset: 64 } +member { + id: 0x5fd9c8cb + name: "tv_usec" + type_id: 0xdd6eef0a + offset: 64 +} member { id: 0x5fe2819a name: "tv_usec" @@ -220708,6 +220754,16 @@ struct_union { member_id: 0x5f6ca574 } } +struct_union { + id: 0x1242bab6 + kind: STRUCT + name: "__kernel_sock_timeval" + definition { + bytesize: 16 + member_id: 0x59ba4787 + member_id: 0x5fd9c8cb + } +} struct_union { id: 0xed09a540 kind: STRUCT @@ -294947,6 +295003,13 @@ function { return_type_id: 0x48b5725f parameter_id: 0x03ce74cd } +function { + id: 0x106c0ac9 + return_type_id: 0x48b5725f + parameter_id: 0x0f88e7f2 + parameter_id: 0xc9082b19 + parameter_id: 0xc9082b19 +} function { id: 0x106c9a5c return_type_id: 0x48b5725f @@ -297423,6 +297486,11 @@ function { parameter_id: 0x2eab5b8a parameter_id: 0x87463428 } +function { + id: 0x137a686f + return_type_id: 0x48b5725f + parameter_id: 0x0f88e7f2 +} function { id: 0x137d1ffc return_type_id: 0x48b5725f @@ -298297,6 +298365,12 @@ function { parameter_id: 0x10134e31 parameter_id: 0x0a22a423 } +function { + id: 0x14b5bc68 + return_type_id: 0x48b5725f + parameter_id: 0x113c61bc + parameter_id: 0x18bd6530 +} function { id: 0x14b6bb25 return_type_id: 0x48b5725f @@ -310702,6 +310776,11 @@ function { return_type_id: 0x15677165 parameter_id: 0x32a623d7 } +function { + id: 0x6eb1606d + return_type_id: 0x054f691a + parameter_id: 0x18bd6530 +} function { id: 0x6ecc6402 return_type_id: 0x1d44326e @@ -316636,6 +316715,11 @@ function { return_type_id: 0x6720d32f parameter_id: 0x3cbd250a } +function { + id: 0x92b47e79 + return_type_id: 0x6720d32f + parameter_id: 0x3cd2755a +} function { id: 0x92b5578e return_type_id: 0x6720d32f @@ -316817,6 +316901,13 @@ function { parameter_id: 0x4585663f parameter_id: 0x4585663f } +function { + id: 0x92d34d4e + return_type_id: 0x6720d32f + parameter_id: 0x32049d01 + parameter_id: 0xf435685e + parameter_id: 0x0972005b +} function { id: 0x92d3b873 return_type_id: 0x6720d32f @@ -332480,6 +332571,14 @@ function { parameter_id: 0x18bd6530 parameter_id: 0x2dcd339f } +function { + id: 0x9d80c6bb + return_type_id: 0x6720d32f + parameter_id: 0x0e00970a + parameter_id: 0xe61f67ea + parameter_id: 0x6720d32f + parameter_id: 0x6d7f5ff6 +} function { id: 0x9d80e32f return_type_id: 0x6720d32f @@ -336447,6 +336546,13 @@ function { parameter_id: 0x07f9a52e parameter_id: 0x6720d32f } +function { + id: 0xa2face03 + return_type_id: 0x6720d32f + parameter_id: 0xfc0e1dbd + parameter_id: 0x18bd6530 + parameter_id: 0x6d7f5ff6 +} function { id: 0xa355db3b return_type_id: 0x257d12af @@ -339941,6 +340047,12 @@ function { return_type_id: 0x1b36c7a2 parameter_id: 0x1d19a9d5 } +function { + id: 0xf1638f87 + return_type_id: 0x6d7f5ff6 + parameter_id: 0x3cd2755a + parameter_id: 0x3cd2755a +} function { id: 0xf16f4d10 return_type_id: 0x32a623d7 @@ -339957,6 +340069,11 @@ function { return_type_id: 0x1344d43c parameter_id: 0x31829648 } +function { + id: 0xf190c652 + return_type_id: 0x6d7f5ff6 + parameter_id: 0x3cd2755a +} function { id: 0xf1a27a59 return_type_id: 0x6d7f5ff6 @@ -403474,6 +403591,15 @@ elf_symbol { type_id: 0x981e2b3a full_name: "sock_common_setsockopt" } +elf_symbol { + id: 0x021ff112 + name: "sock_copy_user_timeval" + is_defined: true + symbol_type: FUNCTION + crc: 0xa0339ba1 + type_id: 0x9d80c6bb + full_name: "sock_copy_user_timeval" +} elf_symbol { id: 0x13ae25c6 name: "sock_create" @@ -403555,6 +403681,15 @@ elf_symbol { type_id: 0x17c95d08 full_name: "sock_gen_put" } +elf_symbol { + id: 0x6c3e2f7c + name: "sock_get_timeout" + is_defined: true + symbol_type: FUNCTION + crc: 0xedd17b31 + type_id: 0xa2face03 + full_name: "sock_get_timeout" +} elf_symbol { id: 0x284bec0f name: "sock_gettstamp" @@ -414583,6 +414718,60 @@ elf_symbol { type_id: 0x9f7cdc88 full_name: "vsnprintf" } +elf_symbol { + id: 0x24b72fe8 + name: "vsock_addr_bound" + is_defined: true + symbol_type: FUNCTION + crc: 0x4b99648c + type_id: 0xf190c652 + full_name: "vsock_addr_bound" +} +elf_symbol { + id: 0x74552293 + name: "vsock_addr_cast" + is_defined: true + symbol_type: FUNCTION + crc: 0x77c14317 + type_id: 0x92d34d4e + full_name: "vsock_addr_cast" +} +elf_symbol { + id: 0x79291ebd + name: "vsock_addr_equals_addr" + is_defined: true + symbol_type: FUNCTION + crc: 0xaf2674b5 + type_id: 0xf1638f87 + full_name: "vsock_addr_equals_addr" +} +elf_symbol { + id: 0x6ea68f58 + name: "vsock_addr_init" + is_defined: true + symbol_type: FUNCTION + crc: 0x3d4b0fca + type_id: 0x106c0ac9 + full_name: "vsock_addr_init" +} +elf_symbol { + id: 0xbf744c76 + name: "vsock_addr_unbind" + is_defined: true + symbol_type: FUNCTION + crc: 0x0e9bc9b6 + type_id: 0x137a686f + full_name: "vsock_addr_unbind" +} +elf_symbol { + id: 0x3bb16099 + name: "vsock_addr_validate" + is_defined: true + symbol_type: FUNCTION + crc: 0xec96eadf + type_id: 0x92b47e79 + full_name: "vsock_addr_validate" +} elf_symbol { id: 0xc46cf30e name: "vsock_core_register" @@ -414601,6 +414790,15 @@ elf_symbol { type_id: 0x1f9a1d61 full_name: "vsock_core_unregister" } +elf_symbol { + id: 0x5af22a06 + name: "vsock_deliver_tap" + is_defined: true + symbol_type: FUNCTION + crc: 0x090a9c1c + type_id: 0x14b5bc68 + full_name: "vsock_deliver_tap" +} elf_symbol { id: 0x3d09e223 name: "vsock_for_each_connected_socket" @@ -422967,6 +423165,7 @@ interface { symbol_id: 0x6974548c symbol_id: 0xe0ea15f1 symbol_id: 0xa829435f + symbol_id: 0x021ff112 symbol_id: 0x13ae25c6 symbol_id: 0x7be16ce2 symbol_id: 0x0967d0a1 @@ -422976,6 +423175,7 @@ interface { symbol_id: 0x83497546 symbol_id: 0xd661cceb symbol_id: 0x4ece0732 + symbol_id: 0x6c3e2f7c symbol_id: 0x284bec0f symbol_id: 0xb2cef8e2 symbol_id: 0xed806c73 @@ -424202,8 +424402,15 @@ interface { symbol_id: 0xea7fc751 symbol_id: 0xd574e01b symbol_id: 0x9af4ba91 + symbol_id: 0x24b72fe8 + symbol_id: 0x74552293 + symbol_id: 0x79291ebd + symbol_id: 0x6ea68f58 + symbol_id: 0xbf744c76 + symbol_id: 0x3bb16099 symbol_id: 0xc46cf30e symbol_id: 0x584cd956 + symbol_id: 0x5af22a06 symbol_id: 0x3d09e223 symbol_id: 0x0db9531c symbol_id: 0xf29d7680 diff --git a/android/abi_gki_aarch64_mtk b/android/abi_gki_aarch64_mtk index 1f73ea577295..dfaf116be687 100644 --- a/android/abi_gki_aarch64_mtk +++ b/android/abi_gki_aarch64_mtk @@ -2552,6 +2552,7 @@ sock_common_getsockopt sock_common_recvmsg sock_common_setsockopt + sock_copy_user_timeval __sock_create sock_create_kern sock_diag_register @@ -2559,6 +2560,7 @@ sock_diag_unregister sock_efree sockfd_lookup + sock_get_timeout sock_gettstamp sock_i_ino sock_init_data @@ -3386,6 +3388,16 @@ vring_new_virtqueue vscnprintf vsnprintf + vsock_addr_bound + vsock_addr_cast + vsock_addr_equals_addr + vsock_addr_init + vsock_addr_unbind + vsock_addr_validate + vsock_core_register + vsock_core_unregister + vsock_deliver_tap + vsock_for_each_connected_socket vsprintf vunmap vzalloc