Skip to content

Commit ee6a3ab

Browse files
jgross1jfvogel
authored andcommitted
xen/netfront: don't bug in case of too many frags
Commit 57f230a ("xen/netfront: raise max number of slots in xennet_get_responses()") raised the max number of allowed slots by one. This seems to be problematic in some configurations with netback using a larger MAX_SKB_FRAGS value (e.g. old Linux kernel with MAX_SKB_FRAGS defined as 18 instead of nowadays 17). Instead of BUG_ON() in this case just fall back to retransmission. Fixes: 57f230a ("xen/netfront: raise max number of slots in xennet_get_responses()") Cc: stable@vger.kernel.org Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit ad4f15d) Signed-off-by: Liam Merwick <Liam.Merwick@oracle.com> Reviewed-by: Darren Kenny <darren.kenny@oracle.com> Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> (cherry picked from commit 2758fbb) Orabug: 29462653 Signed-off-by: Calum Mackay <calum.mackay@oracle.com> Tested-by: Saar Maoz <Saar.Maoz@oracle.com> Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
1 parent 3797466 commit ee6a3ab

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/net/xen-netfront.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1145,7 +1145,11 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
11451145
BUG_ON(pull_to < skb_headlen(skb));
11461146
__pskb_pull_tail(skb, pull_to - skb_headlen(skb));
11471147
}
1148-
BUG_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS);
1148+
if (unlikely(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS)) {
1149+
queue->rx.rsp_cons = ++cons;
1150+
kfree_skb(nskb);
1151+
return ~0U;
1152+
}
11491153

11501154
xennet_page_ref_inc(queue, page, ref);
11511155

@@ -1319,6 +1323,8 @@ static int xennet_poll(struct napi_struct *napi, int budget)
13191323
xennet_page_ref_inc(queue, page, ref);
13201324

13211325
i = xennet_fill_frags(queue, skb, &tmpq);
1326+
if (unlikely(i == ~0U))
1327+
goto err;
13221328

13231329
if (rx->flags & XEN_NETRXF_csum_blank)
13241330
skb->ip_summed = CHECKSUM_PARTIAL;

0 commit comments

Comments
 (0)