lkml.org 
[lkml]   [2010]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[003/205] virtio_net: do not reschedule rx refill forever
    2.6.34-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Michael S. Tsirkin <mst@redhat.com>

    commit 1788f49548860fa1c861ee3454d47b466c877e43 upstream.

    We currently fill all of RX ring, then add_buf
    returns ENOSPC, which gets mis-detected as an out of
    memory condition and causes us to reschedule the work,
    and so on forever. Fix this by oom = err == -ENOMEM;

    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/virtio_net.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    --- a/drivers/net/virtio_net.c
    +++ b/drivers/net/virtio_net.c
    @@ -417,7 +417,7 @@ static int add_recvbuf_mergeable(struct
    static bool try_fill_recv(struct virtnet_info *vi, gfp_t gfp)
    {
    int err;
    - bool oom = false;
    + bool oom;

    do {
    if (vi->mergeable_rx_bufs)
    @@ -427,10 +427,9 @@ static bool try_fill_recv(struct virtnet
    else
    err = add_recvbuf_small(vi, gfp);

    - if (err < 0) {
    - oom = true;
    + oom = err == -ENOMEM;
    + if (err < 0)
    break;
    - }
    ++vi->num;
    } while (err > 0);
    if (unlikely(vi->num > vi->max))



    \
     
     \ /
      Last update: 2010-07-30 20:41    [W:0.019 / U:0.276 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site