From patchwork Fri Jun 22 13:43:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 41401 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 2FA0D1BB4E; Fri, 22 Jun 2018 15:43:49 +0200 (CEST) Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by dpdk.org (Postfix) with ESMTP id 632B21BB15 for ; Fri, 22 Jun 2018 15:43:45 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DE373F68AA; Fri, 22 Jun 2018 13:43:44 +0000 (UTC) Received: from localhost.localdomain (ovpn-112-42.ams2.redhat.com [10.36.112.42]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2AA7C2026D6B; Fri, 22 Jun 2018 13:43:42 +0000 (UTC) From: Maxime Coquelin To: tiwei.bie@intel.com, zhihong.wang@intel.com, jfreimann@redhat.com, dev@dpdk.org Cc: mst@redhat.com, jasowang@redhat.com, wexu@redhat.com, Maxime Coquelin Date: Fri, 22 Jun 2018 15:43:14 +0200 Message-Id: <20180622134327.18973-3-maxime.coquelin@redhat.com> In-Reply-To: <20180622134327.18973-1-maxime.coquelin@redhat.com> References: <20180622134327.18973-1-maxime.coquelin@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 22 Jun 2018 13:43:44 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 22 Jun 2018 13:43:44 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'maxime.coquelin@redhat.com' RCPT:'' Subject: [dpdk-dev] [PATCH v5 02/15] 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" From: Jens Freimann Add some helper functions to check descriptor flags and check if a vring is of type packed. Signed-off-by: Jens Freimann Signed-off-by: Maxime Coquelin --- lib/librte_vhost/vhost.h | 6 ++++++ lib/librte_vhost/virtio-packed.h | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index bf2059198..34a614c97 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -319,6 +319,12 @@ struct virtio_net { struct vhost_user_extern_ops extern_ops; } __rte_cache_aligned; +static __rte_always_inline bool +vq_is_packed(struct virtio_net *dev) +{ + return dev->features & (1ull << VIRTIO_F_RING_PACKED); +} + #define VHOST_LOG_PAGE 4096 /* diff --git a/lib/librte_vhost/virtio-packed.h b/lib/librte_vhost/virtio-packed.h index 744b3991b..21fe5045b 100644 --- a/lib/librte_vhost/virtio-packed.h +++ b/lib/librte_vhost/virtio-packed.h @@ -19,4 +19,20 @@ struct vring_desc_packed { uint16_t flags; }; + +static inline int +desc_is_avail(struct vring_desc_packed *desc, uint16_t wrap_counter) +{ + if (wrap_counter == 1) { + if ((desc->flags & VRING_DESC_F_AVAIL) && + !(desc->flags & VRING_DESC_F_USED)) + return 1; + } else { + if (!(desc->flags & VRING_DESC_F_AVAIL) && + (desc->flags & VRING_DESC_F_USED)) + return 1; + } + return 0; +} + #endif /* __VIRTIO_PACKED_H */