diff options
author | Jennifer Herbert <jennifer.herbert@citrix.com> | 2014-12-24 09:03:16 -0500 |
---|---|---|
committer | David Vrabel <david.vrabel@citrix.com> | 2015-01-28 09:03:11 -0500 |
commit | 0ae65f49af64d68f0daca37b83383115cae5e690 (patch) | |
tree | 9c55a3b138a4f3fcccf1b6b6c7ab82c16ca699e4 /drivers/net/xen-netback/netback.c | |
parent | 0bb599fd30108883b00c7d4a226eeb49111e6932 (diff) |
x86/xen: require ballooned pages for grant maps
Ballooned pages are always used for grant maps which means the
original frame does not need to be saved in page->index nor restored
after the grant unmap.
This allows the workaround in netback for the conflicting use of the
(unionized) page->index and page->pfmemalloc to be removed.
Signed-off-by: Jennifer Herbert <jennifer.herbert@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'drivers/net/xen-netback/netback.c')
-rw-r--r-- | drivers/net/xen-netback/netback.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 908e65e9b821..64413189ad06 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c | |||
@@ -1241,12 +1241,6 @@ static void xenvif_fill_frags(struct xenvif_queue *queue, struct sk_buff *skb) | |||
1241 | /* Take an extra reference to offset network stack's put_page */ | 1241 | /* Take an extra reference to offset network stack's put_page */ |
1242 | get_page(queue->mmap_pages[pending_idx]); | 1242 | get_page(queue->mmap_pages[pending_idx]); |
1243 | } | 1243 | } |
1244 | /* FIXME: __skb_fill_page_desc set this to true because page->pfmemalloc | ||
1245 | * overlaps with "index", and "mapping" is not set. I think mapping | ||
1246 | * should be set. If delivered to local stack, it would drop this | ||
1247 | * skb in sk_filter unless the socket has the right to use it. | ||
1248 | */ | ||
1249 | skb->pfmemalloc = false; | ||
1250 | } | 1244 | } |
1251 | 1245 | ||
1252 | static int xenvif_get_extras(struct xenvif_queue *queue, | 1246 | static int xenvif_get_extras(struct xenvif_queue *queue, |