ACPICA: acpiexec: Add option to dump extra info for memory leaks

ACPICA commit f77565e28b90ee7e06f53a474183ef72300c3574

Dump entire object/buffer for any memory leaks detected by
the object/cache tracking mechanism.

Link: https://github.com/acpica/acpica/commit/f77565e2
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 87d6eb01beaf5a33e0119be30f11439855ff0f79..7a0aeb70ec34b2d94688a5dfcba0f7ed32f430c6 100644 (file)
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -164,6 +164,7 @@ ACPI_GLOBAL(struct acpi_memory_list *, acpi_gbl_global_list);
 ACPI_GLOBAL(struct acpi_memory_list *, acpi_gbl_ns_node_list);
 ACPI_GLOBAL(u8, acpi_gbl_display_final_mem_stats);
 ACPI_GLOBAL(u8, acpi_gbl_disable_mem_tracking);
+ACPI_GLOBAL(u8, acpi_gbl_verbose_leak_dump);
 #endif
 
 /*****************************************************************************

diff --git a/drivers/acpi/acpica/utdecode.c b/drivers/acpi/acpica/utdecode.c
index dad02b821e197d99415f8f117beb18490635f4af..d0a375c3f4e29063ca0a236902603cc444e089f1 100644 (file)
--- a/drivers/acpi/acpica/utdecode.c
+++ b/drivers/acpi/acpica/utdecode.c
@@ -284,7 +284,7 @@ const char *acpi_ut_get_node_name(void *object)
 
 static const char *acpi_gbl_desc_type_names[] = {
        /* 00 */ "Not a Descriptor",
-       /* 01 */ "Cached",
+       /* 01 */ "Cached Object",
        /* 02 */ "State-Generic",
        /* 03 */ "State-Update",
        /* 04 */ "State-Package",
@@ -295,10 +295,10 @@ static const char *acpi_gbl_desc_type_names[] = {
        /* 09 */ "State-Result",
        /* 10 */ "State-Notify",
        /* 11 */ "State-Thread",
-       /* 12 */ "Walk",
-       /* 13 */ "Parser",
-       /* 14 */ "Operand",
-       /* 15 */ "Node"
+       /* 12 */ "Tree Walk State",
+       /* 13 */ "Parse Tree Op",
+       /* 14 */ "Operand Object",
+       /* 15 */ "Namespace Node"
 };
 
 const char *acpi_ut_get_descriptor_name(void *object)

diff --git a/drivers/acpi/acpica/uttrack.c b/drivers/acpi/acpica/uttrack.c
index 016a6621cc6faca0bbe56665bdef358a2bcbc8b9..f6b55e2482ee935e42d14483210f05c9d1e9322f 100644 (file)
--- a/drivers/acpi/acpica/uttrack.c
+++ b/drivers/acpi/acpica/uttrack.c
@@ -588,6 +588,18 @@ void acpi_ut_dump_allocations(u32 component, const char *module)
                                             acpi_ut_get_descriptor_name
                                             (descriptor));
 
+                                       /* Optional object hex dump */
+
+                                       if (acpi_gbl_verbose_leak_dump) {
+                                               acpi_os_printf("\n");
+                                               acpi_ut_dump_buffer((u8 *)
+                                                                   descriptor,
+                                                                   element->
+                                                                   size,
+                                                                   DB_BYTE_DISPLAY,
+                                                                   0);
+                                       }
+
                                        /* Validate the descriptor type using Type field and length */
 
                                        descriptor_type = 0;    /* Not a valid descriptor type */