Re: utmisc-0131: *** Error: Invalid owner_id: 00

[Mattia Dongili <malattia-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]

[-- Attachment #1: Type: text/plain, Size: 335 bytes --]

On 8/25/05, Starikovskiy, Alexey Y <alexey.y.starikovskiy-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> wrote:
>  Could you try this patch?

That fixes it! (I attached again the diff to apply cleanly to .13-rc6-mm2)
I'll test the thing some more to verify that the random "Invalid
owner_id" don't appear anymore.

-- 
mattia
:wq!

[-- Attachment #2: owner_id-2.patch.rc6-mm2 --]
[-- Type: application/octet-stream, Size: 4724 bytes --]

diff -rup linux-2.6.13-rc6-mm2/drivers/acpi/dispatcher/dsmethod.c linux-clean/drivers/acpi/dispatcher/dsmethod.c
--- linux-2.6.13-rc6-mm2/drivers/acpi/dispatcher/dsmethod.c	2005-08-25 10:23:18.949991250 +0200
+++ linux-clean/drivers/acpi/dispatcher/dsmethod.c	2005-08-25 12:22:47.413992250 +0200
@@ -289,11 +289,6 @@ acpi_ds_call_control_method(struct acpi_
 		return_ACPI_STATUS(AE_NULL_OBJECT);
 	}
 
-	status = acpi_ut_allocate_owner_id(&obj_desc->method.owner_id);
-	if (ACPI_FAILURE(status)) {
-		return_ACPI_STATUS(status);
-	}
-
 	/* Init for new method, wait on concurrency semaphore */
 
 	status = acpi_ds_begin_method_execution(method_node, obj_desc,
@@ -302,6 +297,13 @@ acpi_ds_call_control_method(struct acpi_
 		goto cleanup;
 	}
 
+	if (obj_desc->method.thread_count == 1) {
+		status = acpi_ut_allocate_owner_id (&obj_desc->method.owner_id);
+		if (ACPI_FAILURE (status)) {
+			return_ACPI_STATUS (status);
+		}
+	}
+
 	if (!(obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY)) {
 		/* 1) Parse: Create a new walk state for the preempting walk */
 
@@ -335,6 +337,8 @@ acpi_ds_call_control_method(struct acpi_
 		acpi_ps_delete_parse_tree(op);
 	}
 
+	obj_desc->method.thread_count--;
+
 	/* 2) Execute: Create a new state for the preempting walk */
 
 	next_walk_state = acpi_ds_create_walk_state(obj_desc->method.owner_id,
@@ -388,7 +392,9 @@ acpi_ds_call_control_method(struct acpi_
 	/* On error, we must delete the new walk state */
 
       cleanup:
-	acpi_ut_release_owner_id(&obj_desc->method.owner_id);
+	if (!obj_desc->method.thread_count && obj_desc->method.owner_id) {
+		acpi_ut_release_owner_id (&obj_desc->method.owner_id);
+	}
 	if (next_walk_state && (next_walk_state->method_desc)) {
 		/* Decrement the thread count on the method parse tree */
 
@@ -534,14 +540,12 @@ acpi_status acpi_ds_terminate_control_me
 		}
 	}
 
-	if (walk_state->method_desc->method.thread_count) {
+	if (walk_state->method_desc->method.thread_count > 1) {
 		ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
 				  "*** Not deleting method namespace, there are still %d threads\n",
 				  walk_state->method_desc->method.
 				  thread_count));
-	}
-
-	if (!walk_state->method_desc->method.thread_count) {
+	} else {
 		/*
 		 * Support to dynamically change a method from not_serialized to
 		 * Serialized if it appears that the method is written foolishly and

diff -rup linux-2.6.13-rc6-mm2/drivers/acpi/parser/psparse.c linux-clean/drivers/acpi/parser/psparse.c
--- linux-2.6.13-rc6-mm2/drivers/acpi/parser/psparse.c	2005-08-25 10:23:19.970055000 +0200
+++ linux-clean/drivers/acpi/parser/psparse.c	2005-08-25 12:23:37.425117750 +0200
@@ -524,14 +524,6 @@ acpi_status acpi_ps_parse_aml(struct acp
 			}
 		}
 
-		if (walk_state->method_desc) {
-			/* Decrement the thread count on the method parse tree */
-
-			if (walk_state->method_desc->method.thread_count) {
-				walk_state->method_desc->method.thread_count--;
-			}
-		}
-
 		/* We are done with this walk, move on to the parent if any */
 
 		walk_state = acpi_ds_pop_walk_state(thread);

diff -rup linux-2.6.13-rc6-mm2/drivers/acpi/parser/psxface.c linux-clean/drivers/acpi/parser/psxface.c
--- linux-2.6.13-rc6-mm2/drivers/acpi/parser/psxface.c	2005-08-25 10:23:20.014057750 +0200
+++ linux-clean/drivers/acpi/parser/psxface.c	2005-08-25 12:25:04.870582750 +0200
@@ -103,9 +103,11 @@ acpi_status acpi_ps_execute_method(struc
 	 * objects (such as Operation Regions) can be created during the
 	 * first pass parse.
 	 */
-	status = acpi_ut_allocate_owner_id(&info->obj_desc->method.owner_id);
-	if (ACPI_FAILURE(status)) {
-		return_ACPI_STATUS(status);
+	if (info->obj_desc->method.thread_count == 1) {
+		status = acpi_ut_allocate_owner_id (&info->obj_desc->method.owner_id);
+		if (ACPI_FAILURE (status)) {
+			return_ACPI_STATUS (status);
+		}
 	}
 
 	/*
@@ -138,8 +140,11 @@ acpi_status acpi_ps_execute_method(struc
 	info->pass_number = 3;
 	status = acpi_ps_execute_pass(info);
 
+	info->obj_desc->method.thread_count--;
+
       cleanup:
-	if (info->obj_desc->method.owner_id) {
+	if (!info->obj_desc->method.thread_count && 
+	    info->obj_desc->method.owner_id) {
 		acpi_ut_release_owner_id(&info->obj_desc->method.owner_id);
 	}
 
diff -rup linux-2.6.13-rc6-mm2/drivers/acpi/utilities/utmisc.c linux-clean/drivers/acpi/utilities/utmisc.c
--- linux-2.6.13-rc6-mm2/drivers/acpi/utilities/utmisc.c	2005-08-25 10:23:20.550091250 +0200
+++ linux-clean/drivers/acpi/utilities/utmisc.c	2005-08-25 12:25:36.632567750 +0200
@@ -67,6 +67,8 @@ acpi_status acpi_ut_allocate_owner_id(ac
 
 	ACPI_FUNCTION_TRACE("ut_allocate_owner_id");
 
+	WARN_ON (*owner_id);
+
 	/* Mutex for the global ID mask */
 
 	status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);