From: sashiko-bot@kernel.org
To: "Vijendar Mukunda" <Vijendar.Mukunda@amd.com>
Cc: linux-sound@vger.kernel.org
Subject: Re: [PATCH v6 15/23] soundwire: amd: use interrupt_enabled flag to guard IRQ work scheduling
Date: Tue, 17 Nov 2026 07:37:25 +0000 [thread overview]
Message-ID: <sashiko-outbox-218362@kernel.org> (raw)
In-Reply-To: <20261117070906.803139-16-Vijendar.Mukunda@amd.com>
Thank you for your contribution! Sashiko AI review found 2 potential
issues to consider:
- [Medium] soundwire: amd: race with in-flight IRQ queuing
amd_sdw_irq_thread
- [Medium] soundwire: amd: race re-enabling IRQ masks in
amd_disable_sdw_interrupts()
--
commit 14261a7c7d9c5975a602a89ef71b261091c3414b
Author: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
soundwire: amd: use interrupt_enabled flag to guard IRQ work scheduling
This commit adds an interrupt_enabled flag to struct amd_sdw_manager to
prevent queued amd_sdw_irq_thread work items from running after interrupts
are disabled.
> diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
> index f3e9614b9ac82..5536a4fd137aa 100644
> --- a/drivers/soundwire/amd_manager.c
> +++ b/drivers/soundwire/amd_manager.c
[ ... ]
> @@ -135,6 +136,18 @@ static void amd_disable_sdw_interrupts(struct amd_sdw_manager *amd_manager)
> {
> u32 irq_mask;
>
> + /*
> + * Clear the flag before updating hardware masks. Work items already
> + * queued but not yet started will see the flag false at entry and
> + * return early; work items already running will complete their current
> + * invocation. Callers that need to ensure no instance of
> + * amd_sdw_irq_thread() is executing on return must follow this call
> + * with cancel_work_sync(&amd_manager->amd_sdw_irq_thread). Once the
> + * mask registers are written, the ACP hardware will not assert any new
> + * SDW interrupt.
> + */
> + WRITE_ONCE(amd_manager->interrupt_enabled, false);
> +
> mutex_lock(amd_manager->acp_sdw_lock);
> irq_mask = sdw_manager_reg_mask_array[amd_manager->instance];
> amd_updatel(amd_manager->acp_mmio, ACP_EXTERNAL_INTR_CNTL(amd_manager->instance),
[Severity: Medium]
Can an in-flight parent PCI IRQ handler still queue amd_sdw_irq_thread after
amd_disable_sdw_interrupts() and cancel_work_sync() have returned?
The parent PCI hard IRQ handlers (such as acp63_irq_handler() in
sound/soc/amd/ps/pci-ps.c and acp_irq_handler() in sound/soc/sof/amd/acp.c)
call schedule_work(&amd_manager->amd_sdw_irq_thread) without synchronizing
with amd_disable_sdw_interrupts():
sound/soc/amd/ps/pci-ps.c:acp63_irq_handler() {
...
if (adata->sdw) {
amd_manager = dev_get_drvdata(&adata->sdw->pdev[0]->dev);
if (amd_manager)
schedule_work(&amd_manager->amd_sdw_irq_thread);
}
...
}
If the interrupt fires just before ACP_EXTERNAL_INTR_CNTL is masked, the hard
IRQ handler on another CPU can schedule the work after cancel_work_sync()
completes:
CPU0 CPU1 (<hardirq>)
amd_sdw_manager_remove() acp63_irq_handler()
amd_disable_sdw_interrupts()
interrupt_enabled = false
mask ACP_EXTERNAL_INTR_CNTL
cancel_work_sync(
&amd_manager->amd_sdw_irq_thread)
schedule_work(
&amd_manager->amd_sdw_irq_thread)
devres frees amd_manager
amd_sdw_irq_thread()
READ_ONCE(
amd_manager->interrupt_enabled)
<-- use-after-free
During amd_suspend() (in AMD_SDW_CLK_STOP_MODE) and amd_suspend_runtime()
(in AMD_SDW_CLK_STOP_MODE or ACP6.3 AMD_SDW_POWER_OFF_MODE), interrupt_enabled
is set back to true before suspend finishes, so a work item queued by an
in-flight hard IRQ handler after cancel_work_sync() sees
interrupt_enabled == true and accesses SoundWire MMIO registers while the
manager is clock-stopped or powered down.
Using disable_work_sync(&amd_manager->amd_sdw_irq_thread) when disabling
interrupts and enable_work() when re-enabling them (or synchronizing with the
parent IRQ) would prevent late scheduling.
[ ... ]
> @@ -1481,6 +1497,7 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)
> return ret;
> } else if ((amd_manager->acp_rev == ACP63_PCI_REV_ID) &&
> amd_manager->wake_en_mask) {
> + WRITE_ONCE(amd_manager->interrupt_enabled, true);
> mutex_lock(amd_manager->acp_sdw_lock);
> val = sdw_manager_reg_mask_array[amd_manager->instance];
> amd_updatel(amd_manager->acp_mmio,
[Severity: Medium]
Can an in-flight amd_sdw_update_slave_status_work() overwrite the zeroed
interrupt masks during amd_disable_sdw_interrupts() and leave non-wake
interrupts unmasked in runtime suspend?
amd_disable_sdw_interrupts() zeroes ACP_SW_STATE_CHANGE_STATUS_MASK_0TO7 and
ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11 before callers drain amd_sdw_work with
cancel_work_sync(&amd_manager->amd_sdw_work). Meanwhile,
amd_sdw_update_slave_status_work() unconditionally writes AMD_SDW_IRQ_MASK_0TO7
and AMD_SDW_IRQ_MASK_8TO11 back to those registers without checking
interrupt_enabled:
drivers/soundwire/amd_manager.c:amd_sdw_update_slave_status_work() {
...
if (amd_manager->status[0] == SDW_SLAVE_ATTACHED) {
if (retry_count++ < SDW_MAX_DEVICES) {
writel(AMD_SDW_IRQ_MASK_0TO7, amd_manager->mmio +
ACP_SW_STATE_CHANGE_STATUS_MASK_0TO7);
writel(AMD_SDW_IRQ_MASK_8TO11, amd_manager->mmio +
ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11);
...
}
In amd_suspend_runtime() under AMD_SDW_POWER_OFF_MODE, that race leaves
state-change interrupts enabled while the manager is powered off:
CPU0 CPU1 (kworker)
amd_suspend_runtime() amd_sdw_update_slave_status_work()
...
amd_disable_sdw_interrupts()
interrupt_enabled = false
writel(0, ..._MASK_0TO7)
writel(0, ..._MASK_8TO11)
writel(AMD_SDW_IRQ_MASK_0TO7,
..._MASK_0TO7)
writel(AMD_SDW_IRQ_MASK_8TO11,
..._MASK_8TO11)
cancel_work_sync(&amd_sdw_work)
amd_sdw_wake_enable(..., true)
/* RMW preserves MASK_8TO11 */
interrupt_enabled = true
unmask ACP_EXTERNAL_INTR_CNTL <-- non-wake IRQs remain unmasked
Draining amd_sdw_irq_thread and amd_sdw_work (or checking interrupt_enabled in
amd_sdw_update_slave_status_work()) before clearing the mask registers in
amd_disable_sdw_interrupts() would avoid re-arming those masks.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261117070906.803139-1-Vijendar.Mukunda@amd.com?part=15
next prev parent reply other threads:[~2026-11-17 7:37 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 7:05 [PATCH v6 00/23] soundwire: amd: SoundWire manager driver bug fixes Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 01/23] soundwire: amd: consolidate pad register macros into amd_init.h Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 02/23] soundwire: amd: program pad SCHMEN and OE control for ACP 7.0/7.1/7.2 Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 03/23] soundwire: amd: add pad ctrl helpers for D0/D3 PM transitions Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 04/23] soundwire: amd: track full pad teardown across suspend/resume Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 05/23] soundwire: amd: fix missing wake interrupt and group wake-arming calls in runtime suspend Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 06/23] soundwire: amd: fix IRQ thread dropping STATUS_0TO7 on simultaneous wake Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 07/23] soundwire: amd: remove STATUS_8TO11 clear from amd_sdw_process_wake_event() Vijendar Mukunda
2026-11-17 7:26 ` sashiko-bot
2026-11-17 9:33 ` Mukunda,Vijendar
2026-11-17 7:05 ` [PATCH v6 08/23] soundwire: amd: fix missing wake interrupt for ACP6.3 in POWER_OFF suspend Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 09/23] soundwire: amd: fix SDW command timeout return value handling Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 10/23] soundwire: amd: cache ping slave status to avoid spurious disconnect on timeout Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 11/23] soundwire: amd: assert msg_lock is held in amd_sdw_read_ping_status() Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 12/23] soundwire: amd: fix work drain ordering in remove path Vijendar Mukunda
2026-11-17 7:30 ` sashiko-bot
2026-11-17 10:03 ` Mukunda,Vijendar
2026-11-17 7:05 ` [PATCH v6 13/23] soundwire: amd: defer dev_set_drvdata() until after INIT_WORK() Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 14/23] soundwire: amd: pm_runtime guard in remove path Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 15/23] soundwire: amd: use interrupt_enabled flag to guard IRQ work scheduling Vijendar Mukunda
2026-11-17 7:37 ` sashiko-bot [this message]
2026-11-17 10:23 ` Mukunda,Vijendar
2026-11-17 7:05 ` [PATCH v6 16/23] soundwire: amd: delay *sdw_ctx publication until after startup succeeds Vijendar Mukunda
2026-11-17 7:31 ` sashiko-bot
2026-11-17 13:14 ` Mukunda,Vijendar
2026-11-17 7:05 ` [PATCH v6 17/23] soundwire: amd: propagate amd_init_sdw_manager() error on resume Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 18/23] soundwire: amd: drop amd_deinit_sdw_manager() in POWER_OFF suspend Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 19/23] soundwire: amd: replace >= ACP70 with explicit switch/case in PM paths Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 20/23] soundwire: amd: fix interrupt gate and work drain ordering in PM ops Vijendar Mukunda
2026-11-17 7:48 ` sashiko-bot
2026-11-17 12:29 ` Mukunda,Vijendar
2026-11-17 7:05 ` [PATCH v6 21/23] soundwire: amd: check for NULL manager drvdata in sdw_amd_startup() Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 22/23] soundwire: amd: fix shared-register RMW race in amd_sdw_set_device_state() Vijendar Mukunda
2026-11-17 7:05 ` [PATCH v6 23/23] soundwire: amd: fix shared-register RMW race in amd_sdw_host_wake_enable() Vijendar Mukunda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=sashiko-outbox-218362@kernel.org \
--to=sashiko-bot@kernel.org \
--cc=Vijendar.Mukunda@amd.com \
--cc=linux-sound@vger.kernel.org \
--cc=sashiko-reviews@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.