Reapply "ANDROID: enable memory allocation profiling configs"

This reverts commit a68f9ac139. 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 <surenb@google.com>
2025-05-08 11:39:02 -07:00
parent 60372b88d2
commit e44dfa62df
11 changed files with 13 additions and 0 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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