From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 471202B91 for ; Sat, 1 Apr 2017 10:35:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491035737; x=1522571737; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=W2QsiNpPRKgro26esGWEXBb8OydBxTR68IFLc+DMDPQ=; b=Scir4Ug2oQ9TxxdjthAcTZspwgmLe6cdk4vwdoVae1WAqQjfM9eY78FS LFxMNtzoExDeC5Xxg7VcGm6TK7MoqA==; Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Apr 2017 01:35:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,256,1486454400"; d="scan'208";a="840691462" Received: from yliu-dev.sh.intel.com (HELO yliu-dev) ([10.239.67.162]) by FMSMGA003.fm.intel.com with ESMTP; 01 Apr 2017 01:35:31 -0700 Date: Sat, 1 Apr 2017 16:32:58 +0800 From: Yuanhan Liu To: dev@dpdk.org Cc: Maxime Coquelin , Yuanhan Liu Message-ID: <20170401083258.GW18844@yliu-dev.sh.intel.com> References: <1488434385-7605-1-git-send-email-yuanhan.liu@linux.intel.com> <1488435367-22170-1-git-send-email-yuanhan.liu@linux.intel.com> <1042e46c-733f-929d-b299-9ac7abf174cb@redhat.com> <20170322085612.GP18844@yliu-dev.sh.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170322085612.GP18844@yliu-dev.sh.intel.com> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [dpdk-dev] [PATCH] vhost: remove a hack on queue allocation 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: Sat, 01 Apr 2017 08:35:37 -0000 On Wed, Mar 22, 2017 at 04:56:12PM +0800, Yuanhan Liu wrote: > On Wed, Mar 22, 2017 at 09:41:07AM +0100, Maxime Coquelin wrote: > > > > > > On 03/02/2017 07:16 AM, Yuanhan Liu wrote: > > >We used to allocate queues based on the index from SET_VRING_CALL > > >request: if corresponding queue hasn't been allocated, allocate it. > > > > > >Though it's pratically right (it's the first per-vring request we > > >will get from QEMU for vhost-user negotiation), but it's not technically > > >right: it's not documented in the vhost-user spec that it will always > > >be the first per-vring request. For example, SET_VRING_ADDR could also > > >be the first per-vring request. > > > > > >Thus, we should not depend the SET_VRING_CALL on queue allocation. > > >Instead, we could catch all the per-vring messages at the entrance of > > >request handler, and allocate one if it hasn't been allocated before. > > > > > >By that, we could remove a hack. > > > > > >Signed-off-by: Yuanhan Liu > > >--- > > > > > >v2: add missing break > > >--- > > > lib/librte_vhost/vhost_user.c | 61 ++++++++++++++++++++++++++++++++++--------- > > > 1 file changed, 48 insertions(+), 13 deletions(-) > > > > > > Reviewed-by: Maxime Coquelin > > Thanks. > > Applied to dpdk-next-virtio. Reworked, as there is a silly error that cause crash. --yliu -- >8 -- >>From 269ba9b3a6a1671f463b9f9d4cc0d51954f7a2f5 Mon Sep 17 00:00:00 2001 From: Yuanhan Liu Date: Thu, 2 Mar 2017 14:16:07 +0800 Subject: [PATCH v3] vhost: remove a hack on queue allocation We used to allocate queues based on the index from SET_VRING_CALL request: if corresponding queue hasn't been allocated, allocate it. Though it's pratically right (it's the first per-vring request we will get from QEMU for vhost-user negotiation), but it's not technically right: it's not documented in the vhost-user spec that it will always be the first per-vring request. For example, SET_VRING_ADDR could also be the first per-vring request. Thus, we should not depend the SET_VRING_CALL on queue allocation. Instead, we could catch all the per-vring messages at the entrance of request handler, and allocate one if it hasn't been allocated before. By that, we could remove a hack. Signed-off-by: Yuanhan Liu --- v3: fix the virtuqueue check that introduces crash in MQ --- lib/librte_vhost/vhost_user.c | 61 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index cb2156a..2767cca 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -635,7 +635,6 @@ { struct vhost_vring_file file; struct vhost_virtqueue *vq; - uint32_t cur_qp_idx; file.index = pmsg->payload.u64 & VHOST_USER_VRING_IDX_MASK; if (pmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK) @@ -645,19 +644,7 @@ RTE_LOG(INFO, VHOST_CONFIG, "vring call idx:%d file:%d\n", file.index, file.fd); - /* - * FIXME: VHOST_SET_VRING_CALL is the first per-vring message - * we get, so we do vring queue pair allocation here. - */ - cur_qp_idx = file.index / VIRTIO_QNUM; - if (cur_qp_idx + 1 > dev->virt_qp_nb) { - if (alloc_vring_queue_pair(dev, cur_qp_idx) < 0) - return; - } - vq = dev->virtqueue[file.index]; - assert(vq != NULL); - if (vq->callfd >= 0) close(vq->callfd); @@ -914,6 +901,46 @@ return ret; } +/* + * Allocate a queue pair if it hasn't been allocated yet + */ +static int +vhost_user_check_and_alloc_queue_pair(struct virtio_net *dev, VhostUserMsg *msg) +{ + uint16_t vring_idx; + uint16_t qp_idx; + + switch (msg->request) { + case VHOST_USER_SET_VRING_KICK: + case VHOST_USER_SET_VRING_CALL: + case VHOST_USER_SET_VRING_ERR: + vring_idx = msg->payload.u64 & VHOST_USER_VRING_IDX_MASK; + break; + case VHOST_USER_SET_VRING_NUM: + case VHOST_USER_SET_VRING_BASE: + case VHOST_USER_SET_VRING_ENABLE: + vring_idx = msg->payload.state.index; + break; + case VHOST_USER_SET_VRING_ADDR: + vring_idx = msg->payload.addr.index; + break; + default: + return 0; + } + + qp_idx = vring_idx / VIRTIO_QNUM; + if (qp_idx >= VHOST_MAX_QUEUE_PAIRS) { + RTE_LOG(ERR, VHOST_CONFIG, + "invalid vring index: %u\n", vring_idx); + return -1; + } + + if (dev->virtqueue[qp_idx * VIRTIO_QNUM]) + return 0; + + return alloc_vring_queue_pair(dev, qp_idx); +} + int vhost_user_msg_handler(int vid, int fd) { @@ -943,6 +970,14 @@ ret = 0; RTE_LOG(INFO, VHOST_CONFIG, "read message %s\n", vhost_message_str[msg.request]); + + ret = vhost_user_check_and_alloc_queue_pair(dev, &msg); + if (ret < 0) { + RTE_LOG(ERR, VHOST_CONFIG, + "failed to alloc queue\n"); + return -1; + } + switch (msg.request) { case VHOST_USER_GET_FEATURES: msg.payload.u64 = vhost_user_get_features(); -- 1.9.0