pci: raw_spinlock annotations
cover pci: raw_spinlock annotations
Preempt-RT converts spinlocks to sleeping spinlocks, but some spinlocks need to be kept as real spinlocks. In 2.6.33 we merged the spinlock namespace cleanup which allows us to annotate those locks. The lock type is changed to raw_spinlock which is the same as a common spinlock in !RT kernels.
The following series is a collection of lock annotations from the preempt-rt tree. Please merge into 2.6.34.
Thanks,
tglx
PATCH 1/2 pci: Convert pci_lock to raw_spinlock
pci_lock must be a real spinlock in preempt-rt. Convert it to raw_spinlock. No change for !RT kernels.
drivers/pci/access.c +17 -17
@@ -12,7 +12,7 @@* configuration space. */ -static DEFINE_SPINLOCK (pci_lock); +static DEFINE_RAW_SPINLOCK (pci_lock);/* * Wrappers for all PCI configuration access functions. They just check
@@ -32,10 +32,10 @@ int pci_bus_read_config_##size \unsigned long flags; \u32 data =0 ; \ if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \ -spin_lock_irqsave (&pci_lock, flags); \ +raw_spin_lock_irqsave (&pci_lock, flags); \ res = bus->ops->read (bus, devfn, pos, len, &data); \ *value = (type )data; \ -spin_unlock_irqrestore (&pci_lock, flags); \ +raw_spin_unlock_irqrestore (&pci_lock, flags); \return res; \ }
@@ -46,9 +46,9 @@ int pci_bus_write_config_##size \int res; \unsigned long flags; \ if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \ -spin_lock_irqsave (&pci_lock, flags); \ +raw_spin_lock_irqsave (&pci_lock, flags); \ res = bus->ops->write (bus, devfn, pos, len, value); \ -spin_unlock_irqrestore (&pci_lock, flags); \ +raw_spin_unlock_irqrestore (&pci_lock, flags); \return res; \ }
@@ -78,10 +78,10 @@ struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, struct pci_ops *ops)struct pci_ops *old_ops;unsigned long flags; -spin_lock_irqsave (&pci_lock, flags); +raw_spin_lock_irqsave (&pci_lock, flags); old_ops = bus->ops; bus->ops = ops; -spin_unlock_irqrestore (&pci_lock, flags); +raw_spin_unlock_irqrestore (&pci_lock, flags);return old_ops; }EXPORT_SYMBOL (pci_bus_set_ops);
@@ -135,9 +135,9 @@ static noinline void pci_wait_ucfg(struct pci_dev *dev)__add_wait_queue (&pci_ucfg_wait, &wait);do {set_current_state (TASK_UNINTERRUPTIBLE ); -spin_unlock_irq (&pci_lock); +raw_spin_unlock_irq (&pci_lock);schedule (); -spin_lock_irq (&pci_lock); +raw_spin_lock_irq (&pci_lock); }while (dev->block_ucfg_access);__remove_wait_queue (&pci_ucfg_wait, &wait); }
@@ -149,11 +149,11 @@ int pci_user_read_config_##size \int ret =0 ; \u32 data =-1 ; \ if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \ -spin_lock_irq (&pci_lock); \ +raw_spin_lock_irq (&pci_lock); \if (unlikely (dev->block_ucfg_access))pci_wait_ucfg (dev); \ ret = dev->bus->ops->read (dev->bus, dev->devfn, \ pos,sizeof (type), &data); \ -spin_unlock_irq (&pci_lock); \ +raw_spin_unlock_irq (&pci_lock); \ *val = (type )data; \return ret; \ }
@@ -164,11 +164,11 @@ int pci_user_write_config_##size \ { \int ret = -EIO ; \ if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \ -spin_lock_irq (&pci_lock); \ +raw_spin_lock_irq (&pci_lock); \if (unlikely (dev->block_ucfg_access))pci_wait_ucfg (dev); \ ret = dev->bus->ops->write (dev->bus, dev->devfn, \ pos,sizeof (type), val); \ -spin_unlock_irq (&pci_lock); \ +raw_spin_unlock_irq (&pci_lock); \return ret; \ }
@@ -395,10 +395,10 @@ void pci_block_user_cfg_access(struct pci_dev *dev)unsigned long flags;int was_blocked; -spin_lock_irqsave (&pci_lock, flags); +raw_spin_lock_irqsave (&pci_lock, flags); was_blocked = dev->block_ucfg_access; dev->block_ucfg_access =1 ; -spin_unlock_irqrestore (&pci_lock, flags); +raw_spin_unlock_irqrestore (&pci_lock, flags);/* If we BUG() inside the pci_lock, we're guaranteed to hose * the machine */
@@ -416,7 +416,7 @@ void pci_unblock_user_cfg_access(struct pci_dev *dev) {unsigned long flags; -spin_lock_irqsave (&pci_lock, flags); +raw_spin_lock_irqsave (&pci_lock, flags);/* This indicates a problem in the caller, but we don't need * to kill them, unlike a double-block above. */
@@ -424,6 +424,6 @@ void pci_unblock_user_cfg_access(struct pci_dev *dev) dev->block_ucfg_access =0 ;wake_up_all (&pci_ucfg_wait); -spin_unlock_irqrestore (&pci_lock, flags); +raw_spin_unlock_irqrestore (&pci_lock, flags); }EXPORT_SYMBOL_GPL (pci_unblock_user_cfg_access);
Jesse Barnes
AppliedRe: [patch 1/2] pci: Convert pci_lock to raw_spinlock
Quoted 4 lines · On Wed, 17 Feb 2010 14:35:19 -0000 Thomas Gleixner <[email protected]> wrote:
pci_lockmust be a real spinlock in preempt-rt. Convert it toraw_spinlock. No change for !RT kernels.Signed-off-by Thomas Gleixner <[email protected]>
Applied these to my linux-next branch, thanks.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
PATCH 2/2 x86: Convert pci_config_lock to raw_spinlock
In reply to Thomas Gleixnerpci_config_lock must be a real spinlock in preempt-rt. Convert it to raw_spinlock. No change for !RT kernels.
--- arch/x86/include/asm/pci_x86.h | 2 +- arch/x86/pci/common.c | 2 +- arch/x86/pci/direct.c | 16 ++++++++-------- arch/x86/pci/mmconfig_32.c | 8 ++++---- arch/x86/pci/numaq_32.c | 8 ++++---- arch/x86/pci/pcbios.c | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-)
arch/x86/include/asm/pci_x86.h +1 -1
@@ -83,7 +83,7 @@ struct irq_routing_table {extern unsigned int pcibios_irq_mask;extern int pcibios_scanned; -extern spinlock_t pci_config_lock; +extern raw_spinlock_t pci_config_lock;extern int (*pcibios_enable_irq)(struct pci_dev *dev);extern void (*pcibios_disable_irq)(struct pci_dev *dev);
arch/x86/pci/common.c +1 -1
@@ -81,7 +81,7 @@ int pcibios_scanned;* This interrupt-safe spinlock protects all accesses to PCI * configuration space. */ -DEFINE_SPINLOCK (pci_config_lock); +DEFINE_RAW_SPINLOCK (pci_config_lock);static int __devinit can_skip_ioresource_align (const struct dmi_system_id *d) {
arch/x86/pci/direct.c +8 -8
@@ -27,7 +27,7 @@ static int pci_conf1_read(unsigned int sreturn -EINVAL ; } -spin_lock_irqsave (&pci_config_lock, flags); +raw_spin_lock_irqsave (&pci_config_lock, flags);outl (PCI_CONF1_ADDRESS (bus, devfn, reg),0xCF8 );
@@ -43,7 +43,7 @@ static int pci_conf1_read(unsigned int sbreak ; } -spin_unlock_irqrestore (&pci_config_lock, flags); +raw_spin_unlock_irqrestore (&pci_config_lock, flags);return 0 ; }
@@ -56,7 +56,7 @@ static int pci_conf1_write(unsigned intif ((bus >255 ) || (devfn >255 ) || (reg >4095 ))return -EINVAL ; -spin_lock_irqsave (&pci_config_lock, flags); +raw_spin_lock_irqsave (&pci_config_lock, flags);outl (PCI_CONF1_ADDRESS (bus, devfn, reg),0xCF8 );
@@ -72,7 +72,7 @@ static int pci_conf1_write(unsigned intbreak ; } -spin_unlock_irqrestore (&pci_config_lock, flags); +raw_spin_unlock_irqrestore (&pci_config_lock, flags);return 0 ; }
@@ -108,7 +108,7 @@ static int pci_conf2_read(unsigned int sif (dev &0x10 )return PCIBIOS_DEVICE_NOT_FOUND ; -spin_lock_irqsave (&pci_config_lock, flags); +raw_spin_lock_irqsave (&pci_config_lock, flags);outb ((u8)(0xF0 | (fn <<1 )),0xCF8 );outb ((u8 )bus,0xCFA );
@@ -127,7 +127,7 @@ static int pci_conf2_read(unsigned int soutb (0 ,0xCF8 ); -spin_unlock_irqrestore (&pci_config_lock, flags); +raw_spin_unlock_irqrestore (&pci_config_lock, flags);return 0 ; }
@@ -147,7 +147,7 @@ static int pci_conf2_write(unsigned intif (dev &0x10 )return PCIBIOS_DEVICE_NOT_FOUND ; -spin_lock_irqsave (&pci_config_lock, flags); +raw_spin_lock_irqsave (&pci_config_lock, flags);outb ((u8)(0xF0 | (fn <<1 )),0xCF8 );outb ((u8 )bus,0xCFA );
@@ -166,7 +166,7 @@ static int pci_conf2_write(unsigned intoutb (0 ,0xCF8 ); -spin_unlock_irqrestore (&pci_config_lock, flags); +raw_spin_unlock_irqrestore (&pci_config_lock, flags);return 0 ; }
arch/x86/pci/mmconfig_32.c +4 -4
@@ -64,7 +64,7 @@ err: *value = -1;if (!base) goto err; -spin_lock_irqsave (&pci_config_lock, flags); +raw_spin_lock_irqsave (&pci_config_lock, flags);pci_exp_set_dev_base (base, bus, devfn);
@@ -79,7 +79,7 @@ err: *value = -1; *value =mmio_config_readl (mmcfg_virt_addr + reg);break ; } -spin_unlock_irqrestore (&pci_config_lock, flags); +raw_spin_unlock_irqrestore (&pci_config_lock, flags);return 0 ; }
@@ -97,7 +97,7 @@ static int pci_mmcfg_write(unsigned intif (!base)return -EINVAL ; -spin_lock_irqsave (&pci_config_lock, flags); +raw_spin_lock_irqsave (&pci_config_lock, flags);pci_exp_set_dev_base (base, bus, devfn);
@@ -112,7 +112,7 @@ static int pci_mmcfg_write(unsigned intmmio_config_writel (mmcfg_virt_addr + reg, value);break ; } -spin_unlock_irqrestore (&pci_config_lock, flags); +raw_spin_unlock_irqrestore (&pci_config_lock, flags);return 0 ; }
arch/x86/pci/numaq_32.c +4 -4
@@ -41,7 +41,7 @@ static int pci_conf1_mq_read(unsigned inif (!value || (bus >=MAX_MP_BUSSES ) || (devfn >255 ) || (reg >255 ))return -EINVAL ; -spin_lock_irqsave (&pci_config_lock, flags); +raw_spin_lock_irqsave (&pci_config_lock, flags);write_cf8 (bus, devfn, reg);
@@ -66,7 +66,7 @@ static int pci_conf1_mq_read(unsigned inbreak ; } -spin_unlock_irqrestore (&pci_config_lock, flags); +raw_spin_unlock_irqrestore (&pci_config_lock, flags);return 0 ; }
@@ -80,7 +80,7 @@ static int pci_conf1_mq_write(unsigned iif ((bus >=MAX_MP_BUSSES ) || (devfn >255 ) || (reg >255 ))return -EINVAL ; -spin_lock_irqsave (&pci_config_lock, flags); +raw_spin_lock_irqsave (&pci_config_lock, flags);write_cf8 (bus, devfn, reg);
@@ -105,7 +105,7 @@ static int pci_conf1_mq_write(unsigned ibreak ; } -spin_unlock_irqrestore (&pci_config_lock, flags); +raw_spin_unlock_irqrestore (&pci_config_lock, flags);return 0 ; }
arch/x86/pci/pcbios.c +4 -4
@@ -161,7 +161,7 @@ static int pci_bios_read(unsigned int seif (!value || (bus >255 ) || (devfn >255 ) || (reg >255 ))return -EINVAL ; -spin_lock_irqsave (&pci_config_lock, flags); +raw_spin_lock_irqsave (&pci_config_lock, flags);switch (len) {case 1 :
@@ -212,7 +212,7 @@ static int pci_bios_read(unsigned int sebreak ; } -spin_unlock_irqrestore (&pci_config_lock, flags); +raw_spin_unlock_irqrestore (&pci_config_lock, flags);return (int )((result &0xff00 ) >>8 ); }
@@ -227,7 +227,7 @@ static int pci_bios_write(unsigned int sif ((bus >255 ) || (devfn >255 ) || (reg >255 ))return -EINVAL ; -spin_lock_irqsave (&pci_config_lock, flags); +raw_spin_lock_irqsave (&pci_config_lock, flags);switch (len) {case 1 :
@@ -268,7 +268,7 @@ static int pci_bios_write(unsigned int sbreak ; } -spin_unlock_irqrestore (&pci_config_lock, flags); +raw_spin_unlock_irqrestore (&pci_config_lock, flags);return (int )((result &0xff00 ) >>8 ); }