From 2c2201fb0745d3d46be324fa86989224ea2f0d83 Mon Sep 17 00:00:00 2001 From: Jianfeng Tan Date: Fri, 21 Apr 2017 02:28:09 +0000 Subject: [PATCH] net/virtio-user: fix device type check Segfault happens when using virtio-user after commit 7f0a669e7b04 ("ethdev: add allocation helper for virtual drivers"). It's due to we use ethdev->device to recognize physical devices, but after above commit, this field is also filled for virtual devices. Then we obtain the wrong pci_dev pointer and accessing its field when copying pci info results in segfault. To fix it, we use hw->virtio_user_dev to differentiate physical devices from virtual devices. Fixes: 6a7c0dfcdf40 ("net/virtio: do not depend on PCI device of ethdev") Signed-off-by: Jianfeng Tan Acked-by: Yuanhan Liu --- drivers/net/virtio/virtio_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index cd87c0eb3d..73e5da8c54 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1348,7 +1348,7 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) if (virtio_negotiate_features(hw, req_features) < 0) return -1; - if (eth_dev->device) { + if (!hw->virtio_user_dev) { pci_dev = RTE_DEV_TO_PCI(eth_dev->device); rte_eth_copy_pci_info(eth_dev, pci_dev); } -- 2.20.1