From: Jens Freimann <jfreimann@redhat.com>
To: Maxime Coquelin <maxime.coquelin@redhat.com>
Cc: dev@dpdk.org, tiwei.bie@intel.com, Gavin.Hu@arm.com
Subject: Re: [dpdk-dev] [PATCH v12 03/10] net/virtio: add packed virtqueue helpers
Date: Thu, 13 Dec 2018 23:38:32 +0100 [thread overview]
Message-ID: <20181213223832.hiwv7layqpfawp4l@jenstp.localdomain> (raw)
In-Reply-To: <35c2f055-d8f2-325f-d920-1a1f15ea51f3@redhat.com>
On Thu, Dec 13, 2018 at 05:09:03PM +0100, Maxime Coquelin wrote:
>
>
>On 12/13/18 1:34 PM, Jens Freimann wrote:
>>Add helper functions to set/clear and check descriptor flags.
>>
>>Signed-off-by: Jens Freimann <jfreimann@redhat.com>
>>---
>> drivers/net/virtio/virtqueue.h | 72 +++++++++++++++++++++++++++++++++-
>> 1 file changed, 70 insertions(+), 2 deletions(-)
>>
>>diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
>>index 1401a9844..b7a5a5963 100644
>>--- a/drivers/net/virtio/virtqueue.h
>>+++ b/drivers/net/virtio/virtqueue.h
>>@@ -250,6 +250,32 @@ struct virtio_tx_region {
>> __attribute__((__aligned__(16)));
>> };
>>+static inline void
>>+_set_desc_avail(struct vring_packed_desc *desc, int wrap_counter)
>>+{
>>+ desc->flags |= VRING_DESC_F_AVAIL(wrap_counter) |
>>+ VRING_DESC_F_USED(!wrap_counter);
>>+}
>>+
>>+static inline void
>>+set_desc_avail(struct virtqueue *vq, struct vring_packed_desc *desc)
>>+{
>>+ _set_desc_avail(desc, vq->avail_wrap_counter);
>>+}
>>+
>>+static inline int
>>+desc_is_used(struct vring_packed_desc *desc, struct virtqueue *vq)
>>+{
>>+ uint16_t used, avail, flags;
>>+
>>+ flags = desc->flags;
>>+ used = !!(flags & VRING_DESC_F_USED(1));
>>+ avail = !!(flags & VRING_DESC_F_AVAIL(1));
>>+
>>+ return avail == used && used == vq->used_wrap_counter;
>>+}
>>+
>>+
>> static inline void
>> vring_desc_init_packed(struct virtqueue *vq, int n)
>> {
>>@@ -273,22 +299,64 @@ vring_desc_init_split(struct vring_desc *dp, uint16_t n)
>> dp[i].next = VQ_RING_DESC_CHAIN_END;
>> }
>>+/**
>>+ * Tell the backend not to interrupt us.
>>+ */
>>+static inline void
>>+virtqueue_disable_intr_packed(struct virtqueue *vq)
>>+{
>>+ uint16_t *event_flags = &vq->ring_packed.driver_event->desc_event_flags;
>>+
>>+ if (*event_flags != RING_EVENT_FLAGS_DISABLE) {
>>+ *event_flags = RING_EVENT_FLAGS_DISABLE;
>>+ }
>>+}
>>+
>>+
>> /**
>> * Tell the backend not to interrupt us.
>> */
>> static inline void
>> virtqueue_disable_intr(struct virtqueue *vq)
>> {
>>- vq->vq_ring.avail->flags |= VRING_AVAIL_F_NO_INTERRUPT;
>>+ if (vtpci_packed_queue(vq->hw))
>>+ virtqueue_disable_intr_packed(vq);
>>+ else
>>+ vq->vq_ring.avail->flags |= VRING_AVAIL_F_NO_INTERRUPT;
>>+}
>>+
>>+/**
>>+ * Tell the backend to interrupt us.
>>+ */
>>+static inline void
>>+virtqueue_enable_intr_packed(struct virtqueue *vq)
>>+{
>>+ uint16_t *off_wrap = &vq->ring_packed.driver_event->desc_event_off_wrap;
>>+ uint16_t *event_flags = &vq->ring_packed.driver_event->desc_event_flags;
>>+
>>+ *off_wrap = vq->vq_used_cons_idx |
>>+ ((uint16_t)(vq->used_wrap_counter << 15));
>>+
>>+ if (vq->event_flags_shadow == RING_EVENT_FLAGS_DISABLE) {
>>+ virtio_wmb();
>>+ vq->event_flags_shadow =
>>+ vtpci_with_feature(vq->hw, VIRTIO_RING_F_EVENT_IDX) ?
>>+ RING_EVENT_FLAGS_DESC : RING_EVENT_FLAGS_ENABLE;
>>+ *event_flags = vq->event_flags_shadow;
>>+ }
>> }
>>+
>> /**
>> * Tell the backend to interrupt us.
>> */
>> static inline void
>> virtqueue_enable_intr(struct virtqueue *vq)
>> {
>>- vq->vq_ring.avail->flags &= (~VRING_AVAIL_F_NO_INTERRUPT);
>>+ if (vtpci_packed_queue(vq->hw))
>>+ virtqueue_enable_intr_packed(vq);
>>+ else
>>+ vq->vq_ring.avail->flags &= (~VRING_AVAIL_F_NO_INTERRUPT);
>> }
>> /**
>>
>
>IIRC, I asked in previous series to have dedicated functions for split
>ring. It does not have any functional change, but it would be clearer
>IMHO.
>
>I'm ok that it is done after the series is applied though.
Sorry, I missed this. We'll need another respin anyway so I'll fix it.
regards,
Jens
next prev parent reply other threads:[~2018-12-13 22:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-13 12:34 [dpdk-dev] [PATCH v12 00/10] implement packed virtqueues Jens Freimann
2018-12-13 12:34 ` [dpdk-dev] [PATCH v12 01/10] net/virtio: vring init for packed queues Jens Freimann
2018-12-13 16:11 ` Maxime Coquelin
2018-12-13 12:34 ` [dpdk-dev] [PATCH v12 02/10] net/virtio: add packed virtqueue defines Jens Freimann
2018-12-13 12:34 ` [dpdk-dev] [PATCH v12 03/10] net/virtio: add packed virtqueue helpers Jens Freimann
2018-12-13 16:09 ` Maxime Coquelin
2018-12-13 22:38 ` Jens Freimann [this message]
2018-12-13 12:34 ` [dpdk-dev] [PATCH v12 04/10] net/virtio: dump packed virtqueue data Jens Freimann
2018-12-13 12:34 ` [dpdk-dev] [PATCH v12 05/10] net/virtio: implement transmit path for packed queues Jens Freimann
2018-12-13 12:34 ` [dpdk-dev] [PATCH v12 06/10] net/virtio: implement receive " Jens Freimann
2018-12-13 16:34 ` Maxime Coquelin
2018-12-13 12:34 ` [dpdk-dev] [PATCH v12 07/10] net/virtio: add virtio send command packed queue support Jens Freimann
2018-12-13 12:34 ` [dpdk-dev] [PATCH v12 08/10] net/virtio-user: add option to use packed queues Jens Freimann
2018-12-13 12:34 ` [dpdk-dev] [PATCH v12 09/10] net/virtio-user: ctrl virtqueue not supported with packed vqs Jens Freimann
2018-12-13 16:42 ` Maxime Coquelin
2018-12-13 22:35 ` Jens Freimann
2018-12-13 12:34 ` [dpdk-dev] [PATCH v12 10/10] net/virtio: enable packed virtqueues by default Jens Freimann
2018-12-13 16:38 ` [dpdk-dev] [PATCH v12 00/10] implement packed virtqueues Maxime Coquelin
2018-12-13 22:36 ` Jens Freimann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181213223832.hiwv7layqpfawp4l@jenstp.localdomain \
--to=jfreimann@redhat.com \
--cc=Gavin.Hu@arm.com \
--cc=dev@dpdk.org \
--cc=maxime.coquelin@redhat.com \
--cc=tiwei.bie@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).