Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.0/patches/12290/?format=api
http://patchwork.dpdk.org/api/1.0/patches/12290/?format=api", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/1.0/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" }, "msgid": "<1461892716-19122-3-git-send-email-jianfeng.tan@intel.com>", "date": "2016-04-29T01:18:30", "name": "[dpdk-dev,v4,2/8] virtio: abstract vring hdr desc init as a method", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "291d6aac3eb4e7d5cae775ac119077c311e04b14", "submitter": { "id": 313, "url": "http://patchwork.dpdk.org/api/1.0/people/313/?format=api", "name": "Jianfeng Tan", "email": "jianfeng.tan@intel.com" }, "delegate": { "id": 355, "url": "http://patchwork.dpdk.org/api/1.0/users/355/?format=api", "username": "yliu", "first_name": "Yuanhan", "last_name": "Liu", "email": "yuanhan.liu@linux.intel.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1461892716-19122-3-git-send-email-jianfeng.tan@intel.com/mbox/", "series": [], "check": "pending", "checks": "http://patchwork.dpdk.org/api/patches/12290/checks/", "tags": {}, "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 E980F56AB;\n\tFri, 29 Apr 2016 03:18:44 +0200 (CEST)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby dpdk.org (Postfix) with ESMTP id 83C995690\n\tfor <dev@dpdk.org>; Fri, 29 Apr 2016 03:18:41 +0200 (CEST)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga103.jf.intel.com with ESMTP; 28 Apr 2016 18:18:41 -0700", "from dpdk06.sh.intel.com ([10.239.128.225])\n\tby FMSMGA003.fm.intel.com with ESMTP; 28 Apr 2016 18:18:39 -0700" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.24,549,1455004800\"; d=\"scan'208\";a=\"694039298\"", "From": "Jianfeng Tan <jianfeng.tan@intel.com>", "To": "dev@dpdk.org", "Cc": "Jianfeng Tan <jianfeng.tan@intel.com>, Huawei Xie <huawei.xie@intel.com>,\n\trich.lane@bigswitch.com, yuanhan.liu@linux.intel.com, mst@redhat.com, \n\tnakajima.yoshihiro@lab.ntt.co.jp, p.fedin@samsung.com,\n\tmichael.qiu@intel.com, ann.zhuangyanying@huawei.com, mukawa@igel.co.jp,\n\tnhorman@tuxdriver.com", "Date": "Fri, 29 Apr 2016 01:18:30 +0000", "Message-Id": "<1461892716-19122-3-git-send-email-jianfeng.tan@intel.com>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<1461892716-19122-1-git-send-email-jianfeng.tan@intel.com>", "References": "<1446748276-132087-1-git-send-email-jianfeng.tan@intel.com>\n\t<1461892716-19122-1-git-send-email-jianfeng.tan@intel.com>", "Subject": "[dpdk-dev] [PATCH v4 2/8] virtio: abstract vring hdr desc init as a\n\tmethod", "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": "To make it reusable, here we abstract the initialization of vring\nheader into a method.\n\nSigned-off-by: Huawei Xie <huawei.xie@intel.com>\nSigned-off-by: Jianfeng Tan <jianfeng.tan@intel.com>\nAcked-By: Neil Horman <nhorman@tuxdriver.com>\n---\n drivers/net/virtio/virtio_ethdev.c | 22 ++++------------------\n drivers/net/virtio/virtqueue.h | 20 ++++++++++++++++++++\n 2 files changed, 24 insertions(+), 18 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 534f0e6..0c20fb9 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -380,8 +380,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,\n \n \tif (queue_type == VTNET_TQ) {\n \t\tconst struct rte_memzone *hdr_mz;\n-\t\tstruct virtio_tx_region *txr;\n-\t\tunsigned int i;\n+\t\tsize_t hdr_mz_sz = vq_size * sizeof(struct virtio_tx_region);\n \n \t\t/*\n \t\t * For each xmit packet, allocate a virtio_net_hdr\n@@ -390,7 +389,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,\n \t\tsnprintf(vq_name, sizeof(vq_name), \"port%d_tvq%d_hdrzone\",\n \t\t\t dev->data->port_id, queue_idx);\n \t\thdr_mz = rte_memzone_reserve_aligned(vq_name,\n-\t\t\t\t\t\t vq_size * sizeof(*txr),\n+\t\t\t\t\t\t hdr_mz_sz,\n \t\t\t\t\t\t socket_id, 0,\n \t\t\t\t\t\t RTE_CACHE_LINE_SIZE);\n \t\tif (hdr_mz == NULL) {\n@@ -404,21 +403,8 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,\n \t\tvq->virtio_net_hdr_mz = hdr_mz;\n \t\tvq->virtio_net_hdr_mem = hdr_mz->phys_addr;\n \n-\t\ttxr = hdr_mz->addr;\n-\t\tmemset(txr, 0, vq_size * sizeof(*txr));\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-\n-\t\t\t/* first indirect descriptor is always the tx header */\n-\t\t\tstart_dp->addr = vq->virtio_net_hdr_mem\n-\t\t\t\t+ i * sizeof(*txr)\n-\t\t\t\t+ offsetof(struct virtio_tx_region, tx_hdr);\n-\n-\t\t\tstart_dp->len = vq->hw->vtnet_hdr_size;\n-\t\t\tstart_dp->flags = VRING_DESC_F_NEXT;\n-\t\t}\n+\t\tmemset(hdr_mz->addr, 0, hdr_mz_sz);\n+\t\tvring_hdr_desc_init(vq);\n \n \t} else if (queue_type == VTNET_CQ) {\n \t\t/* Allocate a page for control vq command, data and status */\ndiff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h\nindex 83d89ca..3b19fd1 100644\n--- a/drivers/net/virtio/virtqueue.h\n+++ b/drivers/net/virtio/virtqueue.h\n@@ -264,6 +264,26 @@ vring_desc_init(struct vring_desc *dp, uint16_t n)\n \tdp[i].next = VQ_RING_DESC_CHAIN_END;\n }\n \n+static inline void\n+vring_hdr_desc_init(struct virtqueue *vq)\n+{\n+\tint i;\n+\tstruct virtio_tx_region *txr = vq->virtio_net_hdr_mz->addr;\n+\n+\tfor (i = 0; i < vq->vq_nentries; i++) {\n+\t\tstruct vring_desc *start_dp = txr[i].tx_indir;\n+\n+\t\tvring_desc_init(start_dp, RTE_DIM(txr[i].tx_indir));\n+\n+\t\t/* first indirect descriptor is always the tx header */\n+\t\tstart_dp->addr = vq->virtio_net_hdr_mem + i * sizeof(*txr) +\n+\t\t\t\t offsetof(struct virtio_tx_region, tx_hdr);\n+\n+\t\tstart_dp->len = vq->hw->vtnet_hdr_size;\n+\t\tstart_dp->flags = VRING_DESC_F_NEXT;\n+\t}\n+}\n+\n /**\n * Tell the backend not to interrupt us.\n */\n", "prefixes": [ "dpdk-dev", "v4", "2/8" ] }{ "id": 12290, "url": "