From 01996a034a78db79686238a9656f8a49367fe963 Mon Sep 17 00:00:00 2001 From: Marvin Liu Date: Wed, 6 May 2020 23:07:24 +0800 Subject: [PATCH] net/virtio: fix crash when device reconnecting When doing virtio device initialization, virtqueues will be reset in server mode if ring type is packed. It will cause issue because queues have been freed in the beginning of device initialization. Fix this issue by checking whether device has been initialized before reset. If device hasn't been initialized, there's no need to reset queues. Fixes: 6ebbf4109f35 ("net/virtio-user: fix packed ring server mode") Cc: stable@dpdk.org Signed-off-by: Marvin Liu Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_user_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index dfc5291d4c..798f191c32 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -89,7 +89,8 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev) dev->features &= dev->device_features; /* For packed ring, resetting queues is required in reconnection. */ - if (vtpci_packed_queue(hw)) { + if (vtpci_packed_queue(hw) && + (vtpci_get_status(hw) & VIRTIO_CONFIG_STATUS_DRIVER_OK)) { PMD_INIT_LOG(NOTICE, "Packets on the fly will be dropped" " when packed ring reconnecting."); virtio_user_reset_queues_packed(eth_dev); -- 2.20.1