Sasha Levin
2021-Jul-10 23:52 UTC
[PATCH AUTOSEL 4.14 20/21] virtio_net: Fix error handling in virtnet_restore()
From: Xie Yongji <xieyongji at bytedance.com>
[ Upstream commit 3f2869cace829fb4b80fc53b3ddaa7f4ba9acbf1 ]
Do some cleanups in virtnet_restore() when virtnet_cpu_notif_add() failed.
Signed-off-by: Xie Yongji <xieyongji at bytedance.com>
Link: https://lore.kernel.org/r/20210517084516.332-1-xieyongji at bytedance.com
Acked-by: Jason Wang <jasowang at redhat.com>
Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
Signed-off-by: Sasha Levin <sashal at 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 2d2a307c0231..dbc944c5759e 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