Skip to content

Commit 18056a4

Browse files
Ryo Takakurabjorn-helgaas
authored andcommitted
PCI: vmd: Make vmd_dev::cfg_lock a raw_spinlock_t type
The access to the PCI config space via pci_ops::read and pci_ops::write is a low-level hardware access. The functions can be accessed with disabled interrupts even on PREEMPT_RT. The pci_lock is a raw_spinlock_t for this purpose. A spinlock_t becomes a sleeping lock on PREEMPT_RT, so it cannot be acquired with disabled interrupts. The vmd_dev::cfg_lock is accessed in the same context as the pci_lock. Make vmd_dev::cfg_lock a raw_spinlock_t type so it can be used with interrupts disabled. This was reported as: BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48 Call Trace: rt_spin_lock+0x4e/0x130 vmd_pci_read+0x8d/0x100 [vmd] pci_user_read_config_byte+0x6f/0xe0 pci_read_config+0xfe/0x290 sysfs_kf_bin_read+0x68/0x90 Signed-off-by: Ryo Takakura <[email protected]> Tested-by: Luis Claudio R. Goncalves <[email protected]> Acked-by: Luis Claudio R. Goncalves <[email protected]> [bigeasy: reword commit message] Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Tested-off-by: Luis Claudio R. Goncalves <[email protected]> Link: https://lore.kernel.org/r/[email protected] [kwilczynski: commit log] Signed-off-by: Krzysztof Wilczyński <[email protected]> [bhelgaas: add back report info from https://lore.kernel.org/lkml/[email protected]/] Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent 2014c95 commit 18056a4

File tree

1 file changed

+6
-6
lines changed
  • drivers/pci/controller

1 file changed

+6
-6
lines changed

drivers/pci/controller/vmd.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ struct vmd_irq_list {
125125
struct vmd_dev {
126126
struct pci_dev *dev;
127127

128-
spinlock_t cfg_lock;
128+
raw_spinlock_t cfg_lock;
129129
void __iomem *cfgbar;
130130

131131
int msix_count;
@@ -391,7 +391,7 @@ static int vmd_pci_read(struct pci_bus *bus, unsigned int devfn, int reg,
391391
if (!addr)
392392
return -EFAULT;
393393

394-
spin_lock_irqsave(&vmd->cfg_lock, flags);
394+
raw_spin_lock_irqsave(&vmd->cfg_lock, flags);
395395
switch (len) {
396396
case 1:
397397
*value = readb(addr);
@@ -406,7 +406,7 @@ static int vmd_pci_read(struct pci_bus *bus, unsigned int devfn, int reg,
406406
ret = -EINVAL;
407407
break;
408408
}
409-
spin_unlock_irqrestore(&vmd->cfg_lock, flags);
409+
raw_spin_unlock_irqrestore(&vmd->cfg_lock, flags);
410410
return ret;
411411
}
412412

@@ -426,7 +426,7 @@ static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg,
426426
if (!addr)
427427
return -EFAULT;
428428

429-
spin_lock_irqsave(&vmd->cfg_lock, flags);
429+
raw_spin_lock_irqsave(&vmd->cfg_lock, flags);
430430
switch (len) {
431431
case 1:
432432
writeb(value, addr);
@@ -444,7 +444,7 @@ static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg,
444444
ret = -EINVAL;
445445
break;
446446
}
447-
spin_unlock_irqrestore(&vmd->cfg_lock, flags);
447+
raw_spin_unlock_irqrestore(&vmd->cfg_lock, flags);
448448
return ret;
449449
}
450450

@@ -1009,7 +1009,7 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)
10091009
if (features & VMD_FEAT_OFFSET_FIRST_VECTOR)
10101010
vmd->first_vec = 1;
10111011

1012-
spin_lock_init(&vmd->cfg_lock);
1012+
raw_spin_lock_init(&vmd->cfg_lock);
10131013
pci_set_drvdata(dev, vmd);
10141014
err = vmd_enable_domain(vmd, features);
10151015
if (err)

0 commit comments

Comments
 (0)