Skip to contentSkip to conversation

hci_usb: replace mb with smp_mb

PATCH Applied [email protected] 3 participants 3 messages Sep 22, 2008 – Sep 23, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 7/8 hci_usb: replace mb with smp_mb

From: Ming Lei <[email protected]>

smp_mb is enough for ordering memory operations among processors,and mb is more expensive than smp_mb for UP machine, so replace it with smp_mb().

---

 drivers/bluetooth/hci_usb.h |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/bluetooth/hci_usb.h renamed from drivers/bluetooth/hci_usb.h~hci_usb-replace-mb-with-smp_mb +5 -5
diff -puN drivers/bluetooth/hci_usb.h~hci_usb-replace-mb-with-smp_mb drivers/bluetooth/hci_usb.h
@@ -70,8 +70,8 @@ static inline void _urb_queue_head(struc
 {
 	unsigned long flags;
 	spin_lock_irqsave(&q->lock, flags);
-	/* _urb_unlink needs to know which spinlock to use, thus mb(). */
-	_urb->queue = q; mb(); list_add(&_urb->list, &q->head);
+	/* _urb_unlink needs to know which spinlock to use, thus smp_mb(). */
+	_urb->queue = q; smp_mb(); list_add(&_urb->list, &q->head);
 	spin_unlock_irqrestore(&q->lock, flags);
 }
 
@@ -79,8 +79,8 @@ static inline void _urb_queue_tail(struc
 {
 	unsigned long flags;
 	spin_lock_irqsave(&q->lock, flags);
-	/* _urb_unlink needs to know which spinlock to use, thus mb(). */
-	_urb->queue = q; mb(); list_add_tail(&_urb->list, &q->head);
+	/* _urb_unlink needs to know which spinlock to use, thus smp_mb(). */
+	_urb->queue = q; smp_mb(); list_add_tail(&_urb->list, &q->head);
 	spin_unlock_irqrestore(&q->lock, flags);
 }
 
@@ -89,7 +89,7 @@ static inline void _urb_unlink(struct _u
 	struct _urb_queue *q;
 	unsigned long flags;
 
-	mb();
+	smp_mb();
 	q = _urb->queue;
 	/* If q is NULL, it will die at easy-to-debug NULL pointer dereference.
 	   No need to BUG(). */

_

maintainer
#2 lore raw

Hi Dave,

Quoted 8 lines
Quoted 6 lines

smp_mb is enough for ordering memory operations among processors,and mb is more expensive than smp_mb for UP machine, so replace it with smp_mb().

Since this already ACK'd by Marcel, I've added this to net-next-2.6

that is absolutely fine by me. The hci_usb driver is a dead end and we do have multiple people now looking at and testing btusb. So expect the hci_usb driver to go away soon. Either 2.6.28 or 2.6.29.

Regards

Marcel