From a68f9ac139db1ab91ad5f092bbfe1852537a3b66 Mon Sep 17 00:00:00 2001 From: Satya Durga Srinivasu Prabhala Date: Thu, 13 Mar 2025 03:02:12 -0700 Subject: [PATCH] Revert "ANDROID: enable memory allocation profiling configs" This reverts commit 291f8636115d96a9ba20ce6142fad37599b0bcb9. We see below compilation issues with our debug + kasan enabled builds, revert the change as it is more of a debug feature. Traceback (most recent call last): File "avbtool.py", line 3505, in add_hash_footer AvbError: Image size of 67772416 exceeds maximum image size of 67039232 in order to fit in a partition size of 67108864. Bug: 402596474 Change-Id: Ie2f4dc97e60454fac44bc2f75527a3760cd68e60 Signed-off-by: Satya Durga Srinivasu Prabhala --- 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 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index a32a8015d4c0..b4d08be25e89 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -763,8 +763,6 @@ 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 9aec2f25ea19..638f6114d66a 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -691,8 +691,6 @@ 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 39cfb03298a2..5d9f9387d8e7 100644 --- a/gki/aarch64/symbols/amlogic +++ b/gki/aarch64/symbols/amlogic @@ -1312,7 +1312,6 @@ 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 fde35fed4251..f9e1b568d2d4 100644 --- a/gki/aarch64/symbols/db845c +++ b/gki/aarch64/symbols/db845c @@ -475,7 +475,6 @@ 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 8ff0c44c14ed..c884ddc58104 100644 --- a/gki/aarch64/symbols/exynos +++ b/gki/aarch64/symbols/exynos @@ -482,7 +482,6 @@ 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 cff6a20e7c40..9753fb9e5b52 100644 --- a/gki/aarch64/symbols/exynosauto +++ b/gki/aarch64/symbols/exynosauto @@ -36,7 +36,6 @@ 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 ca4c2b4197d7..d4f35348b6e4 100644 --- a/gki/aarch64/symbols/fips140 +++ b/gki/aarch64/symbols/fips140 @@ -105,7 +105,6 @@ __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 ad3ff425d1ef..c9307e9851ec 100644 --- a/gki/aarch64/symbols/imx +++ b/gki/aarch64/symbols/imx @@ -1412,7 +1412,6 @@ 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 3c9ccad6f3d5..49e457906d0e 100644 --- a/gki/aarch64/symbols/pixel +++ b/gki/aarch64/symbols/pixel @@ -1436,7 +1436,6 @@ 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 5e737a26ef3e..f821acbcb1d1 100644 --- a/gki/aarch64/symbols/trusty +++ b/gki/aarch64/symbols/trusty @@ -45,7 +45,6 @@ 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 b282d596a474..910b97c4269c 100644 --- a/gki/aarch64/symbols/virtual_device +++ b/gki/aarch64/symbols/virtual_device @@ -250,7 +250,6 @@ log_post_write_mmio log_read_mmio log_write_mmio - mem_alloc_profiling_key memcpy memmove memset