Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1209/?format=api
{ "id": 1209, "url": "https://patches.dpdk.org/api/patches/1209/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1415372269-8723-1-git-send-email-liang.xu@cinfotech.cn/", "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": "<1415372269-8723-1-git-send-email-liang.xu@cinfotech.cn>", "list_archive_url": "https://inbox.dpdk.org/dev/1415372269-8723-1-git-send-email-liang.xu@cinfotech.cn", "date": "2014-11-07T14:57:49", "name": "[dpdk-dev,v7] eal: map uio resources after hugepages.", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "4b53b8690311bd1d3b4e53436311861a0e71750b", "submitter": { "id": 106, "url": "https://patches.dpdk.org/api/people/106/?format=api", "name": "lxu", "email": "liang.xu@cinfotech.cn" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1415372269-8723-1-git-send-email-liang.xu@cinfotech.cn/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/1209/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/1209/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 885247F4D;\n\tFri, 7 Nov 2014 15:48:43 +0100 (CET)", "from out1134-178.mail.aliyun.com (out1134-178.mail.aliyun.com\n\t[42.120.134.178]) by dpdk.org (Postfix) with ESMTP id CB81B7F30\n\tfor <dev@dpdk.org>; Fri, 7 Nov 2014 15:48:39 +0100 (CET)", "from localhost.localdomain(mailfrom:liang.xu@cinfotech.cn\n\tip:222.65.239.251) by smtp.aliyun-inc.com(10.147.34.66);\n\tFri, 07 Nov 2014 22:58:07 +0800" ], "X-Alimail-AntiSpam": "AC=CONTINUE; BC=0.02695761|-1; FP=0|0|0|0|0|-1|-1|-1;\n\tHT=r41g08146; MF=liang.xu@cinfotech.cn; PH=DS; RN=4; RT=4; SR=0; ", "From": "lxu <liang.xu@cinfotech.cn>", "To": "dev@dpdk.org", "Date": "Fri, 7 Nov 2014 22:57:49 +0800", "Message-Id": "<1415372269-8723-1-git-send-email-liang.xu@cinfotech.cn>", "X-Mailer": "git-send-email 1.9.1", "In-Reply-To": "<1415193919-17361-1-git-send-email-liang.xu@cinfotech.cn>", "References": "<1415193919-17361-1-git-send-email-liang.xu@cinfotech.cn>", "Subject": "[dpdk-dev] [PATCH v7] eal: map uio resources after hugepages.", "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": "A multiple process DPDK application must mmap hugepages and pci resources into same virtual addresses. By default the virtual addresses chosen by the primary process automatically when calling the mmap. But sometime the chosen virtual addresses isn't usable at secondary process. Such as the secondary process linked with more libraries than primary process. The library has been mapped into this virtual address. The command line parameter 'base-virtaddr' has been added for this situation. If it's configured, the hugepages will be mapped into this base address. But the virtual address of uio resource mapped still does not refer to the parameter. In that case \"EAL: pci_map_resource(): cannot mmap\" will be got.\n\nThis patch try to map uio resources after hugepages. So the error can be resolved by set base-virtaddr into free virtual address space.\n\nSigned-off-by: lxu <liang.xu@cinfotech.cn>\n---\n lib/librte_eal/linuxapp/eal/eal_pci.c | 25 ++++++++++++++++++++--\n lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 6 ++++--\n lib/librte_eal/linuxapp/eal/eal_pci_vfio.c | 4 +++-\n lib/librte_eal/linuxapp/eal/include/eal_pci_init.h | 4 ++--\n 4 files changed, 32 insertions(+), 7 deletions(-)", "diff": "diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c\nindex 5fe3961..aef6f5e 100644\n--- a/lib/librte_eal/linuxapp/eal/eal_pci.c\n+++ b/lib/librte_eal/linuxapp/eal/eal_pci.c\n@@ -483,15 +483,36 @@ pci_config_space_set(struct rte_pci_device *dev)\n }\n #endif\n \n+static void *\n+pci_find_max_end_va(void)\n+{\n+\tconst struct rte_memseg * seg = rte_eal_get_physmem_layout();\n+\tconst struct rte_memseg * last = seg;\n+\tunsigned i = 0;\n+\n+\tfor (i=0; i<RTE_MAX_MEMSEG; i++, seg++) {\n+\t\tif (seg->addr == NULL)\n+\t\t\tbreak;\n+\n+\t\tif(seg->addr > last->addr)\n+\t\t \tlast = seg;\n+\n+\t}\n+\treturn RTE_PTR_ADD(last->addr, last->len);\n+}\n+\n static int\n pci_map_device(struct rte_pci_device *dev)\n {\n \tint ret, mapped = 0;\n+\tstatic void * requested_addr;\n+\tif(NULL == requested_addr)\n+\t\trequested_addr = pci_find_max_end_va();\n \n \t/* try mapping the NIC resources using VFIO if it exists */\n #ifdef VFIO_PRESENT\n \tif (pci_vfio_is_enabled()) {\n-\t\tret = pci_vfio_map_resource(dev);\n+\t\tret = pci_vfio_map_resource(dev, &requested_addr);\n \t\tif (ret == 0)\n \t\t\tmapped = 1;\n \t\telse if (ret < 0)\n@@ -500,7 +521,7 @@ pci_map_device(struct rte_pci_device *dev)\n #endif\n \t/* map resources for devices that use igb_uio */\n \tif (!mapped) {\n-\t\tret = pci_uio_map_resource(dev);\n+\t\tret = pci_uio_map_resource(dev, &requested_addr);\n \t\tif (ret != 0)\n \t\t\treturn ret;\n \t}\ndiff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c\nindex 7e62266..e92124e 100644\n--- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c\n+++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c\n@@ -275,7 +275,7 @@ pci_get_uio_dev(struct rte_pci_device *dev, char *dstbuf,\n \n /* map the PCI resource of a PCI device in virtual memory */\n int\n-pci_uio_map_resource(struct rte_pci_device *dev)\n+pci_uio_map_resource(struct rte_pci_device *dev, void **requested_addr)\n {\n \tint i, j;\n \tchar dirname[PATH_MAX];\n@@ -371,10 +371,12 @@ pci_uio_map_resource(struct rte_pci_device *dev)\n \t\t\tif (maps[j].addr != NULL)\n \t\t\t\tfail = 1;\n \t\t\telse {\n-\t\t\t\tmapaddr = pci_map_resource(NULL, fd, (off_t)offset,\n+\t\t\t\tmapaddr = pci_map_resource(*requested_addr, fd, (off_t)offset,\n \t\t\t\t\t\t(size_t)maps[j].size);\n \t\t\t\tif (mapaddr == NULL)\n \t\t\t\t\tfail = 1;\n+\t\t\t\telse\n+\t\t\t\t\t*requested_addr = RTE_PTR_ADD(mapaddr, maps[j].size);\n \t\t\t}\n \n \t\t\tif (fail) {\ndiff --git a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c\nindex c776ddc..2102adf 100644\n--- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c\n+++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c\n@@ -515,7 +515,7 @@ clear_current_group(void)\n * primary and secondary processes follow almost exactly the same path\n */\n int\n-pci_vfio_map_resource(struct rte_pci_device *dev)\n+pci_vfio_map_resource(struct rte_pci_device *dev, void **requested_addr)\n {\n \tstruct vfio_group_status group_status = {\n \t\t\t.argsz = sizeof(group_status)\n@@ -720,6 +720,7 @@ pci_vfio_map_resource(struct rte_pci_device *dev)\n \t\tif (i == msix_bar)\n \t\t\tcontinue;\n \n+\t\tmaps[i].addr = *requested_addr;\n \t\tbar_addr = pci_map_resource(maps[i].addr, vfio_dev_fd, reg.offset,\n \t\t\t\treg.size);\n \n@@ -732,6 +733,7 @@ pci_vfio_map_resource(struct rte_pci_device *dev)\n \t\t\treturn -1;\n \t\t}\n \n+\t\t*requested_addr = bar_addr;\n \t\tmaps[i].addr = bar_addr;\n \t\tmaps[i].offset = reg.offset;\n \t\tmaps[i].size = reg.size;\ndiff --git a/lib/librte_eal/linuxapp/eal/include/eal_pci_init.h b/lib/librte_eal/linuxapp/eal/include/eal_pci_init.h\nindex d758bee..e14fa36 100644\n--- a/lib/librte_eal/linuxapp/eal/include/eal_pci_init.h\n+++ b/lib/librte_eal/linuxapp/eal/include/eal_pci_init.h\n@@ -63,7 +63,7 @@ void *pci_map_resource(void *requested_addr, int fd, off_t offset,\n \t\tsize_t size);\n \n /* map IGB_UIO resource prototype */\n-int pci_uio_map_resource(struct rte_pci_device *dev);\n+int pci_uio_map_resource(struct rte_pci_device *dev, void **requested_addr);\n \n #ifdef VFIO_PRESENT\n \n@@ -74,7 +74,7 @@ int pci_vfio_is_enabled(void);\n int pci_vfio_mp_sync_setup(void);\n \n /* map VFIO resource prototype */\n-int pci_vfio_map_resource(struct rte_pci_device *dev);\n+int pci_vfio_map_resource(struct rte_pci_device *dev, void **requested_addr);\n int pci_vfio_get_group_fd(int iommu_group_fd);\n int pci_vfio_get_container_fd(void);\n \n", "prefixes": [ "dpdk-dev", "v7" ] }