xen-netback: immediately wake tx queue when guest rx queue has space

When an skb is removed from the guest rx queue, immediately wake the
tx queue, instead of after processing them.

Signed-off-by: David Vrabel <david.vrabel@citrix.com>
[re-based]
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 7c0b1a23e6f983fe392c8ffa71d05189ae52ebb5)
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/drivers/net/xen-netback/rx.c b/drivers/net/xen-netback/rx.c
index 9d30bbcfc83db770c520a76cc5d15df96b0870c4..315610ad5aa8f18b8491cf67ce8001a4ead0b1de 100644 (file)
--- a/drivers/net/xen-netback/rx.c
+++ b/drivers/net/xen-netback/rx.c
@@ -92,25 +92,19 @@ static struct sk_buff *xenvif_rx_dequeue(struct xenvif_queue *queue)
        spin_lock_irq(&queue->rx_queue.lock);
 
        skb = __skb_dequeue(&queue->rx_queue);
-       if (skb)
+       if (skb) {
                queue->rx_queue_len -= skb->len;
+               if (queue->rx_queue_len < queue->rx_queue_max) {
+                       struct netdev_queue *txq;
 
-       spin_unlock_irq(&queue->rx_queue.lock);
-
-       return skb;
-}
-
-static void xenvif_rx_queue_maybe_wake(struct xenvif_queue *queue)
-{
-       spin_lock_irq(&queue->rx_queue.lock);
-
-       if (queue->rx_queue_len < queue->rx_queue_max) {
-               struct net_device *dev = queue->vif->dev;
-
-               netif_tx_wake_queue(netdev_get_tx_queue(dev, queue->id));
+                       txq = netdev_get_tx_queue(queue->vif->dev, queue->id);
+                       netif_tx_wake_queue(txq);
+               }
        }
 
        spin_unlock_irq(&queue->rx_queue.lock);
+
+       return skb;
 }
 
 static void xenvif_rx_queue_purge(struct xenvif_queue *queue)
@@ -558,8 +552,6 @@ int xenvif_kthread_guest_rx(void *data)
                 */
                xenvif_rx_queue_drop_expired(queue);
 
-               xenvif_rx_queue_maybe_wake(queue);
-
                cond_resched();
        }