netvsc: eliminate per-device outstanding send counter

Since now keep track of per-queue outstanding sends, we can avoid
one atomic update by removing no longer needed per-device atomic.

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 757205c9cb9371270326683563bcb4089db68519..fec365241f37f2d67fd2ab36fdd3fc37bf8beeca 100644 (file)
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -729,7 +729,6 @@ struct netvsc_channel {
 struct netvsc_device {
        u32 nvsp_version;
 
-       atomic_t num_outstanding_sends;
        wait_queue_head_t wait_drain;
        bool destroy;
 

diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 359e7ef7040be6803974ed01cb0b3dd60501cbdb..bd055146f09848fd19de2dcc047677b762a7629b 100644 (file)
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -90,29 +90,23 @@ static void free_netvsc_device(struct netvsc_device *nvdev)
        kfree(nvdev);
 }
 
-static struct netvsc_device *get_outbound_net_device(struct hv_device *device)
-{
-       struct netvsc_device *net_device = hv_device_to_netvsc_device(device);
 
-       if (net_device && net_device->destroy)
-               net_device = NULL;
+static inline bool netvsc_channel_idle(const struct netvsc_device *net_device,
+                                      u16 q_idx)
+{
+       const struct netvsc_channel *nvchan = &net_device->chan_table[q_idx];
 
-       return net_device;
+       return atomic_read(&net_device->num_outstanding_recvs) == 0 &&
+               atomic_read(&nvchan->queue_sends) == 0;
 }
 
-static struct netvsc_device *get_inbound_net_device(struct hv_device *device)
+static struct netvsc_device *get_outbound_net_device(struct hv_device *device)
 {
        struct netvsc_device *net_device = hv_device_to_netvsc_device(device);
 
-       if (!net_device)
-               goto get_in_err;
-
-       if (net_device->destroy &&
-           atomic_read(&net_device->num_outstanding_sends) == 0 &&
-           atomic_read(&net_device->num_outstanding_recvs) == 0)
+       if (net_device && net_device->destroy)
                net_device = NULL;
 
-get_in_err:
        return net_device;
 }
 
@@ -612,7 +606,6 @@ static void netvsc_send_tx_complete(struct netvsc_device *net_device,
        struct net_device *ndev = hv_get_drvdata(device);
        struct net_device_context *net_device_ctx = netdev_priv(ndev);
        struct vmbus_channel *channel = device->channel;
-       int num_outstanding_sends;
        u16 q_idx = 0;
        int queue_sends;
 
@@ -630,13 +623,10 @@ static void netvsc_send_tx_complete(struct netvsc_device *net_device,
                dev_consume_skb_any(skb);
        }
 
-       num_outstanding_sends =
-               atomic_dec_return(&net_device->num_outstanding_sends);
-
        queue_sends =
                atomic_dec_return(&net_device->chan_table[q_idx].queue_sends);
 
-       if (net_device->destroy && num_outstanding_sends == 0)
+       if (net_device->destroy && queue_sends == 0)
                wake_up(&net_device->wait_drain);
 
        if (netif_tx_queue_stopped(netdev_get_tx_queue(ndev, q_idx)) &&
@@ -823,15 +813,10 @@ static inline int netvsc_send_pkt(
        }
 
        if (ret == 0) {
-               atomic_inc(&net_device->num_outstanding_sends);
                atomic_inc_return(&nvchan->queue_sends);
 
-               if (ring_avail < RING_AVAIL_PERCENT_LOWATER) {
+               if (ring_avail < RING_AVAIL_PERCENT_LOWATER)
                        netif_tx_stop_queue(txq);
-
-                       if (atomic_read(&nvchan->queue_sends) < 1)
-                               netif_tx_wake_queue(txq);
-               }
        } else if (ret == -EAGAIN) {
                netif_tx_stop_queue(txq);
                if (atomic_read(&nvchan->queue_sends) < 1) {
@@ -1259,11 +1244,14 @@ void netvsc_channel_cb(void *context)
        else
                device = channel->device_obj;
 
-       net_device = get_inbound_net_device(device);
-       if (!net_device)
+       ndev = hv_get_drvdata(device);
+       if (unlikely(!ndev))
                return;
 
-       ndev = hv_get_drvdata(device);
+       net_device = net_device_to_netvsc_device(ndev);
+       if (unlikely(net_device->destroy) &&
+           netvsc_channel_idle(net_device, q_idx))
+               return;
 
        while ((desc = get_next_pkt_raw(channel)) != NULL) {
                netvsc_process_raw_pkt(device, channel, net_device,

diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 70b099a731a9217cf3985bfcbb7da466ccc2aade..19356f56b7b144f40184c5766a8f9be33b4a3079 100644 (file)
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -903,6 +903,23 @@ cleanup:
        return ret;
 }
 
+static bool netvsc_device_idle(const struct netvsc_device *nvdev)
+{
+       int i;
+
+       if (atomic_read(&nvdev->num_outstanding_recvs) > 0)
+               return false;
+
+       for (i = 0; i < nvdev->num_chn; i++) {
+               const struct netvsc_channel *nvchan = &nvdev->chan_table[i];
+
+               if (atomic_read(&nvchan->queue_sends) > 0)
+                       return false;
+       }
+
+       return true;
+}
+
 static void rndis_filter_halt_device(struct rndis_device *dev)
 {
        struct rndis_request *request;
@@ -933,9 +950,7 @@ cleanup:
        spin_unlock_irqrestore(&hdev->channel->inbound_lock, flags);
 
        /* Wait for all send completions */
-       wait_event(nvdev->wait_drain,
-                  atomic_read(&nvdev->num_outstanding_sends) == 0 &&
-                  atomic_read(&nvdev->num_outstanding_recvs) == 0);
+       wait_event(nvdev->wait_drain, netvsc_device_idle(nvdev));
 
        if (request)
                put_rndis_request(dev, request);