Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 48497,
    "url": "http://patches.dpdk.org/api/patches/48497/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20181203141515.28368-2-jfreimann@redhat.com/",
    "project": {
        "id": 1,
        "url": "http://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": "<20181203141515.28368-2-jfreimann@redhat.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20181203141515.28368-2-jfreimann@redhat.com",
    "date": "2018-12-03T14:15:07",
    "name": "[v11,1/9] net/virtio: vring init for packed queues",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "4aef255c045791d0b0ef90baf22345aafae150a1",
    "submitter": {
        "id": 745,
        "url": "http://patches.dpdk.org/api/people/745/?format=api",
        "name": "Jens Freimann",
        "email": "jfreimann@redhat.com"
    },
    "delegate": {
        "id": 2642,
        "url": "http://patches.dpdk.org/api/users/2642/?format=api",
        "username": "mcoquelin",
        "first_name": "Maxime",
        "last_name": "Coquelin",
        "email": "maxime.coquelin@redhat.com"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20181203141515.28368-2-jfreimann@redhat.com/mbox/",
    "series": [
        {
            "id": 2645,
            "url": "http://patches.dpdk.org/api/series/2645/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=2645",
            "date": "2018-12-03T14:15:06",
            "name": "implement packed virtqueues",
            "version": 11,
            "mbox": "http://patches.dpdk.org/series/2645/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/48497/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/48497/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 C53E51B416;\n\tMon,  3 Dec 2018 15:15:56 +0100 (CET)",
            "from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\n\tby dpdk.org (Postfix) with ESMTP id 7D6CE1B416\n\tfor <dev@dpdk.org>; Mon,  3 Dec 2018 15:15:55 +0100 (CET)",
            "from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\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 DC1FCC049587;\n\tMon,  3 Dec 2018 14:15:54 +0000 (UTC)",
            "from localhost (dhcp-192-205.str.redhat.com [10.33.192.205])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id D9C0D6717B;\n\tMon,  3 Dec 2018 14:15:51 +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": "Mon,  3 Dec 2018 15:15:07 +0100",
        "Message-Id": "<20181203141515.28368-2-jfreimann@redhat.com>",
        "In-Reply-To": "<20181203141515.28368-1-jfreimann@redhat.com>",
        "References": "<20181203141515.28368-1-jfreimann@redhat.com>",
        "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.12",
        "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]); Mon, 03 Dec 2018 14:15:54 +0000 (UTC)",
        "Subject": "[dpdk-dev] [PATCH v11 1/9] 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>\nSigned-off-by: Tiwei Bie <tiwei.bie@intel.com>\n---\n drivers/net/virtio/virtio_ethdev.c | 34 ++++++++++-------\n drivers/net/virtio/virtio_pci.h    |  7 ++++\n drivers/net/virtio/virtio_ring.h   | 60 ++++++++++++++++++++++++++----\n drivers/net/virtio/virtqueue.h     | 19 +++++++++-\n 4 files changed, 98 insertions(+), 22 deletions(-)",
    "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex e1fe36a23..fdcb7ecaa 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -299,24 +299,25 @@ 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+\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 \tvq->vq_free_cnt = vq->vq_nentries;\n \tmemset(vq->vq_descx, 0, sizeof(struct vq_desc_extra) * vq->vq_nentries);\n-\n-\tvring_desc_init(vr->desc, size);\n-\n-\t/*\n-\t * Disable device(host) interrupting guest\n-\t */\n-\tvirtqueue_disable_intr(vq);\n+\tif (vtpci_packed_queue(vq->hw)) {\n+\t\tvring_init_packed(&vq->ring_packed, ring_mem, VIRTIO_PCI_VRING_ALIGN, size);\n+\t\tvring_desc_init_packed(vq, size);\n+\t} else {\n+\t\tvring_init_split(vr, ring_mem, VIRTIO_PCI_VRING_ALIGN, size);\n+\t\tvring_desc_init_split(vr->desc, size);\n+\t\t/*\n+\t\t * Disable device(host) interrupting guest\n+\t\t */\n+\t\tvirtqueue_disable_intr(vq);\n+\t}\n }\n \n static int\n@@ -382,11 +383,15 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)\n \tvq->hw = hw;\n \tvq->vq_queue_index = vtpci_queue_idx;\n \tvq->vq_nentries = vq_size;\n+\tif (vtpci_packed_queue(hw)) {\n+\t\tvq->avail_wrap_counter = 1;\n+\t\tvq->used_wrap_counter = 1;\n+\t}\n \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 +494,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\n@@ -1905,7 +1910,8 @@ virtio_dev_configure(struct rte_eth_dev *dev)\n \n \tif (vtpci_with_feature(hw, VIRTIO_F_IN_ORDER)) {\n \t\thw->use_inorder_tx = 1;\n-\t\tif (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) {\n+\t\tif (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF) &&\n+\t\t    !vtpci_packed_queue(hw)) {\n \t\t\thw->use_inorder_rx = 1;\n \t\t\thw->use_simple_rx = 0;\n \t\t} else {\ndiff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h\nindex e961a58ca..b22b62dad 100644\n--- a/drivers/net/virtio/virtio_pci.h\n+++ b/drivers/net/virtio/virtio_pci.h\n@@ -113,6 +113,7 @@ 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 \n /*\n  * Some VirtIO feature bits (currently bits 28 through 31) are\n@@ -314,6 +315,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..e155eb17d 100644\n--- a/drivers/net/virtio/virtio_ring.h\n+++ b/drivers/net/virtio/virtio_ring.h\n@@ -54,9 +54,35 @@ 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_packed_desc {\n+\tuint64_t addr;\n+\tuint32_t len;\n+\tuint16_t id;\n+\tuint16_t flags;\n+};\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_packed {\n+\tunsigned int num;\n+\tstruct vring_packed_desc *desc_packed;\n+\tstruct vring_packed_desc_event *driver_event;\n+\tstruct vring_packed_desc_event *device_event;\n+\n+};\n+\n struct vring {\n \tunsigned int num;\n-\tstruct vring_desc  *desc;\n+\tstruct vring_desc *desc;\n \tstruct vring_avail *avail;\n \tstruct vring_used  *used;\n };\n@@ -95,10 +121,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_packed_desc);\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@@ -106,17 +140,29 @@ vring_size(unsigned int num, unsigned long align)\n \t\t(num * sizeof(struct vring_used_elem));\n \treturn size;\n }\n-\n static inline void\n-vring_init(struct vring *vr, unsigned int num, uint8_t *p,\n-\tunsigned long align)\n+vring_init_split(struct vring *vr, uint8_t *p, unsigned long align,\n+\t\t unsigned int num)\n {\n \tvr->num = num;\n \tvr->desc = (struct vring_desc *) p;\n \tvr->avail = (struct vring_avail *) (p +\n-\t\tnum * sizeof(struct vring_desc));\n+\t\t\tvr->num * sizeof(struct vring_desc));\n \tvr->used = (void *)\n-\t\tRTE_ALIGN_CEIL((uintptr_t)(&vr->avail->ring[num]), align);\n+\t\tRTE_ALIGN_CEIL((uintptr_t)(&vr->avail->ring[vr->num]), align);\n+}\n+\n+static inline void\n+vring_init_packed(struct vring_packed *vr, uint8_t *p, unsigned long align,\n+\t\t unsigned int num)\n+{\n+\tvr->num = num;\n+\tvr->desc_packed = (struct vring_packed_desc *)p;\n+\tvr->driver_event = (struct vring_packed_desc_event *)(p +\n+\t\t\tvr->num * sizeof(struct vring_packed_desc));\n+\tvr->device_event = (struct vring_packed_desc_event *)\n+\t\tRTE_ALIGN_CEIL((uintptr_t)(vr->driver_event +\n+\t\t\t\tsizeof(struct vring_packed_desc_event)), align);\n }\n \n /*\ndiff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h\nindex 26518ed98..1401a9844 100644\n--- a/drivers/net/virtio/virtqueue.h\n+++ b/drivers/net/virtio/virtqueue.h\n@@ -161,11 +161,16 @@ struct virtio_pmd_ctrl {\n struct vq_desc_extra {\n \tvoid *cookie;\n \tuint16_t ndescs;\n+\tuint16_t next;\n };\n \n struct virtqueue {\n \tstruct virtio_hw  *hw; /**< virtio_hw structure pointer. */\n \tstruct vring vq_ring;  /**< vring keeping desc, used and avail */\n+\tstruct vring_packed ring_packed;  /**< vring keeping desc, used and avail */\n+\tbool avail_wrap_counter;\n+\tbool used_wrap_counter;\n+\n \t/**\n \t * Last consumed descriptor in the used table,\n \t * trails vq_ring.used->idx.\n@@ -245,9 +250,21 @@ struct virtio_tx_region {\n \t\t\t   __attribute__((__aligned__(16)));\n };\n \n+static inline void\n+vring_desc_init_packed(struct virtqueue *vq, int n)\n+{\n+\tint i;\n+\tfor (i = 0; i < n - 1; i++) {\n+\t\tvq->ring_packed.desc_packed[i].id = i;\n+\t\tvq->vq_descx[i].next = i + 1;\n+\t}\n+\tvq->ring_packed.desc_packed[i].id = i;\n+\tvq->vq_descx[i].next = VQ_RING_DESC_CHAIN_END;\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": [
        "v11",
        "1/9"
    ]
}