From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by dpdk.org (Postfix) with ESMTP id 74E801BC49 for ; Wed, 4 Apr 2018 09:33:28 +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 01FDA8182D0A; Wed, 4 Apr 2018 07:33:28 +0000 (UTC) Received: from [10.36.112.30] (ovpn-112-30.ams2.redhat.com [10.36.112.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E23CE50331; Wed, 4 Apr 2018 07:33:21 +0000 (UTC) To: Jens Freimann , dev@dpdk.org Cc: tiwei.bie@intel.com, yliu@fridaylinux.org, mst@redhat.com References: <20180316152120.13199-1-jfreimann@redhat.com> <20180316152120.13199-2-jfreimann@redhat.com> From: Maxime Coquelin Message-ID: <58c7998d-e6c7-2785-79aa-65d475c9d41b@redhat.com> Date: Wed, 4 Apr 2018 09:33:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180316152120.13199-2-jfreimann@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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.8]); Wed, 04 Apr 2018 07:33:28 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 04 Apr 2018 07:33:28 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'maxime.coquelin@redhat.com' RCPT:'' Subject: Re: [dpdk-dev] [PATCH 01/17] net/virtio: vring init for packed queues 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: , X-List-Received-Date: Wed, 04 Apr 2018 07:33:28 -0000 On 03/16/2018 04:21 PM, Jens Freimann wrote: > Add and initialize descriptor data structures. > > Signed-off-by: Jens Freimann > --- > drivers/net/virtio/virtio_ethdev.c | 22 ++++++++++++---------- > drivers/net/virtio/virtio_pci.h | 8 ++++++++ > drivers/net/virtio/virtio_ring.h | 25 +++++++++++++++++++++++-- > drivers/net/virtio/virtqueue.h | 10 ++++++++++ > 4 files changed, 53 insertions(+), 12 deletions(-) > > diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c > index 884f74a..ce4f53d 100644 > --- a/drivers/net/virtio/virtio_ethdev.c > +++ b/drivers/net/virtio/virtio_ethdev.c > @@ -299,19 +299,21 @@ struct rte_virtio_xstats_name_off { > > PMD_INIT_FUNC_TRACE(); > > - /* > - * Reinitialise since virtio port might have been stopped and restarted > - */ Are you sure the comment has to be removed? > memset(ring_mem, 0, vq->vq_ring_size); > - vring_init(vr, size, ring_mem, VIRTIO_PCI_VRING_ALIGN); > - vq->vq_used_cons_idx = 0; > - vq->vq_desc_head_idx = 0; > - vq->vq_avail_idx = 0; > - vq->vq_desc_tail_idx = (uint16_t)(vq->vq_nentries - 1); > + vring_init(vq->hw, vr, size, ring_mem, VIRTIO_PCI_VRING_ALIGN); > + > vq->vq_free_cnt = vq->vq_nentries; > memset(vq->vq_descx, 0, sizeof(struct vq_desc_extra) * vq->vq_nentries); > + vq->vq_used_cons_idx = 0; > + vq->vq_avail_idx = 0; > + if (vtpci_packed_queue(vq->hw)) { > + vring_desc_init_packed(vr, size); > + } else { > + vq->vq_desc_head_idx = 0; > + vq->vq_desc_tail_idx = (uint16_t)(vq->vq_nentries - 1); > > - vring_desc_init(vr->desc, size); > + vring_desc_init(vr->desc, size); > + } > > /* > * Disable device(host) interrupting guest > @@ -386,7 +388,7 @@ struct rte_virtio_xstats_name_off { > /* > * Reserve a memzone for vring elements > */ > - size = vring_size(vq_size, VIRTIO_PCI_VRING_ALIGN); > + size = vring_size(hw, vq_size, VIRTIO_PCI_VRING_ALIGN); > vq->vq_ring_size = RTE_ALIGN_CEIL(size, VIRTIO_PCI_VRING_ALIGN); > PMD_INIT_LOG(DEBUG, "vring_size: %d, rounded_vring_size: %d", > size, vq->vq_ring_size); > diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h > index a28ba83..528fb46 100644 > --- a/drivers/net/virtio/virtio_pci.h > +++ b/drivers/net/virtio/virtio_pci.h > @@ -112,6 +112,8 @@ > > #define VIRTIO_F_VERSION_1 32 > #define VIRTIO_F_IOMMU_PLATFORM 33 > +#define VIRTIO_F_RING_PACKED 34 > +#define VIRTIO_F_IN_ORDER 35 > > /* > * Some VirtIO feature bits (currently bits 28 through 31) are > @@ -304,6 +306,12 @@ enum virtio_msix_status { > return (hw->guest_features & (1ULL << bit)) != 0; > } > > +static inline int > +vtpci_packed_queue(struct virtio_hw *hw) > +{ > + return vtpci_with_feature(hw, VIRTIO_F_RING_PACKED); > +} > + > /* > * Function declaration from virtio_pci.c > */ > diff --git a/drivers/net/virtio/virtio_ring.h b/drivers/net/virtio/virtio_ring.h > index 9e3c2a0..fc45e34 100644 > --- a/drivers/net/virtio/virtio_ring.h > +++ b/drivers/net/virtio/virtio_ring.h > @@ -9,6 +9,7 @@ > > #include > > + > /* This marks a buffer as continuing via the next field. */ > #define VRING_DESC_F_NEXT 1 > /* This marks a buffer as write-only (otherwise read-only). */ > @@ -54,11 +55,23 @@ struct vring_used { > struct vring_used_elem ring[0]; > }; > > +/* For support of packed virtqueues in Virtio 1.1 the format of descriptors > + * looks like this. > + */ > +struct vring_desc_packed { > + uint64_t addr; > + uint32_t len; > + uint16_t index; > + uint16_t flags; > +}; > + > + Trailing new line. > struct vring { > unsigned int num; > struct vring_desc *desc; > struct vring_avail *avail; > struct vring_used *used; > + struct vring_desc_packed *desc_packed; > }; ...