Patch Detail

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

{
    "id": 2182,
    "url": "https://patches.dpdk.org/api/patches/2182/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1419957440-11767-6-git-send-email-rkerur@gmail.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": "<1419957440-11767-6-git-send-email-rkerur@gmail.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1419957440-11767-6-git-send-email-rkerur@gmail.com",
    "date": "2014-12-30T16:37:20",
    "name": "[dpdk-dev,v3,6/6] Move common functions in eal_memory.c",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "be404a622f2365de7935a9a01915adfc0f6c9eac",
    "submitter": {
        "id": 134,
        "url": "https://patches.dpdk.org/api/people/134/?format=api",
        "name": "Ravi Kerur",
        "email": "rkerur@gmail.com"
    },
    "delegate": null,
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/1419957440-11767-6-git-send-email-rkerur@gmail.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/2182/comments/",
    "check": "pending",
    "checks": "https://patches.dpdk.org/api/patches/2182/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 638B45A1D;\n\tTue, 30 Dec 2014 17:37:54 +0100 (CET)",
            "from mail-pd0-f178.google.com (mail-pd0-f178.google.com\n\t[209.85.192.178]) by dpdk.org (Postfix) with ESMTP id 7E2245A26\n\tfor <dev@dpdk.org>; Tue, 30 Dec 2014 17:37:45 +0100 (CET)",
            "by mail-pd0-f178.google.com with SMTP id r10so19420392pdi.37\n\tfor <dev@dpdk.org>; Tue, 30 Dec 2014 08:37:44 -0800 (PST)",
            "from iaas-l305162.englab.brocade.com ([144.49.130.148])\n\tby mx.google.com with ESMTPSA id\n\tpb6sm38901162pbb.13.2014.12.30.08.37.44\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 30 Dec 2014 08:37:44 -0800 (PST)"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=xoYnGZ1iuKVB5PXB3i6fk2V8tFQu2bsjTqWg+iV/zug=;\n\tb=lPGImMUh+jsh4H3FqkDvTwQI+pOJ6VgCRCgbsNp/U4ebNWFu/AGvoj7r1XFg5dd/57\n\twVOrj1yQ572iqXQlV/8n0ZipgD0Nxt2UYVzU1Q3R9OPNTMJ13J/GxOPnIKL74KfHTA3w\n\tx+SlMufULMPER8bStmrYxD4BuDm6u0IQuhTd36pTTUFyP/qfi4ifwVrKTMCY9KUcgX8Z\n\trEq2Gzv1kBkOCANNQmAZ3eowWCUEtDLhFQtVcBHMg0mvt6Olb+nk8ef6nE642RCwtM4h\n\tDouYA38M99F4AuvBoWZrPyvqPUBK/v0g7OJarJIt48lNa+p+sArJ7qLX1Kz4QNqc4Owp\n\t35qw==",
        "X-Received": "by 10.70.90.39 with SMTP id bt7mr98604607pdb.52.1419957464880;\n\tTue, 30 Dec 2014 08:37:44 -0800 (PST)",
        "From": "Ravi Kerur <rkerur@gmail.com>",
        "To": "dev@dpdk.org",
        "Date": "Tue, 30 Dec 2014 11:37:20 -0500",
        "Message-Id": "<1419957440-11767-6-git-send-email-rkerur@gmail.com>",
        "X-Mailer": "git-send-email 1.9.1",
        "In-Reply-To": "<1419957440-11767-1-git-send-email-rkerur@gmail.com>",
        "References": "<1419957384-11693-1-git-send-email-rkerur@gmail.com>\n\t<1419957440-11767-1-git-send-email-rkerur@gmail.com>",
        "Subject": "[dpdk-dev] [PATCH v3 6/6] Move common functions in eal_memory.c",
        "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": "Changes in v3\nChanged subject line to explicitly include file name\nCommit log includes function names moved to common directory.\n\nChanges in v2\nUse common function names rte_eal_hugepage_init and\nrte_eal_hugepage_attach for BSD and Linux.\nUpdate comments about its actuality in function declaration.\n\nChanges in v1\nMove common functions in eal_memory.c to librte_eal/common/\neal_common_memory.c file.\n\nFollowing functions are moved to eal_common_memory.c file\n\nstatic int rte_eal_memdevice_init(void);\nint rte_eal_memory_init(void);\n\nFix checkpatch warnings and errors.\n\nSigned-off-by: Ravi Kerur <rkerur@gmail.com>\n---\n lib/librte_eal/bsdapp/eal/eal_memory.c    | 40 ++++---------------------------\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  | 36 ++--------------------------\n 4 files changed, 60 insertions(+), 72 deletions(-)",
    "diff": "diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c b/lib/librte_eal/bsdapp/eal/eal_memory.c\nindex 65ee87d..0b62d6d 100644\n--- a/lib/librte_eal/bsdapp/eal/eal_memory.c\n+++ b/lib/librte_eal/bsdapp/eal/eal_memory.c\n@@ -59,8 +59,8 @@ rte_mem_virt2phy(const void *virtaddr)\n \treturn RTE_BAD_PHYS_ADDR;\n }\n \n-static int\n-rte_eal_contigmem_init(void)\n+int\n+rte_eal_hugepage_init(void)\n {\n \tstruct rte_mem_config *mcfg;\n \tuint64_t total_mem = 0;\n@@ -130,8 +130,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@@ -190,35 +190,3 @@ error:\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 77830f8..cb27930 100644\n--- a/lib/librte_eal/common/eal_common_memory.c\n+++ b/lib/librte_eal/common/eal_common_memory.c\n@@ -46,6 +46,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@@ -70,7 +71,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@@ -90,7 +91,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@@ -119,3 +120,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+\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+\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 98a08f0..82a724d 100644\n--- a/lib/librte_eal/common/eal_private.h\n+++ b/lib/librte_eal/common/eal_private.h\n@@ -279,6 +279,24 @@ void set_tsc_freq(void);\n  */\n int set_tsc_freq_from_sysctl(void);\n \n+/**\n+ * This function prepares 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+ * This function creates memory mapping in secondary\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 #ifdef RTE_EXEC_ENV_BSDAPP\n /**\n  * This function gets no. of cpus\ndiff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c\nindex bae2507..f4d91df 100644\n--- a/lib/librte_eal/linuxapp/eal/eal_memory.c\n+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c\n@@ -1031,7 +1031,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@@ -1369,7 +1369,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@@ -1530,35 +1530,3 @@ error:\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-\n-/* init memory subsystem */\n-int\n-rte_eal_memory_init(void)\n-{\n-\tRTE_LOG(INFO, EAL, \"Setting up memory...\\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",
        "v3",
        "6/6"
    ]
}