Commit e26b203e authored by Simon Graham's avatar Simon Graham Committed by David S. Miller

xen/netback: Calculate the number of SKB slots required correctly

When calculating the number of slots required for a packet header, the code
was reserving too many slots if the header crossed a page boundary. Since
netbk_gop_skb copies the header to the start of the page, the count of
slots required for the header should be based solely on the header size.

This problem is easy to reproduce if a VIF is bridged to a USB 3G modem
device as the skb->data value always starts near the end of the first page.
Signed-off-by: default avatarSimon Graham <simon.graham@citrix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4bd8ad9
...@@ -325,8 +325,7 @@ unsigned int xen_netbk_count_skb_slots(struct xenvif *vif, struct sk_buff *skb) ...@@ -325,8 +325,7 @@ unsigned int xen_netbk_count_skb_slots(struct xenvif *vif, struct sk_buff *skb)
unsigned int count; unsigned int count;
int i, copy_off; int i, copy_off;
count = DIV_ROUND_UP( count = DIV_ROUND_UP(skb_headlen(skb), PAGE_SIZE);
offset_in_page(skb->data)+skb_headlen(skb), PAGE_SIZE);
copy_off = skb_headlen(skb) % PAGE_SIZE; copy_off = skb_headlen(skb) % PAGE_SIZE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment