From e44dfa62dfce771dee8ce135b9c863ca0160445d Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Thu, 8 May 2025 11:39:02 -0700 Subject: [PATCH] Reapply "ANDROID: enable memory allocation profiling configs" This reverts commit a68f9ac139db1ab91ad5f092bbfe1852537a3b66. Reason for revert: The config was not the culprit of the issue that required the original revert in b/402596474. Bug: 402596474 Change-Id: Ib76bbe0545367d51c769b2bf3b104c0fe1ff86b7 Signed-off-by: Suren Baghdasaryan --- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ gki/aarch64/symbols/amlogic | 1 + gki/aarch64/symbols/db845c | 1 + gki/aarch64/symbols/exynos | 1 + gki/aarch64/symbols/exynosauto | 1 + gki/aarch64/symbols/fips140 | 1 + gki/aarch64/symbols/imx | 1 + gki/aarch64/symbols/pixel | 1 + gki/aarch64/symbols/trusty | 1 + gki/aarch64/symbols/virtual_device | 1 + 11 files changed, 13 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index b61f92841f50..1e31d28410ed 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -790,6 +790,8 @@ CONFIG_UBSAN_TRAP=y CONFIG_PAGE_OWNER=y CONFIG_PAGE_PINNER=y CONFIG_DEBUG_MEMORY_INIT=y +CONFIG_MEM_ALLOC_PROFILING=y +# CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT is not set CONFIG_KASAN=y CONFIG_KASAN_HW_TAGS=y CONFIG_KFENCE=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 7cbde834df53..d7247ae31d2d 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -697,6 +697,8 @@ CONFIG_UBSAN_TRAP=y CONFIG_PAGE_OWNER=y CONFIG_PAGE_PINNER=y CONFIG_DEBUG_MEMORY_INIT=y +CONFIG_MEM_ALLOC_PROFILING=y +# CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT is not set CONFIG_KFENCE=y CONFIG_KFENCE_SAMPLE_INTERVAL=500 CONFIG_KFENCE_NUM_OBJECTS=63 diff --git a/gki/aarch64/symbols/amlogic b/gki/aarch64/symbols/amlogic index 8297697152ff..f8e263aa9870 100644 --- a/gki/aarch64/symbols/amlogic +++ b/gki/aarch64/symbols/amlogic @@ -1312,6 +1312,7 @@ media_entity_pads_init media_pipeline_start media_pipeline_stop + mem_alloc_profiling_key memchr memcmp memcpy diff --git a/gki/aarch64/symbols/db845c b/gki/aarch64/symbols/db845c index 08bd12406015..23da67c3e728 100644 --- a/gki/aarch64/symbols/db845c +++ b/gki/aarch64/symbols/db845c @@ -475,6 +475,7 @@ mbox_free_channel mbox_request_channel mbox_send_message + mem_alloc_profiling_key memcpy memcpy_and_pad __memcpy_fromio diff --git a/gki/aarch64/symbols/exynos b/gki/aarch64/symbols/exynos index d9cad0cad2cf..21b269264b89 100644 --- a/gki/aarch64/symbols/exynos +++ b/gki/aarch64/symbols/exynos @@ -482,6 +482,7 @@ log_read_mmio log_write_mmio loops_per_jiffy + mem_alloc_profiling_key memchr memcpy __memcpy_fromio diff --git a/gki/aarch64/symbols/exynosauto b/gki/aarch64/symbols/exynosauto index 9753fb9e5b52..cff6a20e7c40 100644 --- a/gki/aarch64/symbols/exynosauto +++ b/gki/aarch64/symbols/exynosauto @@ -36,6 +36,7 @@ log_post_write_mmio log_read_mmio log_write_mmio + mem_alloc_profiling_key memcpy memset module_layout diff --git a/gki/aarch64/symbols/fips140 b/gki/aarch64/symbols/fips140 index d4f35348b6e4..ca4c2b4197d7 100644 --- a/gki/aarch64/symbols/fips140 +++ b/gki/aarch64/symbols/fips140 @@ -105,6 +105,7 @@ __list_del_entry_valid_or_report lskcipher_alloc_instance_simple lskcipher_register_instance + mem_alloc_profiling_key memcpy memset __mutex_init diff --git a/gki/aarch64/symbols/imx b/gki/aarch64/symbols/imx index 168dbbdd50e4..cfd85f0d88f6 100644 --- a/gki/aarch64/symbols/imx +++ b/gki/aarch64/symbols/imx @@ -1415,6 +1415,7 @@ media_graph_walk_next media_graph_walk_start media_pad_remote_pad_first + mem_alloc_profiling_key memchr memchr_inv memcmp diff --git a/gki/aarch64/symbols/pixel b/gki/aarch64/symbols/pixel index f3a0527834bb..7fbf3f5609c0 100644 --- a/gki/aarch64/symbols/pixel +++ b/gki/aarch64/symbols/pixel @@ -1446,6 +1446,7 @@ mctrl_gpio_get_outputs mctrl_gpio_init mctrl_gpio_set + mem_alloc_profiling_key __memcat_p memchr memcmp diff --git a/gki/aarch64/symbols/trusty b/gki/aarch64/symbols/trusty index f821acbcb1d1..5e737a26ef3e 100644 --- a/gki/aarch64/symbols/trusty +++ b/gki/aarch64/symbols/trusty @@ -45,6 +45,7 @@ kstrtoull __list_add_valid_or_report __list_del_entry_valid_or_report + mem_alloc_profiling_key memcpy memset memstart_addr diff --git a/gki/aarch64/symbols/virtual_device b/gki/aarch64/symbols/virtual_device index 8ca8eb0da047..bf7e99e07a63 100644 --- a/gki/aarch64/symbols/virtual_device +++ b/gki/aarch64/symbols/virtual_device @@ -250,6 +250,7 @@ log_post_write_mmio log_read_mmio log_write_mmio + mem_alloc_profiling_key memcpy memmove memset