[v8,12/12] 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>
---
lib/vhost/vhost_user.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
Comments
On 10/18/22 14:07, Andy Pei wrote:
> 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>
> ---
> 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 e0ff79d..9902ae9 100644
> --- a/lib/vhost/vhost_user.c
> +++ b/lib/vhost/vhost_user.c
> @@ -2972,6 +2972,7 @@ static int is_vring_iotlb(struct virtio_net *dev,
> bool handled;
> uint32_t request;
> uint32_t i;
> + uint16_t blk_call_fd;
>
> dev = get_device(vid);
> if (dev == NULL)
> @@ -3181,9 +3182,15 @@ static int is_vring_iotlb(struct virtio_net *dev,
> if (!vdpa_dev)
> goto out;
>
> - if (vdpa_dev->type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK
> - && request != VHOST_USER_SET_VRING_CALL)
> - goto out;
> + if (vdpa_dev->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))
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
Hi Maxime,
Thanks for your review.
> -----Original Message-----
> From: Maxime Coquelin <maxime.coquelin@redhat.com>
> Sent: Tuesday, October 18, 2022 10:15 PM
> To: Pei, Andy <andy.pei@intel.com>; dev@dpdk.org
> Cc: Xia, Chenbo <Chenbo.Xia@intel.com>; Xu, Rosen <rosen.xu@intel.com>;
> Huang, Wei <wei.huang@intel.com>; Cao, Gang <gang.cao@intel.com>
> Subject: Re: [PATCH v8 12/12] vhost: improve vDPA blk device configure
> condition
>
>
>
> On 10/18/22 14:07, Andy Pei wrote:
> > 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>
> > ---
> > 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
> > e0ff79d..9902ae9 100644
> > --- a/lib/vhost/vhost_user.c
> > +++ b/lib/vhost/vhost_user.c
> > @@ -2972,6 +2972,7 @@ static int is_vring_iotlb(struct virtio_net *dev,
> > bool handled;
> > uint32_t request;
> > uint32_t i;
> > + uint16_t blk_call_fd;
> >
> > dev = get_device(vid);
> > if (dev == NULL)
> > @@ -3181,9 +3182,15 @@ static int is_vring_iotlb(struct virtio_net *dev,
> > if (!vdpa_dev)
> > goto out;
> >
> > - if (vdpa_dev->type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK
> > - && request != VHOST_USER_SET_VRING_CALL)
> > - goto out;
> > + if (vdpa_dev->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))
>
> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>
> Thanks,
> Maxime
> -----Original Message-----
> From: Pei, Andy <andy.pei@intel.com>
> Sent: Tuesday, October 18, 2022 8:08 PM
> To: dev@dpdk.org
> Cc: Xia, Chenbo <chenbo.xia@intel.com>; Xu, Rosen <rosen.xu@intel.com>;
> Huang, Wei <wei.huang@intel.com>; Cao, Gang <gang.cao@intel.com>;
> maxime.coquelin@redhat.com
> Subject: [PATCH v8 12/12] 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 <andy.pei@intel.com>
> Signed-off-by: Huang Wei <wei.huang@intel.com>
> ---
> 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 e0ff79d..9902ae9 100644
> --- a/lib/vhost/vhost_user.c
> +++ b/lib/vhost/vhost_user.c
> @@ -2972,6 +2972,7 @@ static int is_vring_iotlb(struct virtio_net *dev,
> bool handled;
> uint32_t request;
> uint32_t i;
> + uint16_t blk_call_fd;
>
> dev = get_device(vid);
> if (dev == NULL)
> @@ -3181,9 +3182,15 @@ static int is_vring_iotlb(struct virtio_net *dev,
> if (!vdpa_dev)
> goto out;
>
> - if (vdpa_dev->type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK
> - && request != VHOST_USER_SET_VRING_CALL)
> - goto out;
> + if (vdpa_dev->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 <chenbo.xia@intel.com>
Hi Chenbo,
Thanks for your review.
> -----Original Message-----
> From: Xia, Chenbo <chenbo.xia@intel.com>
> Sent: Wednesday, October 19, 2022 5:15 PM
> To: Pei, Andy <andy.pei@intel.com>; dev@dpdk.org
> Cc: Xu, Rosen <rosen.xu@intel.com>; Huang, Wei <wei.huang@intel.com>;
> Cao, Gang <gang.cao@intel.com>; maxime.coquelin@redhat.com
> Subject: RE: [PATCH v8 12/12] vhost: improve vDPA blk device configure
> condition
>
> > -----Original Message-----
> > From: Pei, Andy <andy.pei@intel.com>
> > Sent: Tuesday, October 18, 2022 8:08 PM
> > To: dev@dpdk.org
> > Cc: Xia, Chenbo <chenbo.xia@intel.com>; Xu, Rosen
> > <rosen.xu@intel.com>; Huang, Wei <wei.huang@intel.com>; Cao, Gang
> > <gang.cao@intel.com>; maxime.coquelin@redhat.com
> > Subject: [PATCH v8 12/12] 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 <andy.pei@intel.com>
> > Signed-off-by: Huang Wei <wei.huang@intel.com>
> > ---
> > 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
> > e0ff79d..9902ae9 100644
> > --- a/lib/vhost/vhost_user.c
> > +++ b/lib/vhost/vhost_user.c
> > @@ -2972,6 +2972,7 @@ static int is_vring_iotlb(struct virtio_net *dev,
> > bool handled;
> > uint32_t request;
> > uint32_t i;
> > + uint16_t blk_call_fd;
> >
> > dev = get_device(vid);
> > if (dev == NULL)
> > @@ -3181,9 +3182,15 @@ static int is_vring_iotlb(struct virtio_net *dev,
> > if (!vdpa_dev)
> > goto out;
> >
> > - if (vdpa_dev->type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK
> > - && request != VHOST_USER_SET_VRING_CALL)
> > - goto out;
> > + if (vdpa_dev->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 <chenbo.xia@intel.com>
@@ -2972,6 +2972,7 @@ static int is_vring_iotlb(struct virtio_net *dev,
bool handled;
uint32_t request;
uint32_t i;
+ uint16_t blk_call_fd;
dev = get_device(vid);
if (dev == NULL)
@@ -3181,9 +3182,15 @@ static int is_vring_iotlb(struct virtio_net *dev,
if (!vdpa_dev)
goto out;
- if (vdpa_dev->type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK
- && request != VHOST_USER_SET_VRING_CALL)
- goto out;
+ if (vdpa_dev->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))