From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <maxime.coquelin@redhat.com>
Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73])
by dpdk.org (Postfix) with ESMTP id BCD7411A4;
Mon, 10 Sep 2018 09:22:03 +0200 (CEST)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
[10.11.54.3])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 33AA8400C3C0;
Mon, 10 Sep 2018 07:22:03 +0000 (UTC)
Received: from [10.36.112.19] (ovpn-112-19.ams2.redhat.com [10.36.112.19])
by smtp.corp.redhat.com (Postfix) with ESMTPS id 3B63A101041D;
Mon, 10 Sep 2018 07:22:01 +0000 (UTC)
To: Tiwei Bie <tiwei.bie@intel.com>, zhihong.wang@intel.com, dev@dpdk.org
Cc: stable@dpdk.org
References: <20180904235555.31839-1-tiwei.bie@intel.com>
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Message-ID: <f161fa02-196f-5e98-eaa2-7b53abd45680@redhat.com>
Date: Mon, 10 Sep 2018 09:22:00 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
Thunderbird/52.9.1
MIME-Version: 1.0
In-Reply-To: <20180904235555.31839-1-tiwei.bie@intel.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.11.55.6]); Mon, 10 Sep 2018 07:22:03 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]);
Mon, 10 Sep 2018 07:22:03 +0000 (UTC) for IP:'10.11.54.3'
DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com'
HELO:'smtp.corp.redhat.com' FROM:'maxime.coquelin@redhat.com' RCPT:''
Subject: Re: [dpdk-stable] [PATCH] vhost: fix vhost interrupt support
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Sep 2018 07:22:04 -0000
Hi Tiwei,
On 09/05/2018 01:55 AM, Tiwei Bie wrote:
> When VIRTIO_RING_F_EVENT_IDX is negotiated, we need to
> update the avail event to enable the notification.
>
> Fixes: 3f8ff12821e4 ("vhost: support interrupt mode")
> Cc: stable@dpdk.org
>
> Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
> ---
> lib/librte_vhost/Makefile | 1 +
> lib/librte_vhost/vhost.c | 18 ++++++++++++------
> lib/librte_vhost/vhost.h | 2 ++
> 3 files changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile
> index de431fbb7..531cf4832 100644
> --- a/lib/librte_vhost/Makefile
> +++ b/lib/librte_vhost/Makefile
> @@ -13,6 +13,7 @@ LIBABIVER := 4
> CFLAGS += -DALLOW_EXPERIMENTAL_API
> CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -D_FILE_OFFSET_BITS=64
> CFLAGS += -I vhost_user
> +CFLAGS += -fno-strict-aliasing
I'm not clear why this is needed looking at the code below,
could you please explain?
> LDLIBS += -lpthread
>
> ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y)
> diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
> index 3c9be10a0..88b1781d5 100644
> --- a/lib/librte_vhost/vhost.c
> +++ b/lib/librte_vhost/vhost.c
> @@ -646,12 +646,18 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id)
> }
>
> static inline void
> -vhost_enable_notify_split(struct vhost_virtqueue *vq, int enable)
> +vhost_enable_notify_split(struct virtio_net *dev,
> + struct vhost_virtqueue *vq, int enable)
> {
> - if (enable)
> - vq->used->flags &= ~VRING_USED_F_NO_NOTIFY;
> - else
> - vq->used->flags |= VRING_USED_F_NO_NOTIFY;
> + if (!(dev->features & (1ULL << VIRTIO_RING_F_EVENT_IDX))) {
> + if (enable)
> + vq->used->flags &= ~VRING_USED_F_NO_NOTIFY;
> + else
> + vq->used->flags |= VRING_USED_F_NO_NOTIFY;
> + } else {
> + if (enable)
> + vhost_avail_event(vq) = vq->last_avail_idx;
> + }
> }
>
> static inline void
> @@ -689,7 +695,7 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable)
> if (vq_is_packed(dev))
> vhost_enable_notify_packed(dev, vq, enable);
> else
> - vhost_enable_notify_split(vq, enable);
> + vhost_enable_notify_split(dev, vq, enable);
>
> return 0;
> }
> diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
> index 760a09c0d..25ffd7614 100644
> --- a/lib/librte_vhost/vhost.h
> +++ b/lib/librte_vhost/vhost.h
> @@ -648,6 +648,8 @@ vhost_iova_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq,
> return __vhost_iova_to_vva(dev, vq, iova, len, perm);
> }
>
> +#define vhost_avail_event(vr) \
> + (*(volatile uint16_t*)&(vr)->used->ring[(vr)->size])
> #define vhost_used_event(vr) \
> (*(volatile uint16_t*)&(vr)->avail->ring[(vr)->size])
>
>