From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 85E641B8A3; Thu, 10 May 2018 06:42:25 +0200 (CEST) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 May 2018 21:42:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,383,1520924400"; d="scan'208";a="40075697" Received: from debian.sh.intel.com (HELO debian) ([10.67.104.164]) by orsmga008.jf.intel.com with ESMTP; 09 May 2018 21:42:22 -0700 Date: Thu, 10 May 2018 12:42:56 +0800 From: Tiwei Bie To: "Yang, Zhiyong" Cc: "dev@dpdk.org" , "maxime.coquelin@redhat.com" , "Yao, Lei A" , "stable@dpdk.org" Message-ID: <20180510044255.muecjdoegvl62qr6@debian> References: <20180509094936.62796-1-zhiyong.yang@intel.com> <20180510024704.gkcaazw3ctztmait@debian> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: 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 04:42:26 -0000 On Thu, May 10, 2018 at 11:04:59AM +0800, Yang, Zhiyong wrote: > Hi Tiwei, > > > -----Original Message----- > > From: Bie, Tiwei > > Sent: Thursday, May 10, 2018 10:47 AM > > To: Yang, Zhiyong > > Cc: dev@dpdk.org; maxime.coquelin@redhat.com; Yao, Lei A > > ; stable@dpdk.org > > Subject: Re: [dpdk-dev] [PATCH] net/virtio-user: fix multiple queues fail in > > server mode > > > > 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; > > Ok. > > > > + > > > 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? > > > > Yes. if vhost user side receives these feature bits and > Vhost user doesn’t support these features and will close the socket connection. > If we have disable ctrl_VQ, also should disable them. > If cq is disabled, all the related features (including VIRTIO_NET_F_MQ) should have been disabled. The features in this function should already be a subset of the features supported by the vhost backend. The thing that's not right is that, in server mode, virtio-user doesn't do GET_FEATURES. And we need to do it. Thanks > > > > 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. > Ok. fix it. > > > > > > + 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(). > Ok. > > Thanks > Zhiyong