[v5,8/8] vhost: improve vDPA blk device configure condition
Checks
Commit Message
To support multi-queue, configure device
after call fd of all queues are set.
Signed-off-by: Andy Pei <andy.pei@intel.com>
Signed-off-by: Huang Wei <wei.huang@intel.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
---
lib/vhost/vhost_user.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
@@ -2984,6 +2984,7 @@ static int is_vring_iotlb(struct virtio_net *dev,
uint32_t vdpa_type = 0;
uint32_t request;
uint32_t i;
+ uint16_t blk_call_fd;
dev = get_device(vid);
if (dev == NULL)
@@ -3203,9 +3204,15 @@ static int is_vring_iotlb(struct virtio_net *dev,
} else {
vdpa_type = RTE_VHOST_VDPA_DEVICE_TYPE_NET;
}
- if (vdpa_type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK
- && request != VHOST_USER_SET_VRING_CALL)
- goto out;
+ if (vdpa_type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK) {
+ if (request == VHOST_USER_SET_VRING_CALL) {
+ blk_call_fd = ctx.msg.payload.u64 & VHOST_USER_VRING_IDX_MASK;
+ if (blk_call_fd != dev->nr_vring - 1)
+ goto out;
+ } else {
+ goto out;
+ }
+ }
if (!(dev->flags & VIRTIO_DEV_VDPA_CONFIGURED)) {
if (vdpa_dev->ops->dev_conf(dev->vid))