Commit 538d9291 authored by Vineeth Remanan Pillai's avatar Vineeth Remanan Pillai Committed by David S. Miller

xen-netfront: Rework the fix for Rx stall during OOM and network stress

The commit 90c311b0 ("xen-netfront: Fix Rx stall during network
stress and OOM") caused the refill timer to be triggerred almost on
all invocations of xennet_alloc_rx_buffers for certain workloads.
This reworks the fix by reverting to the old behaviour and taking into
consideration the skb allocation failure. Refill timer is now triggered
on insufficient requests or skb allocation failure.
Signed-off-by: default avatarVineeth Remanan Pillai <vineethp@amazon.com>
Fixes: 90c311b0 (xen-netfront: Fix Rx stall during network stress and OOM)
Reported-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d9f66ac
...@@ -281,6 +281,7 @@ static void xennet_alloc_rx_buffers(struct netfront_queue *queue) ...@@ -281,6 +281,7 @@ static void xennet_alloc_rx_buffers(struct netfront_queue *queue)
{ {
RING_IDX req_prod = queue->rx.req_prod_pvt; RING_IDX req_prod = queue->rx.req_prod_pvt;
int notify; int notify;
int err = 0;
if (unlikely(!netif_carrier_ok(queue->info->netdev))) if (unlikely(!netif_carrier_ok(queue->info->netdev)))
return; return;
...@@ -295,8 +296,10 @@ static void xennet_alloc_rx_buffers(struct netfront_queue *queue) ...@@ -295,8 +296,10 @@ static void xennet_alloc_rx_buffers(struct netfront_queue *queue)
struct xen_netif_rx_request *req; struct xen_netif_rx_request *req;
skb = xennet_alloc_one_rx_buffer(queue); skb = xennet_alloc_one_rx_buffer(queue);
if (!skb) if (!skb) {
err = -ENOMEM;
break; break;
}
id = xennet_rxidx(req_prod); id = xennet_rxidx(req_prod);
...@@ -320,8 +323,13 @@ static void xennet_alloc_rx_buffers(struct netfront_queue *queue) ...@@ -320,8 +323,13 @@ static void xennet_alloc_rx_buffers(struct netfront_queue *queue)
queue->rx.req_prod_pvt = req_prod; queue->rx.req_prod_pvt = req_prod;
/* Not enough requests? Try again later. */ /* Try again later if there are not enough requests or skb allocation
if (req_prod - queue->rx.sring->req_prod < NET_RX_SLOTS_MIN) { * failed.
* Enough requests is quantified as the sum of newly created slots and
* the unconsumed slots at the backend.
*/
if (req_prod - queue->rx.rsp_cons < NET_RX_SLOTS_MIN ||
unlikely(err)) {
mod_timer(&queue->rx_refill_timer, jiffies + (HZ/10)); mod_timer(&queue->rx_refill_timer, jiffies + (HZ/10));
return; return;
} }
......
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