Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/6601/?format=api
{ "id": 6601, "url": "http://patches.dpdk.org/api/patches/6601/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1437958594-29468-4-git-send-email-thomas.monjalon@6wind.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": "<1437958594-29468-4-git-send-email-thomas.monjalon@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1437958594-29468-4-git-send-email-thomas.monjalon@6wind.com", "date": "2015-07-27T00:56:34", "name": "[dpdk-dev,v10,3/3] eal: deduplicate memory initialization", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "34df6398f030024eb00aad8b51111513f251d074", "submitter": { "id": 1, "url": "http://patches.dpdk.org/api/people/1/?format=api", "name": "Thomas Monjalon", "email": "thomas.monjalon@6wind.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1437958594-29468-4-git-send-email-thomas.monjalon@6wind.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/6601/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/6601/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 3DBDBC506;\n\tMon, 27 Jul 2015 02:58:03 +0200 (CEST)", "from mail-wi0-f182.google.com (mail-wi0-f182.google.com\n\t[209.85.212.182]) by dpdk.org (Postfix) with ESMTP id 9B014C4FA\n\tfor <dev@dpdk.org>; Mon, 27 Jul 2015 02:57:58 +0200 (CEST)", "by wibud3 with SMTP id ud3so94790838wib.0\n\tfor <dev@dpdk.org>; Sun, 26 Jul 2015 17:57:58 -0700 (PDT)", "from localhost.localdomain (136-92-190-109.dsl.ovh.fr.\n\t[109.190.92.136]) by smtp.gmail.com with ESMTPSA id\n\tdz4sm10733801wib.17.2015.07.26.17.57.57\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tSun, 26 Jul 2015 17:57:57 -0700 (PDT)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=ysf7pcNR0bt0fU4phrYjqxJSgxUMW03MrBMsJfFY2NU=;\n\tb=I9i7z14crIGlOOg2q+Sgul8CB0v63YTR8SxthAwQ+f0+ZyvhRhdmw890h0bPUzmxWc\n\tz/bFg3S+vXMcL7HPROpO/Z4W1vfnkysVSgF+TjAqSHcbSr9S7LcOSw70WYKzayc+REBP\n\tVi1qOga84pcMDf9a8qF6XcpruRkgosYV47TTSzshn+hL0GkI/5rilgoQk8At7V6BqBpq\n\tOdzrYTllR7G2pOdeyfRikkfBk7LMrPIoessbMbtkYWNk6kFVKddT0cZXd3Q8+pmtEO2c\n\tzR1av0va/W4kR/q4AT6BC+XdGYmP1e0Kqqt5x8uYTrc+creAHLzmZTuu7tBzXyoNf/ps\n\t0M8w==", "X-Gm-Message-State": "ALoCoQmNmArS/z81saoagxlaVbthXJsUJWMoCHCVBiUoNbPN442s2gi6gzwMMWm5LdRcT5EkLS5Q", "X-Received": "by 10.194.108.232 with SMTP id\n\thn8mr25277072wjb.154.1437958678490; \n\tSun, 26 Jul 2015 17:57:58 -0700 (PDT)", "From": "Thomas Monjalon <thomas.monjalon@6wind.com>", "To": "david.marchand@6wind.com", "Date": "Mon, 27 Jul 2015 02:56:34 +0200", "Message-Id": "<1437958594-29468-4-git-send-email-thomas.monjalon@6wind.com>", "X-Mailer": "git-send-email 2.4.2", "In-Reply-To": "<1437958594-29468-1-git-send-email-thomas.monjalon@6wind.com>", "References": "<1437852868-6031-1-git-send-email-rkerur@gmail.com>\n\t<1437958594-29468-1-git-send-email-thomas.monjalon@6wind.com>", "Cc": "dev@dpdk.org", "Subject": "[dpdk-dev] [PATCH v10 3/3] eal: deduplicate memory initialization", "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": "From: Ravi Kerur <rkerur@gmail.com>\n\nMove common functions from BSD/Linux to eal_common_memory.c file.\nBSD uses contigmem kernel module and Linux uses /proc/self/pagemap file.\n\nSigned-off-by: Ravi Kerur <rkerur@gmail.com>\nSigned-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>\n---\n lib/librte_eal/bsdapp/eal/eal_memory.c | 39 ++-------------\n lib/librte_eal/common/eal_common_memory.c | 38 ++++++++++++++-\n lib/librte_eal/common/eal_private.h | 18 +++++++\n lib/librte_eal/linuxapp/eal/eal_memory.c | 80 ++++++++++---------------------\n 4 files changed, 81 insertions(+), 94 deletions(-)", "diff": "diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c b/lib/librte_eal/bsdapp/eal/eal_memory.c\nindex a3242a5..937e8db 100644\n--- a/lib/librte_eal/bsdapp/eal/eal_memory.c\n+++ b/lib/librte_eal/bsdapp/eal/eal_memory.c\n@@ -59,7 +59,7 @@ rte_mem_virt2phy(const void *virtaddr)\n \treturn RTE_BAD_PHYS_ADDR;\n }\n \n-static int\n+int\n rte_eal_contigmem_init(void)\n {\n \tstruct rte_mem_config *mcfg;\n@@ -132,8 +132,8 @@ rte_eal_contigmem_init(void)\n \treturn 0;\n }\n \n-static int\n-rte_eal_contigmem_attach(void)\n+int\n+rte_eal_hugepage_attach(void)\n {\n \tconst struct hugepage_info *hpi;\n \tint fd_hugepage_info, fd_hugepage = -1;\n@@ -192,36 +192,3 @@ error:\n \t\tclose(fd_hugepage);\n \treturn -1;\n }\n-\n-\n-static int\n-rte_eal_memdevice_init(void)\n-{\n-\tstruct rte_config *config;\n-\n-\tif (rte_eal_process_type() == RTE_PROC_SECONDARY)\n-\t\treturn 0;\n-\n-\tconfig = rte_eal_get_configuration();\n-\tconfig->mem_config->nchannel = internal_config.force_nchannel;\n-\tconfig->mem_config->nrank = internal_config.force_nrank;\n-\n-\treturn 0;\n-}\n-\n-/* init memory subsystem */\n-int\n-rte_eal_memory_init(void)\n-{\n-\tRTE_LOG(INFO, EAL, \"Setting up physically contiguous memory...\\n\");\n-\tconst int retval = rte_eal_process_type() == RTE_PROC_PRIMARY ?\n-\t\t\trte_eal_contigmem_init() :\n-\t\t\trte_eal_contigmem_attach();\n-\tif (retval < 0)\n-\t\treturn -1;\n-\n-\tif (internal_config.no_shconf == 0 && rte_eal_memdevice_init() < 0)\n-\t\treturn -1;\n-\n-\treturn 0;\n-}\ndiff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/librte_eal/common/eal_common_memory.c\nindex 9a07b1e..b647573 100644\n--- a/lib/librte_eal/common/eal_common_memory.c\n+++ b/lib/librte_eal/common/eal_common_memory.c\n@@ -45,6 +45,7 @@\n #include <rte_log.h>\n \n #include \"eal_private.h\"\n+#include \"eal_internal_cfg.h\"\n \n /*\n * Return a pointer to a read-only table of struct rte_physmem_desc\n@@ -69,7 +70,7 @@ rte_eal_get_physmem_size(void)\n \t/* get pointer to global configuration */\n \tmcfg = rte_eal_get_configuration()->mem_config;\n \n-\tfor (i=0; i<RTE_MAX_MEMSEG; i++) {\n+\tfor (i = 0; i < RTE_MAX_MEMSEG; i++) {\n \t\tif (mcfg->memseg[i].addr == NULL)\n \t\t\tbreak;\n \n@@ -89,7 +90,7 @@ rte_dump_physmem_layout(FILE *f)\n \t/* get pointer to global configuration */\n \tmcfg = rte_eal_get_configuration()->mem_config;\n \n-\tfor (i=0; i<RTE_MAX_MEMSEG; i++) {\n+\tfor (i = 0; i < RTE_MAX_MEMSEG; i++) {\n \t\tif (mcfg->memseg[i].addr == NULL)\n \t\t\tbreak;\n \n@@ -118,3 +119,36 @@ unsigned rte_memory_get_nrank(void)\n {\n \treturn rte_eal_get_configuration()->mem_config->nrank;\n }\n+\n+static int\n+rte_eal_memdevice_init(void)\n+{\n+\tstruct rte_config *config;\n+\n+\tif (rte_eal_process_type() == RTE_PROC_SECONDARY)\n+\t\treturn 0;\n+\n+\tconfig = rte_eal_get_configuration();\n+\tconfig->mem_config->nchannel = internal_config.force_nchannel;\n+\tconfig->mem_config->nrank = internal_config.force_nrank;\n+\n+\treturn 0;\n+}\n+\n+/* init memory subsystem */\n+int\n+rte_eal_memory_init(void)\n+{\n+\tRTE_LOG(INFO, EAL, \"Setting up physically contiguous memory...\\n\");\n+\n+\tconst int retval = rte_eal_process_type() == RTE_PROC_PRIMARY ?\n+\t\t\trte_eal_hugepage_init() :\n+\t\t\trte_eal_hugepage_attach();\n+\tif (retval < 0)\n+\t\treturn -1;\n+\n+\tif (internal_config.no_shconf == 0 && rte_eal_memdevice_init() < 0)\n+\t\treturn -1;\n+\n+\treturn 0;\n+}\ndiff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h\nindex f8e8869..072e672 100644\n--- a/lib/librte_eal/common/eal_private.h\n+++ b/lib/librte_eal/common/eal_private.h\n@@ -328,4 +328,22 @@ void set_tsc_freq(void);\n */\n uint64_t get_tsc_freq(void);\n \n+/**\n+ * Prepare physical memory mapping\n+ * i.e. hugepages on Linux and\n+ * contigmem on BSD.\n+ *\n+ * This function is private to the EAL.\n+ */\n+int rte_eal_hugepage_init(void);\n+\n+/**\n+ * Creates memory mapping in secondary process\n+ * i.e. hugepages on Linux and\n+ * contigmem on BSD.\n+ *\n+ * This function is private to the EAL.\n+ */\n+int rte_eal_hugepage_attach(void);\n+\n #endif /* _EAL_PRIVATE_H_ */\ndiff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c\nindex d529016..ac2745e 100644\n--- a/lib/librte_eal/linuxapp/eal/eal_memory.c\n+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c\n@@ -115,6 +115,24 @@ static unsigned proc_pagemap_readable;\n \n #define RANDOMIZE_VA_SPACE_FILE \"/proc/sys/kernel/randomize_va_space\"\n \n+static void\n+test_proc_pagemap_readable(void)\n+{\n+\tint fd = open(\"/proc/self/pagemap\", O_RDONLY);\n+\n+\tif (fd < 0) {\n+\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\"Cannot open /proc/self/pagemap: %s. \"\n+\t\t\t\"virt2phys address translation will not work\\n\",\n+\t\t\tstrerror(errno));\n+\t\treturn;\n+\t}\n+\n+\t/* Is readable */\n+\tclose(fd);\n+\tproc_pagemap_readable = 1;\n+}\n+\n /* Lock page in physical memory and prevent from swapping. */\n int\n rte_mem_lock_page(const void *virt)\n@@ -1037,7 +1055,7 @@ calc_num_pages_per_socket(uint64_t * memory,\n * 6. unmap the first mapping\n * 7. fill memsegs in configuration with contiguous zones\n */\n-static int\n+int\n rte_eal_hugepage_init(void)\n {\n \tstruct rte_mem_config *mcfg;\n@@ -1054,6 +1072,8 @@ rte_eal_hugepage_init(void)\n \tint new_pages_count[MAX_HUGEPAGE_SIZES];\n #endif\n \n+\ttest_proc_pagemap_readable();\n+\n \tmemset(used_hp, 0, sizeof(used_hp));\n \n \t/* get pointer to global configuration */\n@@ -1087,7 +1107,6 @@ rte_eal_hugepage_init(void)\n #endif\n \t}\n \n-\n \t/* calculate total number of hugepages available. at this point we haven't\n \t * yet started sorting them so they all are on socket 0 */\n \tfor (i = 0; i < (int) internal_config.num_hugepage_sizes; i++) {\n@@ -1378,7 +1397,7 @@ getFileSize(int fd)\n * configuration and finds the hugepages which form that segment, mapping them\n * in order to form a contiguous block in the virtual memory space\n */\n-static int\n+int\n rte_eal_hugepage_attach(void)\n {\n \tconst struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n@@ -1395,6 +1414,8 @@ rte_eal_hugepage_attach(void)\n \t\t\t\t\"into secondary processes\\n\");\n \t}\n \n+\ttest_proc_pagemap_readable();\n+\n \tif (internal_config.xen_dom0_support) {\n #ifdef RTE_LIBRTE_XEN_DOM0\n \t\tif (rte_xen_dom0_memory_attach() < 0) {\n@@ -1538,56 +1559,3 @@ error:\n \t\tclose(fd_hugepage);\n \treturn -1;\n }\n-\n-static int\n-rte_eal_memdevice_init(void)\n-{\n-\tstruct rte_config *config;\n-\n-\tif (rte_eal_process_type() == RTE_PROC_SECONDARY)\n-\t\treturn 0;\n-\n-\tconfig = rte_eal_get_configuration();\n-\tconfig->mem_config->nchannel = internal_config.force_nchannel;\n-\tconfig->mem_config->nrank = internal_config.force_nrank;\n-\n-\treturn 0;\n-}\n-\n-static int\n-test_proc_pagemap_readable(void)\n-{\n-\tint fd = open(\"/proc/self/pagemap\", O_RDONLY);\n-\n-\tif (fd < 0)\n-\t\treturn 0;\n-\t/* Is readable */\n-\tclose(fd);\n-\n-\treturn 1;\n-}\n-\n-/* init memory subsystem */\n-int\n-rte_eal_memory_init(void)\n-{\n-\tRTE_LOG(INFO, EAL, \"Setting up memory...\\n\");\n-\n-\tproc_pagemap_readable = test_proc_pagemap_readable();\n-\tif (!proc_pagemap_readable)\n-\t\tRTE_LOG(ERR, EAL,\n-\t\t\t\"Cannot open /proc/self/pagemap: %s. \"\n-\t\t\t\"virt2phys address translation will not work\\n\",\n-\t\t\tstrerror(errno));\n-\n-\tconst int retval = rte_eal_process_type() == RTE_PROC_PRIMARY ?\n-\t\t\trte_eal_hugepage_init() :\n-\t\t\trte_eal_hugepage_attach();\n-\tif (retval < 0)\n-\t\treturn -1;\n-\n-\tif (internal_config.no_shconf == 0 && rte_eal_memdevice_init() < 0)\n-\t\treturn -1;\n-\n-\treturn 0;\n-}\n", "prefixes": [ "dpdk-dev", "v10", "3/3" ] }