Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Sep 2017 18:13:56 +0000 (11:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Sep 2017 18:13:56 +0000 (11:13 -0700)
Pull x86 spinlock update from Ingo Molnar:
 "Convert an NMI lock to raw"

[ Clarification: it's not that the lock itself is NMI-safe, it's about
  NMI registration called from RT contexts  - Linus ]

* 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/nmi: Use raw lock

arch/x86/kernel/nmi.c

index 446c8aa09b9bc1935627579926c0e9b22f7aa12f..35aafc95e4b8a505491d7079a06e8e1b8e16c968 100644 (file)
 #include <trace/events/nmi.h>
 
 struct nmi_desc {
-       spinlock_t lock;
+       raw_spinlock_t lock;
        struct list_head head;
 };
 
 static struct nmi_desc nmi_desc[NMI_MAX] = 
 {
        {
-               .lock = __SPIN_LOCK_UNLOCKED(&nmi_desc[0].lock),
+               .lock = __RAW_SPIN_LOCK_UNLOCKED(&nmi_desc[0].lock),
                .head = LIST_HEAD_INIT(nmi_desc[0].head),
        },
        {
-               .lock = __SPIN_LOCK_UNLOCKED(&nmi_desc[1].lock),
+               .lock = __RAW_SPIN_LOCK_UNLOCKED(&nmi_desc[1].lock),
                .head = LIST_HEAD_INIT(nmi_desc[1].head),
        },
        {
-               .lock = __SPIN_LOCK_UNLOCKED(&nmi_desc[2].lock),
+               .lock = __RAW_SPIN_LOCK_UNLOCKED(&nmi_desc[2].lock),
                .head = LIST_HEAD_INIT(nmi_desc[2].head),
        },
        {
-               .lock = __SPIN_LOCK_UNLOCKED(&nmi_desc[3].lock),
+               .lock = __RAW_SPIN_LOCK_UNLOCKED(&nmi_desc[3].lock),
                .head = LIST_HEAD_INIT(nmi_desc[3].head),
        },
 
@@ -163,7 +163,7 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
 
        init_irq_work(&action->irq_work, nmi_max_handler);
 
-       spin_lock_irqsave(&desc->lock, flags);
+       raw_spin_lock_irqsave(&desc->lock, flags);
 
        /*
         * Indicate if there are multiple registrations on the
@@ -181,7 +181,7 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
        else
                list_add_tail_rcu(&action->list, &desc->head);
        
-       spin_unlock_irqrestore(&desc->lock, flags);
+       raw_spin_unlock_irqrestore(&desc->lock, flags);
        return 0;
 }
 EXPORT_SYMBOL(__register_nmi_handler);
@@ -192,7 +192,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
        struct nmiaction *n;
        unsigned long flags;
 
-       spin_lock_irqsave(&desc->lock, flags);
+       raw_spin_lock_irqsave(&desc->lock, flags);
 
        list_for_each_entry_rcu(n, &desc->head, list) {
                /*
@@ -207,7 +207,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
                }
        }
 
-       spin_unlock_irqrestore(&desc->lock, flags);
+       raw_spin_unlock_irqrestore(&desc->lock, flags);
        synchronize_rcu();
 }
 EXPORT_SYMBOL_GPL(unregister_nmi_handler);