Skip to content

Commit 22db063

Browse files
committed
ACPI: sleep: Avoid breaking S3 wakeup due to might_sleep()
The addition of might_sleep() to down_timeout() caused the latter to enable interrupts unconditionally in some cases, which in turn broke the ACPI S3 wakeup path in acpi_suspend_enter(), where down_timeout() is called by acpi_disable_all_gpes() via acpi_ut_acquire_mutex(). Namely, if CONFIG_DEBUG_ATOMIC_SLEEP is set, might_sleep() causes might_resched() to be used and if CONFIG_PREEMPT_VOLUNTARY is set, this triggers __cond_resched() which may call preempt_schedule_common(), so __schedule() gets invoked and it ends up with enabled interrupts (in the prev == next case). Now, enabling interrupts early in the S3 wakeup path causes the kernel to crash. Address this by modifying acpi_suspend_enter() to disable GPEs without attempting to acquire the sleeping lock which is not needed in that code path anyway. Fixes: 99409b9 ("locking/semaphore: Add might_sleep() to down_*() family") Reported-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: 5.15+ <stable@vger.kernel.org> # 5.15+
1 parent 858fd16 commit 22db063

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

drivers/acpi/acpica/achware.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ acpi_status
101101
acpi_hw_get_gpe_status(struct acpi_gpe_event_info *gpe_event_info,
102102
acpi_event_status *event_status);
103103

104-
acpi_status acpi_hw_disable_all_gpes(void);
105-
106104
acpi_status acpi_hw_enable_all_runtime_gpes(void);
107105

108106
acpi_status acpi_hw_enable_all_wakeup_gpes(void);

drivers/acpi/sleep.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -636,11 +636,19 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
636636
}
637637

638638
/*
639-
* Disable and clear GPE status before interrupt is enabled. Some GPEs
640-
* (like wakeup GPE) haven't handler, this can avoid such GPE misfire.
641-
* acpi_leave_sleep_state will reenable specific GPEs later
639+
* Disable all GPE and clear their status bits before interrupts are
640+
* enabled. Some GPEs (like wakeup GPEs) have no handlers and this can
641+
* prevent them from producing spurious interrups.
642+
*
643+
* acpi_leave_sleep_state() will reenable specific GPEs later.
644+
*
645+
* Because this code runs on one CPU with disabled interrupts (all of
646+
* the other CPUs are offline at this time), it need not acquire any
647+
* sleeping locks which may trigger an implicit preemption point even
648+
* if there is no contention, so avoid doing that by using a low-level
649+
* library routine here.
642650
*/
643-
acpi_disable_all_gpes();
651+
acpi_hw_disable_all_gpes();
644652
/* Allow EC transactions to happen. */
645653
acpi_ec_unblock_transactions();
646654

include/acpi/acpixf.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,7 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
761761
acpi_event_status
762762
*event_status))
763763
ACPI_HW_DEPENDENT_RETURN_UINT32(u32 acpi_dispatch_gpe(acpi_handle gpe_device, u32 gpe_number))
764+
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_hw_disable_all_gpes(void))
764765
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable_all_gpes(void))
765766
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_runtime_gpes(void))
766767
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_wakeup_gpes(void))

0 commit comments

Comments
 (0)