[dpdk-dev] [dpdk-stable] [PATCH] net/virtio-user: fix multiple queues fail in server mode

[Yang, Zhiyong]

> -----Original Message-----
> From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Yang, Zhiyong
> Sent: Thursday, May 10, 2018 9:29 AM
> To: Yigit, Ferruh <ferruh.yigit at intel.com>; dev at dpdk.org
> Cc: maxime.coquelin at redhat.com; Yao, Lei A <lei.a.yao at intel.com>;
> stable at dpdk.org; Bie, Tiwei <tiwei.bie at intel.com>
> Subject: Re: [dpdk-dev] [dpdk-stable] [PATCH] net/virtio-user: fix multiple
> queues fail in server mode
> 
> 
> 
> > -----Original Message-----
> > From: Yigit, Ferruh
> > Sent: Wednesday, May 9, 2018 10:49 PM
> > To: Yang, Zhiyong <zhiyong.yang at intel.com>; dev at dpdk.org
> > Cc: maxime.coquelin at redhat.com; Yao, Lei A <lei.a.yao at intel.com>;
> > stable at dpdk.org; Bie, Tiwei <tiwei.bie at intel.com>
> > Subject: Re: [dpdk-stable] [PATCH] net/virtio-user: fix multiple
> > queues fail in server mode
> >
> > On 5/9/2018 10:49 AM, zhiyong.yang at 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 at dpdk.org
> >
> > Hi Zhiyong,
> >
> > Is this for rc3?
> >
> 
> Right.
> 
> > Hi Tiwei,
> >
> > Since Maxime is out this week, can you please review this patch?
> >
> > Thanks,
> > ferruh
> >
> > > Signed-off-by: Zhiyong Yang <zhiyong.yang at 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;
> > > +
> Since virtio-user server mode need to start firstly before vhost user, So, In
> this case, the socket connection is not setup, So, we add to check validation
> of vhostfd here.
> 
> > >  	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.
> >
> 
> Thanks so much for your pointing out, Ferruh,  fix it in next version.

My bad, I remember I was aware of this issue yesterday, but sent out the wrong version by mistake.