From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 7EE062BAC for ; Thu, 13 Dec 2018 17:11:10 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D8DC087622; Thu, 13 Dec 2018 16:11:09 +0000 (UTC) Received: from [10.36.112.32] (ovpn-112-32.ams2.redhat.com [10.36.112.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5A113608C6; Thu, 13 Dec 2018 16:11:05 +0000 (UTC) To: Jens Freimann , dev@dpdk.org Cc: tiwei.bie@intel.com, Gavin.Hu@arm.com References: <20181213123453.15035-1-jfreimann@redhat.com> <20181213123453.15035-2-jfreimann@redhat.com> From: Maxime Coquelin Message-ID: <19715f10-a124-9cd4-3c08-a7a42a7be0b4@redhat.com> Date: Thu, 13 Dec 2018 17:11:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <20181213123453.15035-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.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 13 Dec 2018 16:11:09 +0000 (UTC) Subject: Re: [dpdk-dev] [PATCH v12 01/10] 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: Thu, 13 Dec 2018 16:11:10 -0000 On 12/13/18 1:34 PM, Jens Freimann wrote: > Add and initialize descriptor data structures. > > Signed-off-by: Jens Freimann > Signed-off-by: Tiwei Bie > --- > drivers/net/virtio/virtio_ethdev.c | 36 +++++++++++------- > drivers/net/virtio/virtio_pci.h | 7 ++++ > drivers/net/virtio/virtio_ring.h | 60 ++++++++++++++++++++++++++---- > drivers/net/virtio/virtqueue.h | 19 +++++++++- > 4 files changed, 100 insertions(+), 22 deletions(-) > > diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c > index cb2b2e0bf..b1232df59 100644 > --- a/drivers/net/virtio/virtio_ethdev.c > +++ b/drivers/net/virtio/virtio_ethdev.c > @@ -299,24 +299,26 @@ virtio_init_vring(struct virtqueue *vq) > > PMD_INIT_FUNC_TRACE(); > > - /* > - * Reinitialise since virtio port might have been stopped and restarted > - */ > memset(ring_mem, 0, vq->vq_ring_size); > - vring_init(vr, size, ring_mem, VIRTIO_PCI_VRING_ALIGN); > + Please remove the trailing new line. > 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); > vq->vq_free_cnt = vq->vq_nentries; > memset(vq->vq_descx, 0, sizeof(struct vq_desc_extra) * vq->vq_nentries); > - > - vring_desc_init(vr->desc, size); > - > - /* > - * Disable device(host) interrupting guest > - */ > - virtqueue_disable_intr(vq); > + if (vtpci_packed_queue(vq->hw)) { > + vring_init_packed(&vq->ring_packed, ring_mem, VIRTIO_PCI_VRING_ALIGN, size); > + vring_desc_init_packed(vq, size); > + virtqueue_disable_intr_packed(vq); > + } else { > + vring_init_split(vr, ring_mem, VIRTIO_PCI_VRING_ALIGN, size); > + vring_desc_init_split(vr->desc, size); > + /* > + * Disable device(host) interrupting guest > + */ > + virtqueue_disable_intr(vq); > + } > } > > static int > @@ -384,11 +386,16 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx) > vq->hw = hw; > vq->vq_queue_index = vtpci_queue_idx; > vq->vq_nentries = vq_size; > + vq->event_flags_shadow = 0; > + if (vtpci_packed_queue(hw)) { > + vq->avail_wrap_counter = 1; > + vq->used_wrap_counter = 1; > + } > > /* > * 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); > @@ -491,7 +498,7 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx) > for (i = 0; i < vq_size; i++) { > struct vring_desc *start_dp = txr[i].tx_indir; > > - vring_desc_init(start_dp, RTE_DIM(txr[i].tx_indir)); > + vring_desc_init_split(start_dp, RTE_DIM(txr[i].tx_indir)); > > /* first indirect descriptor is always the tx header */ > start_dp->addr = txvq->virtio_net_hdr_mem > @@ -1908,7 +1915,8 @@ virtio_dev_configure(struct rte_eth_dev *dev) > > if (vtpci_with_feature(hw, VIRTIO_F_IN_ORDER)) { > hw->use_inorder_tx = 1; > - if (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) { > + if (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF) && > + !vtpci_packed_queue(hw)) { > hw->use_inorder_rx = 1; > hw->use_simple_rx = 0; > } else { > diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h > index e961a58ca..b22b62dad 100644 > --- a/drivers/net/virtio/virtio_pci.h > +++ b/drivers/net/virtio/virtio_pci.h > @@ -113,6 +113,7 @@ struct virtnet_ctl; > > #define VIRTIO_F_VERSION_1 32 > #define VIRTIO_F_IOMMU_PLATFORM 33 > +#define VIRTIO_F_RING_PACKED 34 > > /* > * Some VirtIO feature bits (currently bits 28 through 31) are > @@ -314,6 +315,12 @@ vtpci_with_feature(struct virtio_hw *hw, uint64_t bit) > 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 9e3c2a015..e155eb17d 100644 > --- a/drivers/net/virtio/virtio_ring.h > +++ b/drivers/net/virtio/virtio_ring.h > @@ -54,9 +54,35 @@ 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_packed_desc { > + uint64_t addr; > + uint32_t len; > + uint16_t id; > + uint16_t flags; > +}; > + > +#define RING_EVENT_FLAGS_ENABLE 0x0 > +#define RING_EVENT_FLAGS_DISABLE 0x1 > +#define RING_EVENT_FLAGS_DESC 0x2 > +struct vring_packed_desc_event { > + uint16_t desc_event_off_wrap; > + uint16_t desc_event_flags; > +}; > + > +struct vring_packed { > + unsigned int num; > + struct vring_packed_desc *desc_packed; > + struct vring_packed_desc_event *driver_event; > + struct vring_packed_desc_event *device_event; > + > +}; > + Shouldn't all the above be in the patch declaring all packed ring related defines & structs? > struct vring { > unsigned int num; > - struct vring_desc *desc; > + struct vring_desc *desc; > struct vring_avail *avail; > struct vring_used *used; > }; > @@ -95,10 +121,18 @@ struct vring { > #define vring_avail_event(vr) (*(uint16_t *)&(vr)->used->ring[(vr)->num]) > > static inline size_t > -vring_size(unsigned int num, unsigned long align) > +vring_size(struct virtio_hw *hw, unsigned int num, unsigned long align) > { > size_t size; > > + if (vtpci_packed_queue(hw)) { > + size = num * sizeof(struct vring_packed_desc); > + size += sizeof(struct vring_packed_desc_event); > + size = RTE_ALIGN_CEIL(size, align); > + size += sizeof(struct vring_packed_desc_event); > + return size; > + } > + > size = num * sizeof(struct vring_desc); > size += sizeof(struct vring_avail) + (num * sizeof(uint16_t)); > size = RTE_ALIGN_CEIL(size, align); > @@ -106,17 +140,29 @@ vring_size(unsigned int num, unsigned long align) > (num * sizeof(struct vring_used_elem)); > return size; > } > - > static inline void > -vring_init(struct vring *vr, unsigned int num, uint8_t *p, > - unsigned long align) > +vring_init_split(struct vring *vr, uint8_t *p, unsigned long align, > + unsigned int num) > { > vr->num = num; > vr->desc = (struct vring_desc *) p; > vr->avail = (struct vring_avail *) (p + > - num * sizeof(struct vring_desc)); > + vr->num * sizeof(struct vring_desc)); > vr->used = (void *) > - RTE_ALIGN_CEIL((uintptr_t)(&vr->avail->ring[num]), align); > + RTE_ALIGN_CEIL((uintptr_t)(&vr->avail->ring[vr->num]), align); > +} > + > +static inline void > +vring_init_packed(struct vring_packed *vr, uint8_t *p, unsigned long align, > + unsigned int num) > +{ > + vr->num = num; > + vr->desc_packed = (struct vring_packed_desc *)p; > + vr->driver_event = (struct vring_packed_desc_event *)(p + > + vr->num * sizeof(struct vring_packed_desc)); > + vr->device_event = (struct vring_packed_desc_event *) > + RTE_ALIGN_CEIL((uintptr_t)(vr->driver_event + > + sizeof(struct vring_packed_desc_event)), align); > } > > /* > diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h > index 26518ed98..1401a9844 100644 > --- a/drivers/net/virtio/virtqueue.h > +++ b/drivers/net/virtio/virtqueue.h > @@ -161,11 +161,16 @@ struct virtio_pmd_ctrl { > struct vq_desc_extra { > void *cookie; > uint16_t ndescs; > + uint16_t next; > }; > > struct virtqueue { > struct virtio_hw *hw; /**< virtio_hw structure pointer. */ > struct vring vq_ring; /**< vring keeping desc, used and avail */ > + struct vring_packed ring_packed; /**< vring keeping desc, used and avail */ > + bool avail_wrap_counter; > + bool used_wrap_counter; > + > /** > * Last consumed descriptor in the used table, > * trails vq_ring.used->idx. > @@ -245,9 +250,21 @@ struct virtio_tx_region { > __attribute__((__aligned__(16))); > }; > > +static inline void > +vring_desc_init_packed(struct virtqueue *vq, int n) > +{ > + int i; > + for (i = 0; i < n - 1; i++) { > + vq->ring_packed.desc_packed[i].id = i; > + vq->vq_descx[i].next = i + 1; > + } > + vq->ring_packed.desc_packed[i].id = i; > + vq->vq_descx[i].next = VQ_RING_DESC_CHAIN_END; > +} > + > /* Chain all the descriptors in the ring with an END */ > static inline void > -vring_desc_init(struct vring_desc *dp, uint16_t n) > +vring_desc_init_split(struct vring_desc *dp, uint16_t n) > { > uint16_t i; > >