From bc1dd753bde4cfb8b72f4835dade76bcde2ffd8a Mon Sep 17 00:00:00 2001
From: Vijayanand Jitta <vjitta@codeaurora.org>
Date: Fri, 2 Apr 2021 13:20:36 +0530
Subject: [PATCH] ANDROID: android: Add symbols to debug_symbols driver

Add symbols which will be used by the minidump module to
the debug symbol driver.

Bug: 184707701
Change-Id: I4cfdc59e0fcab89ad4df4fcb4de4a706a9c84cf8
Signed-off-by: Vijayanand Jitta <vjitta@codeaurora.org>
---
 drivers/android/debug_symbols.c       | 18 ++++++++++++++++++
 include/linux/android_debug_symbols.h | 13 +++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/drivers/android/debug_symbols.c b/drivers/android/debug_symbols.c
index 0a8c20cc775c..2ce0bfc51421 100644
--- a/drivers/android/debug_symbols.c
+++ b/drivers/android/debug_symbols.c
@@ -11,6 +11,11 @@
 #include <asm/stacktrace.h>
 #include <asm/sections.h>
 
+#include <linux/cma.h>
+#include "../../mm/slab.h"
+#include <linux/memblock.h>
+#include <linux/page_owner.h>
+
 struct ads_entry {
 	char *name;
 	void *addr;
@@ -37,6 +42,19 @@ static const struct ads_entry ads_entries[ADS_END] = {
 	ADS_ENTRY(ADS_START_RO_AFTER_INIT, __start_ro_after_init),
 	ADS_ENTRY(ADS_END_RO_AFTER_INIT, __end_ro_after_init),
 	ADS_ENTRY(ADS_LINUX_BANNER, linux_banner),
+#ifdef CONFIG_CMA
+	ADS_ENTRY(ADS_TOTAL_CMA, &totalcma_pages),
+#endif
+	ADS_ENTRY(ADS_SLAB_CACHES, &slab_caches),
+	ADS_ENTRY(ADS_SLAB_MUTEX, &slab_mutex),
+	ADS_ENTRY(ADS_MIN_LOW_PFN, &min_low_pfn),
+	ADS_ENTRY(ADS_MAX_PFN, &max_pfn),
+#ifdef CONFIG_PAGE_OWNER
+	ADS_ENTRY(ADS_PAGE_OWNER_ENABLED, &page_owner_enabled),
+#endif
+#ifdef CONFIG_SLUB_DEBUG
+	ADS_ENTRY(ADS_SLUB_DEBUG, &slub_debug),
+#endif
 };
 
 /*
diff --git a/include/linux/android_debug_symbols.h b/include/linux/android_debug_symbols.h
index 5d669b2f82f6..a68636bba186 100644
--- a/include/linux/android_debug_symbols.h
+++ b/include/linux/android_debug_symbols.h
@@ -14,6 +14,19 @@ enum android_debug_symbol {
 	ADS_START_RO_AFTER_INIT,
 	ADS_END_RO_AFTER_INIT,
 	ADS_LINUX_BANNER,
+#ifdef CONFIG_CMA
+	ADS_TOTAL_CMA,
+#endif
+	ADS_SLAB_CACHES,
+	ADS_SLAB_MUTEX,
+	ADS_MIN_LOW_PFN,
+	ADS_MAX_PFN,
+#ifdef CONFIG_PAGE_OWNER
+	ADS_PAGE_OWNER_ENABLED,
+#endif
+#ifdef CONFIG_SLUB_DEBUG
+	ADS_SLUB_DEBUG,
+#endif
 	ADS_END
 };