Patch Detail

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

{
    "id": 51323,
    "url": "http://patches.dpdk.org/api/patches/51323/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190319064312.13743-7-tiwei.bie@intel.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": "<20190319064312.13743-7-tiwei.bie@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20190319064312.13743-7-tiwei.bie@intel.com",
    "date": "2019-03-19T06:43:08",
    "name": "[06/10] net/virtio: drop redundant suffix in packed ring structure",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "b1842d1a4b50a636c43bd57cf92145f5766bae4e",
    "submitter": {
        "id": 617,
        "url": "http://patches.dpdk.org/api/people/617/?format=api",
        "name": "Tiwei Bie",
        "email": "tiwei.bie@intel.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/20190319064312.13743-7-tiwei.bie@intel.com/mbox/",
    "series": [
        {
            "id": 3795,
            "url": "http://patches.dpdk.org/api/series/3795/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=3795",
            "date": "2019-03-19T06:43:02",
            "name": "net/virtio: cleanups and fixes for packed/split ring",
            "version": 1,
            "mbox": "http://patches.dpdk.org/series/3795/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/51323/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/51323/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 6D7E34F94;\n\tTue, 19 Mar 2019 07:43:55 +0100 (CET)",
            "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby dpdk.org (Postfix) with ESMTP id 60D1A4C91\n\tfor <dev@dpdk.org>; Tue, 19 Mar 2019 07:43:42 +0100 (CET)",
            "from orsmga007.jf.intel.com ([10.7.209.58])\n\tby orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t18 Mar 2019 23:43:41 -0700",
            "from dpdk-tbie.sh.intel.com ([10.67.104.173])\n\tby orsmga007.jf.intel.com with ESMTP; 18 Mar 2019 23:43:40 -0700"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.58,496,1544515200\"; d=\"scan'208\";a=\"123847060\"",
        "From": "Tiwei Bie <tiwei.bie@intel.com>",
        "To": "maxime.coquelin@redhat.com,\n\tzhihong.wang@intel.com,\n\tdev@dpdk.org",
        "Date": "Tue, 19 Mar 2019 14:43:08 +0800",
        "Message-Id": "<20190319064312.13743-7-tiwei.bie@intel.com>",
        "X-Mailer": "git-send-email 2.17.1",
        "In-Reply-To": "<20190319064312.13743-1-tiwei.bie@intel.com>",
        "References": "<20190319064312.13743-1-tiwei.bie@intel.com>",
        "Subject": "[dpdk-dev] [PATCH 06/10] net/virtio: drop redundant suffix in\n\tpacked ring structure",
        "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": "Drop redundant suffix (_packed and _event) from the fields in\npacked ring structure.\n\nSigned-off-by: Tiwei Bie <tiwei.bie@intel.com>\n---\n drivers/net/virtio/virtio_ethdev.c            |  2 +-\n drivers/net/virtio/virtio_ring.h              | 15 ++++++-------\n drivers/net/virtio/virtio_rxtx.c              | 14 ++++++------\n .../net/virtio/virtio_user/virtio_user_dev.c  | 22 +++++++++----------\n drivers/net/virtio/virtio_user_ethdev.c       | 11 ++++------\n drivers/net/virtio/virtqueue.c                |  2 +-\n drivers/net/virtio/virtqueue.h                | 10 ++++-----\n 7 files changed, 36 insertions(+), 40 deletions(-)",
    "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex bc91ad493..f452a9a79 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -147,7 +147,7 @@ virtio_send_command_packed(struct virtnet_ctl *cvq,\n {\n \tstruct virtqueue *vq = cvq->vq;\n \tint head;\n-\tstruct vring_packed_desc *desc = vq->vq_packed.ring.desc_packed;\n+\tstruct vring_packed_desc *desc = vq->vq_packed.ring.desc;\n \tstruct virtio_pmd_ctrl *result;\n \tuint16_t flags;\n \tint sum = 0;\ndiff --git a/drivers/net/virtio/virtio_ring.h b/drivers/net/virtio/virtio_ring.h\nindex 5a37629fe..6abec4d87 100644\n--- a/drivers/net/virtio/virtio_ring.h\n+++ b/drivers/net/virtio/virtio_ring.h\n@@ -78,10 +78,9 @@ struct vring_packed_desc_event {\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+\tstruct vring_packed_desc *desc;\n+\tstruct vring_packed_desc_event *driver;\n+\tstruct vring_packed_desc_event *device;\n };\n \n struct vring {\n@@ -161,11 +160,11 @@ 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+\tvr->desc = (struct vring_packed_desc *)p;\n+\tvr->driver = (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+\tvr->device = (struct vring_packed_desc_event *)\n+\t\tRTE_ALIGN_CEIL(((uintptr_t)vr->driver +\n \t\t\t\tsizeof(struct vring_packed_desc_event)), align);\n }\n \ndiff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex 02f8d9451..42d0f533c 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -118,7 +118,7 @@ virtqueue_dequeue_burst_rx_packed(struct virtqueue *vq,\n \tstruct vring_packed_desc *desc;\n \tuint16_t i;\n \n-\tdesc = vq->vq_packed.ring.desc_packed;\n+\tdesc = vq->vq_packed.ring.desc;\n \n \tfor (i = 0; i < num; i++) {\n \t\tused_idx = vq->vq_used_cons_idx;\n@@ -229,7 +229,7 @@ virtio_xmit_cleanup_inorder_packed(struct virtqueue *vq, int num)\n {\n \tuint16_t used_idx, id, curr_id, free_cnt = 0;\n \tuint16_t size = vq->vq_nentries;\n-\tstruct vring_packed_desc *desc = vq->vq_packed.ring.desc_packed;\n+\tstruct vring_packed_desc *desc = vq->vq_packed.ring.desc;\n \tstruct vq_desc_extra *dxp;\n \n \tused_idx = vq->vq_used_cons_idx;\n@@ -261,7 +261,7 @@ virtio_xmit_cleanup_normal_packed(struct virtqueue *vq, int num)\n {\n \tuint16_t used_idx, id;\n \tuint16_t size = vq->vq_nentries;\n-\tstruct vring_packed_desc *desc = vq->vq_packed.ring.desc_packed;\n+\tstruct vring_packed_desc *desc = vq->vq_packed.ring.desc;\n \tstruct vq_desc_extra *dxp;\n \n \tused_idx = vq->vq_used_cons_idx;\n@@ -430,7 +430,7 @@ static inline int\n virtqueue_enqueue_recv_refill_packed(struct virtqueue *vq,\n \t\t\t\t     struct rte_mbuf **cookie, uint16_t num)\n {\n-\tstruct vring_packed_desc *start_dp = vq->vq_packed.ring.desc_packed;\n+\tstruct vring_packed_desc *start_dp = vq->vq_packed.ring.desc;\n \tuint16_t flags = vq->vq_packed.cached_flags;\n \tstruct virtio_hw *hw = vq->hw;\n \tstruct vq_desc_extra *dxp;\n@@ -635,7 +635,7 @@ virtqueue_enqueue_xmit_packed_fast(struct virtnet_tx *txvq,\n \n \tid = in_order ? vq->vq_avail_idx : vq->vq_desc_head_idx;\n \tidx = vq->vq_avail_idx;\n-\tdp = &vq->vq_packed.ring.desc_packed[idx];\n+\tdp = &vq->vq_packed.ring.desc[idx];\n \n \tdxp = &vq->vq_descx[id];\n \tdxp->ndescs = 1;\n@@ -698,9 +698,9 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie,\n \thead_idx = vq->vq_avail_idx;\n \tidx = head_idx;\n \tprev = head_idx;\n-\tstart_dp = vq->vq_packed.ring.desc_packed;\n+\tstart_dp = vq->vq_packed.ring.desc;\n \n-\thead_dp = &vq->vq_packed.ring.desc_packed[idx];\n+\thead_dp = &vq->vq_packed.ring.desc[idx];\n \thead_flags = cookie->next ? VRING_DESC_F_NEXT : 0;\n \thead_flags |= vq->vq_packed.cached_flags;\n \ndiff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c\nindex d1157378d..2dc8f2051 100644\n--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c\n+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c\n@@ -52,11 +52,11 @@ virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel)\n \n \tif (dev->features & (1ULL << VIRTIO_F_RING_PACKED)) {\n \t\taddr.desc_user_addr =\n-\t\t\t(uint64_t)(uintptr_t)pq_vring->desc_packed;\n+\t\t\t(uint64_t)(uintptr_t)pq_vring->desc;\n \t\taddr.avail_user_addr =\n-\t\t\t(uint64_t)(uintptr_t)pq_vring->driver_event;\n+\t\t\t(uint64_t)(uintptr_t)pq_vring->driver;\n \t\taddr.used_user_addr =\n-\t\t\t(uint64_t)(uintptr_t)pq_vring->device_event;\n+\t\t\t(uint64_t)(uintptr_t)pq_vring->device;\n \t} else {\n \t\taddr.desc_user_addr = (uint64_t)(uintptr_t)vring->desc;\n \t\taddr.avail_user_addr = (uint64_t)(uintptr_t)vring->avail;\n@@ -650,30 +650,30 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev,\n \tn_descs++;\n \n \tidx_status = idx_data;\n-\twhile (vring->desc_packed[idx_status].flags & VRING_DESC_F_NEXT) {\n+\twhile (vring->desc[idx_status].flags & VRING_DESC_F_NEXT) {\n \t\tidx_status++;\n \t\tif (idx_status >= dev->queue_size)\n \t\t\tidx_status -= dev->queue_size;\n \t\tn_descs++;\n \t}\n \n-\thdr = (void *)(uintptr_t)vring->desc_packed[idx_hdr].addr;\n+\thdr = (void *)(uintptr_t)vring->desc[idx_hdr].addr;\n \tif (hdr->class == VIRTIO_NET_CTRL_MQ &&\n \t    hdr->cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {\n \t\tuint16_t queues;\n \n \t\tqueues = *(uint16_t *)(uintptr_t)\n-\t\t\t\tvring->desc_packed[idx_data].addr;\n+\t\t\t\tvring->desc[idx_data].addr;\n \t\tstatus = virtio_user_handle_mq(dev, queues);\n \t}\n \n \t/* Update status */\n \t*(virtio_net_ctrl_ack *)(uintptr_t)\n-\t\tvring->desc_packed[idx_status].addr = status;\n+\t\tvring->desc[idx_status].addr = status;\n \n \t/* Update used descriptor */\n-\tvring->desc_packed[idx_hdr].id = vring->desc_packed[idx_status].id;\n-\tvring->desc_packed[idx_hdr].len = sizeof(status);\n+\tvring->desc[idx_hdr].id = vring->desc[idx_status].id;\n+\tvring->desc[idx_hdr].len = sizeof(status);\n \n \treturn n_descs;\n }\n@@ -685,14 +685,14 @@ virtio_user_handle_cq_packed(struct virtio_user_dev *dev, uint16_t queue_idx)\n \tstruct vring_packed *vring = &dev->packed_vrings[queue_idx];\n \tuint16_t n_descs;\n \n-\twhile (desc_is_avail(&vring->desc_packed[vq->used_idx],\n+\twhile (desc_is_avail(&vring->desc[vq->used_idx],\n \t\t\t     vq->used_wrap_counter)) {\n \n \t\tn_descs = virtio_user_handle_ctrl_msg_packed(dev, vring,\n \t\t\t\tvq->used_idx);\n \n \t\trte_smp_wmb();\n-\t\tvring->desc_packed[vq->used_idx].flags =\n+\t\tvring->desc[vq->used_idx].flags =\n \t\t\tVRING_DESC_F_WRITE |\n \t\t\tVRING_DESC_F_AVAIL(vq->used_wrap_counter) |\n \t\t\tVRING_DESC_F_USED(vq->used_wrap_counter);\ndiff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c\nindex 6423e1f61..c5a76bd91 100644\n--- a/drivers/net/virtio/virtio_user_ethdev.c\n+++ b/drivers/net/virtio/virtio_user_ethdev.c\n@@ -290,17 +290,14 @@ virtio_user_setup_queue_packed(struct virtqueue *vq,\n \t\t\t   sizeof(struct vring_packed_desc_event),\n \t\t\t   VIRTIO_PCI_VRING_ALIGN);\n \tvring->num = vq->vq_nentries;\n-\tvring->desc_packed =\n-\t\t(void *)(uintptr_t)desc_addr;\n-\tvring->driver_event =\n-\t\t(void *)(uintptr_t)avail_addr;\n-\tvring->device_event =\n-\t\t(void *)(uintptr_t)used_addr;\n+\tvring->desc = (void *)(uintptr_t)desc_addr;\n+\tvring->driver = (void *)(uintptr_t)avail_addr;\n+\tvring->device = (void *)(uintptr_t)used_addr;\n \tdev->packed_queues[queue_idx].avail_wrap_counter = true;\n \tdev->packed_queues[queue_idx].used_wrap_counter = true;\n \n \tfor (i = 0; i < vring->num; i++)\n-\t\tvring->desc_packed[i].flags = 0;\n+\t\tvring->desc[i].flags = 0;\n }\n \n static void\ndiff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c\nindex 79491db32..5ff1e3587 100644\n--- a/drivers/net/virtio/virtqueue.c\n+++ b/drivers/net/virtio/virtqueue.c\n@@ -61,7 +61,7 @@ virtqueue_rxvq_flush_packed(struct virtqueue *vq)\n \tstruct vq_desc_extra *dxp;\n \tuint16_t i;\n \n-\tstruct vring_packed_desc *descs = vq->vq_packed.ring.desc_packed;\n+\tstruct vring_packed_desc *descs = vq->vq_packed.ring.desc;\n \tint cnt = 0;\n \n \ti = vq->vq_used_cons_idx;\ndiff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h\nindex 48b3912e6..78df6d390 100644\n--- a/drivers/net/virtio/virtqueue.h\n+++ b/drivers/net/virtio/virtqueue.h\n@@ -302,10 +302,10 @@ vring_desc_init_packed(struct virtqueue *vq, int n)\n {\n \tint i;\n \tfor (i = 0; i < n - 1; i++) {\n-\t\tvq->vq_packed.ring.desc_packed[i].id = i;\n+\t\tvq->vq_packed.ring.desc[i].id = i;\n \t\tvq->vq_descx[i].next = i + 1;\n \t}\n-\tvq->vq_packed.ring.desc_packed[i].id = i;\n+\tvq->vq_packed.ring.desc[i].id = i;\n \tvq->vq_descx[i].next = VQ_RING_DESC_CHAIN_END;\n }\n \n@@ -328,7 +328,7 @@ virtqueue_disable_intr_packed(struct virtqueue *vq)\n {\n \tif (vq->vq_packed.event_flags_shadow != RING_EVENT_FLAGS_DISABLE) {\n \t\tvq->vq_packed.event_flags_shadow = RING_EVENT_FLAGS_DISABLE;\n-\t\tvq->vq_packed.ring.driver_event->desc_event_flags =\n+\t\tvq->vq_packed.ring.driver->desc_event_flags =\n \t\t\tvq->vq_packed.event_flags_shadow;\n \t}\n }\n@@ -353,7 +353,7 @@ virtqueue_enable_intr_packed(struct virtqueue *vq)\n {\n \tif (vq->vq_packed.event_flags_shadow == RING_EVENT_FLAGS_DISABLE) {\n \t\tvq->vq_packed.event_flags_shadow = RING_EVENT_FLAGS_ENABLE;\n-\t\tvq->vq_packed.ring.driver_event->desc_event_flags =\n+\t\tvq->vq_packed.ring.driver->desc_event_flags =\n \t\t\tvq->vq_packed.event_flags_shadow;\n \t}\n }\n@@ -460,7 +460,7 @@ virtqueue_kick_prepare_packed(struct virtqueue *vq)\n \t * Ensure updated data is visible to vhost before reading the flags.\n \t */\n \tvirtio_mb(vq->hw->weak_barriers);\n-\tflags = vq->vq_packed.ring.device_event->desc_event_flags;\n+\tflags = vq->vq_packed.ring.device->desc_event_flags;\n \n \treturn flags != RING_EVENT_FLAGS_DISABLE;\n }\n",
    "prefixes": [
        "06/10"
    ]
}