Skip to content

Commit 8d48562

Browse files
committed
powerpc/pci: Fix get_phb_number() locking
The recent change to get_phb_number() causes a DEBUG_ATOMIC_SLEEP warning on some systems: BUG: sleeping function called from invalid context at kernel/locking/mutex.c:580 in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 1, name: swapper preempt_count: 1, expected: 0 RCU nest depth: 0, expected: 0 1 lock held by swapper/1: #0: c157efb0 (hose_spinlock){+.+.}-{2:2}, at: pcibios_alloc_controller+0x64/0x220 Preemption disabled at: [<00000000>] 0x0 CPU: 0 PID: 1 Comm: swapper Not tainted 5.19.0-yocto-standard+ #1 Call Trace: [d101dc90] [c073b264] dump_stack_lvl+0x50/0x8c (unreliable) [d101dcb0] [c0093b70] __might_resched+0x258/0x2a8 [d101dcd0] [c0d3e634] __mutex_lock+0x6c/0x6ec [d101dd50] [c0a84174] of_alias_get_id+0x50/0xf4 [d101dd80] [c002ec78] pcibios_alloc_controller+0x1b8/0x220 [d101ddd0] [c140c9dc] pmac_pci_init+0x198/0x784 [d101de50] [c140852c] discover_phbs+0x30/0x4c [d101de60] [c0007fd4] do_one_initcall+0x94/0x344 [d101ded0] [c1403b40] kernel_init_freeable+0x1a8/0x22c [d101df10] [c00086e0] kernel_init+0x34/0x160 [d101df30] [c001b334] ret_from_kernel_thread+0x5c/0x64 This is because pcibios_alloc_controller() holds hose_spinlock but of_alias_get_id() takes of_mutex which can sleep. The hose_spinlock protects the phb_bitmap, and also the hose_list, but it doesn't need to be held while get_phb_number() calls the OF routines, because those are only looking up information in the device tree. So fix it by having get_phb_number() take the hose_spinlock itself, only where required, and then dropping the lock before returning. pcibios_alloc_controller() then needs to take the lock again before the list_add() but that's safe, the order of the list is not important. Fixes: 0fe1e96 ("powerpc/pci: Prefer PCI domain assignment via DT 'linux,pci-domain' and alias") Reported-by: Guenter Roeck <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 568035b commit 8d48562

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

arch/powerpc/kernel/pci-common.c

+10-6
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ void __init set_pci_dma_ops(const struct dma_map_ops *dma_ops)
6868
pci_dma_ops = dma_ops;
6969
}
7070

71-
/*
72-
* This function should run under locking protection, specifically
73-
* hose_spinlock.
74-
*/
7571
static int get_phb_number(struct device_node *dn)
7672
{
7773
int ret, phb_id = -1;
@@ -108,15 +104,20 @@ static int get_phb_number(struct device_node *dn)
108104
if (!ret)
109105
phb_id = (int)(prop & (MAX_PHBS - 1));
110106

107+
spin_lock(&hose_spinlock);
108+
111109
/* We need to be sure to not use the same PHB number twice. */
112110
if ((phb_id >= 0) && !test_and_set_bit(phb_id, phb_bitmap))
113-
return phb_id;
111+
goto out_unlock;
114112

115113
/* If everything fails then fallback to dynamic PHB numbering. */
116114
phb_id = find_first_zero_bit(phb_bitmap, MAX_PHBS);
117115
BUG_ON(phb_id >= MAX_PHBS);
118116
set_bit(phb_id, phb_bitmap);
119117

118+
out_unlock:
119+
spin_unlock(&hose_spinlock);
120+
120121
return phb_id;
121122
}
122123

@@ -127,10 +128,13 @@ struct pci_controller *pcibios_alloc_controller(struct device_node *dev)
127128
phb = zalloc_maybe_bootmem(sizeof(struct pci_controller), GFP_KERNEL);
128129
if (phb == NULL)
129130
return NULL;
130-
spin_lock(&hose_spinlock);
131+
131132
phb->global_number = get_phb_number(dev);
133+
134+
spin_lock(&hose_spinlock);
132135
list_add_tail(&phb->list_node, &hose_list);
133136
spin_unlock(&hose_spinlock);
137+
134138
phb->dn = dev;
135139
phb->is_dynamic = slab_is_available();
136140
#ifdef CONFIG_PPC64

0 commit comments

Comments
 (0)