Patch Detail

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

{
    "id": 10785,
    "url": "http://patches.dpdk.org/api/patches/10785/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1456314438-4021-3-git-send-email-i.maximets@samsung.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": "<1456314438-4021-3-git-send-email-i.maximets@samsung.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1456314438-4021-3-git-send-email-i.maximets@samsung.com",
    "date": "2016-02-24T11:47:17",
    "name": "[dpdk-dev,RFC,v3,2/3] vhost: make buf vector for scatter RX local.",
    "commit_ref": null,
    "pull_url": null,
    "state": "rejected",
    "archived": true,
    "hash": "046e077b3bd3b8bb12f01f965952b6bffe0a89b6",
    "submitter": {
        "id": 323,
        "url": "http://patches.dpdk.org/api/people/323/?format=api",
        "name": "Ilya Maximets",
        "email": "i.maximets@samsung.com"
    },
    "delegate": null,
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/1456314438-4021-3-git-send-email-i.maximets@samsung.com/mbox/",
    "series": [],
    "comments": "http://patches.dpdk.org/api/patches/10785/comments/",
    "check": "pending",
    "checks": "http://patches.dpdk.org/api/patches/10785/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id E781A2BD6;\n\tWed, 24 Feb 2016 12:47:39 +0100 (CET)",
            "from mailout2.w1.samsung.com (mailout2.w1.samsung.com\n\t[210.118.77.12]) by dpdk.org (Postfix) with ESMTP id 9332D2BD2\n\tfor <dev@dpdk.org>; Wed, 24 Feb 2016 12:47:37 +0100 (CET)",
            "from eucpsbgm1.samsung.com (unknown [203.254.199.244])\n\tby mailout2.w1.samsung.com\n\t(Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5\n\t2014)) with ESMTP id <0O3100DTYVFCSRA0@mailout2.w1.samsung.com> for\n\tdev@dpdk.org; Wed, 24 Feb 2016 11:47:36 +0000 (GMT)",
            "from eusync4.samsung.com ( [203.254.199.214])\n\tby eucpsbgm1.samsung.com (EUCPMTA) with SMTP id DF.F5.16778.7589DC65;\n\tWed, 24 Feb 2016 11:47:35 +0000 (GMT)",
            "from imaximets.rnd.samsung.ru ([106.109.129.180])\n\tby eusync4.samsung.com\n\t(Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5\n\t2014)) with ESMTPA id <0O3100380VF3RS40@eusync4.samsung.com>; Wed,\n\t24 Feb 2016 11:47:35 +0000 (GMT)"
        ],
        "X-AuditID": "cbfec7f4-f79026d00000418a-33-56cd9857ab85",
        "From": "Ilya Maximets <i.maximets@samsung.com>",
        "To": "dev@dpdk.org, Huawei Xie <huawei.xie@intel.com>,\n\tYuanhan Liu <yuanhan.liu@linux.intel.com>",
        "Date": "Wed, 24 Feb 2016 14:47:17 +0300",
        "Message-id": "<1456314438-4021-3-git-send-email-i.maximets@samsung.com>",
        "X-Mailer": "git-send-email 2.5.0",
        "In-reply-to": "<1456314438-4021-1-git-send-email-i.maximets@samsung.com>",
        "References": "<1456314438-4021-1-git-send-email-i.maximets@samsung.com>",
        "X-Brightmail-Tracker": "H4sIAAAAAAAAA+NgFlrBLMWRmVeSWpSXmKPExsVy+t/xa7rhM86GGXy5o2nx7tN2Jov2mWeZ\n\tLK60/2S3mDjJxGL60wiLYz2fWC0mz5ay+LJpOpvF9QkXWB04PS7232H02HCin9Xj14KlrB6N\n\tzyU8Fu95yeRx59oeNo95JwM9+rasYgzgiOKySUnNySxLLdK3S+DKeHvnKHvBbeeKm6872RsY\n\tl5p3MXJySAiYSCyd3MQIYYtJXLi3nq2LkYtDSGApo8SxjSeZIJxWJolfy66CVbEJ6EicWn0E\n\tzBYRSJA4sv83K0gRs8BvRokde5qYuxg5OIQFPCSOPeIAqWERUJX4f+0tWD2vgKvE6keHWUFK\n\tJATkJBZcSAcJcwq4SSyetZgZxBYCKnn74jjTBEbeBYwMqxhFU0uTC4qT0nMN9YoTc4tL89L1\n\tkvNzNzFCwu/LDsbFx6wOMQpwMCrx8D7YcCZMiDWxrLgy9xCjBAezkghv3LSzYUK8KYmVValF\n\t+fFFpTmpxYcYpTlYlMR55+56HyIkkJ5YkpqdmlqQWgSTZeLglGpg1D7FLfAsg2nvo53SHp6z\n\t0/50vJyndU5wop/XNp4/i7f8sjQvuFfmeMg3bfXzM+d+375y9/d2xVcb+4pXNB+K+rNtStkE\n\t3/VdibOSv7v2uuU+Psr8si58FmtwJ5uv9m3bt6tyZkTnXSyNVj3G3RPELzFpmf3kp4b/dodn\n\taP/l11665MMZiyn/bJVYijMSDbWYi4oTAacM5MA7AgAA",
        "Cc": "Dyasly Sergey <s.dyasly@samsung.com>,\n\tIlya Maximets <i.maximets@samsung.com>",
        "Subject": "[dpdk-dev] [PATCH RFC v3 2/3] vhost: make buf vector for scatter RX\n\tlocal.",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "patches and discussions about DPDK <dev.dpdk.org>",
        "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://dpdk.org/ml/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "Array of buf_vector's is just an array for temporary storing information\nabout available descriptors. It used only locally in virtio_dev_merge_rx()\nand there is no reason for that array to be shared.\n\nFix that by allocating local buf_vec inside virtio_dev_merge_rx().\nbuf_vec field of struct vhost_virtqueue marked as deprecated.\n\nSigned-off-by: Ilya Maximets <i.maximets@samsung.com>\n---\n doc/guides/rel_notes/deprecation.rst |  1 +\n lib/librte_vhost/rte_virtio_net.h    |  2 +-\n lib/librte_vhost/vhost_rxtx.c        | 49 ++++++++++++++++++------------------\n 3 files changed, 27 insertions(+), 25 deletions(-)",
    "diff": "diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst\nindex e94d4a2..40f350d 100644\n--- a/doc/guides/rel_notes/deprecation.rst\n+++ b/doc/guides/rel_notes/deprecation.rst\n@@ -7,6 +7,7 @@ API and ABI deprecation notices are to be posted here.\n \n Deprecation Notices\n -------------------\n+* Field buf_vec of struct vhost_virtqueue have been deprecated.\n \n * The following fields have been deprecated in rte_eth_stats:\n   ibadcrc, ibadlen, imcasts, fdirmatch, fdirmiss,\ndiff --git a/lib/librte_vhost/rte_virtio_net.h b/lib/librte_vhost/rte_virtio_net.h\nindex 4a2303a..e6e5cf3 100644\n--- a/lib/librte_vhost/rte_virtio_net.h\n+++ b/lib/librte_vhost/rte_virtio_net.h\n@@ -93,7 +93,7 @@ struct vhost_virtqueue {\n \tint\t\t\tenabled;\n \tuint64_t\t\tlog_guest_addr;\t\t/**< Physical address of used ring, for logging */\n \tuint64_t\t\treserved[15];\t\t/**< Reserve some spaces for future extension. */\n-\tstruct buf_vector\tbuf_vec[BUF_VECTOR_MAX];\t/**< for scatter RX. */\n+\tstruct buf_vector       buf_vec[BUF_VECTOR_MAX] __rte_deprecated;        /**< @deprecated Buffer for scatter RX. */\n } __rte_cache_aligned;\n \n \ndiff --git a/lib/librte_vhost/vhost_rxtx.c b/lib/librte_vhost/vhost_rxtx.c\nindex 14c2159..a8e2582 100644\n--- a/lib/librte_vhost/vhost_rxtx.c\n+++ b/lib/librte_vhost/vhost_rxtx.c\n@@ -340,7 +340,7 @@ virtio_dev_rx(struct virtio_net *dev, uint16_t queue_id,\n static inline uint32_t __attribute__((always_inline))\n copy_from_mbuf_to_vring(struct virtio_net *dev, uint32_t queue_id,\n \t\t\tuint16_t res_base_idx, uint16_t res_end_idx,\n-\t\t\tstruct rte_mbuf *pkt)\n+\t\t\tstruct rte_mbuf *pkt, struct buf_vector *buf_vec)\n {\n \tuint32_t vec_idx = 0;\n \tuint32_t entry_success = 0;\n@@ -371,7 +371,7 @@ copy_from_mbuf_to_vring(struct virtio_net *dev, uint32_t queue_id,\n \t */\n \tvq = dev->virtqueue[queue_id];\n \n-\tvb_addr = gpa_to_vva(dev, vq->buf_vec[vec_idx].buf_addr);\n+\tvb_addr = gpa_to_vva(dev, buf_vec[vec_idx].buf_addr);\n \tvb_hdr_addr = vb_addr;\n \n \t/* Prefetch buffer address. */\n@@ -386,24 +386,24 @@ copy_from_mbuf_to_vring(struct virtio_net *dev, uint32_t queue_id,\n \n \trte_memcpy((void *)(uintptr_t)vb_hdr_addr,\n \t\t(const void *)&virtio_hdr, vq->vhost_hlen);\n-\tvhost_log_write(dev, vq->buf_vec[vec_idx].buf_addr, vq->vhost_hlen);\n+\tvhost_log_write(dev, buf_vec[vec_idx].buf_addr, vq->vhost_hlen);\n \n \tPRINT_PACKET(dev, (uintptr_t)vb_hdr_addr, vq->vhost_hlen, 1);\n \n \tseg_avail = rte_pktmbuf_data_len(pkt);\n \tvb_offset = vq->vhost_hlen;\n-\tvb_avail = vq->buf_vec[vec_idx].buf_len - vq->vhost_hlen;\n+\tvb_avail = buf_vec[vec_idx].buf_len - vq->vhost_hlen;\n \n \tentry_len = vq->vhost_hlen;\n \n \tif (vb_avail == 0) {\n-\t\tuint32_t desc_idx = vq->buf_vec[vec_idx].desc_idx;\n+\t\tuint32_t desc_idx = buf_vec[vec_idx].desc_idx;\n \n \t\tif ((vq->desc[desc_idx].flags & VRING_DESC_F_NEXT) == 0) {\n \t\t\tidx = cur_idx & (vq->size - 1);\n \n \t\t\t/* Update used ring with desc information */\n-\t\t\tvq->used->ring[idx].id = vq->buf_vec[vec_idx].desc_idx;\n+\t\t\tvq->used->ring[idx].id = buf_vec[vec_idx].desc_idx;\n \t\t\tvq->used->ring[idx].len = entry_len;\n \n \t\t\tvhost_log_used_vring(dev, vq,\n@@ -416,12 +416,12 @@ copy_from_mbuf_to_vring(struct virtio_net *dev, uint32_t queue_id,\n \t\t}\n \n \t\tvec_idx++;\n-\t\tvb_addr = gpa_to_vva(dev, vq->buf_vec[vec_idx].buf_addr);\n+\t\tvb_addr = gpa_to_vva(dev, buf_vec[vec_idx].buf_addr);\n \n \t\t/* Prefetch buffer address. */\n \t\trte_prefetch0((void *)(uintptr_t)vb_addr);\n \t\tvb_offset = 0;\n-\t\tvb_avail = vq->buf_vec[vec_idx].buf_len;\n+\t\tvb_avail = buf_vec[vec_idx].buf_len;\n \t}\n \n \tcpy_len = RTE_MIN(vb_avail, seg_avail);\n@@ -431,7 +431,7 @@ copy_from_mbuf_to_vring(struct virtio_net *dev, uint32_t queue_id,\n \t\trte_memcpy((void *)(uintptr_t)(vb_addr + vb_offset),\n \t\t\trte_pktmbuf_mtod_offset(pkt, const void *, seg_offset),\n \t\t\tcpy_len);\n-\t\tvhost_log_write(dev, vq->buf_vec[vec_idx].buf_addr + vb_offset,\n+\t\tvhost_log_write(dev, buf_vec[vec_idx].buf_addr + vb_offset,\n \t\t\tcpy_len);\n \n \t\tPRINT_PACKET(dev,\n@@ -450,12 +450,12 @@ copy_from_mbuf_to_vring(struct virtio_net *dev, uint32_t queue_id,\n \t\t\t * entry reach to its end.\n \t\t\t * But the segment doesn't complete.\n \t\t\t */\n-\t\t\tif ((vq->desc[vq->buf_vec[vec_idx].desc_idx].flags &\n+\t\t\tif ((vq->desc[buf_vec[vec_idx].desc_idx].flags &\n \t\t\t\tVRING_DESC_F_NEXT) == 0) {\n \t\t\t\t/* Update used ring with desc information */\n \t\t\t\tidx = cur_idx & (vq->size - 1);\n \t\t\t\tvq->used->ring[idx].id\n-\t\t\t\t\t= vq->buf_vec[vec_idx].desc_idx;\n+\t\t\t\t\t= buf_vec[vec_idx].desc_idx;\n \t\t\t\tvq->used->ring[idx].len = entry_len;\n \t\t\t\tvhost_log_used_vring(dev, vq,\n \t\t\t\t\toffsetof(struct vring_used, ring[idx]),\n@@ -467,9 +467,9 @@ copy_from_mbuf_to_vring(struct virtio_net *dev, uint32_t queue_id,\n \n \t\t\tvec_idx++;\n \t\t\tvb_addr = gpa_to_vva(dev,\n-\t\t\t\tvq->buf_vec[vec_idx].buf_addr);\n+\t\t\t\tbuf_vec[vec_idx].buf_addr);\n \t\t\tvb_offset = 0;\n-\t\t\tvb_avail = vq->buf_vec[vec_idx].buf_len;\n+\t\t\tvb_avail = buf_vec[vec_idx].buf_len;\n \t\t\tcpy_len = RTE_MIN(vb_avail, seg_avail);\n \t\t} else {\n \t\t\t/*\n@@ -488,7 +488,7 @@ copy_from_mbuf_to_vring(struct virtio_net *dev, uint32_t queue_id,\n \t\t\t\t\t * from buf_vec.\n \t\t\t\t\t */\n \t\t\t\t\tuint32_t desc_idx =\n-\t\t\t\t\t\tvq->buf_vec[vec_idx].desc_idx;\n+\t\t\t\t\t\tbuf_vec[vec_idx].desc_idx;\n \n \t\t\t\t\tif ((vq->desc[desc_idx].flags &\n \t\t\t\t\t\tVRING_DESC_F_NEXT) == 0) {\n@@ -512,9 +512,9 @@ copy_from_mbuf_to_vring(struct virtio_net *dev, uint32_t queue_id,\n \t\t\t\t\t/* Get next buffer from buf_vec. */\n \t\t\t\t\tvec_idx++;\n \t\t\t\t\tvb_addr = gpa_to_vva(dev,\n-\t\t\t\t\t\tvq->buf_vec[vec_idx].buf_addr);\n+\t\t\t\t\t\tbuf_vec[vec_idx].buf_addr);\n \t\t\t\t\tvb_avail =\n-\t\t\t\t\t\tvq->buf_vec[vec_idx].buf_len;\n+\t\t\t\t\t\tbuf_vec[vec_idx].buf_len;\n \t\t\t\t\tvb_offset = 0;\n \t\t\t\t}\n \n@@ -528,7 +528,7 @@ copy_from_mbuf_to_vring(struct virtio_net *dev, uint32_t queue_id,\n \t\t\t\t/* Update used ring with desc information */\n \t\t\t\tidx = cur_idx & (vq->size - 1);\n \t\t\t\tvq->used->ring[idx].id\n-\t\t\t\t\t= vq->buf_vec[vec_idx].desc_idx;\n+\t\t\t\t\t= buf_vec[vec_idx].desc_idx;\n \t\t\t\tvq->used->ring[idx].len = entry_len;\n \t\t\t\tvhost_log_used_vring(dev, vq,\n \t\t\t\t\toffsetof(struct vring_used, ring[idx]),\n@@ -544,7 +544,7 @@ copy_from_mbuf_to_vring(struct virtio_net *dev, uint32_t queue_id,\n \n static inline void __attribute__((always_inline))\n update_secure_len(struct vhost_virtqueue *vq, uint32_t id,\n-\tuint32_t *secure_len, uint32_t *vec_idx)\n+\tuint32_t *secure_len, uint32_t *vec_idx, struct buf_vector *buf_vec)\n {\n \tuint16_t wrapped_idx = id & (vq->size - 1);\n \tuint32_t idx = vq->avail->ring[wrapped_idx];\n@@ -555,9 +555,9 @@ update_secure_len(struct vhost_virtqueue *vq, uint32_t id,\n \tdo {\n \t\tnext_desc = 0;\n \t\tlen += vq->desc[idx].len;\n-\t\tvq->buf_vec[vec_id].buf_addr = vq->desc[idx].addr;\n-\t\tvq->buf_vec[vec_id].buf_len = vq->desc[idx].len;\n-\t\tvq->buf_vec[vec_id].desc_idx = idx;\n+\t\tbuf_vec[vec_id].buf_addr = vq->desc[idx].addr;\n+\t\tbuf_vec[vec_id].buf_len = vq->desc[idx].len;\n+\t\tbuf_vec[vec_id].desc_idx = idx;\n \t\tvec_id++;\n \n \t\tif (vq->desc[idx].flags & VRING_DESC_F_NEXT) {\n@@ -582,6 +582,7 @@ virtio_dev_merge_rx(struct virtio_net *dev, uint16_t queue_id,\n \tuint16_t avail_idx;\n \tuint16_t res_base_idx, res_cur_idx;\n \tuint8_t success = 0;\n+\tstruct buf_vector buf_vec[BUF_VECTOR_MAX];\n \n \tLOG_DEBUG(VHOST_DATA, \"(%\"PRIu64\") virtio_dev_merge_rx()\\n\",\n \t\tdev->device_fh);\n@@ -620,8 +621,8 @@ virtio_dev_merge_rx(struct virtio_net *dev, uint16_t queue_id,\n \t\t\t\tif (unlikely(res_cur_idx == avail_idx))\n \t\t\t\t\tgoto merge_rx_exit;\n \n-\t\t\t\tupdate_secure_len(vq, res_cur_idx,\n-\t\t\t\t\t\t  &secure_len, &vec_idx);\n+\t\t\t\tupdate_secure_len(vq, res_cur_idx, &secure_len,\n+\t\t\t\t\t\t  &vec_idx, buf_vec);\n \t\t\t\tres_cur_idx++;\n \t\t\t} while (pkt_len > secure_len);\n \n@@ -632,7 +633,7 @@ virtio_dev_merge_rx(struct virtio_net *dev, uint16_t queue_id,\n \t\t} while (success == 0);\n \n \t\tentry_success = copy_from_mbuf_to_vring(dev, queue_id,\n-\t\t\tres_base_idx, res_cur_idx, pkts[pkt_idx]);\n+\t\t\tres_base_idx, res_cur_idx, pkts[pkt_idx], buf_vec);\n \n \t\trte_smp_wmb();\n \n",
    "prefixes": [
        "dpdk-dev",
        "RFC",
        "v3",
        "2/3"
    ]
}