diff options
| author | Brian King | 2017-04-19 19:44:47 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-04-21 19:33:52 +0200 |
| commit | 58c8c0c096611f6a1d43ed24e320494bf894a66e (patch) | |
| tree | f7d746339f099da59ef3a5e2aaaceb8174a6e93a /drivers/net/ethernet/ibm/ibmvnic.c | |
| parent | ibmvnic: Unmap longer term buffer before free (diff) | |
| download | kernel-qcow2-linux-58c8c0c096611f6a1d43ed24e320494bf894a66e.tar.gz kernel-qcow2-linux-58c8c0c096611f6a1d43ed24e320494bf894a66e.tar.xz kernel-qcow2-linux-58c8c0c096611f6a1d43ed24e320494bf894a66e.zip | |
ibmvnic: Fixup atomic API usage
Replace a couple of modifications of an atomic followed
by a read of the atomic, which is no longer atomic, to
use atomic_XX_return variants to avoid race conditions.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm/ibmvnic.c')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index c10bae7823e0..b5871dfff1b7 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -962,9 +962,8 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) goto out; } - atomic_inc(&tx_scrq->used); - - if (atomic_read(&tx_scrq->used) >= adapter->req_tx_entries_per_subcrq) { + if (atomic_inc_return(&tx_scrq->used) + >= adapter->req_tx_entries_per_subcrq) { netdev_info(netdev, "Stopping queue %d\n", queue_num); netif_stop_subqueue(netdev, queue_num); } @@ -1499,9 +1498,8 @@ restart_loop: } if (txbuff->last_frag) { - atomic_dec(&scrq->used); - - if (atomic_read(&scrq->used) <= + if (atomic_sub_return(next->tx_comp.num_comps, + &scrq->used) <= (adapter->req_tx_entries_per_subcrq / 2) && netif_subqueue_stopped(adapter->netdev, txbuff->skb)) { |