From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ferruh Yigit Subject: Re: [dpdk-stable] [PATCH] net/virtio-user: fix multiple queues fail in server mode Date: Wed, 9 May 2018 15:48:58 +0100 Message-ID: References: <20180509094936.62796-1-zhiyong.yang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: maxime.coquelin@redhat.com, lei.a.yao@intel.com, stable@dpdk.org, Tiwei Bie To: zhiyong.yang@intel.com, dev@dpdk.org Return-path: In-Reply-To: <20180509094936.62796-1-zhiyong.yang@intel.com> Content-Language: en-US List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 5/9/2018 10:49 AM, 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 Hi Zhiyong, Is this for rc3? Hi Tiwei, Since Maxime is out this week, can you please review this patch? Thanks, ferruh > Signed-off-by: Zhiyong Yang > --- > 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; > + > 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); > 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. > + * / There is a typo here causing comment block not ended. > + if (dev->is_server && dev->vhostfd < 0) > + status = 0; > > /* Update status */ > *(virtio_net_ctrl_ack *)(uintptr_t)vring->desc[idx_status].addr = status; >