Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/37026/?format=api
https://patches.dpdk.org/api/patches/37026/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/3e8dd7c87e018d2fca18f53b8ca6f2910015536c.1522797505.git.anatoly.burakov@intel.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": "<3e8dd7c87e018d2fca18f53b8ca6f2910015536c.1522797505.git.anatoly.burakov@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/3e8dd7c87e018d2fca18f53b8ca6f2910015536c.1522797505.git.anatoly.burakov@intel.com", "date": "2018-04-03T23:21:47", "name": "[dpdk-dev,v3,35/68] virtio: use memseg contig walk instead of iteration", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "7d7758b14a1dd968c8d47fabaf46e920a7db4b11", "submitter": { "id": 4, "url": "https://patches.dpdk.org/api/people/4/?format=api", "name": "Burakov, Anatoly", "email": "anatoly.burakov@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/3e8dd7c87e018d2fca18f53b8ca6f2910015536c.1522797505.git.anatoly.burakov@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/37026/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/37026/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 00DF51BA54;\n\tWed, 4 Apr 2018 01:23:35 +0200 (CEST)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id 568851B8A0\n\tfor <dev@dpdk.org>; Wed, 4 Apr 2018 01:22:32 +0200 (CEST)", "from fmsmga006.fm.intel.com ([10.253.24.20])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t03 Apr 2018 16:22:31 -0700", "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby fmsmga006.fm.intel.com with ESMTP; 03 Apr 2018 16:22:27 -0700", "from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com\n\t[10.237.217.45])\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\n\tw33NMRj7013143; Wed, 4 Apr 2018 00:22:27 +0100", "from sivswdev01.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev01.ir.intel.com with ESMTP id w33NMRRx014823;\n\tWed, 4 Apr 2018 00:22:27 +0100", "(from aburakov@localhost)\n\tby sivswdev01.ir.intel.com with LOCAL id w33NMRoh014819;\n\tWed, 4 Apr 2018 00:22:27 +0100" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.48,403,1517904000\"; d=\"scan'208\";a=\"217300752\"", "From": "Anatoly Burakov <anatoly.burakov@intel.com>", "To": "dev@dpdk.org", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>,\n\tTiwei Bie <tiwei.bie@intel.com>, keith.wiles@intel.com,\n\tjianfeng.tan@intel.com, andras.kovacs@ericsson.com,\n\tlaszlo.vadkeri@ericsson.com, benjamin.walker@intel.com,\n\tbruce.richardson@intel.com, thomas@monjalon.net,\n\tkonstantin.ananyev@intel.com, kuralamudhan.ramakrishnan@intel.com,\n\tlouise.m.daly@intel.com, nelio.laranjeiro@6wind.com,\n\tyskoh@mellanox.com, pepperjo@japf.ch, jerin.jacob@caviumnetworks.com, \n\themant.agrawal@nxp.com, olivier.matz@6wind.com, shreyansh.jain@nxp.com,\n\tgowrishankar.m@linux.vnet.ibm.com", "Date": "Wed, 4 Apr 2018 00:21:47 +0100", "Message-Id": "<3e8dd7c87e018d2fca18f53b8ca6f2910015536c.1522797505.git.anatoly.burakov@intel.com>", "X-Mailer": "git-send-email 1.7.0.7", "In-Reply-To": [ "<cover.1522797505.git.anatoly.burakov@intel.com>", "<cover.1522797505.git.anatoly.burakov@intel.com>" ], "References": [ "<cover.1522797505.git.anatoly.burakov@intel.com>", "<cover.1520428025.git.anatoly.burakov@intel.com>\n\t<cover.1522797505.git.anatoly.burakov@intel.com>" ], "Subject": "[dpdk-dev] [PATCH v3 35/68] virtio: use memseg contig walk instead\n\tof iteration", "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://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": "<https://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": "Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>\n---\n drivers/net/virtio/virtio_user/vhost_kernel.c | 83 +++++++++++----------------\n 1 file changed, 35 insertions(+), 48 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c b/drivers/net/virtio/virtio_user/vhost_kernel.c\nindex 1711ead..93d7efe 100644\n--- a/drivers/net/virtio/virtio_user/vhost_kernel.c\n+++ b/drivers/net/virtio/virtio_user/vhost_kernel.c\n@@ -70,6 +70,32 @@ static uint64_t vhost_req_user_to_kernel[] = {\n \t[VHOST_USER_SET_MEM_TABLE] = VHOST_SET_MEM_TABLE,\n };\n \n+struct walk_arg {\n+\tstruct vhost_memory_kernel *vm;\n+\tuint32_t region_nr;\n+};\n+static int\n+add_memory_region(const struct rte_memseg *ms, size_t len, void *arg)\n+{\n+\tstruct walk_arg *wa = arg;\n+\tstruct vhost_memory_region *mr;\n+\tvoid *start_addr;\n+\n+\tif (wa->region_nr >= max_regions)\n+\t\treturn -1;\n+\n+\tmr = &wa->vm->regions[wa->region_nr++];\n+\tstart_addr = ms->addr;\n+\n+\tmr->guest_phys_addr = (uint64_t)(uintptr_t)start_addr;\n+\tmr->userspace_addr = (uint64_t)(uintptr_t)start_addr;\n+\tmr->memory_size = len;\n+\tmr->mmap_offset = 0;\n+\n+\treturn 0;\n+}\n+\n+\n /* By default, vhost kernel module allows 64 regions, but DPDK allows\n * 256 segments. As a relief, below function merges those virtually\n * adjacent memsegs into one region.\n@@ -77,63 +103,24 @@ static uint64_t vhost_req_user_to_kernel[] = {\n static struct vhost_memory_kernel *\n prepare_vhost_memory_kernel(void)\n {\n-\tuint32_t i, j, k = 0;\n-\tstruct rte_memseg *seg;\n-\tstruct vhost_memory_region *mr;\n \tstruct vhost_memory_kernel *vm;\n+\tstruct walk_arg wa;\n \n \tvm = malloc(sizeof(struct vhost_memory_kernel) +\n-\t\t max_regions *\n-\t\t sizeof(struct vhost_memory_region));\n+\t\t\tmax_regions *\n+\t\t\tsizeof(struct vhost_memory_region));\n \tif (!vm)\n \t\treturn NULL;\n \n-\tfor (i = 0; i < RTE_MAX_MEMSEG; ++i) {\n-\t\tseg = &rte_eal_get_configuration()->mem_config->memseg[i];\n-\t\tif (!seg->addr)\n-\t\t\tbreak;\n-\n-\t\tint new_region = 1;\n-\n-\t\tfor (j = 0; j < k; ++j) {\n-\t\t\tmr = &vm->regions[j];\n+\twa.region_nr = 0;\n+\twa.vm = vm;\n \n-\t\t\tif (mr->userspace_addr + mr->memory_size ==\n-\t\t\t (uint64_t)(uintptr_t)seg->addr) {\n-\t\t\t\tmr->memory_size += seg->len;\n-\t\t\t\tnew_region = 0;\n-\t\t\t\tbreak;\n-\t\t\t}\n-\n-\t\t\tif ((uint64_t)(uintptr_t)seg->addr + seg->len ==\n-\t\t\t mr->userspace_addr) {\n-\t\t\t\tmr->guest_phys_addr =\n-\t\t\t\t\t(uint64_t)(uintptr_t)seg->addr;\n-\t\t\t\tmr->userspace_addr =\n-\t\t\t\t\t(uint64_t)(uintptr_t)seg->addr;\n-\t\t\t\tmr->memory_size += seg->len;\n-\t\t\t\tnew_region = 0;\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t}\n-\n-\t\tif (new_region == 0)\n-\t\t\tcontinue;\n-\n-\t\tmr = &vm->regions[k++];\n-\t\t/* use vaddr here! */\n-\t\tmr->guest_phys_addr = (uint64_t)(uintptr_t)seg->addr;\n-\t\tmr->userspace_addr = (uint64_t)(uintptr_t)seg->addr;\n-\t\tmr->memory_size = seg->len;\n-\t\tmr->mmap_offset = 0;\n-\n-\t\tif (k >= max_regions) {\n-\t\t\tfree(vm);\n-\t\t\treturn NULL;\n-\t\t}\n+\tif (rte_memseg_contig_walk(add_memory_region, &wa) < 0) {\n+\t\tfree(vm);\n+\t\treturn NULL;\n \t}\n \n-\tvm->nregions = k;\n+\tvm->nregions = wa.region_nr;\n \tvm->padding = 0;\n \treturn vm;\n }\n", "prefixes": [ "dpdk-dev", "v3", "35/68" ] }{ "id": 37026, "url": "