From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f51.google.com (mail-pa0-f51.google.com [209.85.220.51]) by dpdk.org (Postfix) with ESMTP id 610582934 for ; Thu, 10 Mar 2016 07:34:12 +0100 (CET) Received: by mail-pa0-f51.google.com with SMTP id fe3so43662386pab.1 for ; Wed, 09 Mar 2016 22:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=igel-co-jp.20150623.gappssmtp.com; s=20150623; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=ULlrrKkY2DlTiNYP3Sdj9I1qTVZrW22Th6o7VGdIsEw=; b=fXinUBcnX41vCch5Y8LZO5X0zByRsVb8iCiffEgGjl/caUaWgfIIv+fFpYc/UVpk9c SC57LQHBOOi1L3olIH5Oz4AhqceeMZ4V1p7O0W5lPYRAgQXv/eLWvor0w84PJgZt9llC N9WeLvhJmrSHFB80vtcXCpbxyTmLWaUBFmD6L1nq7/IyolCkDuV4Nu6W2bPi9UoIvi7G WQM44YwzjKPRdHn47CRYkfo1oSGfqzj1+OBg4ch9Kk0I+QL3UOyWy/IF9vzc/5Rvn9iL K8ZlG2PNHIqRnDMrtGZvgSTqzjGq9EBGz7x/frSz5tlmJiaUiOunLNkRxFj9usIhlVxP ncgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=ULlrrKkY2DlTiNYP3Sdj9I1qTVZrW22Th6o7VGdIsEw=; b=VMBwaqy6ZgYX6zLoTrh+t/UN7v81ec6/LUt65E7O45V01szkg/nLFK6x4svWnO0VES rjWytzQQQbjRLcLhp68uXKVfgUIVZ8hYN4F9FShUq4otv6cyQLp8owcdOaTncIcKhonP niYQdT8cWIQJLIqfs5XWhtW1tXPBGEzpRciSoKF6J6O1l68PnpgUva/NOYQNyr8Cnook KzR3b+IA0NMzRlz1DwZEuHzQ83buZLqouQbeuEKPgD8EA+LIeIa23gkdq4UpkmxLW6zo jeBmGBWCTNM5sd73yjoJa3qMqgok4Jwgos+dkuSlW298qYf7/CG8XjPiEZSpMBfQxV5U R/8w== X-Gm-Message-State: AD7BkJLX65virPUWDOthWFeq6BVRBz5QsXy8YO6MFNHO5dbICWhqfbIe67szYE/+HnGBkQ== X-Received: by 10.66.90.226 with SMTP id bz2mr2608115pab.31.1457591651771; Wed, 09 Mar 2016 22:34:11 -0800 (PST) Received: from [10.16.129.101] (napt.igel.co.jp. [219.106.231.132]) by smtp.googlemail.com with ESMTPSA id zu10sm2549471pab.31.2016.03.09.22.34.10 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Mar 2016 22:34:11 -0800 (PST) To: "Tan, Jianfeng" , dev@dpdk.org References: <1457590462-3680-1-git-send-email-mukawa@igel.co.jp> <56E11345.7030404@intel.com> From: Tetsuya Mukawa Message-ID: <56E1155F.30201@igel.co.jp> Date: Thu, 10 Mar 2016 15:34:07 +0900 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <56E11345.7030404@intel.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH] 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: , X-List-Received-Date: Thu, 10 Mar 2016 06:34:12 -0000 On 2016/03/10 15:25, Tan, Jianfeng wrote: > > > On 3/10/2016 2:14 PM, Tetsuya Mukawa wrote: >> Currently, default value of kickfd and callfd is -1. >> If the value is -1, current code guess kickfd and callfd hasn't been >> initialized yet. And 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 changes default value to -2. And the >> patch defines -2 as VIRTIO_UNINITIALIZED_EVENTFD. >> >> Signed-off-by: Tetsuya Mukawa >> --- >> lib/librte_vhost/rte_virtio_net.h | 1 + >> lib/librte_vhost/vhost_user/virtio-net-user.c | 7 ++++--- >> lib/librte_vhost/virtio-net.c | 4 ++-- >> 3 files changed, 7 insertions(+), 5 deletions(-) >> >> diff --git a/lib/librte_vhost/rte_virtio_net.h >> b/lib/librte_vhost/rte_virtio_net.h >> index 7d1fde2..d745707 100644 >> --- a/lib/librte_vhost/rte_virtio_net.h >> +++ b/lib/librte_vhost/rte_virtio_net.h >> @@ -89,6 +89,7 @@ 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_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_user/virtio-net-user.c >> b/lib/librte_vhost/vhost_user/virtio-net-user.c >> index 65b5652..591f9bf 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 >> @@ -318,7 +318,8 @@ user_get_vring_base(struct vhost_device_ctx ctx, >> */ >> if (dev->virtqueue[state->index]->kickfd >= 0) { >> close(dev->virtqueue[state->index]->kickfd); > > Then -1 will be a valid value, need to check if it's not -1 to > close()? Nevertheless, close(-1) brings no big problem. > We did it in above 'if' condition checking, then close(-1) will not be called. Thanks, Tetsuya > Thanks, > Jianfeng > >> - 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 fe1a77e..3498e9d 100644 >> --- a/lib/librte_vhost/virtio-net.c >> +++ b/lib/librte_vhost/virtio-net.c >> @@ -263,8 +263,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; >