| 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
| ||
|
Message-ID: <20260209075706.16367-2-ionut.nechita@windriver.com>
Date: Mon, 9 Feb 2026 09:57:07 +0200
From: "Ionut Nechita (Wind River)" <ionut.nechita@...driver.com>
To: Bjorn Helgaas <bhelgaas@...gle.com>, linux-pci@...r.kernel.org
Cc: Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
Clark Williams <clrkwllms@...nel.org>,
Steven Rostedt <rostedt@...dmis.org>, linux-rt-devel@...ts.linux.dev,
linux-kernel@...r.kernel.org,
Ionut Nechita <ionut.nechita@...driver.com>,
Ionut Nechita <ionut_n2001@...oo.com>
Subject: [PATCH] PCI/IOV: Fix recursive locking deadlock on pci_rescan_remove_lock
From: Ionut Nechita <ionut.nechita@...driver.com>
When a PCI device is hot-removed via sysfs (e.g., echo 1 > /sys/.../remove),
pci_stop_and_remove_bus_device_locked() acquires pci_rescan_remove_lock and
then recursively walks the bus hierarchy calling driver .remove() callbacks.
If the removed device is a PF with SR-IOV enabled (e.g., i40e, ice), the
driver's .remove() calls pci_disable_sriov() -> sriov_disable() ->
sriov_del_vfs() which also tries to acquire pci_rescan_remove_lock.
Since this is a non-recursive mutex and the same thread already holds it,
this results in a deadlock.
On PREEMPT_RT kernels, where mutexes are backed by rtmutex with deadlock
detection, this immediately triggers:
WARNING: CPU: 15 PID: 11730 at kernel/locking/rtmutex.c:1663
Call Trace:
mutex_lock+0x47/0x60
sriov_disable+0x2a/0x100
i40e_free_vfs+0x415/0x470 [i40e]
i40e_remove+0x38d/0x3e0 [i40e]
pci_device_remove+0x3b/0xb0
device_release_driver_internal+0x193/0x200
pci_stop_bus_device+0x81/0xb0
pci_stop_and_remove_bus_device_locked+0x16/0x30
remove_store+0x79/0x90
On non-RT kernels the same recursive acquisition silently hangs the calling
process, eventually causing netdev watchdog TX timeout splats.
This affects all drivers that call pci_disable_sriov() from their .remove()
callback (i40e, ice, and others).
Fix this by tracking the owner of pci_rescan_remove_lock and skipping the
redundant acquisition in sriov_del_vfs() when the current thread already
holds it. The VF removal is still serialized correctly because the caller
already holds the lock.
Signed-off-by: Ionut Nechita <ionut.nechita@...driver.com>
---
drivers/pci/iov.c | 23 +++++++++++++++++++++--
drivers/pci/pci.h | 1 +
drivers/pci/probe.c | 15 +++++++++++++++
3 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 00784a60ba80b..3a21cf9aaa747 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -763,12 +763,31 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn)
static void sriov_del_vfs(struct pci_dev *dev)
{
struct pci_sriov *iov = dev->sriov;
+ bool do_unlock = false;
int i;
- pci_lock_rescan_remove();
+ /*
+ * If the current thread already holds pci_rescan_remove_lock (e.g.,
+ * when pci_disable_sriov() is called from a driver's .remove() that
+ * was invoked by pci_stop_and_remove_bus_device_locked()), skip
+ * taking the lock to avoid a deadlock. The lock is non-recursive
+ * and on PREEMPT_RT, where mutexes are rtmutexes, the deadlock is
+ * detected immediately and produces an alarming WARNING splat. On
+ * non-RT kernels the same recursive acquisition silently hangs.
+ *
+ * The VF removal below is still serialized correctly because the
+ * caller already holds the lock.
+ */
+ if (!pci_rescan_remove_locked()) {
+ pci_lock_rescan_remove();
+ do_unlock = true;
+ }
+
for (i = 0; i < iov->num_VFs; i++)
pci_iov_remove_virtfn(dev, i);
- pci_unlock_rescan_remove();
+
+ if (do_unlock)
+ pci_unlock_rescan_remove();
}
static void sriov_disable(struct pci_dev *dev)
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 0e67014aa0013..c1055d333e08a 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -92,6 +92,7 @@ extern const unsigned char pcie_link_speed[];
extern bool pci_early_dump;
extern struct mutex pci_rescan_remove_lock;
+bool pci_rescan_remove_locked(void);
bool pcie_cap_has_lnkctl(const struct pci_dev *dev);
bool pcie_cap_has_lnkctl2(const struct pci_dev *dev);
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 41183aed8f5d9..f058ffb51519c 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -3540,19 +3540,34 @@ EXPORT_SYMBOL_GPL(pci_rescan_bus);
* routines should always be executed under this mutex.
*/
DEFINE_MUTEX(pci_rescan_remove_lock);
+static struct task_struct *pci_rescan_remove_owner;
void pci_lock_rescan_remove(void)
{
mutex_lock(&pci_rescan_remove_lock);
+ WRITE_ONCE(pci_rescan_remove_owner, current);
}
EXPORT_SYMBOL_GPL(pci_lock_rescan_remove);
void pci_unlock_rescan_remove(void)
{
+ WRITE_ONCE(pci_rescan_remove_owner, NULL);
mutex_unlock(&pci_rescan_remove_lock);
}
EXPORT_SYMBOL_GPL(pci_unlock_rescan_remove);
+/**
+ * pci_rescan_remove_locked - check if current thread holds the lock
+ *
+ * Returns true if the current thread already holds pci_rescan_remove_lock.
+ * This is used by PCI core functions that may be called both with and
+ * without the lock held, to avoid recursive locking deadlocks.
+ */
+bool pci_rescan_remove_locked(void)
+{
+ return READ_ONCE(pci_rescan_remove_owner) == current;
+}
+
static int __init pci_sort_bf_cmp(const struct device *d_a,
const struct device *d_b)
{
--
2.52.0
Powered by blists - more mailing lists