From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id DB64B1B7B8; Thu, 10 May 2018 02:48:14 +0200 (CEST) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 May 2018 17:48:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,383,1520924400"; d="scan'208";a="227276839" Received: from debian.sh.intel.com (HELO debian) ([10.67.104.164]) by fmsmga006.fm.intel.com with ESMTP; 09 May 2018 17:48:12 -0700 Date: Thu, 10 May 2018 08:48:45 +0800 From: Tiwei Bie To: Ferruh Yigit Cc: zhiyong.yang@intel.com, dev@dpdk.org, maxime.coquelin@redhat.com, lei.a.yao@intel.com, stable@dpdk.org Message-ID: <20180510004845.644dnaqakuxtz52v@debian> References: <20180509094936.62796-1-zhiyong.yang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [dpdk-stable] [PATCH] net/virtio-user: fix multiple queues fail in server mode X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 May 2018 00:48:15 -0000 On Wed, May 09, 2018 at 03:48:58PM +0100, Ferruh Yigit wrote: > 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? Sure. Will do it! Thanks > > 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; > > >