DPDK patches and discussions
 help / color / mirror / Atom feed
From: Tiwei Bie <tiwei.bie@intel.com>
To: zhiyong.yang@intel.com
Cc: dev@dpdk.org, maxime.coquelin@redhat.com, lei.a.yao@intel.com,
	stable@dpdk.org
Subject: Re: [dpdk-dev] [PATCH] net/virtio-user: fix multiple queues fail in server mode
Date: Thu, 10 May 2018 10:47:04 +0800	[thread overview]
Message-ID: <20180510024704.gkcaazw3ctztmait@debian> (raw)
In-Reply-To: <20180509094936.62796-1-zhiyong.yang@intel.com>

On Wed, May 09, 2018 at 05:49:36PM +0800, zhiyong.yang@intel.com wrote:
> This patch fixes multiple queues failure when virtio-user works in
> server mode.
> 
> Fixes: bd8f50a45d0f ("net/virtio-user: support server mode")
> Cc: stable@dpdk.org
> Signed-off-by: Zhiyong Yang <zhiyong.yang@intel.com>
> ---
>  drivers/net/virtio/virtio_user/vhost_user.c      | 3 +++
>  drivers/net/virtio/virtio_user/virtio_user_dev.c | 9 +++++++++
>  2 files changed, 12 insertions(+)
> 
> diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
> index a6df97a00..a9e53d7b5 100644
> --- a/drivers/net/virtio/virtio_user/vhost_user.c
> +++ b/drivers/net/virtio/virtio_user/vhost_user.c
> @@ -263,6 +263,9 @@ vhost_user_sock(struct virtio_user_dev *dev,
>  
>  	PMD_DRV_LOG(INFO, "%s", vhost_msg_strings[req]);
>  
> +	if (vhostfd < 0)
> +		return -1;

I think this is just a workaround to avoid printing
error messages in server mode.

Ideally, vhost_user_sock() shouldn't be called with
vhostfd < 0.

If we want this workaround, we should only allow
this in server mode. I.e. do the check like this:

	if (dev->is_server && vhostfd < 0)
		return -1;

> +
>  	msg.request = req;
>  	msg.flags = VHOST_USER_VERSION;
>  	msg.size = 0;
> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> index 38b8bc90d..e988dc3f4 100644
> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> @@ -126,6 +126,10 @@ virtio_user_start_device(struct virtio_user_dev *dev)
>  	features &= ~(1ull << VIRTIO_NET_F_MAC);
>  	/* Strip VIRTIO_NET_F_CTRL_VQ, as devices do not really need to know */
>  	features &= ~(1ull << VIRTIO_NET_F_CTRL_VQ);
> +	/* Also disable features which depend on VIRTIO_NET_F_CTRL_VQ */
> +	features &= ~(1ull << VIRTIO_NET_F_CTRL_RX);
> +	features &= ~(1ull << VIRTIO_NET_F_CTRL_VLAN);
> +	features &= ~(1ull << VIRTIO_NET_F_CTRL_MAC_ADDR);

Is this really related to this fix?

>  	features &= ~(1ull << VIRTIO_NET_F_STATUS);
>  	ret = dev->ops->send_request(dev, VHOST_USER_SET_FEATURES, &features);
>  	if (ret < 0)
> @@ -488,6 +492,11 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,
>  		queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr;
>  		status = virtio_user_handle_mq(dev, queues);
>  	}
> +	/* Server mode can't enable queue pairs if vhostfd is not connected,
> +	 * we suppose that status always returns 0 in this case.
> +	 * /

As Ferruh pointed, a typo here.

> +	if (dev->is_server && dev->vhostfd < 0)
> +		status = 0;

When the connection to the backend isn't established in
server mode, what virtio_user_handle_mq() can't do is to
enable the queue pairs. But other checks in that function
are still valid. So I would suggest moving above code to
virtio_user_handle_mq().

Thanks

>  
>  	/* Update status */
>  	*(virtio_net_ctrl_ack *)(uintptr_t)vring->desc[idx_status].addr = status;
> -- 
> 2.14.3
> 

  parent reply	other threads:[~2018-05-10  2:46 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-09  9:49 zhiyong.yang
2018-05-09 14:48 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2018-05-10  0:48   ` Tiwei Bie
2018-05-10  1:28   ` Yang, Zhiyong
2018-05-10  1:38     ` Yang, Zhiyong
2018-05-10  2:47 ` Tiwei Bie [this message]
2018-05-10  3:04   ` [dpdk-dev] " Yang, Zhiyong
2018-05-10  4:42     ` Tiwei Bie
2018-05-10  9:36 ` [dpdk-dev] [PATCH v2] " zhiyong.yang
2018-05-10 10:23   ` Tiwei Bie
2018-05-10 14:01     ` Yang, Zhiyong
2018-05-10 14:19       ` Tiwei Bie
2018-05-11  2:12   ` [dpdk-dev] [PATCH v3] " zhiyong.yang
2018-05-11  2:49     ` Tiwei Bie
2018-05-11  3:01       ` Yang, Zhiyong
2018-05-11  3:31     ` [dpdk-dev] [PATCH v4] " zhiyong.yang
2018-05-11 11:33       ` Ferruh Yigit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180510024704.gkcaazw3ctztmait@debian \
    --to=tiwei.bie@intel.com \
    --cc=dev@dpdk.org \
    --cc=lei.a.yao@intel.com \
    --cc=maxime.coquelin@redhat.com \
    --cc=stable@dpdk.org \
    --cc=zhiyong.yang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).