From patchwork Mon Mar 14 08:53:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuya Mukawa X-Patchwork-Id: 11481 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 352F1532C; Mon, 14 Mar 2016 09:53:42 +0100 (CET) Received: from mail-pa0-f52.google.com (mail-pa0-f52.google.com [209.85.220.52]) by dpdk.org (Postfix) with ESMTP id 1DEFD5320 for ; Mon, 14 Mar 2016 09:53:41 +0100 (CET) Received: by mail-pa0-f52.google.com with SMTP id fe3so136361589pab.1 for ; Mon, 14 Mar 2016 01:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=igel-co-jp.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3bH82+uRwGhB0gU577jfZ8IYTnEQdlMAVEsaQwcESgQ=; b=NXy2N1pLT2DTtw1bejUQ0WNKmne9Xzf6M2UODxLq0u/n3gtrA1j3b4sooBYJAs5UVF xt8Hb1D3s4tABjqj4C0rTLbHbjxa49jDIWRGBj27Qh1IJoCJ5deKDVwJdQYSUh4PGlHd aZYaC1IrHQeqA8FJ+yIqbIETo+JWOUpY2079kCOdRZ3HjlxiUd0p+d0jKjRt38LzGO3Z cfc4YoiYivxoYRclJ9Hr29C5m1pJITD/nvjbH4SkTTMMJxSJJO0Ag+IbppfIhpDVGUxd ddjJNeTn7T1UpJEvbiwQ5QsJaD3pAHeOni1dd/GloB9u0RVBxhyTOIw8nRwqcMD/OBGh AaHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3bH82+uRwGhB0gU577jfZ8IYTnEQdlMAVEsaQwcESgQ=; b=ExhSoeRuxUJyAfYwMS5AL2TqAipQbQrO50cczMVG3oZdlI/Jj+U31JtCiODAHd5usC cwpTF0OAbsw6VPq/pe+3REqayeod2HqYlNn65QiBoweIQFFh1OJzRL2HUKUICgLUF6ky fAv2y8Rct0UL51mTfX7L20Wz1GPBmPPcfgAv/Vvb9h/UkuJzYZMslRdLQymKPFcKjgxC 4jOpIdTGQncOKEZWOVzlZuVYAMC4VvVFzIzgNcKwSljoqeDY/VE18z/VrPhpdGbUtMm7 ZkGPlT6I0oUa2Fa1Wy1JvrFUHwqbzhQ02sRW3Y6OfLokV8BKh8xASfdQwGa/HfNm+Gdu YkdA== X-Gm-Message-State: AD7BkJIu7gnu6eUIiYjLtZEciSlwG3/L9E/sw/JiU6AxTiZDfsM2npvvFw2y9Ok1AOF9tg== X-Received: by 10.66.193.131 with SMTP id ho3mr35746597pac.154.1457945620534; Mon, 14 Mar 2016 01:53:40 -0700 (PDT) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id t87sm30289423pfa.54.2016.03.14.01.53.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Mar 2016 01:53:39 -0700 (PDT) From: Tetsuya Mukawa To: dev@dpdk.org Cc: jianfeng.tan@intel.com, huawei.xie@intel.com, Tetsuya Mukawa Date: Mon, 14 Mar 2016 17:53:32 +0900 Message-Id: <1457945612-30165-1-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1457593565-16240-1-git-send-email-mukawa@igel.co.jp> References: <1457593565-16240-1-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [PATCH v3] vhost: Fix default value of kickfd and callfd 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Currently, default values of kickfd and callfd are -1. If the values are -1, current code guesses kickfd and callfd haven't been initialized yet. Then vhost library will guess the virtqueue isn't ready for processing. But callfd and kickfd will be set as -1 when "--enable-kvm" isn't specified in QEMU command line. It means we cannot treat -1 as uninitialized state. The patch defines -1 and -2 as VIRTIO_INVALID_EVENTFD and VIRTIO_UNINITIALIZED_EVENTFD, and uses VIRTIO_UNINITIALIZED_EVENTFD for the default values of kickfd and callfd. Signed-off-by: Tetsuya Mukawa Acked-by: Yuanhan Liu --- lib/librte_vhost/rte_virtio_net.h | 2 ++ lib/librte_vhost/vhost_rxtx.c | 9 ++++++--- lib/librte_vhost/vhost_user/virtio-net-user.c | 14 +++++++------- lib/librte_vhost/virtio-net.c | 4 ++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/lib/librte_vhost/rte_virtio_net.h b/lib/librte_vhost/rte_virtio_net.h index 443245d..600b20b 100644 --- a/lib/librte_vhost/rte_virtio_net.h +++ b/lib/librte_vhost/rte_virtio_net.h @@ -89,6 +89,8 @@ struct vhost_virtqueue { uint16_t vhost_hlen; /**< Vhost header length (varies depending on RX merge buffers. */ volatile uint16_t last_used_idx; /**< Last index used on the available ring */ volatile uint16_t last_used_idx_res; /**< Used for multiple devices reserving buffers. */ +#define VIRTIO_INVALID_EVENTFD (-1) +#define VIRTIO_UNINITIALIZED_EVENTFD (-2) int callfd; /**< Used to notify the guest (trigger interrupt). */ int kickfd; /**< Currently unused as polling mode is enabled. */ int enabled; diff --git a/lib/librte_vhost/vhost_rxtx.c b/lib/librte_vhost/vhost_rxtx.c index 9d23eb1..29d002d 100644 --- a/lib/librte_vhost/vhost_rxtx.c +++ b/lib/librte_vhost/vhost_rxtx.c @@ -333,7 +333,8 @@ virtio_dev_rx(struct virtio_net *dev, uint16_t queue_id, rte_mb(); /* Kick the guest if necessary. */ - if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT)) + if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT) + && (vq->callfd >= 0)) eventfd_write(vq->callfd, (eventfd_t)1); return count; } @@ -654,7 +655,8 @@ merge_rx_exit: rte_mb(); /* Kick the guest if necessary. */ - if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT)) + if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT) + && (vq->callfd >= 0)) eventfd_write(vq->callfd, (eventfd_t)1); } @@ -1048,7 +1050,8 @@ rte_vhost_dequeue_burst(struct virtio_net *dev, uint16_t queue_id, sizeof(vq->used->idx)); /* Kick guest if required. */ - if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT)) + if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT) + && (vq->callfd >= 0)) eventfd_write(vq->callfd, (eventfd_t)1); out: diff --git a/lib/librte_vhost/vhost_user/virtio-net-user.c b/lib/librte_vhost/vhost_user/virtio-net-user.c index 65b5652..f5248bc 100644 --- a/lib/librte_vhost/vhost_user/virtio-net-user.c +++ b/lib/librte_vhost/vhost_user/virtio-net-user.c @@ -225,8 +225,8 @@ static int vq_is_ready(struct vhost_virtqueue *vq) { return vq && vq->desc && - vq->kickfd != -1 && - vq->callfd != -1; + vq->kickfd != VIRTIO_UNINITIALIZED_EVENTFD && + vq->callfd != VIRTIO_UNINITIALIZED_EVENTFD; } static int @@ -258,7 +258,7 @@ user_set_vring_call(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg) file.index = pmsg->payload.u64 & VHOST_USER_VRING_IDX_MASK; if (pmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK) - file.fd = -1; + file.fd = VIRTIO_INVALID_EVENTFD; else file.fd = pmsg->fds[0]; RTE_LOG(INFO, VHOST_CONFIG, @@ -279,7 +279,7 @@ user_set_vring_kick(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg) file.index = pmsg->payload.u64 & VHOST_USER_VRING_IDX_MASK; if (pmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK) - file.fd = -1; + file.fd = VIRTIO_INVALID_EVENTFD; else file.fd = pmsg->fds[0]; RTE_LOG(INFO, VHOST_CONFIG, @@ -316,10 +316,10 @@ user_get_vring_base(struct vhost_device_ctx ctx, * sent and only sent in vhost_vring_stop. * TODO: cleanup the vring, it isn't usable since here. */ - if (dev->virtqueue[state->index]->kickfd >= 0) { + if (dev->virtqueue[state->index]->kickfd >= 0) close(dev->virtqueue[state->index]->kickfd); - dev->virtqueue[state->index]->kickfd = -1; - } + + dev->virtqueue[state->index]->kickfd = VIRTIO_UNINITIALIZED_EVENTFD; return 0; } diff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.c index 28c3912..90da9ba 100644 --- a/lib/librte_vhost/virtio-net.c +++ b/lib/librte_vhost/virtio-net.c @@ -167,8 +167,8 @@ init_vring_queue(struct vhost_virtqueue *vq, int qp_idx) { memset(vq, 0, sizeof(struct vhost_virtqueue)); - vq->kickfd = -1; - vq->callfd = -1; + vq->kickfd = VIRTIO_UNINITIALIZED_EVENTFD; + vq->callfd = VIRTIO_UNINITIALIZED_EVENTFD; /* Backends are set to -1 indicating an inactive device. */ vq->backend = -1;