Patch Detail

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

{
    "id": 1235,
    "url": "http://patches.dpdk.org/api/patches/1235/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1415619272-8281-1-git-send-email-anatoly.burakov@intel.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": "<1415619272-8281-1-git-send-email-anatoly.burakov@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1415619272-8281-1-git-send-email-anatoly.burakov@intel.com",
    "date": "2014-11-10T11:34:32",
    "name": "[dpdk-dev,v7] eal: map PCI memory resources after hugepages",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "969d1dc7830c67f2c994bd97ca717ca5a2c98bdf",
    "submitter": {
        "id": 4,
        "url": "http://patches.dpdk.org/api/people/4/?format=api",
        "name": "Anatoly Burakov",
        "email": "anatoly.burakov@intel.com"
    },
    "delegate": null,
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/1415619272-8281-1-git-send-email-anatoly.burakov@intel.com/mbox/",
    "series": [],
    "comments": "http://patches.dpdk.org/api/patches/1235/comments/",
    "check": "pending",
    "checks": "http://patches.dpdk.org/api/patches/1235/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 352897E1C;\n\tMon, 10 Nov 2014 12:24:57 +0100 (CET)",
            "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby dpdk.org (Postfix) with ESMTP id 7D31D6828\n\tfor <dev@dpdk.org>; Mon, 10 Nov 2014 12:24:55 +0100 (CET)",
            "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga102.jf.intel.com with ESMTP; 10 Nov 2014 03:32:49 -0800",
            "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby orsmga001.jf.intel.com with ESMTP; 10 Nov 2014 03:34:38 -0800",
            "from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com\n\t[10.237.217.46])\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\n\tsAABYb2e001448; Mon, 10 Nov 2014 11:34:37 GMT",
            "from sivswdev02.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev02.ir.intel.com with ESMTP id sAABYa6g008322;\n\tMon, 10 Nov 2014 11:34:37 GMT",
            "(from aburakov@localhost)\n\tby sivswdev02.ir.intel.com with  id sAABYWQ0008317;\n\tMon, 10 Nov 2014 11:34:32 GMT"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.07,352,1413270000\"; d=\"scan'208\";a=\"605244009\"",
        "From": "Anatoly Burakov <anatoly.burakov@intel.com>",
        "To": "dev@dpdk.org",
        "Date": "Mon, 10 Nov 2014 11:34:32 +0000",
        "Message-Id": "<1415619272-8281-1-git-send-email-anatoly.burakov@intel.com>",
        "X-Mailer": "git-send-email 1.7.4.1",
        "In-Reply-To": "<1415347284-15468-1-git-send-email-liang.xu@cinfotech.cn>",
        "References": "<1415347284-15468-1-git-send-email-liang.xu@cinfotech.cn>",
        "Subject": "[dpdk-dev] [PATCH v7] eal: map PCI memory 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": "Multi-process DPDK application must mmap hugepages and pci resources\ninto the same virtual address space. By default the virtual addresses\nare chosen by the primary process automatically when calling the mmap.\nBut sometimes the chosen virtual addresses aren't usable in secondary\nprocess - for example, secondary process is linked with more libraries\nthan primary process, and the library occupies the same address space\nthat the primary process has requested for PCI mappings.\n\nThis patch makes EAL map PCI BARs right after the hugepages (instead of\nlocation chosen by mmap) in virtual memory.\n\nSigned-off-by: Anatoly Burakov <anatoly.burakov@intel.com>\nSigned-off-by: Liang Xu <liang.xu@cinfotech.cn>\n---\n lib/librte_eal/linuxapp/eal/eal_pci.c              | 19 +++++++++++++++++++\n lib/librte_eal/linuxapp/eal/eal_pci_uio.c          |  9 ++++++++-\n lib/librte_eal/linuxapp/eal/eal_pci_vfio.c         | 13 +++++++++++--\n lib/librte_eal/linuxapp/eal/include/eal_pci_init.h |  6 ++++++\n 4 files changed, 44 insertions(+), 3 deletions(-)",
    "diff": "diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c\nindex 5fe3961..dae8739 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+\n /* map a particular resource from a file */\n void *\n pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size)\ndiff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c\nindex 7e62266..5090bf1 100644\n--- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c\n+++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c\n@@ -48,6 +48,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 +373,15 @@ 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\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\t\tfail = 1;\n+\n+\t\t\t\tpci_map_addr = RTE_PTR_ADD(pci_map_addr, 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..fb6ee7a 100644\n--- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c\n+++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c\n@@ -720,8 +720,17 @@ 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\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(pci_map_addr, 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\t\tRTE_LOG(ERR, EAL, \"  %s mapping BAR%i failed: %s\\n\", pci_addr, i,\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 {\n TAILQ_HEAD(mapped_pci_res_list, mapped_pci_resource);\n extern struct mapped_pci_res_list *pci_res_list;\n \n+/*\n+ * Helper function to map PCI resources right after hugepages in virtual memory\n+ */\n+extern void *pci_map_addr;\n+void *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",
    "prefixes": [
        "dpdk-dev",
        "v7"
    ]
}