net/virtio-user: do not reset virtqueues for split ring

  Add missing braces to avoid resetting virtqueues unconditionally
during reconnection.

Fixes: 6ebbf4109f35 ("net/virtio-user: fix packed ring server mode")

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
---
Cc: Xuan Ding <xuan.ding@intel.com>

 drivers/net/virtio/virtio_user_ethdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
  

Hi Tiwei,

Corrected on my local, thank you for your fix in advance.

Regards,
Xuan Ding

> -----Original Message-----
> From: Bie, Tiwei <tiwei.bie@intel.com>
> Sent: Wednesday, February 5, 2020 10:11 AM
> To: dev@dpdk.org; maxime.coquelin@redhat.com; Wang, Zhihong
> <zhihong.wang@intel.com>
> Cc: Ding, Xuan <xuan.ding@intel.com>
> Subject: [PATCH] net/virtio-user: do not reset virtqueues for split ring
> 
> Add missing braces to avoid resetting virtqueues unconditionally during
> reconnection.
> 
> Fixes: 6ebbf4109f35 ("net/virtio-user: fix packed ring server mode")
> 
> Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
> ---
> Cc: Xuan Ding <xuan.ding@intel.com>
> 
>  drivers/net/virtio/virtio_user_ethdev.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/virtio/virtio_user_ethdev.c
> b/drivers/net/virtio/virtio_user_ethdev.c
> index f3b35d1bd..e61af4068 100644
> --- a/drivers/net/virtio/virtio_user_ethdev.c
> +++ b/drivers/net/virtio/virtio_user_ethdev.c
> @@ -89,10 +89,11 @@ virtio_user_server_reconnect(struct virtio_user_dev
> *dev)
>  	dev->features &= dev->device_features;
> 
>  	/* For packed ring, resetting queues is required in reconnection. */
> -	if (vtpci_packed_queue(hw))
> +	if (vtpci_packed_queue(hw)) {
>  		PMD_INIT_LOG(NOTICE, "Packets on the fly will be dropped"
>  				" when packed ring reconnecting.");
>  		virtio_user_reset_queues_packed(eth_dev);
> +	}
> 
>  	ret = virtio_user_start_device(dev);
>  	if (ret < 0)
> --
> 2.24.1
  

On 2/5/20 3:11 AM, Tiwei Bie wrote:
> Add missing braces to avoid resetting virtqueues unconditionally
> during reconnection.
> 
> Fixes: 6ebbf4109f35 ("net/virtio-user: fix packed ring server mode")
> 
> Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
> ---
> Cc: Xuan Ding <xuan.ding@intel.com>
> 
>  drivers/net/virtio/virtio_user_ethdev.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
> index f3b35d1bd..e61af4068 100644
> --- a/drivers/net/virtio/virtio_user_ethdev.c
> +++ b/drivers/net/virtio/virtio_user_ethdev.c
> @@ -89,10 +89,11 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev)
>  	dev->features &= dev->device_features;
>  
>  	/* For packed ring, resetting queues is required in reconnection. */
> -	if (vtpci_packed_queue(hw))
> +	if (vtpci_packed_queue(hw)) {
>  		PMD_INIT_LOG(NOTICE, "Packets on the fly will be dropped"
>  				" when packed ring reconnecting.");
>  		virtio_user_reset_queues_packed(eth_dev);
> +	}
>  
>  	ret = virtio_user_start_device(dev);
>  	if (ret < 0)
> 

Oops, thank you Tiwei for fixing it!

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

Maxime
  

On 2/5/20 3:11 AM, Tiwei Bie wrote:
> Add missing braces to avoid resetting virtqueues unconditionally
> during reconnection.
> 
> Fixes: 6ebbf4109f35 ("net/virtio-user: fix packed ring server mode")
> 
> Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
> ---
> Cc: Xuan Ding <xuan.ding@intel.com>
> 
>  drivers/net/virtio/virtio_user_ethdev.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied to dpdk-next-virtio tree.

Thanks,
Maxime