Revert "Move xen patchset to new version's subdir."

[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.xen / 764-netback-foreign-pages.patch

diff --git a/src/patches/suse-2.6.27.31/patches.xen/764-netback-foreign-pages.patch b/src/patches/suse-2.6.27.31/patches.xen/764-netback-foreign-pages.patch
deleted file mode 100644 (file)
index 58db1f6..0000000
--- a/src/patches/suse-2.6.27.31/patches.xen/764-netback-foreign-pages.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg?rev/618fc299e2f1
-# HG changeset 764 patch
-# User Keir Fraser <keir.fraser@citrix.com>
-# Date 1229601096 0
-# Node ID 618fc299e2f1e222686bc234c48ac70e1104e18d
-# Parent  ff9683032b76f533509191bb9532df10cbb9830b
-Subject: netback: handle non-netback foreign pages
-Patch-mainline: obsolete
-
-An SKB can contain pages which are foreign but not tracked by netback,
-such as those created by gnttab_copy_grant_page when in
-NETBK_DELAYED_COPY_SKB mode. These pages do not have a mapping field
-which points to a valid offset in the pending_tx_info array.
-
-Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
-Acked-by: jbeulich@novell.com
-
---- head-2008-12-23.orig/drivers/xen/netback/netback.c 2008-12-01 11:25:57.000000000 +0100
-+++ head-2008-12-23/drivers/xen/netback/netback.c      2008-12-23 09:31:07.000000000 +0100
-@@ -40,9 +40,6 @@
- 
- /*define NETBE_DEBUG_INTERRUPT*/
- 
--/* extra field used in struct page */
--#define netif_page_index(pg) (*(long *)&(pg)->mapping)
--
- struct netbk_rx_meta {
-       skb_frag_t frag;
-       int id;
-@@ -89,6 +86,25 @@ static inline unsigned long idx_to_kaddr
-       return (unsigned long)pfn_to_kaddr(idx_to_pfn(idx));
- }
- 
-+/* extra field used in struct page */
-+static inline void netif_set_page_index(struct page *pg, unsigned int index)
-+{
-+      *(unsigned long *)&pg->mapping = index;
-+}
-+
-+static inline int netif_page_index(struct page *pg)
-+{
-+      unsigned long idx = (unsigned long)pg->mapping;
-+
-+      if (!PageForeign(pg))
-+              return -1;
-+
-+      if ((idx >= MAX_PENDING_REQS) || (mmap_pages[idx] != pg))
-+              return -1;
-+
-+      return idx;
-+}
-+
- #define PKT_PROT_LEN 64
- 
- static struct pending_tx_info {
-@@ -370,6 +386,7 @@ static u16 netbk_gop_frag(netif_t *netif
-       multicall_entry_t *mcl;
-       netif_rx_request_t *req;
-       unsigned long old_mfn, new_mfn;
-+      int idx = netif_page_index(page);
- 
-       old_mfn = virt_to_mfn(page_address(page));
- 
-@@ -380,9 +397,8 @@ static u16 netbk_gop_frag(netif_t *netif
-               meta->copy = 1;
-               copy_gop = npo->copy + npo->copy_prod++;
-               copy_gop->flags = GNTCOPY_dest_gref;
--              if (PageForeign(page)) {
--                      struct pending_tx_info *src_pend =
--                              &pending_tx_info[netif_page_index(page)];
-+              if (idx > -1) {
-+                      struct pending_tx_info *src_pend = &pending_tx_info[idx];
-                       copy_gop->source.domid = src_pend->netif->domid;
-                       copy_gop->source.u.ref = src_pend->req.gref;
-                       copy_gop->flags |= GNTCOPY_source_gref;
-@@ -1437,8 +1453,10 @@ static void netif_idx_release(u16 pendin
- 
- static void netif_page_release(struct page *page, unsigned int order)
- {
-+      int idx = netif_page_index(page);
-       BUG_ON(order);
--      netif_idx_release(netif_page_index(page));
-+      BUG_ON(idx < 0);
-+      netif_idx_release(idx);
- }
- 
- irqreturn_t netif_be_int(int irq, void *dev_id, struct pt_regs *regs)
-@@ -1572,7 +1590,7 @@ static int __init netback_init(void)
-       for (i = 0; i < MAX_PENDING_REQS; i++) {
-               page = mmap_pages[i];
-               SetPageForeign(page, netif_page_release);
--              netif_page_index(page) = i;
-+              netif_set_page_index(page, i);
-               INIT_LIST_HEAD(&pending_inuse[i].list);
-       }
-