netdev - Re: [PATCH net] net: ipa: disable ipa interrupt during suspend: manual merge

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Wed, 18 Jan 2023 11:19:32 +0100
From:   Matthieu Baerts <matthieu.baerts@...sares.net>
To:     Caleb Connolly <caleb.connolly@...aro.org>,
        Alex Elder <elder@...nel.org>,
        "David S. Miller" <davem@...emloft.net>,
        Eric Dumazet <edumazet@...gle.com>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>
Cc:     Alex Elder <elder@...aro.org>, netdev@...r.kernel.org
Subject: Re: [PATCH net] net: ipa: disable ipa interrupt during suspend:
 manual merge

Hello,

On 15/01/2023 18:59, Caleb Connolly wrote:
> The IPA interrupt can fire when pm_runtime is disabled due to it racing
> with the PM suspend/resume code. This causes a splat in the interrupt
> handler when it tries to call pm_runtime_get().
> 
> Explicitly disable the interrupt in our ->suspend callback, and
> re-enable it in ->resume to avoid this. If there is an interrupt pending
> it will be handled after resuming. The interrupt is a wake_irq, as a
> result even when disabled if it fires it will cause the system to wake
> from suspend as well as cancel any suspend transition that may be in
> progress. If there is an interrupt pending, the ipa_isr_thread handler
> will be called after resuming.
> 
> Fixes: 1aac309d3207 ("net: ipa: use autosuspend")
> Signed-off-by: Caleb Connolly <caleb.connolly@...aro.org>

FYI, we got some small conflicts when merging -net in net-next in the
MPTCP tree due to this patch applied in -net:

  9ec9b2a30853 ("net: ipa: disable ipa interrupt during suspend")

and these one from net-next:

  8e461e1f092b ("net: ipa: introduce ipa_interrupt_enable()")
  d50ed3558719 ("net: ipa: enable IPA interrupt handlers separate from
registration")

These conflicts have been resolved on our side[1] and the resolution we
suggest is attached to this email: I simply took both part (new
functions) and changed the order to have the functions from -net first.

Cheers,
Matt

[1] https://github.com/multipath-tcp/mptcp_net-next/commit/00697360079c
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
View attachment "00697360079c3cff038eefe6561a1761ffe7e333.patch" of type "text/x-patch" (2537 bytes)