[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAErSpo6WEgqQ2Loub4QKzCvmh5V6nU8X8sui3WLdJbgVZ0BnJw@mail.gmail.com>
Date: Thu, 28 Feb 2019 14:42:13 -0600
From: Bjorn Helgaas <bhelgaas@...gle.com>
To: "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc: Dongdong Liu <liudongdong3@...wei.com>,
Lukas Wunner <lukas@...ner.de>,
Linux PCI <linux-pci@...r.kernel.org>,
Linux PM <linux-pm@...r.kernel.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] PCI: PCIe: PME: Fix pcie_pme_remove()
On Wed, Feb 27, 2019 at 5:58 PM Rafael J. Wysocki <rjw@...ysocki.net> wrote:
>
> From: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
>
> It is incorrect to call pcie_pme_suspend() from pcie_pme_remove() for
> two reasons.
>
> First, pcie_pme_suspend() calls synchronize_irq() that will wait for
> the native hotplug interrupt handler as well as for the PME one,
> because they share one IRQ (as per the spec). That may deadlock if
> hotplug is signaled while pcie_pme_remove() is running and the latter
> calls pci_lock_rescan_remove() before the former.
>
> Second, if pcie_pme_suspend() figures out that wakeup needs to be
> enabled for the port, it will return without disabling the interrupt
> as expected by pcie_pme_remove() which was overlooked by commit
> c7b5a4e6e8fb ("PCI / PM: Fix native PME handling during system
> suspend/resume").
>
> To fix that, rework pcie_pme_remove() to disable the PME interrupt,
> clear its status and prevent the PME worker function from re-enabling it
> before calling free_irq() on it which should be sufficient.
>
> Fixes: c7b5a4e6e8fb ("PCI / PM: Fix native PME handling during system suspend/resume")
> Reported-by: Dongdong Liu <liudongdong3@...wei.com>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
I added the deadlock details from Dongdong and applied this to pci/pm
for v5.1, thanks!
Bjorn
Powered by blists - more mailing lists