kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

r8152: replace spin_lock_irqsave and spin_unlock_irqrestore

Browse source 
Use spin_lock and spin_unlock in interrupt context.

The ndo_start_xmit would not be called in interrupt context, so
replace the relative spin_lock_irqsave and spin_unlock_irqrestore
with spin_lock_bh and spin_unlock_bh.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
hayeswang 2014-03-07 11:04:34 +08:00 committed by David S. Miller
parent 91bd66e4c8
commit 2685d41063
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/net/usb/r8152.c
View file

@ -963,7 +963,6 @@ static int rtl8152_set_mac_address(struct net_device *netdev, void *p)
static void read_bulk_callback(struct urb *urb) static void read_bulk_callback(struct urb *urb)
{ {
struct net_device *netdev; struct net_device *netdev;
unsigned long flags;
int status = urb->status; int status = urb->status;
struct rx_agg *agg; struct rx_agg *agg;
struct r8152 *tp; struct r8152 *tp;
@ -997,9 +996,9 @@ static void read_bulk_callback(struct urb *urb)
if (urb->actual_length < ETH_ZLEN) if (urb->actual_length < ETH_ZLEN)
break; break;
spin_lock_irqsave(&tp->rx_lock, flags); spin_lock(&tp->rx_lock);
list_add_tail(&agg->list, &tp->rx_done); list_add_tail(&agg->list, &tp->rx_done);
spin_unlock_irqrestore(&tp->rx_lock, flags); spin_unlock(&tp->rx_lock);
tasklet_schedule(&tp->tl); tasklet_schedule(&tp->tl);
return; return;
case -ESHUTDOWN: case -ESHUTDOWN:
@ -1022,9 +1021,9 @@ static void read_bulk_callback(struct urb *urb)
if (result == -ENODEV) { if (result == -ENODEV) {
netif_device_detach(tp->netdev); netif_device_detach(tp->netdev);
} else if (result) { } else if (result) {
spin_lock_irqsave(&tp->rx_lock, flags); spin_lock(&tp->rx_lock);
list_add_tail(&agg->list, &tp->rx_done); list_add_tail(&agg->list, &tp->rx_done);
spin_unlock_irqrestore(&tp->rx_lock, flags); spin_unlock(&tp->rx_lock);
tasklet_schedule(&tp->tl); tasklet_schedule(&tp->tl);
} }
} }
@ -1033,7 +1032,6 @@ static void write_bulk_callback(struct urb *urb)
{ {
struct net_device_stats *stats; struct net_device_stats *stats;
struct net_device *netdev; struct net_device *netdev;
unsigned long flags;
struct tx_agg *agg; struct tx_agg *agg;
struct r8152 *tp; struct r8152 *tp;
int status = urb->status; int status = urb->status;
@ -1057,9 +1055,9 @@ static void write_bulk_callback(struct urb *urb)
stats->tx_bytes += agg->skb_len; stats->tx_bytes += agg->skb_len;
} }
spin_lock_irqsave(&tp->tx_lock, flags); spin_lock(&tp->tx_lock);
list_add_tail(&agg->list, &tp->tx_free); list_add_tail(&agg->list, &tp->tx_free);
spin_unlock_irqrestore(&tp->tx_lock, flags); spin_unlock(&tp->tx_lock);
usb_autopm_put_interface_async(tp->intf); usb_autopm_put_interface_async(tp->intf);
@ -1330,14 +1328,13 @@ r8152_tx_csum(struct r8152 *tp, struct tx_desc *desc, struct sk_buff *skb)
static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg) static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg)
{ {
struct sk_buff_head skb_head, *tx_queue = &tp->tx_queue; struct sk_buff_head skb_head, *tx_queue = &tp->tx_queue;
unsigned long flags;
int remain, ret; int remain, ret;
u8 *tx_data; u8 *tx_data;
__skb_queue_head_init(&skb_head); __skb_queue_head_init(&skb_head);
spin_lock_irqsave(&tx_queue->lock, flags); spin_lock_bh(&tx_queue->lock);
skb_queue_splice_init(tx_queue, &skb_head); skb_queue_splice_init(tx_queue, &skb_head);
spin_unlock_irqrestore(&tx_queue->lock, flags); spin_unlock_bh(&tx_queue->lock);
tx_data = agg->head; tx_data = agg->head;
agg->skb_num = agg->skb_len = 0; agg->skb_num = agg->skb_len = 0;
@ -1374,9 +1371,9 @@ static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg)
} }
if (!skb_queue_empty(&skb_head)) { if (!skb_queue_empty(&skb_head)) {
spin_lock_irqsave(&tx_queue->lock, flags); spin_lock_bh(&tx_queue->lock);
skb_queue_splice(&skb_head, tx_queue); skb_queue_splice(&skb_head, tx_queue);
spin_unlock_irqrestore(&tx_queue->lock, flags); spin_unlock_bh(&tx_queue->lock);
} }
netif_tx_lock_bh(tp->netdev); netif_tx_lock_bh(tp->netdev);
@ -1551,16 +1548,15 @@ static void rtl_drop_queued_tx(struct r8152 *tp)
{ {
struct net_device_stats *stats = &tp->netdev->stats; struct net_device_stats *stats = &tp->netdev->stats;
struct sk_buff_head skb_head, *tx_queue = &tp->tx_queue; struct sk_buff_head skb_head, *tx_queue = &tp->tx_queue;
unsigned long flags;
struct sk_buff *skb; struct sk_buff *skb;
if (skb_queue_empty(tx_queue)) if (skb_queue_empty(tx_queue))
return; return;
__skb_queue_head_init(&skb_head); __skb_queue_head_init(&skb_head);
spin_lock_irqsave(&tx_queue->lock, flags); spin_lock_bh(&tx_queue->lock);
skb_queue_splice_init(tx_queue, &skb_head); skb_queue_splice_init(tx_queue, &skb_head);
spin_unlock_irqrestore(&tx_queue->lock, flags); spin_unlock_bh(&tx_queue->lock);
while ((skb = __skb_dequeue(&skb_head))) { while ((skb = __skb_dequeue(&skb_head))) {
dev_kfree_skb(skb); dev_kfree_skb(skb);