[PATCH 0/2] Some fixes for virtio and vhost

[PATCH 0/2] Some fixes for virtio and vhost

[Tiwei Bie]

Tiwei Bie (2):
  vhost: fix IOVA access for packed ring
  net/virtio-user: fix typo in error message

 drivers/net/virtio/virtio_user_ethdev.c | 2 +-
 lib/librte_vhost/virtio_net.c           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.19.1

[PATCH 1/2] vhost: fix IOVA access for packed ring

[Tiwei Bie]

We should apply for RO access when receiving packets from the
VM and apply for RW access when sending packets to the VM.

Fixes: a922401f35cc ("vhost: add Rx support for packed ring")
Fixes: ae999ce49dcb ("vhost: add Tx support for packed ring")
Cc: stable@dpdk.org

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
---
 lib/librte_vhost/virtio_net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index 8ad30c94a..5e1a1a727 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -598,7 +598,7 @@ reserve_avail_buf_packed(struct virtio_net *dev, struct vhost_virtqueue *vq,
 						avail_idx, &desc_count,
 						buf_vec, &vec_idx,
 						&buf_id, &len,
-						VHOST_ACCESS_RO) < 0))
+						VHOST_ACCESS_RW) < 0))
 			return -1;
 
 		len = RTE_MIN(len, size);
@@ -1503,7 +1503,7 @@ virtio_dev_tx_packed(struct virtio_net *dev, struct vhost_virtqueue *vq,
 						vq->last_avail_idx, &desc_count,
 						buf_vec, &nr_vec,
 						&buf_id, &dummy_len,
-						VHOST_ACCESS_RW) < 0))
+						VHOST_ACCESS_RO) < 0))
 			break;
 
 		if (likely(dev->dequeue_zero_copy == 0))
-- 
2.19.1

[PATCH 2/2] net/virtio-user: fix typo in error message

[Tiwei Bie]

The param we are checking is VIRTIO_USER_ARG_PATH, instead
of VIRTIO_USER_ARG_QUEUE_SIZE.

Fixes: ce2eabdd43ec ("net/virtio-user: add virtual device")
Cc: stable@dpdk.org

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
---
 drivers/net/virtio/virtio_user_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 61b7c0a38..f8791391a 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -484,7 +484,7 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
 		}
 	} else {
 		PMD_INIT_LOG(ERR, "arg %s is mandatory for virtio_user",
-			  VIRTIO_USER_ARG_QUEUE_SIZE);
+			     VIRTIO_USER_ARG_PATH);
 		goto end;
 	}
 
-- 
2.19.1

Re: [PATCH 1/2] vhost: fix IOVA access for packed ring

[Maxime Coquelin]

On 11/6/18 7:40 AM, Tiwei Bie wrote:
> We should apply for RO access when receiving packets from the
> VM and apply for RW access when sending packets to the VM.
> 
> Fixes: a922401f35cc ("vhost: add Rx support for packed ring")
> Fixes: ae999ce49dcb ("vhost: add Tx support for packed ring")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
> ---
>   lib/librte_vhost/virtio_net.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
> index 8ad30c94a..5e1a1a727 100644
> --- a/lib/librte_vhost/virtio_net.c
> +++ b/lib/librte_vhost/virtio_net.c
> @@ -598,7 +598,7 @@ reserve_avail_buf_packed(struct virtio_net *dev, struct vhost_virtqueue *vq,
>   						avail_idx, &desc_count,
>   						buf_vec, &vec_idx,
>   						&buf_id, &len,
> -						VHOST_ACCESS_RO) < 0))
> +						VHOST_ACCESS_RW) < 0))
>   			return -1;
>   
>   		len = RTE_MIN(len, size);
> @@ -1503,7 +1503,7 @@ virtio_dev_tx_packed(struct virtio_net *dev, struct vhost_virtqueue *vq,
>   						vq->last_avail_idx, &desc_count,
>   						buf_vec, &nr_vec,
>   						&buf_id, &dummy_len,
> -						VHOST_ACCESS_RW) < 0))
> +						VHOST_ACCESS_RO) < 0))
>   			break;
>   
>   		if (likely(dev->dequeue_zero_copy == 0))
> 

Ouch, good catch!

Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks,
Maxime

Re: [PATCH 2/2] net/virtio-user: fix typo in error message

[Jens Freimann]

On Tue, Nov 06, 2018 at 02:40:22PM +0800, Tiwei Bie wrote:
>The param we are checking is VIRTIO_USER_ARG_PATH, instead
>of VIRTIO_USER_ARG_QUEUE_SIZE.
>
>Fixes: ce2eabdd43ec ("net/virtio-user: add virtual device")
>Cc: stable@dpdk.org
>
>Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
>---
> drivers/net/virtio/virtio_user_ethdev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>

Reviewed-by: Jens Freimann <jfreimann@redhat.com>

Re: [PATCH 0/2] Some fixes for virtio and vhost

[Maxime Coquelin]

On 11/6/18 7:40 AM, Tiwei Bie wrote:
> Tiwei Bie (2):
>    vhost: fix IOVA access for packed ring
>    net/virtio-user: fix typo in error message
> 
>   drivers/net/virtio/virtio_user_ethdev.c | 2 +-
>   lib/librte_vhost/virtio_net.c           | 4 ++--
>   2 files changed, 3 insertions(+), 3 deletions(-)
> 


Applied to dpdk-next-virtio/master

Thanks,
Maxime