From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 2AA511B3CD; Thu, 10 May 2018 04:46:33 +0200 (CEST) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 May 2018 19:46:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,383,1520924400"; d="scan'208";a="54641062" Received: from debian.sh.intel.com (HELO debian) ([10.67.104.164]) by orsmga001.jf.intel.com with ESMTP; 09 May 2018 19:46:31 -0700 Date: Thu, 10 May 2018 10:47:04 +0800 From: Tiwei Bie To: zhiyong.yang@intel.com Cc: dev@dpdk.org, maxime.coquelin@redhat.com, lei.a.yao@intel.com, stable@dpdk.org Message-ID: <20180510024704.gkcaazw3ctztmait@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: <20180509094936.62796-1-zhiyong.yang@intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [dpdk-stable] [dpdk-dev] [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 02:46:36 -0000 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 > --- > 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 >