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 634705A35 for ; Thu, 18 Aug 2016 10:40:19 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 18 Aug 2016 01:39:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,538,1464678000"; d="scan'208";a="1043336169" Received: from yliu-dev.sh.intel.com ([10.239.67.162]) by fmsmga002.fm.intel.com with ESMTP; 18 Aug 2016 01:39:53 -0700 From: Yuanhan Liu To: dev@dpdk.org Cc: Yuanhan Liu Date: Thu, 18 Aug 2016 16:48:40 +0800 Message-Id: <1471510123-4984-5-git-send-email-yuanhan.liu@linux.intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1471510123-4984-1-git-send-email-yuanhan.liu@linux.intel.com> References: <1471510123-4984-1-git-send-email-yuanhan.liu@linux.intel.com> Subject: [dpdk-dev] [PATCH 4/7] vhost: fold common message handlers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Aug 2016 08:40:20 -0000 Due to history reason (that we have 2 vhost implementations), some messages are handled in two calls: vhost specific implementation handles it first and then invoke the common one to do another handling. We have one implementation only now, we could write one method for each message. Here fold those common handles to corresponding vhost user handler. Signed-off-by: Yuanhan Liu --- lib/librte_vhost/vhost_user.c | 115 ++++++++++++------------------------------ 1 file changed, 31 insertions(+), 84 deletions(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index c4714b7..ada0a63 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -426,87 +426,6 @@ vhost_set_vring_base(int vid, struct vhost_vring_state *state) return 0; } -/* - * We send the virtio device our available ring last used index. - */ -static int -vhost_get_vring_base(int vid, uint32_t index, - struct vhost_vring_state *state) -{ - struct virtio_net *dev; - - dev = get_device(vid); - if (dev == NULL) - return -1; - - state->index = index; - /* State->index refers to the queue index. The txq is 1, rxq is 0. */ - state->num = dev->virtqueue[state->index]->last_used_idx; - - return 0; -} - -/* - * The virtio device sends an eventfd to interrupt the guest. This fd gets - * copied into our process space. - */ -static int -vhost_set_vring_call(int vid, struct vhost_vring_file *file) -{ - struct virtio_net *dev; - struct vhost_virtqueue *vq; - uint32_t cur_qp_idx = file->index / VIRTIO_QNUM; - - dev = get_device(vid); - if (dev == NULL) - return -1; - - /* - * FIXME: VHOST_SET_VRING_CALL is the first per-vring message - * we get, so we do vring queue pair allocation here. - */ - if (cur_qp_idx + 1 > dev->virt_qp_nb) { - if (alloc_vring_queue_pair(dev, cur_qp_idx) < 0) - return -1; - } - - /* file->index refers to the queue index. The txq is 1, rxq is 0. */ - vq = dev->virtqueue[file->index]; - assert(vq != NULL); - - if (vq->callfd >= 0) - close(vq->callfd); - - vq->callfd = file->fd; - - return 0; -} - -/* - * The virtio device sends an eventfd that it can use to notify us. - * This fd gets copied into our process space. - */ -static int -vhost_set_vring_kick(int vid, struct vhost_vring_file *file) -{ - struct virtio_net *dev; - struct vhost_virtqueue *vq; - - dev = get_device(vid); - if (dev == NULL) - return -1; - - /* file->index refers to the queue index. The txq is 1, rxq is 0. */ - vq = dev->virtqueue[file->index]; - - if (vq->kickfd >= 0) - close(vq->kickfd); - - vq->kickfd = file->fd; - - return 0; -} - static int user_set_mem_table(int vid, struct VhostUserMsg *pmsg) { @@ -671,6 +590,12 @@ static void user_set_vring_call(int vid, struct VhostUserMsg *pmsg) { struct vhost_vring_file file; + struct virtio_net *dev = get_device(vid); + struct vhost_virtqueue *vq; + uint32_t cur_qp_idx; + + if (!dev) + return; file.index = pmsg->payload.u64 & VHOST_USER_VRING_IDX_MASK; if (pmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK) @@ -679,7 +604,24 @@ user_set_vring_call(int vid, struct VhostUserMsg *pmsg) file.fd = pmsg->fds[0]; RTE_LOG(INFO, VHOST_CONFIG, "vring call idx:%d file:%d\n", file.index, file.fd); - vhost_set_vring_call(vid, &file); + + /* + * 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); + + vq->callfd = file.fd; } /* @@ -691,6 +633,7 @@ user_set_vring_kick(int vid, struct VhostUserMsg *pmsg) { struct vhost_vring_file file; struct virtio_net *dev = get_device(vid); + struct vhost_virtqueue *vq; if (!dev) return; @@ -702,7 +645,11 @@ user_set_vring_kick(int vid, struct VhostUserMsg *pmsg) file.fd = pmsg->fds[0]; RTE_LOG(INFO, VHOST_CONFIG, "vring kick idx:%d file:%d\n", file.index, file.fd); - vhost_set_vring_kick(vid, &file); + + vq = dev->virtqueue[file.index]; + if (vq->kickfd >= 0) + close(vq->kickfd); + vq->kickfd = file.fd; if (virtio_is_ready(dev) && !(dev->flags & VIRTIO_DEV_RUNNING)) { if (notify_ops->new_device(vid) == 0) @@ -727,7 +674,7 @@ user_get_vring_base(int vid, struct vhost_vring_state *state) } /* Here we are safe to get the last used index */ - vhost_get_vring_base(vid, state->index, state); + state->num = dev->virtqueue[state->index]->last_used_idx; RTE_LOG(INFO, VHOST_CONFIG, "vring base idx:%d file:%d\n", state->index, state->num); -- 1.9.0