From: Cyril Chemparathy <cchemparathy@ezchip.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v2 06/12] memzone: refactor rte_memzone_reserve() variants
Date: Mon, 22 Jun 2015 11:58:38 -0700 [thread overview]
Message-ID: <1434999524-26528-7-git-send-email-cchemparathy@ezchip.com> (raw)
In-Reply-To: <1434999524-26528-1-git-send-email-cchemparathy@ezchip.com>
The definitions of rte_memzone_reserve_aligned() and
rte_memzone_reserve_bounded() were identical with the exception of the
bound argument passed into rte_memzone_reserve_thread_safe().
This patch removes this replication of code by unifying it into
rte_memzone_reserve_thread_safe(), which is then called by all three
variants of rte_memzone_reserve().
Change-Id: Id26c25b4dd3d07861eaf35e72aaa2de555916fa3
Signed-off-by: Cyril Chemparathy <cchemparathy@ezchip.com>
---
lib/librte_eal/common/eal_common_memzone.c | 77 +++++++++++++-----------------
1 file changed, 33 insertions(+), 44 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/librte_eal/common/eal_common_memzone.c
index 888f9e5..87057d4 100644
--- a/lib/librte_eal/common/eal_common_memzone.c
+++ b/lib/librte_eal/common/eal_common_memzone.c
@@ -77,18 +77,6 @@ memzone_lookup_thread_unsafe(const char *name)
}
/*
- * Return a pointer to a correctly filled memzone descriptor. If the
- * allocation cannot be done, return NULL.
- */
-const struct rte_memzone *
-rte_memzone_reserve(const char *name, size_t len, int socket_id,
- unsigned flags)
-{
- return rte_memzone_reserve_aligned(name,
- len, socket_id, flags, RTE_CACHE_LINE_SIZE);
-}
-
-/*
* Helper function for memzone_reserve_aligned_thread_unsafe().
* Calculate address offset from the start of the segment.
* Align offset in that way that it satisfy istart alignmnet and
@@ -307,13 +295,10 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
return mz;
}
-/*
- * Return a pointer to a correctly filled memzone descriptor (with a
- * specified alignment). If the allocation cannot be done, return NULL.
- */
-const struct rte_memzone *
-rte_memzone_reserve_aligned(const char *name, size_t len,
- int socket_id, unsigned flags, unsigned align)
+static const struct rte_memzone *
+rte_memzone_reserve_thread_safe(const char *name, size_t len,
+ int socket_id, unsigned flags, unsigned align,
+ unsigned bound)
{
struct rte_mem_config *mcfg;
const struct rte_memzone *mz = NULL;
@@ -331,7 +316,7 @@ rte_memzone_reserve_aligned(const char *name, size_t len,
rte_rwlock_write_lock(&mcfg->mlock);
mz = memzone_reserve_aligned_thread_unsafe(
- name, len, socket_id, flags, align, 0);
+ name, len, socket_id, flags, align, bound);
rte_rwlock_write_unlock(&mcfg->mlock);
@@ -340,36 +325,40 @@ rte_memzone_reserve_aligned(const char *name, size_t len,
/*
* Return a pointer to a correctly filled memzone descriptor (with a
- * specified alignment and boundary).
- * If the allocation cannot be done, return NULL.
+ * specified alignment and boundary). If the allocation cannot be done,
+ * return NULL.
*/
const struct rte_memzone *
-rte_memzone_reserve_bounded(const char *name, size_t len,
- int socket_id, unsigned flags, unsigned align, unsigned bound)
+rte_memzone_reserve_bounded(const char *name, size_t len, int socket_id,
+ unsigned flags, unsigned align, unsigned bound)
{
- struct rte_mem_config *mcfg;
- const struct rte_memzone *mz = NULL;
-
- /* both sizes cannot be explicitly called for */
- if (((flags & RTE_MEMZONE_1GB) && (flags & RTE_MEMZONE_2MB))
- || ((flags & RTE_MEMZONE_16MB) && (flags & RTE_MEMZONE_16GB))) {
- rte_errno = EINVAL;
- return NULL;
- }
-
- /* get pointer to global configuration */
- mcfg = rte_eal_get_configuration()->mem_config;
-
- rte_rwlock_write_lock(&mcfg->mlock);
-
- mz = memzone_reserve_aligned_thread_unsafe(
- name, len, socket_id, flags, align, bound);
-
- rte_rwlock_write_unlock(&mcfg->mlock);
+ return rte_memzone_reserve_thread_safe(name, len, socket_id, flags,
+ align, bound);
+}
- return mz;
+/*
+ * Return a pointer to a correctly filled memzone descriptor (with a
+ * specified alignment). If the allocation cannot be done, return NULL.
+ */
+const struct rte_memzone *
+rte_memzone_reserve_aligned(const char *name, size_t len, int socket_id,
+ unsigned flags, unsigned align)
+{
+ return rte_memzone_reserve_thread_safe(name, len, socket_id, flags,
+ align, 0);
}
+/*
+ * Return a pointer to a correctly filled memzone descriptor. If the
+ * allocation cannot be done, return NULL.
+ */
+const struct rte_memzone *
+rte_memzone_reserve(const char *name, size_t len, int socket_id,
+ unsigned flags)
+{
+ return rte_memzone_reserve_thread_safe(name, len, socket_id,
+ flags, RTE_CACHE_LINE_SIZE, 0);
+}
/*
* Lookup for the memzone identified by the given name
--
2.1.2
next prev parent reply other threads:[~2015-06-22 18:58 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1434999524-26528-1-git-send-email-cchemparathy@ezchip.com>
2015-06-22 18:58 ` [dpdk-dev] [PATCH v2 01/12] test: limit x86 cpuflags checks to x86 builds Cyril Chemparathy
2015-06-22 18:58 ` [dpdk-dev] [PATCH v2 02/12] hash: fix compilation on non-X86 platforms Cyril Chemparathy
2015-06-22 18:58 ` [dpdk-dev] [PATCH v2 03/12] hash: check SSE flags only on x86 builds Cyril Chemparathy
2015-06-22 18:58 ` [dpdk-dev] [PATCH v2 04/12] eal: allow empty compile time flags Cyril Chemparathy
2015-06-22 18:58 ` [dpdk-dev] [PATCH v2 05/12] config: remove RTE_LIBNAME definition Cyril Chemparathy
2015-06-22 18:58 ` Cyril Chemparathy [this message]
2015-06-22 18:58 ` [dpdk-dev] [PATCH v2 07/12] memzone: allow multiple pagesizes to be requested Cyril Chemparathy
2015-06-22 18:58 ` [dpdk-dev] [PATCH v2 08/12] mempool: allow config override on element alignment Cyril Chemparathy
2015-06-23 0:31 ` Ananyev, Konstantin
2015-06-23 20:43 ` Cyril Chemparathy
2015-06-23 21:21 ` Ananyev, Konstantin
2015-06-22 18:58 ` [dpdk-dev] [PATCH v2 09/12] tile: add page sizes for TILE-Gx/Mx platforms Cyril Chemparathy
2015-06-22 18:58 ` [dpdk-dev] [PATCH v2 10/12] tile: initial TILE-Gx support Cyril Chemparathy
2015-06-22 18:58 ` [dpdk-dev] [PATCH v2 11/12] tile: Add TILE-Gx mPIPE poll mode driver Cyril Chemparathy
2015-06-22 18:58 ` [dpdk-dev] [PATCH v2 12/12] maintainers: claim responsibility for TILE-Gx platform Cyril Chemparathy
2015-06-24 16:42 ` [dpdk-dev] [PATCH v2 00/12] Introducing the " Cyril Chemparathy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434999524-26528-7-git-send-email-cchemparathy@ezchip.com \
--to=cchemparathy@ezchip.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).