From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id AE7551B7FD for ; Thu, 10 Jan 2019 15:59:04 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 13FEFDF88E; Thu, 10 Jan 2019 14:59:04 +0000 (UTC) Received: from localhost (unknown [10.36.118.36]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 96C8C5D784; Thu, 10 Jan 2019 14:58:58 +0000 (UTC) Date: Thu, 10 Jan 2019 15:58:57 +0100 From: Jens Freimann To: Tiwei Bie Cc: dev@dpdk.org, maxime.coquelin@redhat.com Message-ID: <20190110145857.6ofzht7npb3zheun@jenstp.localdomain> References: <20190110131751.32670-1-jfreimann@redhat.com> <20190110131751.32670-3-jfreimann@redhat.com> <20190110144024.GA27794@dpdk-tbie.sh.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20190110144024.GA27794@dpdk-tbie.sh.intel.com> User-Agent: NeoMutt/20180716 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 10 Jan 2019 14:59:04 +0000 (UTC) Subject: Re: [dpdk-dev] [PATCH v2 2/2] Revert "net/virtio-user: fail if cq used with packed vq" X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2019 14:59:04 -0000 On Thu, Jan 10, 2019 at 10:40:25PM +0800, Tiwei Bie wrote: >On Thu, Jan 10, 2019 at 02:17:51PM +0100, Jens Freimann wrote: >> This reverts commit 5e4e7a7524a30c176bd6b1789ab30963f27f2681. >> >> Not a clean revert, I had to resolve a conflict due to >> 616ea5519 net/virtio-user: fix packed vq option parsing >> >> Signed-off-by: Jens Freimann >> --- >> drivers/net/virtio/virtio_user/virtio_user_dev.c | 11 +++-------- >> 1 file changed, 3 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c >> index 49fcf48b9..b7059cb1e 100644 >> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c >> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c >> @@ -478,15 +478,10 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues, >> if (!in_order) >> dev->unsupported_features |= (1ull << VIRTIO_F_IN_ORDER); >> >> - if (packed_vq) { >> - if (cq) { >> - PMD_INIT_LOG(ERR, "control vq not supported yet with " >> - "packed virtqueues\n"); >> - return -1; >> - } > >I think it's natural to drop above code in the same patch that >introduces the control vq support. I just split it out because Maxime requested it. > >> - } else { >> + if (packed_vq) >> + dev->device_features |= (1ull << VIRTIO_F_RING_PACKED); > >We shouldn't add this bit into device_features like this. >We just need this: ok regards, Jens > > if (!packed_vq) > dev->unsupported_features |= (1ull << VIRTIO_F_RING_PACKED); > > >> + else >> dev->unsupported_features |= (1ull << VIRTIO_F_RING_PACKED); >> - } >> >> if (dev->mac_specified) >> dev->frontend_features |= (1ull << VIRTIO_NET_F_MAC); >> -- >> 2.17.2 >>