xen/netfront: don't bug in case of too many frags
Subsystems (4)
Juergen Gross
maintainerPATCH 1/1 xen/netfront: don't bug in case of too many frags
Commit 57f230ab04d291 ("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.
--- drivers/net/xen-netfront.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/xen-netfront.c +7 -1
@@ -908,7 +908,11 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,BUG_ON (pull_to <=skb_headlen (skb));__pskb_pull_tail (skb, pull_to -skb_headlen (skb)); } -BUG_ON (skb_shinfo (skb)->nr_frags >=MAX_SKB_FRAGS ); +if (unlikely (skb_shinfo (skb)->nr_frags >=MAX_SKB_FRAGS )) { + queue->rx.rsp_cons = ++cons; +kfree_skb (nskb); +return ~0U ; + } skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, skb_frag_page(nfrag),
@@ -1045,6 +1049,8 @@ static int xennet_poll(struct napi_struct *napi, int budget) skb->len += rx->status; i =xennet_fill_frags (queue, skb, &tmpq); +if (unlikely (i == ~0U )) + goto err;if (rx->flags & XEN_NETRXF_csum_blank) skb->ip_summed =CHECKSUM_PARTIAL ;
Signature · 1 line
2.16.4
From: Juergen Gross <[email protected]>
Date: Tue, 11 Sep 2018 09:04:48 +0200
Quoted 11 lines
Commit
57f230ab04d291("xen/netfront: raise max number of slots inxennet_get_responses()") raised the max number of allowed slots by one. This seems to be problematic in some configurations with netback using a largerMAX_SKB_FRAGSvalue (e.g. old Linux kernel withMAX_SKB_FRAGSdefined as 18 instead of nowadays 17).Instead of
BUG_ON()in this case just fall back to retransmission.Fixes 57f230ab04d291 ("xen/netfront: raise max number of slots in xennet_get_responses()")Signed-off-by Juergen Gross <[email protected]>
Applied.
From: Juergen Gross <[email protected]>
Date: Tue, 11 Sep 2018 09:04:48 +0200
Quoted 11 lines
Commit
57f230ab04d291("xen/netfront: raise max number of slots inxennet_get_responses()") raised the max number of allowed slots by one. This seems to be problematic in some configurations with netback using a largerMAX_SKB_FRAGSvalue (e.g. old Linux kernel withMAX_SKB_FRAGSdefined as 18 instead of nowadays 17).Instead of
BUG_ON()in this case just fall back to retransmission.Fixes 57f230ab04d291 ("xen/netfront: raise max number of slots in xennet_get_responses()")Signed-off-by Juergen Gross <[email protected]>
Applied.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel