From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 5323C2C8 for ; Wed, 21 Jun 2017 04:59:25 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP; 20 Jun 2017 19:59:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,367,1493708400"; d="scan'208";a="101830262" Received: from dpdk25.sh.intel.com ([10.67.111.75]) by orsmga002.jf.intel.com with ESMTP; 20 Jun 2017 19:59:23 -0700 From: Tiwei Bie To: dev@dpdk.org Cc: Yuanhan Liu , Jens Freimann Date: Wed, 21 Jun 2017 10:57:37 +0800 Message-Id: <1498013885-102779-2-git-send-email-tiwei.bie@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498013885-102779-1-git-send-email-tiwei.bie@intel.com> References: <1498013885-102779-1-git-send-email-tiwei.bie@intel.com> Subject: [dpdk-dev] [RFC 01/29] net/virtio: vring init for 1.1 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, 21 Jun 2017 02:59:25 -0000 From: Yuanhan Liu Add and initialize descriptor data structures. Signed-off-by: Yuanhan Liu [rename desc_1_1 to vring_desc_1_1, refactor desc init code] Signed-off-by: Jens Freimann --- drivers/net/virtio/virtio-1.1.h | 19 +++++++++++++++++++ drivers/net/virtio/virtio_ethdev.c | 22 ++++++++++++---------- drivers/net/virtio/virtio_pci.h | 7 +++++++ drivers/net/virtio/virtio_ring.h | 15 +++++++++++++-- drivers/net/virtio/virtqueue.h | 10 ++++++++++ 5 files changed, 61 insertions(+), 12 deletions(-) create mode 100644 drivers/net/virtio/virtio-1.1.h diff --git a/drivers/net/virtio/virtio-1.1.h b/drivers/net/virtio/virtio-1.1.h new file mode 100644 index 0000000..48cbb18 --- /dev/null +++ b/drivers/net/virtio/virtio-1.1.h @@ -0,0 +1,19 @@ +#ifndef __VIRTIO_1_1_H +#define __VIRTIO_1_1_H + +#define VRING_DESC_F_NEXT 1 +#define VRING_DESC_F_WRITE 2 +#define VRING_DESC_F_INDIRECT 4 + +#define BATCH_NOT_FIRST 0x0010 +#define BATCH_NOT_LAST 0x0020 +#define DESC_HW 0x0080 + +struct vring_desc_1_1 { + uint64_t addr; + uint32_t len; + uint16_t index; + uint16_t flags; +}; + +#endif /* __VIRTIO_1_1_H */ diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 66c28ac..7c4799a 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -320,19 +320,21 @@ 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); - 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_version_1_1(vq->hw)) { + vring_desc_init_1_1(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 @@ -407,7 +409,7 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx) /* * 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 18caebd..ec74009 100644 --- a/drivers/net/virtio/virtio_pci.h +++ b/drivers/net/virtio/virtio_pci.h @@ -140,6 +140,7 @@ struct virtnet_ctl; #define VIRTIO_F_VERSION_1 32 #define VIRTIO_F_IOMMU_PLATFORM 33 +#define VIRTIO_F_VERSION_1_1 34 /* * Some VirtIO feature bits (currently bits 28 through 31) are @@ -318,6 +319,12 @@ vtpci_with_feature(struct virtio_hw *hw, uint64_t bit) return (hw->guest_features & (1ULL << bit)) != 0; } +static inline int +vtpci_version_1_1(struct virtio_hw *hw) +{ + return vtpci_with_feature(hw, VIRTIO_F_VERSION_1_1); +} + /* * Function declaration from virtio_pci.c */ diff --git a/drivers/net/virtio/virtio_ring.h b/drivers/net/virtio/virtio_ring.h index fcecc16..a991092 100644 --- a/drivers/net/virtio/virtio_ring.h +++ b/drivers/net/virtio/virtio_ring.h @@ -38,6 +38,8 @@ #include +#include "virtio-1.1.h" + /* 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). */ @@ -88,6 +90,7 @@ struct vring { struct vring_desc *desc; struct vring_avail *avail; struct vring_used *used; + struct vring_desc_1_1 *desc_1_1; }; /* The standard layout for the ring is a continuous chunk of memory which @@ -124,10 +127,13 @@ 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_version_1_1(hw)) + return num * sizeof(struct vring_desc_1_1); + size = num * sizeof(struct vring_desc); size += sizeof(struct vring_avail) + (num * sizeof(uint16_t)); size = RTE_ALIGN_CEIL(size, align); @@ -137,10 +143,15 @@ vring_size(unsigned int num, unsigned long align) } static inline void -vring_init(struct vring *vr, unsigned int num, uint8_t *p, +vring_init(struct virtio_hw *hw, struct vring *vr, unsigned int num, uint8_t *p, unsigned long align) { vr->num = num; + if (vtpci_version_1_1(hw)) { + vr->desc_1_1 = (struct vring_desc_1_1 *)p; + return; + } + vr->desc = (struct vring_desc *) p; vr->avail = (struct vring_avail *) (p + num * sizeof(struct vring_desc)); diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h index 2e12086..91d2db7 100644 --- a/drivers/net/virtio/virtqueue.h +++ b/drivers/net/virtio/virtqueue.h @@ -266,6 +266,16 @@ struct virtio_tx_region { __attribute__((__aligned__(16))); }; +static inline void +vring_desc_init_1_1(struct vring *vr, int n) +{ + int i; + for (i = 0; i < n; i++) { + struct vring_desc_1_1 *desc = &vr->desc_1_1[i]; + desc->index = i; + } +} + /* Chain all the descriptors in the ring with an END */ static inline void vring_desc_init(struct vring_desc *dp, uint16_t n) -- 2.7.4