ACPICA: Optimization: Reduce the number of namespace walks

On control method exit, only walk the namespace if the method is
known to have created namespace objects outside of its local scope.

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index 00846333773eec656e6f8561ba38c2bdbfc5dcee..64750ee96e2012047742d2e5e20acb89110c6bbb 100644 (file)
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -584,8 +584,22 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                 * want make the objects permanent.
                 */
                if (!(method_desc->method.flags & AOPOBJ_MODULE_LEVEL)) {
-                       acpi_ns_delete_namespace_by_owner(method_desc->method.
-                                                         owner_id);
+
+                       /* Delete any direct children of (created by) this method */
+
+                       acpi_ns_delete_namespace_subtree(walk_state->
+                                                        method_node);
+
+                       /*
+                        * Delete any objects that were created by this method
+                        * elsewhere in the namespace (if any were created).
+                        */
+                       if (method_desc->method.
+                           flags & AOPOBJ_MODIFIED_NAMESPACE) {
+                               acpi_ns_delete_namespace_by_owner(method_desc->
+                                                                 method.
+                                                                 owner_id);
+                       }
                }
        }
 

diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c
index 8d3a43a061ab1214662b37932958c24ab4c26bd6..1e5ff803d9ad14ba678ba06fc4c28984995112eb 100644 (file)
--- a/drivers/acpi/acpica/nsalloc.c
+++ b/drivers/acpi/acpica/nsalloc.c
@@ -219,12 +219,24 @@ void acpi_ns_install_node(struct acpi_walk_state *walk_state, struct acpi_namesp
 
        ACPI_FUNCTION_TRACE(ns_install_node);
 
-       /*
-        * Get the owner ID from the Walk state. The owner ID is used to track
-        * table deletion and deletion of objects created by methods.
-        */
        if (walk_state) {
+               /*
+                * Get the owner ID from the Walk state. The owner ID is used to
+                * track table deletion and deletion of objects created by methods.
+                */
                owner_id = walk_state->owner_id;
+
+               if ((walk_state->method_desc) &&
+                   (parent_node != walk_state->method_node)) {
+                       /*
+                        * A method is creating a new node that is not a child of the
+                        * method (it is non-local). Mark the executing method as having
+                        * modified the namespace. This is used for cleanup when the
+                        * method exits.
+                        */
+                       walk_state->method_desc->method.flags |=
+                           AOPOBJ_MODIFIED_NAMESPACE;
+               }
        }
 
        /* Link the new entry into the parent and existing children */