[Xen-changelog] [linux-2.6.18-xen] [NETFRONT] Implement netif_release_rx_bufs for the copying case.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1184590655 -3600
# Node ID 41918416db51d1eeaba7c71259e1c0f0ea3426f6
# Parent  34ebf92ad28d53f70ca02966c9f926f7d83bafbb
[NETFRONT] Implement netif_release_rx_bufs for the copying case.

Also reduce the log level when we are unable end foreign access to a
grant.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
 drivers/xen/core/gnttab.c       |    4 +--
 drivers/xen/netfront/netfront.c |   53 +++++++++++++++++++++++++++++++++-------
 2 files changed, 47 insertions(+), 10 deletions(-)

diff -r 34ebf92ad28d -r 41918416db51 drivers/xen/core/gnttab.c
--- a/drivers/xen/core/gnttab.c Sat Jul 14 09:50:59 2007 +0100
+++ b/drivers/xen/core/gnttab.c Mon Jul 16 13:57:35 2007 +0100
@@ -184,7 +184,7 @@ int gnttab_end_foreign_access_ref(grant_
        nflags = shared[ref].flags;
        do {
                if ((flags = nflags) & (GTF_reading|GTF_writing)) {
-                       printk(KERN_ALERT "WARNING: g.e. still in use!\n");
+                       printk(KERN_DEBUG "WARNING: g.e. still in use!\n");
                        return 0;
                }
        } while ((nflags = synch_cmpxchg_subword(&shared[ref].flags, flags, 0)) 
!=
@@ -204,7 +204,7 @@ void gnttab_end_foreign_access(grant_ref
        } else {
                /* XXX This needs to be fixed so that the ref and page are
                   placed on a list to be freed up later. */
-               printk(KERN_WARNING
+               printk(KERN_DEBUG
                       "WARNING: leaking g.e. and page still in use!\n");
        }
 }
diff -r 34ebf92ad28d -r 41918416db51 drivers/xen/netfront/netfront.c
--- a/drivers/xen/netfront/netfront.c   Sat Jul 14 09:50:59 2007 +0100
+++ b/drivers/xen/netfront/netfront.c   Mon Jul 16 13:57:35 2007 +0100
@@ -1536,7 +1536,7 @@ static void netif_release_tx_bufs(struct
        }
 }
 
-static void netif_release_rx_bufs(struct netfront_info *np)
+static void netif_release_rx_bufs_flip(struct netfront_info *np)
 {
        struct mmu_update      *mmu = np->rx_mmu;
        struct multicall_entry *mcl = np->rx_mcl;
@@ -1545,11 +1545,6 @@ static void netif_release_rx_bufs(struct
        unsigned long mfn;
        int xfer = 0, noxfer = 0, unused = 0;
        int id, ref, rc;
-
-       if (np->copying_receiver) {
-               WPRINTK("%s: fix me for copying receiver.\n", __FUNCTION__);
-               return;
-       }
 
        skb_queue_head_init(&free_list);
 
@@ -1597,7 +1592,7 @@ static void netif_release_rx_bufs(struct
                xfer++;
        }
 
-       IPRINTK("%s: %d xfer, %d noxfer, %d unused\n",
+       DPRINTK("%s: %d xfer, %d noxfer, %d unused\n",
                __FUNCTION__, xfer, noxfer, unused);
 
        if (xfer) {
@@ -1624,6 +1619,45 @@ static void netif_release_rx_bufs(struct
        spin_unlock_bh(&np->rx_lock);
 }
 
+static void netif_release_rx_bufs_copy(struct netfront_info *np)
+{
+       struct sk_buff *skb;
+       int i, ref;
+       int busy = 0, inuse = 0;
+
+       spin_lock_bh(&np->rx_lock);
+
+       for (i = 0; i < NET_RX_RING_SIZE; i++) {
+               ref = np->grant_rx_ref[i];
+
+               if (ref == GRANT_INVALID_REF)
+                       continue;
+
+               inuse++;
+
+               skb = np->rx_skbs[i];
+
+               if (!gnttab_end_foreign_access_ref(ref, 0))
+               {
+                       busy++;
+                       continue;
+               }
+
+               gnttab_release_grant_reference(&np->gref_rx_head, ref);
+               np->grant_rx_ref[i] = GRANT_INVALID_REF;
+               add_id_to_freelist(np->rx_skbs, i);
+
+               skb_shinfo(skb)->nr_frags = 0;
+               dev_kfree_skb(skb);
+       }
+
+       if (busy)
+               DPRINTK("%s: Unable to release %d of %d inuse grant references 
out of %ld total.\n",
+                       __FUNCTION__, busy, inuse, NET_RX_RING_SIZE);
+
+       spin_unlock_bh(&np->rx_lock);
+}
+
 static int network_close(struct net_device *dev)
 {
        struct netfront_info *np = netdev_priv(dev);
@@ -1817,7 +1851,10 @@ static void netif_uninit(struct net_devi
 {
        struct netfront_info *np = netdev_priv(dev);
        netif_release_tx_bufs(np);
-       netif_release_rx_bufs(np);
+       if (np->copying_receiver)
+               netif_release_rx_bufs_copy(np);
+       else
+               netif_release_rx_bufs_flip(np);
        gnttab_free_grant_references(np->gref_tx_head);
        gnttab_free_grant_references(np->gref_rx_head);
 }

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog