Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 164a08ce authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Dispatcher: Introduce timeout mechanism for infinite loop detection 

ACPICA commit 9605023e7e6d1f05581502766c8cf2905bcc03d9

This patch implements a new infinite loop detection mechanism to replace
the old one, it uses acpi_os_get_timer() to limit loop execution into a
determined time slice.
This is useful in case some hardware/firmware operations really require the
AML interpreter to wait while the old mechanism could expire too fast on
recent machines.

The new mechanism converts old acpi_gbl_max_loop_iterations to store the user
configurable value for the new mechanism in order to allow users to be
still able to configure this value for acpiexec via command line. This
patch also removes wrong initilization code of acpi_gbl_max_loop_iterations
accordingly (it should have been initialized by ACPI_INIT_GLOBAL, and the
default value is also properly tuned for acpiexec). Reported by M. Foronda,
fixed by Lv Zheng.

Link: https://github.com/acpica/acpica/commit/9605023e
Link: https://bugzilla.kernel.org/show_bug.cgi?id=156501


Reported-by: default avatarM. Foronda <josemauricioforonda@gmail.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 29ad1f88

drivers/acpi/acpica/aclocal.h

+1 −1
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ struct acpi_control_state { 
	union acpi_parse_object *predicate_op;

	u8 *aml_predicate_start;	/* Start of if/while predicate */

	u8 *package_end;	/* End of if/while block */

	u32 loop_count;		/* While() loop counter */

	u64 loop_timeout;	/* While() loop timeout */

};



/*

drivers/acpi/acpica/dscontrol.c

+9 −7
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state, 
		control_state->control.package_end =

		    walk_state->parser_state.pkg_end;

		control_state->control.opcode = op->common.aml_opcode;

		control_state->control.loop_timeout = acpi_os_get_timer() +

		    (u64)(acpi_gbl_max_loop_iterations * ACPI_100NSEC_PER_SEC);



		/* Push the control state on this walk's control stack */
@@ -206,14 +208,14 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state *walk_state, 
			/* Predicate was true, the body of the loop was just executed */



			/*

			 * This loop counter mechanism allows the interpreter to escape

			 * possibly infinite loops. This can occur in poorly written AML

			 * when the hardware does not respond within a while loop and the

			 * loop does not implement a timeout.

			 * This infinite loop detection mechanism allows the interpreter

			 * to escape possibly infinite loops. This can occur in poorly

			 * written AML when the hardware does not respond within a while

			 * loop and the loop does not implement a timeout.

			 */

			control_state->control.loop_count++;

			if (control_state->control.loop_count >

			    acpi_gbl_max_loop_iterations) {

			if (ACPI_TIME_AFTER(acpi_os_get_timer(),

					    control_state->control.

					    loop_timeout)) {

				status = AE_AML_INFINITE_LOOP;

				break;

			}

drivers/acpi/acpica/utinit.c

+0 −1
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ acpi_status acpi_ut_init_globals(void) 
	acpi_gbl_next_owner_id_offset = 0;

	acpi_gbl_debugger_configuration = DEBUGGER_THREADING;

	acpi_gbl_osi_mutex = NULL;

	acpi_gbl_max_loop_iterations = ACPI_MAX_LOOP_COUNT;



	/* Hardware oriented */

include/acpi/acconfig.h

+2 −2
Original line number Diff line number Diff line
@@ -145,9 +145,9 @@ 


#define ACPI_ADDRESS_RANGE_MAX          2



/* Maximum number of While() loops before abort */

/* Maximum time (default 30s) of While() loops before abort */



#define ACPI_MAX_LOOP_COUNT             0x000FFFFF

#define ACPI_MAX_LOOP_TIMEOUT           30



/******************************************************************************

 *

include/acpi/acpixf.h

+2 −2
Original line number Diff line number Diff line
@@ -260,11 +260,11 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_osi_data, 0); 
ACPI_INIT_GLOBAL(u8, acpi_gbl_reduced_hardware, FALSE);



/*

 * Maximum number of While() loop iterations before forced method abort.

 * Maximum timeout for While() loop iterations before forced method abort.

 * This mechanism is intended to prevent infinite loops during interpreter

 * execution within a host kernel.

 */

ACPI_INIT_GLOBAL(u32, acpi_gbl_max_loop_iterations, ACPI_MAX_LOOP_COUNT);

ACPI_INIT_GLOBAL(u32, acpi_gbl_max_loop_iterations, ACPI_MAX_LOOP_TIMEOUT);



/*

 * This mechanism is used to trace a specified AML method. The method is