> -----Original Message----- > From: Pei, Andy <[email protected]> > Sent: Thursday, October 13, 2022 4:45 PM > To: [email protected] > Cc: Xia, Chenbo <[email protected]>; Xu, Rosen <[email protected]>; > Huang, Wei <[email protected]>; Cao, Gang <[email protected]>; > [email protected] > Subject: [PATCH v4 8/8] vhost: improve vDPA blk device configure condition > > To support multi-queue, configure device > after call fd of all queues are set. > > Signed-off-by: Andy Pei <[email protected]> > Signed-off-by: Huang Wei <[email protected]> > --- > lib/vhost/vhost_user.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c > index 0509025..3ede83f 100644 > --- a/lib/vhost/vhost_user.c > +++ b/lib/vhost/vhost_user.c > @@ -2965,6 +2965,7 @@ static int is_vring_iotlb(struct virtio_net *dev, > uint32_t vdpa_type = -1; > uint32_t request; > uint32_t i; > + uint16_t blk_call_fd; > > dev = get_device(vid); > if (dev == NULL) > @@ -3191,9 +3192,15 @@ static int is_vring_iotlb(struct virtio_net *dev, > if (!vdpa_dev) > goto out; > > - 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)) > -- > 1.8.3.1
Reviewed-by: Chenbo Xia <[email protected]>
