From patchwork Thu Apr 19 07:07:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 38477 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 976927F0C; Thu, 19 Apr 2018 09:08:41 +0200 (CEST) Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by dpdk.org (Postfix) with ESMTP id 5BA4E6C93 for ; Thu, 19 Apr 2018 09:08:36 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 02DF6EAEAB; Thu, 19 Apr 2018 07:08:36 +0000 (UTC) Received: from localhost (ovpn-117-19.ams2.redhat.com [10.36.117.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AA9522166BAE; Thu, 19 Apr 2018 07:08:35 +0000 (UTC) From: Jens Freimann To: dev@dpdk.org Cc: tiwei.bie@intel.com, yliu@fridaylinux.org, maxime.coquelin@redhat.com, mst@redhat.com, jens@freimann.org Date: Thu, 19 Apr 2018 09:07:44 +0200 Message-Id: <20180419070751.8933-14-jfreimann@redhat.com> In-Reply-To: <20180419070751.8933-1-jfreimann@redhat.com> References: <20180419070751.8933-1-jfreimann@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 19 Apr 2018 07:08:36 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 19 Apr 2018 07:08:36 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jfreimann@redhat.com' RCPT:'' Subject: [dpdk-dev] [PATCH v4 13/20] vhost: add helpers for packed virtqueues 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add some helper functions to set/check descriptor flags and toggle the used wrap counter. Signed-off-by: Jens Freimann --- lib/librte_vhost/virtio-packed.h | 64 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/lib/librte_vhost/virtio-packed.h b/lib/librte_vhost/virtio-packed.h index 744b3991b..cd272d456 100644 --- a/lib/librte_vhost/virtio-packed.h +++ b/lib/librte_vhost/virtio-packed.h @@ -19,4 +19,68 @@ struct vring_desc_packed { uint16_t flags; }; +static inline uint64_t +vq_is_packed(struct virtio_net *dev) +{ + return dev->features & (1ull << VIRTIO_F_RING_PACKED); +} + +static inline void +toggle_wrap_counter(struct vhost_virtqueue *vq) +{ + vq->used_wrap_counter ^= 1; +} + +static inline uint16_t +increase_index (uint16_t index, uint32_t size) +{ + return ++index >= size ? 0 : index; +} + +static inline uint16_t +update_index (struct vhost_virtqueue *vq, uint16_t index, uint32_t size) { + index = increase_index(index, size); + if (increase_index(index, size) == 0) + toggle_wrap_counter(vq); + return index; +} + +static inline int +desc_is_avail(struct vhost_virtqueue *vq, struct vring_desc_packed *desc) +{ + if (vq->used_wrap_counter == 1) { + if ((desc->flags & VRING_DESC_F_AVAIL) && + !(desc->flags & VRING_DESC_F_USED)) + return 1; + } + if (vq->used_wrap_counter == 0) { + if (!(desc->flags & VRING_DESC_F_AVAIL) && + (desc->flags & VRING_DESC_F_USED)) + return 1; + } + return 0; +} + +static inline void +_set_desc_used(struct vring_desc_packed *desc, int wrap_counter) +{ + uint16_t flags = desc->flags; + + if (wrap_counter == 1) { + flags |= VRING_DESC_F_USED; + flags |= VRING_DESC_F_AVAIL; + } else { + flags &= ~VRING_DESC_F_USED; + flags &= ~VRING_DESC_F_AVAIL; + } + + desc->flags = flags; +} + +static inline void +set_desc_used(struct vhost_virtqueue *vq, struct vring_desc_packed *desc) +{ + _set_desc_used(desc, vq->used_wrap_counter); +} + #endif /* __VIRTIO_PACKED_H */