75 lines
2.6 KiB
Diff
75 lines
2.6 KiB
Diff
From db6a4a063a4f3f8069fb7f95d07bbc1d0d6fd1bd Mon Sep 17 00:00:00 2001
|
|
From: Wei Liu <wei.liu2@citrix.com>
|
|
Date: Tue, 12 Aug 2014 11:48:08 +0100
|
|
Subject: [PATCH 10/14] xen-netback: remove loop waiting function
|
|
Origin: https://git.kernel.org/linus/b1252858213f39700dac1bc3295b6e88f6cce24b
|
|
|
|
The original implementation relies on a loop to check if all inflight
|
|
packets are freed. Now we have proper reference counting, there's no
|
|
need to use loop anymore.
|
|
|
|
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
|
|
Cc: Ian Campbell <ian.campbell@citrix.com>
|
|
Cc: Zoltan Kiss <zoltan.kiss@citrix.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
(cherry picked from commit b1252858213f39700dac1bc3295b6e88f6cce24b)
|
|
---
|
|
drivers/net/xen-netback/interface.c | 29 -----------------------------
|
|
1 file changed, 29 deletions(-)
|
|
|
|
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
|
|
index 428c57c..10d832a 100644
|
|
--- a/drivers/net/xen-netback/interface.c
|
|
+++ b/drivers/net/xen-netback/interface.c
|
|
@@ -660,25 +660,6 @@ void xenvif_carrier_off(struct xenvif *vif)
|
|
rtnl_unlock();
|
|
}
|
|
|
|
-static void xenvif_wait_unmap_timeout(struct xenvif_queue *queue,
|
|
- unsigned int worst_case_skb_lifetime)
|
|
-{
|
|
- int i, unmap_timeout = 0;
|
|
-
|
|
- for (i = 0; i < MAX_PENDING_REQS; ++i) {
|
|
- if (queue->grant_tx_handle[i] != NETBACK_INVALID_HANDLE) {
|
|
- unmap_timeout++;
|
|
- schedule_timeout(msecs_to_jiffies(1000));
|
|
- if (unmap_timeout > worst_case_skb_lifetime &&
|
|
- net_ratelimit())
|
|
- netdev_err(queue->vif->dev,
|
|
- "Page still granted! Index: %x\n",
|
|
- i);
|
|
- i = -1;
|
|
- }
|
|
- }
|
|
-}
|
|
-
|
|
void xenvif_disconnect(struct xenvif *vif)
|
|
{
|
|
struct xenvif_queue *queue = NULL;
|
|
@@ -731,21 +712,11 @@ void xenvif_free(struct xenvif *vif)
|
|
struct xenvif_queue *queue = NULL;
|
|
unsigned int num_queues = vif->num_queues;
|
|
unsigned int queue_index;
|
|
- /* Here we want to avoid timeout messages if an skb can be legitimately
|
|
- * stuck somewhere else. Realistically this could be an another vif's
|
|
- * internal or QDisc queue. That another vif also has this
|
|
- * rx_drain_timeout_msecs timeout, so give it time to drain out.
|
|
- * Although if that other guest wakes up just before its timeout happens
|
|
- * and takes only one skb from QDisc, it can hold onto other skbs for a
|
|
- * longer period.
|
|
- */
|
|
- unsigned int worst_case_skb_lifetime = (rx_drain_timeout_msecs/1000);
|
|
|
|
unregister_netdev(vif->dev);
|
|
|
|
for (queue_index = 0; queue_index < num_queues; ++queue_index) {
|
|
queue = &vif->queues[queue_index];
|
|
- xenvif_wait_unmap_timeout(queue, worst_case_skb_lifetime);
|
|
xenvif_deinit_queue(queue);
|
|
}
|
|
|
|
--
|
|
1.7.10.4
|
|
|