Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/45068/?format=api
{ "id": 45068, "url": "https://patches.dpdk.org/api/patches/45068/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20180921103308.16357-2-jfreimann@redhat.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20180921103308.16357-2-jfreimann@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180921103308.16357-2-jfreimann@redhat.com", "date": "2018-09-21T10:32:58", "name": "[v6,01/11] net/virtio: vring init for packed queues", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "0c724cf86c3288c266fde16b215d56c95b7bc3b3", "submitter": { "id": 745, "url": "https://patches.dpdk.org/api/people/745/?format=api", "name": "Jens Freimann", "email": "jfreimann@redhat.com" }, "delegate": { "id": 2642, "url": "https://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20180921103308.16357-2-jfreimann@redhat.com/mbox/", "series": [ { "id": 1435, "url": "https://patches.dpdk.org/api/series/1435/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=1435", "date": "2018-09-21T10:32:57", "name": "implement packed virtqueues", "version": 6, "mbox": "https://patches.dpdk.org/series/1435/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/45068/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/45068/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id D89E24CA0;\n\tFri, 21 Sep 2018 12:33:25 +0200 (CEST)", "from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\n\tby dpdk.org (Postfix) with ESMTP id EBDC12BD3\n\tfor <dev@dpdk.org>; Fri, 21 Sep 2018 12:33:24 +0200 (CEST)", "from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 5DD005F724;\n\tFri, 21 Sep 2018 10:33:24 +0000 (UTC)", "from localhost (dhcp-192-209.str.redhat.com [10.33.192.209])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id A577D8069E;\n\tFri, 21 Sep 2018 10:33:17 +0000 (UTC)" ], "From": "Jens Freimann <jfreimann@redhat.com>", "To": "dev@dpdk.org", "Cc": "tiwei.bie@intel.com,\n\tmaxime.coquelin@redhat.com,\n\tGavin.Hu@arm.com", "Date": "Fri, 21 Sep 2018 12:32:58 +0200", "Message-Id": "<20180921103308.16357-2-jfreimann@redhat.com>", "In-Reply-To": "<20180921103308.16357-1-jfreimann@redhat.com>", "References": "<20180921103308.16357-1-jfreimann@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.11", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]); Fri, 21 Sep 2018 10:33:24 +0000 (UTC)", "Subject": "[dpdk-dev] [PATCH v6 01/11] 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 <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add and initialize descriptor data structures.\n\nSigned-off-by: Jens Freimann <jfreimann@redhat.com>\n---\n drivers/net/virtio/virtio_ethdev.c | 24 +++++++------\n drivers/net/virtio/virtio_pci.h | 8 +++++\n drivers/net/virtio/virtio_ring.h | 55 +++++++++++++++++++++++++++---\n drivers/net/virtio/virtqueue.h | 12 ++++++-\n 4 files changed, 82 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex b81df0a99..29f3e1043 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -299,19 +299,21 @@ virtio_init_vring(struct virtqueue *vq)\n \n \tPMD_INIT_FUNC_TRACE();\n \n-\t/*\n-\t * Reinitialise since virtio port might have been stopped and restarted\n-\t */\n \tmemset(ring_mem, 0, vq->vq_ring_size);\n-\tvring_init(vr, size, ring_mem, VIRTIO_PCI_VRING_ALIGN);\n-\tvq->vq_used_cons_idx = 0;\n-\tvq->vq_desc_head_idx = 0;\n-\tvq->vq_avail_idx = 0;\n-\tvq->vq_desc_tail_idx = (uint16_t)(vq->vq_nentries - 1);\n+\tvring_init(vq->hw, vr, size, ring_mem, VIRTIO_PCI_VRING_ALIGN);\n+\n \tvq->vq_free_cnt = vq->vq_nentries;\n \tmemset(vq->vq_descx, 0, sizeof(struct vq_desc_extra) * vq->vq_nentries);\n+\tvq->vq_used_cons_idx = 0;\n+\tvq->vq_avail_idx = 0;\n+\tif (vtpci_packed_queue(vq->hw)) {\n+\t\tvring_desc_init_packed(vr, size);\n+\t} else {\n+\t\tvq->vq_desc_head_idx = 0;\n+\t\tvq->vq_desc_tail_idx = (uint16_t)(vq->vq_nentries - 1);\n \n-\tvring_desc_init(vr->desc, size);\n+\t\tvring_desc_init_split(vr->desc, size);\n+\t}\n \n \t/*\n \t * Disable device(host) interrupting guest\n@@ -386,7 +388,7 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)\n \t/*\n \t * Reserve a memzone for vring elements\n \t */\n-\tsize = vring_size(vq_size, VIRTIO_PCI_VRING_ALIGN);\n+\tsize = vring_size(hw, vq_size, VIRTIO_PCI_VRING_ALIGN);\n \tvq->vq_ring_size = RTE_ALIGN_CEIL(size, VIRTIO_PCI_VRING_ALIGN);\n \tPMD_INIT_LOG(DEBUG, \"vring_size: %d, rounded_vring_size: %d\",\n \t\t size, vq->vq_ring_size);\n@@ -489,7 +491,7 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)\n \t\tfor (i = 0; i < vq_size; i++) {\n \t\t\tstruct vring_desc *start_dp = txr[i].tx_indir;\n \n-\t\t\tvring_desc_init(start_dp, RTE_DIM(txr[i].tx_indir));\n+\t\t\tvring_desc_init_split(start_dp, RTE_DIM(txr[i].tx_indir));\n \n \t\t\t/* first indirect descriptor is always the tx header */\n \t\t\tstart_dp->addr = txvq->virtio_net_hdr_mem\ndiff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h\nindex 58fdd3d45..90204d281 100644\n--- a/drivers/net/virtio/virtio_pci.h\n+++ b/drivers/net/virtio/virtio_pci.h\n@@ -113,6 +113,8 @@ struct virtnet_ctl;\n \n #define VIRTIO_F_VERSION_1\t\t32\n #define VIRTIO_F_IOMMU_PLATFORM\t33\n+#define VIRTIO_F_RING_PACKED\t\t34\n+#define VIRTIO_F_IN_ORDER\t\t35\n \n /*\n * Some VirtIO feature bits (currently bits 28 through 31) are\n@@ -314,6 +316,12 @@ vtpci_with_feature(struct virtio_hw *hw, uint64_t bit)\n \treturn (hw->guest_features & (1ULL << bit)) != 0;\n }\n \n+static inline int\n+vtpci_packed_queue(struct virtio_hw *hw)\n+{\n+\treturn vtpci_with_feature(hw, VIRTIO_F_RING_PACKED);\n+}\n+\n /*\n * Function declaration from virtio_pci.c\n */\ndiff --git a/drivers/net/virtio/virtio_ring.h b/drivers/net/virtio/virtio_ring.h\nindex 9e3c2a015..309069fdb 100644\n--- a/drivers/net/virtio/virtio_ring.h\n+++ b/drivers/net/virtio/virtio_ring.h\n@@ -54,11 +54,38 @@ struct vring_used {\n \tstruct vring_used_elem ring[0];\n };\n \n+/* For support of packed virtqueues in Virtio 1.1 the format of descriptors\n+ * looks like this.\n+ */\n+struct vring_desc_packed {\n+\tuint64_t addr;\n+\tuint32_t len;\n+\tuint16_t index;\n+\tuint16_t flags;\n+} __attribute__ ((aligned(16)));\n+\n+#define RING_EVENT_FLAGS_ENABLE 0x0\n+#define RING_EVENT_FLAGS_DISABLE 0x1\n+#define RING_EVENT_FLAGS_DESC 0x2\n+struct vring_packed_desc_event {\n+\tuint16_t desc_event_off_wrap;\n+\tuint16_t desc_event_flags;\n+};\n+\n struct vring {\n \tunsigned int num;\n-\tstruct vring_desc *desc;\n-\tstruct vring_avail *avail;\n-\tstruct vring_used *used;\n+\tunion {\n+\t\tstruct vring_desc_packed *desc_packed;\n+\t\tstruct vring_desc *desc;\n+\t};\n+\tunion {\n+\t\tstruct vring_avail *avail;\n+\t\tstruct vring_packed_desc_event *driver_event;\n+\t};\n+\tunion {\n+\t\tstruct vring_used *used;\n+\t\tstruct vring_packed_desc_event *device_event;\n+\t};\n };\n \n /* The standard layout for the ring is a continuous chunk of memory which\n@@ -95,10 +122,18 @@ struct vring {\n #define vring_avail_event(vr) (*(uint16_t *)&(vr)->used->ring[(vr)->num])\n \n static inline size_t\n-vring_size(unsigned int num, unsigned long align)\n+vring_size(struct virtio_hw *hw, unsigned int num, unsigned long align)\n {\n \tsize_t size;\n \n+\tif (vtpci_packed_queue(hw)) {\n+\t\tsize = num * sizeof(struct vring_desc_packed);\n+\t\tsize += sizeof(struct vring_packed_desc_event);\n+\t\tsize = RTE_ALIGN_CEIL(size, align);\n+\t\tsize += sizeof(struct vring_packed_desc_event);\n+\t\treturn size;\n+\t}\n+\n \tsize = num * sizeof(struct vring_desc);\n \tsize += sizeof(struct vring_avail) + (num * sizeof(uint16_t));\n \tsize = RTE_ALIGN_CEIL(size, align);\n@@ -108,10 +143,20 @@ vring_size(unsigned int num, unsigned long align)\n }\n \n static inline void\n-vring_init(struct vring *vr, unsigned int num, uint8_t *p,\n+vring_init(struct virtio_hw *hw, struct vring *vr, unsigned int num, uint8_t *p,\n \tunsigned long align)\n {\n \tvr->num = num;\n+\tif (vtpci_packed_queue(hw)) {\n+\t\tvr->desc_packed = (struct vring_desc_packed *)p;\n+\t\tvr->driver_event = (struct vring_packed_desc_event *)(p +\n+\t\t\tnum * sizeof(struct vring_desc_packed));\n+\t\tvr->device_event = (struct vring_packed_desc_event *)\n+\t\t\t\tRTE_ALIGN_CEIL((uintptr_t)(vr->driver_event +\n+\t\t\t\tsizeof(struct vring_packed_desc_event)), align);\n+\t\treturn;\n+\t}\n+\n \tvr->desc = (struct vring_desc *) p;\n \tvr->avail = (struct vring_avail *) (p +\n \t\tnum * sizeof(struct vring_desc));\ndiff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h\nindex 26518ed98..7f337cd42 100644\n--- a/drivers/net/virtio/virtqueue.h\n+++ b/drivers/net/virtio/virtqueue.h\n@@ -245,9 +245,19 @@ struct virtio_tx_region {\n \t\t\t __attribute__((__aligned__(16)));\n };\n \n+static inline void\n+vring_desc_init_packed(struct vring *vr, int n)\n+{\n+\tint i;\n+\tfor (i = 0; i < n; i++) {\n+\t\tstruct vring_desc_packed *desc = &vr->desc_packed[i];\n+\t\tdesc->index = i;\n+\t}\n+}\n+\n /* Chain all the descriptors in the ring with an END */\n static inline void\n-vring_desc_init(struct vring_desc *dp, uint16_t n)\n+vring_desc_init_split(struct vring_desc *dp, uint16_t n)\n {\n \tuint16_t i;\n \n", "prefixes": [ "v6", "01/11" ] }