Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/56156/?format=api
{ "id": 56156, "url": "http://patches.dpdk.org/api/patches/56156/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/d6441ec8f00c9b51093ceb8024a0a45cb1157655.1562332112.git.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": "<d6441ec8f00c9b51093ceb8024a0a45cb1157655.1562332112.git.anatoly.burakov@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/d6441ec8f00c9b51093ceb8024a0a45cb1157655.1562332112.git.anatoly.burakov@intel.com", "date": "2019-07-05T13:10:27", "name": "[v4,1/8] eal: add API to lock/unlock memory hotplug", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ed1d991ce9f0804988bff69b560c23716f84e530", "submitter": { "id": 4, "url": "http://patches.dpdk.org/api/people/4/?format=api", "name": "Anatoly Burakov", "email": "anatoly.burakov@intel.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/d6441ec8f00c9b51093ceb8024a0a45cb1157655.1562332112.git.anatoly.burakov@intel.com/mbox/", "series": [ { "id": 5369, "url": "http://patches.dpdk.org/api/series/5369/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=5369", "date": "2019-07-05T13:10:26", "name": "Make shared memory config non-public", "version": 4, "mbox": "http://patches.dpdk.org/series/5369/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/56156/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/56156/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 1DFE21BEB2;\n\tFri, 5 Jul 2019 15:10:46 +0200 (CEST)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby dpdk.org (Postfix) with ESMTP id 163341D9E\n\tfor <dev@dpdk.org>; Fri, 5 Jul 2019 15:10:43 +0200 (CEST)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t05 Jul 2019 06:10:43 -0700", "from silpixa00399498.ir.intel.com (HELO\n\tsilpixa00399498.ger.corp.intel.com) ([10.237.223.125])\n\tby fmsmga004.fm.intel.com with ESMTP; 05 Jul 2019 06:10:36 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.63,455,1557212400\"; d=\"scan'208\";a=\"187862973\"", "From": "Anatoly Burakov <anatoly.burakov@intel.com>", "To": "dev@dpdk.org", "Cc": "Hemant Agrawal <hemant.agrawal@nxp.com>,\n\tShreyansh Jain <shreyansh.jain@nxp.com>,\n\tMatan Azrad <matan@mellanox.com>, Shahaf Shuler <shahafs@mellanox.com>,\n\tYongseok Koh <yskoh@mellanox.com>, \n\tMaxime Coquelin <maxime.coquelin@redhat.com>,\n\tTiwei Bie <tiwei.bie@intel.com>, Zhihong Wang <zhihong.wang@intel.com>,\n\tBruce Richardson <bruce.richardson@intel.com>, thomas@monjalon.net,\n\tdavid.marchand@redhat.com, stephen@networkplumber.org", "Date": "Fri, 5 Jul 2019 14:10:27 +0100", "Message-Id": "<d6441ec8f00c9b51093ceb8024a0a45cb1157655.1562332112.git.anatoly.burakov@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": [ "<cover.1562332112.git.anatoly.burakov@intel.com>", "<cover.1562332112.git.anatoly.burakov@intel.com>" ], "References": [ "<cover.1562332112.git.anatoly.burakov@intel.com>", "<cover.1561635481.git.anatoly.burakov@intel.com>\n\t<cover.1562332112.git.anatoly.burakov@intel.com>" ], "Subject": "[dpdk-dev] [PATCH v4 1/8] eal: add API to lock/unlock memory hotplug", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Currently, the memory hotplug is locked automatically by all\nmemory-related _walk() functions, but sometimes locking the\nmemory subsystem outside of them is needed. There is no\npublic API to do that, so it creates a dependency on shared\nmemory config to be public. Fix this by introducing a new\nAPI to lock/unlock the memory hotplug subsystem.\n\nCreate a new common file for all things mem config, and a\nnew API namespace rte_mcfg_*, and search-and-replace all\nusages of the locks with the new API.\n\nSigned-off-by: Anatoly Burakov <anatoly.burakov@intel.com>\nAcked-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/bus/fslmc/fslmc_vfio.c | 8 ++--\n drivers/net/mlx4/mlx4_mr.c | 11 +++--\n drivers/net/mlx5/mlx5_mr.c | 11 +++--\n .../net/virtio/virtio_user/virtio_user_dev.c | 7 ++-\n lib/librte_eal/common/eal_common_mcfg.c | 34 +++++++++++++++\n lib/librte_eal/common/eal_common_memory.c | 43 ++++++++-----------\n .../common/include/rte_eal_memconfig.h | 24 +++++++++++\n lib/librte_eal/common/malloc_heap.c | 14 +++---\n lib/librte_eal/common/meson.build | 1 +\n lib/librte_eal/common/rte_malloc.c | 32 ++++++--------\n lib/librte_eal/freebsd/eal/Makefile | 1 +\n lib/librte_eal/linux/eal/Makefile | 1 +\n lib/librte_eal/linux/eal/eal_vfio.c | 16 +++----\n lib/librte_eal/rte_eal_version.map | 4 ++\n 14 files changed, 125 insertions(+), 82 deletions(-)\n create mode 100644 lib/librte_eal/common/eal_common_mcfg.c", "diff": "diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c\nindex 1aae56fa9..44e4fa6e2 100644\n--- a/drivers/bus/fslmc/fslmc_vfio.c\n+++ b/drivers/bus/fslmc/fslmc_vfio.c\n@@ -347,14 +347,12 @@ fslmc_dmamap_seg(const struct rte_memseg_list *msl __rte_unused,\n int rte_fslmc_vfio_dmamap(void)\n {\n \tint i = 0, ret;\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n-\trte_rwlock_t *mem_lock = &mcfg->memory_hotplug_lock;\n \n \t/* Lock before parsing and registering callback to memory subsystem */\n-\trte_rwlock_read_lock(mem_lock);\n+\trte_mcfg_mem_read_lock();\n \n \tif (rte_memseg_walk(fslmc_dmamap_seg, &i) < 0) {\n-\t\trte_rwlock_read_unlock(mem_lock);\n+\t\trte_mcfg_mem_read_unlock();\n \t\treturn -1;\n \t}\n \n@@ -378,7 +376,7 @@ int rte_fslmc_vfio_dmamap(void)\n \t/* Existing segments have been mapped and memory callback for hotplug\n \t * has been installed.\n \t */\n-\trte_rwlock_read_unlock(mem_lock);\n+\trte_mcfg_mem_read_unlock();\n \n \treturn 0;\n }\ndiff --git a/drivers/net/mlx4/mlx4_mr.c b/drivers/net/mlx4/mlx4_mr.c\nindex 48d458ad4..80827ce75 100644\n--- a/drivers/net/mlx4/mlx4_mr.c\n+++ b/drivers/net/mlx4/mlx4_mr.c\n@@ -593,7 +593,6 @@ mlx4_mr_create_primary(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry,\n \t\t uintptr_t addr)\n {\n \tstruct mlx4_priv *priv = dev->data->dev_private;\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tconst struct rte_memseg_list *msl;\n \tconst struct rte_memseg *ms;\n \tstruct mlx4_mr *mr = NULL;\n@@ -696,7 +695,7 @@ mlx4_mr_create_primary(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry,\n \t * just single page. If not, go on with the big chunk atomically from\n \t * here.\n \t */\n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_lock();\n \tdata_re = data;\n \tif (len > msl->page_sz &&\n \t !rte_memseg_contig_walk(mr_find_contig_memsegs_cb, &data_re)) {\n@@ -714,7 +713,7 @@ mlx4_mr_create_primary(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry,\n \t\t */\n \t\tdata.start = RTE_ALIGN_FLOOR(addr, msl->page_sz);\n \t\tdata.end = data.start + msl->page_sz;\n-\t\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\t\trte_mcfg_mem_read_unlock();\n \t\tmr_free(mr);\n \t\tgoto alloc_resources;\n \t}\n@@ -734,7 +733,7 @@ mlx4_mr_create_primary(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry,\n \t\tDEBUG(\"port %u found MR for %p on final lookup, abort\",\n \t\t dev->data->port_id, (void *)addr);\n \t\trte_rwlock_write_unlock(&priv->mr.rwlock);\n-\t\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\t\trte_mcfg_mem_read_unlock();\n \t\t/*\n \t\t * Must be unlocked before calling rte_free() because\n \t\t * mlx4_mr_mem_event_free_cb() can be called inside.\n@@ -802,12 +801,12 @@ mlx4_mr_create_primary(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry,\n \t/* Lookup can't fail. */\n \tassert(entry->lkey != UINT32_MAX);\n \trte_rwlock_write_unlock(&priv->mr.rwlock);\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n \treturn entry->lkey;\n err_mrlock:\n \trte_rwlock_write_unlock(&priv->mr.rwlock);\n err_memlock:\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n err_nolock:\n \t/*\n \t * In case of error, as this can be called in a datapath, a warning\ndiff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c\nindex 66e8e874e..872d0591e 100644\n--- a/drivers/net/mlx5/mlx5_mr.c\n+++ b/drivers/net/mlx5/mlx5_mr.c\n@@ -580,7 +580,6 @@ mlx5_mr_create_primary(struct rte_eth_dev *dev, struct mlx5_mr_cache *entry,\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_ibv_shared *sh = priv->sh;\n \tstruct mlx5_dev_config *config = &priv->config;\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tconst struct rte_memseg_list *msl;\n \tconst struct rte_memseg *ms;\n \tstruct mlx5_mr *mr = NULL;\n@@ -684,7 +683,7 @@ mlx5_mr_create_primary(struct rte_eth_dev *dev, struct mlx5_mr_cache *entry,\n \t * just single page. If not, go on with the big chunk atomically from\n \t * here.\n \t */\n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_lock();\n \tdata_re = data;\n \tif (len > msl->page_sz &&\n \t !rte_memseg_contig_walk(mr_find_contig_memsegs_cb, &data_re)) {\n@@ -702,7 +701,7 @@ mlx5_mr_create_primary(struct rte_eth_dev *dev, struct mlx5_mr_cache *entry,\n \t\t */\n \t\tdata.start = RTE_ALIGN_FLOOR(addr, msl->page_sz);\n \t\tdata.end = data.start + msl->page_sz;\n-\t\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\t\trte_mcfg_mem_read_unlock();\n \t\tmr_free(mr);\n \t\tgoto alloc_resources;\n \t}\n@@ -722,7 +721,7 @@ mlx5_mr_create_primary(struct rte_eth_dev *dev, struct mlx5_mr_cache *entry,\n \t\tDEBUG(\"port %u found MR for %p on final lookup, abort\",\n \t\t dev->data->port_id, (void *)addr);\n \t\trte_rwlock_write_unlock(&sh->mr.rwlock);\n-\t\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\t\trte_mcfg_mem_read_unlock();\n \t\t/*\n \t\t * Must be unlocked before calling rte_free() because\n \t\t * mlx5_mr_mem_event_free_cb() can be called inside.\n@@ -790,12 +789,12 @@ mlx5_mr_create_primary(struct rte_eth_dev *dev, struct mlx5_mr_cache *entry,\n \t/* Lookup can't fail. */\n \tassert(entry->lkey != UINT32_MAX);\n \trte_rwlock_write_unlock(&sh->mr.rwlock);\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n \treturn entry->lkey;\n err_mrlock:\n \trte_rwlock_write_unlock(&sh->mr.rwlock);\n err_memlock:\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n err_nolock:\n \t/*\n \t * In case of error, as this can be called in a datapath, a warning\ndiff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c\nindex e743695e4..c3ab9a21d 100644\n--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c\n+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c\n@@ -125,7 +125,6 @@ is_vhost_user_by_type(const char *path)\n int\n virtio_user_start_device(struct virtio_user_dev *dev)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tuint64_t features;\n \tint ret;\n \n@@ -142,7 +141,7 @@ virtio_user_start_device(struct virtio_user_dev *dev)\n \t * replaced when we get proper supports from the\n \t * memory subsystem in the future.\n \t */\n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_lock();\n \tpthread_mutex_lock(&dev->mutex);\n \n \tif (is_vhost_user_by_type(dev->path) && dev->vhostfd < 0)\n@@ -180,12 +179,12 @@ virtio_user_start_device(struct virtio_user_dev *dev)\n \n \tdev->started = true;\n \tpthread_mutex_unlock(&dev->mutex);\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n \n \treturn 0;\n error:\n \tpthread_mutex_unlock(&dev->mutex);\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n \t/* TODO: free resource here or caller to check */\n \treturn -1;\n }\ndiff --git a/lib/librte_eal/common/eal_common_mcfg.c b/lib/librte_eal/common/eal_common_mcfg.c\nnew file mode 100644\nindex 000000000..985d36cc2\n--- /dev/null\n+++ b/lib/librte_eal/common/eal_common_mcfg.c\n@@ -0,0 +1,34 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2019 Intel Corporation\n+ */\n+\n+#include <rte_config.h>\n+#include <rte_eal_memconfig.h>\n+\n+void\n+rte_mcfg_mem_read_lock(void)\n+{\n+\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n+\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+}\n+\n+void\n+rte_mcfg_mem_read_unlock(void)\n+{\n+\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n+\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+}\n+\n+void\n+rte_mcfg_mem_write_lock(void)\n+{\n+\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n+\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+}\n+\n+void\n+rte_mcfg_mem_write_unlock(void)\n+{\n+\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n+\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+}\ndiff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/librte_eal/common/eal_common_memory.c\nindex 858d56382..fe22b139b 100644\n--- a/lib/librte_eal/common/eal_common_memory.c\n+++ b/lib/librte_eal/common/eal_common_memory.c\n@@ -596,13 +596,12 @@ rte_memseg_contig_walk_thread_unsafe(rte_memseg_contig_walk_t func, void *arg)\n int\n rte_memseg_contig_walk(rte_memseg_contig_walk_t func, void *arg)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tint ret = 0;\n \n \t/* do not allow allocations/frees/init while we iterate */\n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_lock();\n \tret = rte_memseg_contig_walk_thread_unsafe(func, arg);\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n \n \treturn ret;\n }\n@@ -638,13 +637,12 @@ rte_memseg_walk_thread_unsafe(rte_memseg_walk_t func, void *arg)\n int\n rte_memseg_walk(rte_memseg_walk_t func, void *arg)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tint ret = 0;\n \n \t/* do not allow allocations/frees/init while we iterate */\n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_lock();\n \tret = rte_memseg_walk_thread_unsafe(func, arg);\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n \n \treturn ret;\n }\n@@ -671,13 +669,12 @@ rte_memseg_list_walk_thread_unsafe(rte_memseg_list_walk_t func, void *arg)\n int\n rte_memseg_list_walk(rte_memseg_list_walk_t func, void *arg)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tint ret = 0;\n \n \t/* do not allow allocations/frees/init while we iterate */\n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_lock();\n \tret = rte_memseg_list_walk_thread_unsafe(func, arg);\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n \n \treturn ret;\n }\n@@ -727,12 +724,11 @@ rte_memseg_get_fd_thread_unsafe(const struct rte_memseg *ms)\n int\n rte_memseg_get_fd(const struct rte_memseg *ms)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tint ret;\n \n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_lock();\n \tret = rte_memseg_get_fd_thread_unsafe(ms);\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n \n \treturn ret;\n }\n@@ -783,12 +779,11 @@ rte_memseg_get_fd_offset_thread_unsafe(const struct rte_memseg *ms,\n int\n rte_memseg_get_fd_offset(const struct rte_memseg *ms, size_t *offset)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tint ret;\n \n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_lock();\n \tret = rte_memseg_get_fd_offset_thread_unsafe(ms, offset);\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n \n \treturn ret;\n }\n@@ -809,7 +804,7 @@ rte_extmem_register(void *va_addr, size_t len, rte_iova_t iova_addrs[],\n \t\trte_errno = EINVAL;\n \t\treturn -1;\n \t}\n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_lock();\n \n \t/* make sure the segment doesn't already exist */\n \tif (malloc_heap_find_external_seg(va_addr, len) != NULL) {\n@@ -838,14 +833,13 @@ rte_extmem_register(void *va_addr, size_t len, rte_iova_t iova_addrs[],\n \t/* memseg list successfully created - increment next socket ID */\n \tmcfg->next_socket_id++;\n unlock:\n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_unlock();\n \treturn ret;\n }\n \n int\n rte_extmem_unregister(void *va_addr, size_t len)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tstruct rte_memseg_list *msl;\n \tint ret = 0;\n \n@@ -853,7 +847,7 @@ rte_extmem_unregister(void *va_addr, size_t len)\n \t\trte_errno = EINVAL;\n \t\treturn -1;\n \t}\n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_lock();\n \n \t/* find our segment */\n \tmsl = malloc_heap_find_external_seg(va_addr, len);\n@@ -865,14 +859,13 @@ rte_extmem_unregister(void *va_addr, size_t len)\n \n \tret = malloc_heap_destroy_external_seg(msl);\n unlock:\n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_unlock();\n \treturn ret;\n }\n \n static int\n sync_memory(void *va_addr, size_t len, bool attach)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tstruct rte_memseg_list *msl;\n \tint ret = 0;\n \n@@ -880,7 +873,7 @@ sync_memory(void *va_addr, size_t len, bool attach)\n \t\trte_errno = EINVAL;\n \t\treturn -1;\n \t}\n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_lock();\n \n \t/* find our segment */\n \tmsl = malloc_heap_find_external_seg(va_addr, len);\n@@ -895,7 +888,7 @@ sync_memory(void *va_addr, size_t len, bool attach)\n \t\tret = rte_fbarray_detach(&msl->memseg_arr);\n \n unlock:\n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_unlock();\n \treturn ret;\n }\n \n@@ -923,7 +916,7 @@ rte_eal_memory_init(void)\n \t\treturn -1;\n \n \t/* lock mem hotplug here, to prevent races while we init */\n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_lock();\n \n \tif (rte_eal_memseg_init() < 0)\n \t\tgoto fail;\n@@ -942,6 +935,6 @@ rte_eal_memory_init(void)\n \n \treturn 0;\n fail:\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n \treturn -1;\n }\ndiff --git a/lib/librte_eal/common/include/rte_eal_memconfig.h b/lib/librte_eal/common/include/rte_eal_memconfig.h\nindex 84aabe36c..a554518ef 100644\n--- a/lib/librte_eal/common/include/rte_eal_memconfig.h\n+++ b/lib/librte_eal/common/include/rte_eal_memconfig.h\n@@ -100,6 +100,30 @@ rte_eal_mcfg_wait_complete(struct rte_mem_config* mcfg)\n \t\trte_pause();\n }\n \n+/**\n+ * Lock the internal EAL shared memory configuration for shared access.\n+ */\n+void\n+rte_mcfg_mem_read_lock(void);\n+\n+/**\n+ * Unlock the internal EAL shared memory configuration for shared access.\n+ */\n+void\n+rte_mcfg_mem_read_unlock(void);\n+\n+/**\n+ * Lock the internal EAL shared memory configuration for exclusive access.\n+ */\n+void\n+rte_mcfg_mem_write_lock(void);\n+\n+/**\n+ * Unlock the internal EAL shared memory configuration for exclusive access.\n+ */\n+void\n+rte_mcfg_mem_write_unlock(void);\n+\n #ifdef __cplusplus\n }\n #endif\ndiff --git a/lib/librte_eal/common/malloc_heap.c b/lib/librte_eal/common/malloc_heap.c\nindex f9235932e..f1d31de0d 100644\n--- a/lib/librte_eal/common/malloc_heap.c\n+++ b/lib/librte_eal/common/malloc_heap.c\n@@ -485,10 +485,9 @@ try_expand_heap(struct malloc_heap *heap, uint64_t pg_sz, size_t elt_size,\n \t\tint socket, unsigned int flags, size_t align, size_t bound,\n \t\tbool contig)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tint ret;\n \n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_lock();\n \n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n \t\tret = try_expand_heap_primary(heap, pg_sz, elt_size, socket,\n@@ -498,7 +497,7 @@ try_expand_heap(struct malloc_heap *heap, uint64_t pg_sz, size_t elt_size,\n \t\t\t\tflags, align, bound, contig);\n \t}\n \n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_unlock();\n \treturn ret;\n }\n \n@@ -821,7 +820,6 @@ malloc_heap_free_pages(void *aligned_start, size_t aligned_len)\n int\n malloc_heap_free(struct malloc_elem *elem)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tstruct malloc_heap *heap;\n \tvoid *start, *aligned_start, *end, *aligned_end;\n \tsize_t len, aligned_len, page_sz;\n@@ -935,7 +933,7 @@ malloc_heap_free(struct malloc_elem *elem)\n \n \t/* now we can finally free us some pages */\n \n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_lock();\n \n \t/*\n \t * we allow secondary processes to clear the heap of this allocated\n@@ -990,7 +988,7 @@ malloc_heap_free(struct malloc_elem *elem)\n \tRTE_LOG(DEBUG, EAL, \"Heap on socket %d was shrunk by %zdMB\\n\",\n \t\tmsl->socket_id, aligned_len >> 20ULL);\n \n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_unlock();\n free_unlock:\n \trte_spinlock_unlock(&(heap->lock));\n \treturn ret;\n@@ -1344,7 +1342,7 @@ rte_eal_malloc_heap_init(void)\n \n \tif (register_mp_requests()) {\n \t\tRTE_LOG(ERR, EAL, \"Couldn't register malloc multiprocess actions\\n\");\n-\t\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\t\trte_mcfg_mem_read_unlock();\n \t\treturn -1;\n \t}\n \n@@ -1352,7 +1350,7 @@ rte_eal_malloc_heap_init(void)\n \t * even come before primary itself is fully initialized, and secondaries\n \t * do not need to initialize the heap.\n \t */\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n \n \t/* secondary process does not need to initialize anything */\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\ndiff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build\nindex bafd23207..58b433bc2 100644\n--- a/lib/librte_eal/common/meson.build\n+++ b/lib/librte_eal/common/meson.build\n@@ -18,6 +18,7 @@ common_sources = files(\n \t'eal_common_launch.c',\n \t'eal_common_lcore.c',\n \t'eal_common_log.c',\n+\t'eal_common_mcfg.c',\n \t'eal_common_memalloc.c',\n \t'eal_common_memory.c',\n \t'eal_common_memzone.c',\ndiff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c\nindex b119ebae3..2cad7beaa 100644\n--- a/lib/librte_eal/common/rte_malloc.c\n+++ b/lib/librte_eal/common/rte_malloc.c\n@@ -223,7 +223,7 @@ rte_malloc_heap_get_socket(const char *name)\n \t\trte_errno = EINVAL;\n \t\treturn -1;\n \t}\n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_lock();\n \tfor (idx = 0; idx < RTE_MAX_HEAPS; idx++) {\n \t\tstruct malloc_heap *tmp = &mcfg->malloc_heaps[idx];\n \n@@ -239,7 +239,7 @@ rte_malloc_heap_get_socket(const char *name)\n \t\trte_errno = ENOENT;\n \t\tret = -1;\n \t}\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n \n \treturn ret;\n }\n@@ -254,7 +254,7 @@ rte_malloc_heap_socket_is_external(int socket_id)\n \tif (socket_id == SOCKET_ID_ANY)\n \t\treturn 0;\n \n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_lock();\n \tfor (idx = 0; idx < RTE_MAX_HEAPS; idx++) {\n \t\tstruct malloc_heap *tmp = &mcfg->malloc_heaps[idx];\n \n@@ -264,7 +264,7 @@ rte_malloc_heap_socket_is_external(int socket_id)\n \t\t\tbreak;\n \t\t}\n \t}\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n \n \treturn ret;\n }\n@@ -352,7 +352,6 @@ int\n rte_malloc_heap_memory_add(const char *heap_name, void *va_addr, size_t len,\n \t\trte_iova_t iova_addrs[], unsigned int n_pages, size_t page_sz)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tstruct malloc_heap *heap = NULL;\n \tstruct rte_memseg_list *msl;\n \tunsigned int n;\n@@ -369,7 +368,7 @@ rte_malloc_heap_memory_add(const char *heap_name, void *va_addr, size_t len,\n \t\trte_errno = EINVAL;\n \t\treturn -1;\n \t}\n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_lock();\n \n \t/* find our heap */\n \theap = find_named_heap(heap_name);\n@@ -398,7 +397,7 @@ rte_malloc_heap_memory_add(const char *heap_name, void *va_addr, size_t len,\n \trte_spinlock_unlock(&heap->lock);\n \n unlock:\n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_unlock();\n \n \treturn ret;\n }\n@@ -406,7 +405,6 @@ rte_malloc_heap_memory_add(const char *heap_name, void *va_addr, size_t len,\n int\n rte_malloc_heap_memory_remove(const char *heap_name, void *va_addr, size_t len)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tstruct malloc_heap *heap = NULL;\n \tstruct rte_memseg_list *msl;\n \tint ret;\n@@ -418,7 +416,7 @@ rte_malloc_heap_memory_remove(const char *heap_name, void *va_addr, size_t len)\n \t\trte_errno = EINVAL;\n \t\treturn -1;\n \t}\n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_lock();\n \t/* find our heap */\n \theap = find_named_heap(heap_name);\n \tif (heap == NULL) {\n@@ -448,7 +446,7 @@ rte_malloc_heap_memory_remove(const char *heap_name, void *va_addr, size_t len)\n \tret = malloc_heap_destroy_external_seg(msl);\n \n unlock:\n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_unlock();\n \n \treturn ret;\n }\n@@ -456,7 +454,6 @@ rte_malloc_heap_memory_remove(const char *heap_name, void *va_addr, size_t len)\n static int\n sync_memory(const char *heap_name, void *va_addr, size_t len, bool attach)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tstruct malloc_heap *heap = NULL;\n \tstruct rte_memseg_list *msl;\n \tint ret;\n@@ -468,7 +465,7 @@ sync_memory(const char *heap_name, void *va_addr, size_t len, bool attach)\n \t\trte_errno = EINVAL;\n \t\treturn -1;\n \t}\n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_lock();\n \n \t/* find our heap */\n \theap = find_named_heap(heap_name);\n@@ -516,7 +513,7 @@ sync_memory(const char *heap_name, void *va_addr, size_t len, bool attach)\n \t\t}\n \t}\n unlock:\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_read_unlock();\n \treturn ret;\n }\n \n@@ -549,7 +546,7 @@ rte_malloc_heap_create(const char *heap_name)\n \t/* check if there is space in the heap list, or if heap with this name\n \t * already exists.\n \t */\n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_lock();\n \n \tfor (i = 0; i < RTE_MAX_HEAPS; i++) {\n \t\tstruct malloc_heap *tmp = &mcfg->malloc_heaps[i];\n@@ -578,7 +575,7 @@ rte_malloc_heap_create(const char *heap_name)\n \t/* we're sure that we can create a new heap, so do it */\n \tret = malloc_heap_create(heap, heap_name);\n unlock:\n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_unlock();\n \n \treturn ret;\n }\n@@ -586,7 +583,6 @@ rte_malloc_heap_create(const char *heap_name)\n int\n rte_malloc_heap_destroy(const char *heap_name)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tstruct malloc_heap *heap = NULL;\n \tint ret;\n \n@@ -597,7 +593,7 @@ rte_malloc_heap_destroy(const char *heap_name)\n \t\trte_errno = EINVAL;\n \t\treturn -1;\n \t}\n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_lock();\n \n \t/* start from non-socket heaps */\n \theap = find_named_heap(heap_name);\n@@ -621,7 +617,7 @@ rte_malloc_heap_destroy(const char *heap_name)\n \tif (ret < 0)\n \t\trte_spinlock_unlock(&heap->lock);\n unlock:\n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_mcfg_mem_write_unlock();\n \n \treturn ret;\n }\ndiff --git a/lib/librte_eal/freebsd/eal/Makefile b/lib/librte_eal/freebsd/eal/Makefile\nindex ca616c480..eb921275e 100644\n--- a/lib/librte_eal/freebsd/eal/Makefile\n+++ b/lib/librte_eal/freebsd/eal/Makefile\n@@ -44,6 +44,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_timer.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memzone.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_log.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_launch.c\n+SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_mcfg.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memalloc.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memory.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_tailqs.c\ndiff --git a/lib/librte_eal/linux/eal/Makefile b/lib/librte_eal/linux/eal/Makefile\nindex 729795a10..dfe8e9a49 100644\n--- a/lib/librte_eal/linux/eal/Makefile\n+++ b/lib/librte_eal/linux/eal/Makefile\n@@ -52,6 +52,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_timer.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memzone.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_log.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_launch.c\n+SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_mcfg.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memalloc.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memory.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_tailqs.c\ndiff --git a/lib/librte_eal/linux/eal/eal_vfio.c b/lib/librte_eal/linux/eal/eal_vfio.c\nindex feada64c0..96a03a657 100644\n--- a/lib/librte_eal/linux/eal/eal_vfio.c\n+++ b/lib/librte_eal/linux/eal/eal_vfio.c\n@@ -635,8 +635,6 @@ int\n rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,\n \t\tint *vfio_dev_fd, struct vfio_device_info *device_info)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n-\trte_rwlock_t *mem_lock = &mcfg->memory_hotplug_lock;\n \tstruct vfio_group_status group_status = {\n \t\t\t.argsz = sizeof(group_status)\n \t};\n@@ -739,7 +737,7 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,\n \t\t\t/* lock memory hotplug before mapping and release it\n \t\t\t * after registering callback, to prevent races\n \t\t\t */\n-\t\t\trte_rwlock_read_lock(mem_lock);\n+\t\t\trte_mcfg_mem_read_lock();\n \t\t\tif (vfio_cfg == default_vfio_cfg)\n \t\t\t\tret = t->dma_map_func(vfio_container_fd);\n \t\t\telse\n@@ -750,7 +748,7 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,\n \t\t\t\t\tdev_addr, errno, strerror(errno));\n \t\t\t\tclose(vfio_group_fd);\n \t\t\t\trte_vfio_clear_group(vfio_group_fd);\n-\t\t\t\trte_rwlock_read_unlock(mem_lock);\n+\t\t\t\trte_mcfg_mem_read_unlock();\n \t\t\t\treturn -1;\n \t\t\t}\n \n@@ -781,7 +779,7 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,\n \t\t\t\t\t\t\tmap->len);\n \t\t\t\t\trte_spinlock_recursive_unlock(\n \t\t\t\t\t\t\t&user_mem_maps->lock);\n-\t\t\t\t\trte_rwlock_read_unlock(mem_lock);\n+\t\t\t\t\trte_mcfg_mem_read_unlock();\n \t\t\t\t\treturn -1;\n \t\t\t\t}\n \t\t\t}\n@@ -795,7 +793,7 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,\n \t\t\telse\n \t\t\t\tret = 0;\n \t\t\t/* unlock memory hotplug */\n-\t\t\trte_rwlock_read_unlock(mem_lock);\n+\t\t\trte_mcfg_mem_read_unlock();\n \n \t\t\tif (ret && rte_errno != ENOTSUP) {\n \t\t\t\tRTE_LOG(ERR, EAL, \"Could not install memory event callback for VFIO\\n\");\n@@ -862,8 +860,6 @@ int\n rte_vfio_release_device(const char *sysfs_base, const char *dev_addr,\n \t\t int vfio_dev_fd)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n-\trte_rwlock_t *mem_lock = &mcfg->memory_hotplug_lock;\n \tstruct vfio_group_status group_status = {\n \t\t\t.argsz = sizeof(group_status)\n \t};\n@@ -876,7 +872,7 @@ rte_vfio_release_device(const char *sysfs_base, const char *dev_addr,\n \t * VFIO device, because this might be the last device and we might need\n \t * to unregister the callback.\n \t */\n-\trte_rwlock_read_lock(mem_lock);\n+\trte_mcfg_mem_read_lock();\n \n \t/* get group number */\n \tret = rte_vfio_get_group_num(sysfs_base, dev_addr, &iommu_group_num);\n@@ -947,7 +943,7 @@ rte_vfio_release_device(const char *sysfs_base, const char *dev_addr,\n \tret = 0;\n \n out:\n-\trte_rwlock_read_unlock(mem_lock);\n+\trte_mcfg_mem_read_unlock();\n \treturn ret;\n }\n \ndiff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map\nindex a53a29a35..754060dc9 100644\n--- a/lib/librte_eal/rte_eal_version.map\n+++ b/lib/librte_eal/rte_eal_version.map\n@@ -292,6 +292,10 @@ DPDK_19.08 {\n \n \trte_lcore_index;\n \trte_lcore_to_socket_id;\n+\trte_mcfg_mem_read_lock;\n+\trte_mcfg_mem_read_unlock;\n+\trte_mcfg_mem_write_lock;\n+\trte_mcfg_mem_write_unlock;\n \trte_rand;\n \trte_srand;\n \n", "prefixes": [ "v4", "1/8" ] }