vDPA/ifcvf: get_config_size should return dev specific config size

get_config_size() should return the size based on the decected
device type.

Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/20210419063326.3748-4-lingshan.zhu@intel.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c
index 9a4a6df91f089a3bc9407b5746a0224acacfff38..ab0ab5cf0f6e12bf6bc3b40120dda4cb20663035 100644 (file)
--- a/drivers/vdpa/ifcvf/ifcvf_main.c
+++ b/drivers/vdpa/ifcvf/ifcvf_main.c
@@ -356,7 +356,24 @@ static u32 ifcvf_vdpa_get_vq_align(struct vdpa_device *vdpa_dev)
 
 static size_t ifcvf_vdpa_get_config_size(struct vdpa_device *vdpa_dev)
 {
-       return sizeof(struct virtio_net_config);
+       struct ifcvf_adapter *adapter = vdpa_to_adapter(vdpa_dev);
+       struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev);
+       struct pci_dev *pdev = adapter->pdev;
+       size_t size;
+
+       switch (vf->dev_type) {
+       case VIRTIO_ID_NET:
+               size = sizeof(struct virtio_net_config);
+               break;
+       case VIRTIO_ID_BLOCK:
+               size = sizeof(struct virtio_blk_config);
+               break;
+       default:
+               size = 0;
+               IFCVF_ERR(pdev, "VIRTIO ID %u not supported\n", vf->dev_type);
+       }
+
+       return size;
 }
 
 static void ifcvf_vdpa_get_config(struct vdpa_device *vdpa_dev,