lkml.org 
[lkml]   [2019]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 28/74] virtio_net: Fix not restoring real_num_rx_queues
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

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

    From: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>

    [ Upstream commit 188313c137c4f76afd0862f50dbc185b198b9e2a ]

    When _virtnet_set_queues() failed we did not restore real_num_rx_queues.
    Fix this by placing the change of real_num_rx_queues after
    _virtnet_set_queues().
    This order is also in line with virtnet_set_channels().

    Fixes: 4941d472bf95 ("virtio-net: do not reset during XDP set")
    Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
    Acked-by: Jason Wang <jasowang@redhat.com>
    Acked-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/virtio_net.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/net/virtio_net.c
    +++ b/drivers/net/virtio_net.c
    @@ -2377,10 +2377,10 @@ static int virtnet_xdp_set(struct net_de
    }
    }

    - netif_set_real_num_rx_queues(dev, curr_qp + xdp_qp);
    err = _virtnet_set_queues(vi, curr_qp + xdp_qp);
    if (err)
    goto err;
    + netif_set_real_num_rx_queues(dev, curr_qp + xdp_qp);
    vi->xdp_queue_pairs = xdp_qp;

    for (i = 0; i < vi->max_queue_pairs; i++) {

    \
     
     \ /
      Last update: 2019-02-04 12:01    [W:4.168 / U:0.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site