Skip to content

Commit 37d89be

Browse files
jwrdegoedesmb49
authored andcommitted
PCI: pciehp: Use down_read/write_nested(reset_lock) to fix lockdep errors
BugLink: https://bugs.launchpad.net/bugs/1962230 commit 085a9f4 upstream. Use down_read_nested() and down_write_nested() when taking the ctrl->reset_lock rw-sem, passing the number of PCIe hotplug controllers in the path to the PCI root bus as lock subclass parameter. This fixes the following false-positive lockdep report when unplugging a Lenovo X1C8 from a Lenovo 2nd gen TB3 dock: pcieport 0000:06:01.0: pciehp: Slot(1): Link Down pcieport 0000:06:01.0: pciehp: Slot(1): Card not present ============================================ WARNING: possible recursive locking detected 5.16.0-rc2+ #621 Not tainted -------------------------------------------- irq/124-pciehp/86 is trying to acquire lock: ffff8e5ac4299ef8 (&ctrl->reset_lock){.+.+}-{3:3}, at: pciehp_check_presence+0x23/0x80 but task is already holding lock: ffff8e5ac4298af8 (&ctrl->reset_lock){.+.+}-{3:3}, at: pciehp_ist+0xf3/0x180 other info that might help us debug this: Possible unsafe locking scenario: CPU0 ---- lock(&ctrl->reset_lock); lock(&ctrl->reset_lock); *** DEADLOCK *** May be due to missing lock nesting notation 3 locks held by irq/124-pciehp/86: #0: ffff8e5ac4298af8 (&ctrl->reset_lock){.+.+}-{3:3}, at: pciehp_ist+0xf3/0x180 #1: ffffffffa3b024e8 (pci_rescan_remove_lock){+.+.}-{3:3}, at: pciehp_unconfigure_device+0x31/0x110 #2: ffff8e5ac1ee2248 (&dev->mutex){....}-{3:3}, at: device_release_driver+0x1c/0x40 stack backtrace: CPU: 4 PID: 86 Comm: irq/124-pciehp Not tainted 5.16.0-rc2+ #621 Hardware name: LENOVO 20U90SIT19/20U90SIT19, BIOS N2WET30W (1.20 ) 08/26/2021 Call Trace: <TASK> dump_stack_lvl+0x59/0x73 __lock_acquire.cold+0xc5/0x2c6 lock_acquire+0xb5/0x2b0 down_read+0x3e/0x50 pciehp_check_presence+0x23/0x80 pciehp_runtime_resume+0x5c/0xa0 device_for_each_child+0x45/0x70 pcie_port_device_runtime_resume+0x20/0x30 pci_pm_runtime_resume+0xa7/0xc0 __rpm_callback+0x41/0x110 rpm_callback+0x59/0x70 rpm_resume+0x512/0x7b0 __pm_runtime_resume+0x4a/0x90 __device_release_driver+0x28/0x240 device_release_driver+0x26/0x40 pci_stop_bus_device+0x68/0x90 pci_stop_bus_device+0x2c/0x90 pci_stop_and_remove_bus_device+0xe/0x20 pciehp_unconfigure_device+0x6c/0x110 pciehp_disable_slot+0x5b/0xe0 pciehp_handle_presence_or_link_change+0xc3/0x2f0 pciehp_ist+0x179/0x180 This lockdep warning is triggered because with Thunderbolt, hotplug ports are nested. When removing multiple devices in a daisy-chain, each hotplug port's reset_lock may be acquired recursively. It's never the same lock, so the lockdep splat is a false positive. Because locks at the same hierarchy level are never acquired recursively, a per-level lockdep class is sufficient to fix the lockdep warning. The choice to use one lockdep subclass per pcie-hotplug controller in the path to the root-bus was made to conserve class keys because their number is limited and the complexity grows quadratically with number of keys according to Documentation/locking/lockdep-design.rst. Link: https://lore.kernel.org/linux-pci/[email protected]/ Link: https://lore.kernel.org/linux-pci/[email protected]/ Link: https://lore.kernel.org/r/[email protected] Link: https://bugzilla.kernel.org/show_bug.cgi?id=208855 Reported-by: "Theodore Ts'o" <[email protected]> Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Lukas Wunner <[email protected]> Cc: [email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Kamal Mostafa <[email protected]> Signed-off-by: Stefan Bader <[email protected]>
1 parent 8bd72bf commit 37d89be

File tree

3 files changed

+22
-4
lines changed

3 files changed

+22
-4
lines changed

drivers/pci/hotplug/pciehp.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ extern int pciehp_poll_time;
7272
* @reset_lock: prevents access to the Data Link Layer Link Active bit in the
7373
* Link Status register and to the Presence Detect State bit in the Slot
7474
* Status register during a slot reset which may cause them to flap
75+
* @depth: Number of additional hotplug ports in the path to the root bus,
76+
* used as lock subclass for @reset_lock
7577
* @ist_running: flag to keep user request waiting while IRQ thread is running
7678
* @request_result: result of last user request submitted to the IRQ thread
7779
* @requester: wait queue to wake up on completion of user request,
@@ -103,6 +105,7 @@ struct controller {
103105

104106
struct hotplug_slot hotplug_slot; /* hotplug core interface */
105107
struct rw_semaphore reset_lock;
108+
unsigned int depth;
106109
unsigned int ist_running;
107110
int request_result;
108111
wait_queue_head_t requester;

drivers/pci/hotplug/pciehp_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ static void pciehp_check_presence(struct controller *ctrl)
166166
{
167167
int occupied;
168168

169-
down_read(&ctrl->reset_lock);
169+
down_read_nested(&ctrl->reset_lock, ctrl->depth);
170170
mutex_lock(&ctrl->state_lock);
171171

172172
occupied = pciehp_card_present_or_link_active(ctrl);

drivers/pci/hotplug/pciehp_hpc.c

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ static void pciehp_ignore_dpc_link_change(struct controller *ctrl,
583583
* the corresponding link change may have been ignored above.
584584
* Synthesize it to ensure that it is acted on.
585585
*/
586-
down_read(&ctrl->reset_lock);
586+
down_read_nested(&ctrl->reset_lock, ctrl->depth);
587587
if (!pciehp_check_link_active(ctrl))
588588
pciehp_request(ctrl, PCI_EXP_SLTSTA_DLLSC);
589589
up_read(&ctrl->reset_lock);
@@ -746,7 +746,7 @@ static irqreturn_t pciehp_ist(int irq, void *dev_id)
746746
* Disable requests have higher priority than Presence Detect Changed
747747
* or Data Link Layer State Changed events.
748748
*/
749-
down_read(&ctrl->reset_lock);
749+
down_read_nested(&ctrl->reset_lock, ctrl->depth);
750750
if (events & DISABLE_SLOT)
751751
pciehp_handle_disable_request(ctrl);
752752
else if (events & (PCI_EXP_SLTSTA_PDC | PCI_EXP_SLTSTA_DLLSC))
@@ -880,7 +880,7 @@ int pciehp_reset_slot(struct hotplug_slot *hotplug_slot, int probe)
880880
if (probe)
881881
return 0;
882882

883-
down_write(&ctrl->reset_lock);
883+
down_write_nested(&ctrl->reset_lock, ctrl->depth);
884884

885885
if (!ATTN_BUTTN(ctrl)) {
886886
ctrl_mask |= PCI_EXP_SLTCTL_PDCE;
@@ -936,6 +936,20 @@ static inline void dbg_ctrl(struct controller *ctrl)
936936

937937
#define FLAG(x, y) (((x) & (y)) ? '+' : '-')
938938

939+
static inline int pcie_hotplug_depth(struct pci_dev *dev)
940+
{
941+
struct pci_bus *bus = dev->bus;
942+
int depth = 0;
943+
944+
while (bus->parent) {
945+
bus = bus->parent;
946+
if (bus->self && bus->self->is_hotplug_bridge)
947+
depth++;
948+
}
949+
950+
return depth;
951+
}
952+
939953
struct controller *pcie_init(struct pcie_device *dev)
940954
{
941955
struct controller *ctrl;
@@ -949,6 +963,7 @@ struct controller *pcie_init(struct pcie_device *dev)
949963
return NULL;
950964

951965
ctrl->pcie = dev;
966+
ctrl->depth = pcie_hotplug_depth(dev->port);
952967
pcie_capability_read_dword(pdev, PCI_EXP_SLTCAP, &slot_cap);
953968

954969
if (pdev->hotplug_user_indicators)

0 commit comments

Comments
 (0)