From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxime Coquelin Subject: [PATCH v2 13/19] vhost: enable rings at the right time Date: Sun, 24 Sep 2017 18:19:15 +0200 Message-ID: <20170924161921.30010-14-maxime.coquelin@redhat.com> References: <20170924161921.30010-1-maxime.coquelin@redhat.com> Cc: mst@redhat.com, jfreiman@redhat.com, vkaplans@redhat.com, jasowang@redhat.com, Maxime Coquelin To: dev@dpdk.org, remy.horton@intel.com, tiwei.bie@intel.com, yliu@fridaylinux.org Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 0270F1B19A for ; Sun, 24 Sep 2017 18:20:39 +0200 (CEST) In-Reply-To: <20170924161921.30010-1-maxime.coquelin@redhat.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When VHOST_USER_F_PROTOCOL_FEATURES is negotiated, the ring is not enabled when started, but enabled through dedicated VHOST_USER_SET_VRING_ENABLE request. When not negotiated, the ring is started in enabled state, at VHOST_USER_SET_VRING_KICK request time. Signed-off-by: Maxime Coquelin --- lib/librte_vhost/vhost.c | 6 ------ lib/librte_vhost/vhost_user.c | 9 +++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index 6f243534e..0e2ad3322 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -158,12 +158,6 @@ init_vring_queue(struct virtio_net *dev, uint32_t vring_idx) /* Backends are set to -1 indicating an inactive device. */ vq->backend = -1; - /* - * always set the vq to enabled; this is to keep compatibility - * with the old QEMU, whereas there is no SET_VRING_ENABLE message. - */ - vq->enabled = 1; - TAILQ_INIT(&vq->zmbuf_list); } diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 0f23ea388..8aca7ef7e 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -699,6 +699,15 @@ vhost_user_set_vring_kick(struct virtio_net *dev, struct VhostUserMsg *pmsg) "vring kick idx:%d file:%d\n", file.index, file.fd); vq = dev->virtqueue[file.index]; + + /* + * When VHOST_USER_F_PROTOCOL_FEATURES is not negotiated, + * the ring starts already enabled. Otherwise, it is enabled via + * the SET_VRING_ENABLE message. + */ + if (!(dev->features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES))) + vq->enabled = 1; + if (vq->kickfd >= 0) close(vq->kickfd); vq->kickfd = file.fd; -- 2.13.5