From patchwork Thu Apr 19 07:07:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 38467 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 C70A27CCC; Thu, 19 Apr 2018 09:08:05 +0200 (CEST) Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by dpdk.org (Postfix) with ESMTP id 55B4C72FB for ; Thu, 19 Apr 2018 09:08:05 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F1203EAEAB; Thu, 19 Apr 2018 07:08:04 +0000 (UTC) Received: from localhost (ovpn-117-19.ams2.redhat.com [10.36.117.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CCB1476F5; Thu, 19 Apr 2018 07:07:58 +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:34 +0200 Message-Id: <20180419070751.8933-4-jfreimann@redhat.com> In-Reply-To: <20180419070751.8933-1-jfreimann@redhat.com> References: <20180419070751.8933-1-jfreimann@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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:05 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 19 Apr 2018 07:08:05 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jfreimann@redhat.com' RCPT:'' Subject: [dpdk-dev] [PATCH v4 03/20] net/virtio: add packed virtqueue helpers 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 helper functions to set/clear and check descriptor flags. Signed-off-by: Jens Freimann --- drivers/net/virtio/virtio_ring.h | 38 ++++++++++++++++++++++++++++++++++++++ drivers/net/virtio/virtqueue.h | 19 +++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/drivers/net/virtio/virtio_ring.h b/drivers/net/virtio/virtio_ring.h index 76168eed7..4eed023cc 100644 --- a/drivers/net/virtio/virtio_ring.h +++ b/drivers/net/virtio/virtio_ring.h @@ -78,6 +78,7 @@ struct vring_packed_desc_event { struct vring { unsigned int num; + unsigned int avail_wrap_counter; union { struct vring_desc_packed *desc_packed; struct vring_desc *desc; @@ -92,6 +93,43 @@ struct vring { }; }; +static inline void +toggle_wrap_counter(struct vring *vr) +{ + vr->avail_wrap_counter ^= 1; +} + +static inline void +_set_desc_avail(struct vring_desc_packed *desc, + int wrap_counter) +{ + uint16_t flags = desc->flags; + + if (wrap_counter) { + flags |= VRING_DESC_F_AVAIL; + flags &= ~VRING_DESC_F_USED; + } else { + flags &= ~VRING_DESC_F_AVAIL; + flags |= VRING_DESC_F_USED; + } + + desc->flags = flags; +} + +static inline void +set_desc_avail(struct vring *vr, + struct vring_desc_packed *desc) +{ + _set_desc_avail(desc, vr->avail_wrap_counter); +} + +static inline int +desc_is_used(struct vring_desc_packed *desc) +{ + return !(desc->flags & VRING_DESC_F_AVAIL) == + !(desc->flags & VRING_DESC_F_USED); +} + /* The standard layout for the ring is a continuous chunk of memory which * looks like this. We assume num is a power of 2. * diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h index cc2e7c0f6..081b27a52 100644 --- a/drivers/net/virtio/virtqueue.h +++ b/drivers/net/virtio/virtqueue.h @@ -245,6 +245,25 @@ struct virtio_tx_region { __attribute__((__aligned__(16))); }; +static inline uint16_t +increment_pq_index(uint16_t idx, size_t ring_size) +{ + return ++idx >= ring_size ? 0 : idx; +} + +static inline uint16_t +update_pq_avail_index(struct virtqueue *vq) +{ + uint16_t idx; + + idx = increment_pq_index(vq->vq_avail_idx, vq->vq_nentries); + if (idx == 0) + toggle_wrap_counter(&vq->vq_ring); + vq->vq_avail_idx = idx; + + return vq->vq_avail_idx; +} + static inline void vring_desc_init_packed(struct vring *vr, int n) {