Patch Detail

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

{
    "id": 1264,
    "url": "https://patches.dpdk.org/api/patches/1264/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/C6ECDF3AB251BE4894318F4E4512369780C08733@IRSMSX109.ger.corp.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": "<C6ECDF3AB251BE4894318F4E4512369780C08733@IRSMSX109.ger.corp.intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/C6ECDF3AB251BE4894318F4E4512369780C08733@IRSMSX109.ger.corp.intel.com",
    "date": "2014-11-13T11:34:22",
    "name": "[dpdk-dev,v8] eal: map PCI memory resources after hugepages",
    "commit_ref": null,
    "pull_url": null,
    "state": "not-applicable",
    "archived": true,
    "hash": "1d38666fa1152043d3737dbfc04bbc5d1acb7c8c",
    "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/C6ECDF3AB251BE4894318F4E4512369780C08733@IRSMSX109.ger.corp.intel.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/1264/comments/",
    "check": "pending",
    "checks": "https://patches.dpdk.org/api/patches/1264/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 CFF117E75;\n\tThu, 13 Nov 2014 12:24:47 +0100 (CET)",
            "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id 17A39594F\n\tfor <dev@dpdk.org>; Thu, 13 Nov 2014 12:24:45 +0100 (CET)",
            "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga101.jf.intel.com with ESMTP; 13 Nov 2014 03:34:25 -0800",
            "from irsmsx104.ger.corp.intel.com ([163.33.3.159])\n\tby orsmga001.jf.intel.com with ESMTP; 13 Nov 2014 03:34:24 -0800",
            "from irsmsx109.ger.corp.intel.com ([169.254.13.101]) by\n\tIRSMSX104.ger.corp.intel.com ([169.254.5.116]) with mapi id\n\t14.03.0195.001; Thu, 13 Nov 2014 11:34:23 +0000"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.07,376,1413270000\"; d=\"scan'208\";a=\"607185879\"",
        "From": "\"Burakov, Anatoly\" <anatoly.burakov@intel.com>",
        "To": "\"dev@dpdk.org\" <dev@dpdk.org>",
        "Thread-Topic": "[dpdk-dev] [PATCH v8] eal: map PCI memory resources after\n\thugepages",
        "Thread-Index": "AQHP/Ze/g7jr2A7Af06zlboPmaVZspxeb8uA",
        "Date": "Thu, 13 Nov 2014 11:34:22 +0000",
        "Message-ID": "<C6ECDF3AB251BE4894318F4E4512369780C08733@IRSMSX109.ger.corp.intel.com>",
        "References": "<1415619272-8281-1-git-send-email-anatoly.burakov@intel.com>\n\t<1415700565-19157-1-git-send-email-anatoly.burakov@intel.com>",
        "In-Reply-To": "<1415700565-19157-1-git-send-email-anatoly.burakov@intel.com>",
        "Accept-Language": "en-US",
        "Content-Language": "en-US",
        "X-MS-Has-Attach": "",
        "X-MS-TNEF-Correlator": "",
        "x-originating-ip": "[163.33.239.180]",
        "Content-Type": "text/plain; charset=\"us-ascii\"",
        "Content-Transfer-Encoding": "quoted-printable",
        "MIME-Version": "1.0",
        "Subject": "Re: [dpdk-dev] [PATCH v8] eal: map PCI memory resources after\n\thugepages",
        "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": "Hi Thomas and all\n\nAre there any objections to this patch? If there are no objections to it, could someone perhaps ack it?\n\nThanks,\nAnatoly\n\n-----Original Message-----\nFrom: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Anatoly Burakov\nSent: Tuesday, November 11, 2014 10:09 AM\nTo: dev@dpdk.org\nSubject: [dpdk-dev] [PATCH v8] eal: map PCI memory resources after hugepages\n\nMulti-process DPDK application must mmap hugepages and PCI resources into the same virtual address space. By default the virtual addresses are chosen by the primary process automatically when calling the mmap.\nBut sometimes the chosen virtual addresses aren't usable in secondary process - for example, secondary process is linked with more libraries than primary process, and the library occupies the same address space that the primary process has requested for PCI mappings.\n\nThis patch makes EAL try and map PCI BARs right after the hugepages (instead of location chosen by mmap) in virtual memory, so that PCI BARs have less chance of ending up in random places in virtual memory.\n\nSigned-off-by: Liang Xu <liang.xu@cinfotech.cn>\nSigned-off-by: Anatoly Burakov <anatoly.burakov@intel.com>\n---\n lib/librte_eal/linuxapp/eal/eal_pci.c              | 30 ++++++++++++++++------\n lib/librte_eal/linuxapp/eal/eal_pci_uio.c          | 13 ++++++++--\n lib/librte_eal/linuxapp/eal/eal_pci_vfio.c         | 19 +++++++++++---\n lib/librte_eal/linuxapp/eal/include/eal_pci_init.h |  6 +++++\n 4 files changed, 55 insertions(+), 13 deletions(-)",
    "diff": "diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c\nindex 5fe3961..79fbbb8 100644\n--- a/lib/librte_eal/linuxapp/eal/eal_pci.c\n+++ b/lib/librte_eal/linuxapp/eal/eal_pci.c\n@@ -97,6 +97,25 @@ error:\n \treturn -1;\n }\n \n+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 /* map a particular resource from a file */  void *  pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size) @@ -106,21 +125,16 @@ pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size)\n \t/* Map the PCI memory resource of device */\n \tmapaddr = mmap(requested_addr, size, PROT_READ | PROT_WRITE,\n \t\t\tMAP_SHARED, fd, offset);\n-\tif (mapaddr == MAP_FAILED ||\n-\t\t\t(requested_addr != NULL && mapaddr != requested_addr)) {\n+\tif (mapaddr == MAP_FAILED) {\n \t\tRTE_LOG(ERR, EAL, \"%s(): cannot mmap(%d, %p, 0x%lx, 0x%lx): %s (%p)\\n\",\n \t\t\t__func__, fd, requested_addr,\n \t\t\t(unsigned long)size, (unsigned long)offset,\n \t\t\tstrerror(errno), mapaddr);\n-\t\tgoto fail;\n+\t} else {\n+\t\tRTE_LOG(DEBUG, EAL, \"  PCI memory mapped at %p\\n\", mapaddr);\n \t}\n \n-\tRTE_LOG(DEBUG, EAL, \"  PCI memory mapped at %p\\n\", mapaddr);\n-\n \treturn mapaddr;\n-\n-fail:\n-\treturn NULL;\n }\n \n /* parse the \"resource\" sysfs file */\ndiff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c\nindex 7e62266..e53f06b 100644\n--- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c\n+++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c\n@@ -35,6 +35,7 @@\n #include <fcntl.h>\n #include <dirent.h>\n #include <sys/stat.h>\n+#include <sys/mman.h>\n \n #include <rte_log.h>\n #include <rte_pci.h>\n@@ -48,6 +49,8 @@\n \n static int pci_parse_sysfs_value(const char *filename, uint64_t *val);\n \n+void *pci_map_addr = NULL;\n+\n \n #define OFF_MAX              ((uint64_t)(off_t)-1)\n static int\n@@ -371,10 +374,16 @@ 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\t/* try mapping somewhere close to the end of hugepages */\n+\t\t\t\tif (pci_map_addr == NULL)\n+\t\t\t\t\tpci_map_addr = pci_find_max_end_va();\n+\n+\t\t\t\tmapaddr = pci_map_resource(pci_map_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\tif (mapaddr == MAP_FAILED)\n \t\t\t\t\tfail = 1;\n+\n+\t\t\t\tpci_map_addr = RTE_PTR_ADD(mapaddr, (size_t) 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..c1246e8 100644\n--- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c\n+++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c\n@@ -37,6 +37,7 @@\n #include <sys/eventfd.h>\n #include <sys/socket.h>\n #include <sys/ioctl.h>\n+#include <sys/mman.h>\n \n #include <rte_log.h>\n #include <rte_pci.h>\n@@ -720,10 +721,22 @@ pci_vfio_map_resource(struct rte_pci_device *dev)\n \t\tif (i == msix_bar)\n \t\t\tcontinue;\n \n-\t\tbar_addr = pci_map_resource(maps[i].addr, vfio_dev_fd, reg.offset,\n-\t\t\t\treg.size);\n+\t\tif (internal_config.process_type == RTE_PROC_PRIMARY) {\n+\t\t\t/* try mapping somewhere close to the end of hugepages */\n+\t\t\tif (pci_map_addr == NULL)\n+\t\t\t\tpci_map_addr = pci_find_max_end_va();\n+\n+\t\t\tbar_addr = pci_map_resource(pci_map_addr, vfio_dev_fd, reg.offset,\n+\t\t\t\t\treg.size);\n+\t\t\tpci_map_addr = RTE_PTR_ADD(bar_addr, (size_t) reg.size);\n+\t\t} else {\n+\t\t\tbar_addr = pci_map_resource(maps[i].addr, vfio_dev_fd, reg.offset,\n+\t\t\t\t\treg.size);\n+\t\t}\n \n-\t\tif (bar_addr == NULL) {\n+\t\tif (bar_addr == MAP_FAILED ||\n+\t\t\t\t(internal_config.process_type == RTE_PROC_SECONDARY &&\n+\t\t\t\t\t\tbar_addr != maps[i].addr)) {\n \t\t\tRTE_LOG(ERR, EAL, \"  %s mapping BAR%i failed: %s\\n\", pci_addr, i,\n \t\t\t\t\tstrerror(errno));\n \t\t\tclose(vfio_dev_fd);\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..1070eb8 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@@ -59,6 +59,12 @@ struct mapped_pci_resource {  TAILQ_HEAD(mapped_pci_res_list, mapped_pci_resource);  extern struct mapped_pci_res_list *pci_res_list;\n \n+/*\n+ * Helper function to map PCI resources right after hugepages in \n+virtual memory  */ extern void *pci_map_addr; void \n+*pci_find_max_end_va(void);\n+\n void *pci_map_resource(void *requested_addr, int fd, off_t offset,\n \t\tsize_t size);\n \n--\n1.8.1.4\n\n\n",
    "prefixes": [
        "dpdk-dev",
        "v8"
    ]
}