lkml.org 
[lkml]   [2021]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 285/315] virtio_net: Fix error handling in virtnet_restore()
    Date
    From: Xie Yongji <xieyongji@bytedance.com>

    [ Upstream commit 3f2869cace829fb4b80fc53b3ddaa7f4ba9acbf1 ]

    Do some cleanups in virtnet_restore() when virtnet_cpu_notif_add() failed.

    Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
    Link: https://lore.kernel.org/r/20210517084516.332-1-xieyongji@bytedance.com
    Acked-by: Jason Wang <jasowang@redhat.com>
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/virtio_net.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
    index 71052d17c9ae..c8abbf81ef52 100644
    --- a/drivers/net/virtio_net.c
    +++ b/drivers/net/virtio_net.c
    @@ -2765,8 +2765,11 @@ static __maybe_unused int virtnet_restore(struct virtio_device *vdev)
    virtnet_set_queues(vi, vi->curr_queue_pairs);

    err = virtnet_cpu_notif_add(vi);
    - if (err)
    + if (err) {
    + virtnet_freeze_down(vdev);
    + remove_vq_common(vi);
    return err;
    + }

    return 0;
    }
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-19 17:50    [W:4.026 / U:0.600 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site