From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net
Subject: [PATCH 03/14] mem: annotate shared memory config locks
Date: Fri, 24 Feb 2023 09:16:31 +0100 [thread overview]
Message-ID: <20230224081642.2566619-4-david.marchand@redhat.com> (raw)
In-Reply-To: <20230224081642.2566619-1-david.marchand@redhat.com>
Expose internal locks via some internal accessors.
Then annotate rte_mcfg_xxx_(read|write)_(|un)lock.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
lib/eal/common/eal_common_mcfg.c | 66 +++++++++++++++++------------
lib/eal/include/rte_eal_memconfig.h | 63 +++++++++++++++++++++------
lib/eal/version.map | 4 ++
3 files changed, 91 insertions(+), 42 deletions(-)
diff --git a/lib/eal/common/eal_common_mcfg.c b/lib/eal/common/eal_common_mcfg.c
index cf4a279905..b60d41f7b6 100644
--- a/lib/eal/common/eal_common_mcfg.c
+++ b/lib/eal/common/eal_common_mcfg.c
@@ -69,102 +69,112 @@ eal_mcfg_update_from_internal(void)
mcfg->version = RTE_VERSION;
}
+rte_rwlock_t *
+rte_mcfg_mem_get_lock(void)
+{
+ return &rte_eal_get_configuration()->mem_config->memory_hotplug_lock;
+}
+
void
rte_mcfg_mem_read_lock(void)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- rte_rwlock_read_lock(&mcfg->memory_hotplug_lock);
+ rte_rwlock_read_lock(rte_mcfg_mem_get_lock());
}
void
rte_mcfg_mem_read_unlock(void)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- rte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);
+ rte_rwlock_read_unlock(rte_mcfg_mem_get_lock());
}
void
rte_mcfg_mem_write_lock(void)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- rte_rwlock_write_lock(&mcfg->memory_hotplug_lock);
+ rte_rwlock_write_lock(rte_mcfg_mem_get_lock());
}
void
rte_mcfg_mem_write_unlock(void)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- rte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);
+ rte_rwlock_write_unlock(rte_mcfg_mem_get_lock());
+}
+
+rte_rwlock_t *
+rte_mcfg_tailq_get_lock(void)
+{
+ return &rte_eal_get_configuration()->mem_config->qlock;
}
void
rte_mcfg_tailq_read_lock(void)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- rte_rwlock_read_lock(&mcfg->qlock);
+ rte_rwlock_read_lock(rte_mcfg_tailq_get_lock());
}
void
rte_mcfg_tailq_read_unlock(void)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- rte_rwlock_read_unlock(&mcfg->qlock);
+ rte_rwlock_read_unlock(rte_mcfg_tailq_get_lock());
}
void
rte_mcfg_tailq_write_lock(void)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- rte_rwlock_write_lock(&mcfg->qlock);
+ rte_rwlock_write_lock(rte_mcfg_tailq_get_lock());
}
void
rte_mcfg_tailq_write_unlock(void)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- rte_rwlock_write_unlock(&mcfg->qlock);
+ rte_rwlock_write_unlock(rte_mcfg_tailq_get_lock());
+}
+
+rte_rwlock_t *
+rte_mcfg_mempool_get_lock(void)
+{
+ return &rte_eal_get_configuration()->mem_config->mplock;
}
void
rte_mcfg_mempool_read_lock(void)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- rte_rwlock_read_lock(&mcfg->mplock);
+ rte_rwlock_read_lock(rte_mcfg_mempool_get_lock());
}
void
rte_mcfg_mempool_read_unlock(void)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- rte_rwlock_read_unlock(&mcfg->mplock);
+ rte_rwlock_read_unlock(rte_mcfg_mempool_get_lock());
}
void
rte_mcfg_mempool_write_lock(void)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- rte_rwlock_write_lock(&mcfg->mplock);
+ rte_rwlock_write_lock(rte_mcfg_mempool_get_lock());
}
void
rte_mcfg_mempool_write_unlock(void)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- rte_rwlock_write_unlock(&mcfg->mplock);
+ rte_rwlock_write_unlock(rte_mcfg_mempool_get_lock());
+}
+
+rte_spinlock_t *
+rte_mcfg_timer_get_lock(void)
+{
+ return &rte_eal_get_configuration()->mem_config->tlock;
}
void
rte_mcfg_timer_lock(void)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- rte_spinlock_lock(&mcfg->tlock);
+ rte_spinlock_lock(rte_mcfg_timer_get_lock());
}
void
rte_mcfg_timer_unlock(void)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- rte_spinlock_unlock(&mcfg->tlock);
+ rte_spinlock_unlock(rte_mcfg_timer_get_lock());
}
bool
diff --git a/lib/eal/include/rte_eal_memconfig.h b/lib/eal/include/rte_eal_memconfig.h
index e175564647..c527f9aa29 100644
--- a/lib/eal/include/rte_eal_memconfig.h
+++ b/lib/eal/include/rte_eal_memconfig.h
@@ -7,6 +7,8 @@
#include <stdbool.h>
+#include <rte_rwlock.h>
+#include <rte_spinlock.h>
/**
* @file
@@ -18,89 +20,122 @@
extern "C" {
#endif
+/**
+ * Internal helpers used for lock annotations.
+ */
+__rte_internal
+rte_rwlock_t *
+rte_mcfg_mem_get_lock(void);
+
+__rte_internal
+rte_rwlock_t *
+rte_mcfg_tailq_get_lock(void);
+
+__rte_internal
+rte_rwlock_t *
+rte_mcfg_mempool_get_lock(void);
+
+__rte_internal
+rte_spinlock_t *
+rte_mcfg_timer_get_lock(void);
+
/**
* Lock the internal EAL shared memory configuration for shared access.
*/
void
-rte_mcfg_mem_read_lock(void);
+rte_mcfg_mem_read_lock(void)
+ __rte_shared_lock_function(rte_mcfg_mem_get_lock());
/**
* Unlock the internal EAL shared memory configuration for shared access.
*/
void
-rte_mcfg_mem_read_unlock(void);
+rte_mcfg_mem_read_unlock(void)
+ __rte_unlock_function(rte_mcfg_mem_get_lock());
/**
* Lock the internal EAL shared memory configuration for exclusive access.
*/
void
-rte_mcfg_mem_write_lock(void);
+rte_mcfg_mem_write_lock(void)
+ __rte_exclusive_lock_function(rte_mcfg_mem_get_lock());
/**
* Unlock the internal EAL shared memory configuration for exclusive access.
*/
void
-rte_mcfg_mem_write_unlock(void);
+rte_mcfg_mem_write_unlock(void)
+ __rte_unlock_function(rte_mcfg_mem_get_lock());
/**
* Lock the internal EAL TAILQ list for shared access.
*/
void
-rte_mcfg_tailq_read_lock(void);
+rte_mcfg_tailq_read_lock(void)
+ __rte_shared_lock_function(rte_mcfg_tailq_get_lock());
/**
* Unlock the internal EAL TAILQ list for shared access.
*/
void
-rte_mcfg_tailq_read_unlock(void);
+rte_mcfg_tailq_read_unlock(void)
+ __rte_unlock_function(rte_mcfg_tailq_get_lock());
/**
* Lock the internal EAL TAILQ list for exclusive access.
*/
void
-rte_mcfg_tailq_write_lock(void);
+rte_mcfg_tailq_write_lock(void)
+ __rte_exclusive_lock_function(rte_mcfg_tailq_get_lock());
/**
* Unlock the internal EAL TAILQ list for exclusive access.
*/
void
-rte_mcfg_tailq_write_unlock(void);
+rte_mcfg_tailq_write_unlock(void)
+ __rte_unlock_function(rte_mcfg_tailq_get_lock());
/**
* Lock the internal EAL Mempool list for shared access.
*/
void
-rte_mcfg_mempool_read_lock(void);
+rte_mcfg_mempool_read_lock(void)
+ __rte_shared_lock_function(rte_mcfg_mempool_get_lock());
/**
* Unlock the internal EAL Mempool list for shared access.
*/
void
-rte_mcfg_mempool_read_unlock(void);
+rte_mcfg_mempool_read_unlock(void)
+ __rte_unlock_function(rte_mcfg_mempool_get_lock());
/**
* Lock the internal EAL Mempool list for exclusive access.
*/
void
-rte_mcfg_mempool_write_lock(void);
+rte_mcfg_mempool_write_lock(void)
+ __rte_exclusive_lock_function(rte_mcfg_mempool_get_lock());
/**
* Unlock the internal EAL Mempool list for exclusive access.
*/
void
-rte_mcfg_mempool_write_unlock(void);
+rte_mcfg_mempool_write_unlock(void)
+ __rte_unlock_function(rte_mcfg_mempool_get_lock());
/**
* Lock the internal EAL Timer Library lock for exclusive access.
*/
void
-rte_mcfg_timer_lock(void);
+rte_mcfg_timer_lock(void)
+ __rte_exclusive_lock_function(rte_mcfg_timer_get_lock());
/**
* Unlock the internal EAL Timer Library lock for exclusive access.
*/
void
-rte_mcfg_timer_unlock(void);
+rte_mcfg_timer_unlock(void)
+ __rte_unlock_function(rte_mcfg_timer_get_lock());
/**
* If true, pages are put in single files (per memseg list),
diff --git a/lib/eal/version.map b/lib/eal/version.map
index 6d6978f108..51a820d829 100644
--- a/lib/eal/version.map
+++ b/lib/eal/version.map
@@ -469,6 +469,10 @@ INTERNAL {
rte_intr_vec_list_free;
rte_intr_vec_list_index_get;
rte_intr_vec_list_index_set;
+ rte_mcfg_mem_get_lock;
+ rte_mcfg_mempool_get_lock;
+ rte_mcfg_tailq_get_lock;
+ rte_mcfg_timer_get_lock;
rte_mem_lock;
rte_mem_map;
rte_mem_page_size;
--
2.39.2
next prev parent reply other threads:[~2023-02-24 8:17 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-24 8:16 [PATCH 00/14] Enable lock annotations on most libraries and drivers David Marchand
2023-02-24 8:16 ` [PATCH 01/14] malloc: rework heap lock handling David Marchand
2023-02-24 8:16 ` [PATCH 02/14] mem: rework malloc heap init David Marchand
2023-02-24 8:16 ` David Marchand [this message]
2023-02-24 8:16 ` [PATCH 04/14] hash: annotate cuckoo hash lock David Marchand
2023-02-24 8:16 ` [PATCH 05/14] graph: annotate graph lock David Marchand
2023-02-24 8:16 ` [PATCH 06/14] drivers: inherit lock annotations for Intel drivers David Marchand
2023-02-24 8:16 ` [PATCH 07/14] net/cxgbe: inherit lock annotations David Marchand
2023-02-24 8:16 ` [PATCH 08/14] net/fm10k: annotate mailbox lock David Marchand
2023-02-24 8:16 ` [PATCH 09/14] net/sfc: rework locking in proxy code David Marchand
2023-02-24 8:16 ` [PATCH 10/14] net/sfc: inherit lock annotations David Marchand
2023-02-24 8:16 ` [PATCH 11/14] net/virtio: annotate lock for guest announce David Marchand
2023-02-24 8:16 ` [PATCH 12/14] raw/ifpga: inherit lock annotations David Marchand
2023-02-24 8:16 ` [PATCH 13/14] vdpa/sfc: " David Marchand
2023-02-24 8:16 ` [PATCH 14/14] enable lock check David Marchand
2023-02-24 15:11 ` [PATCH v2 00/20] Enable lock annotations on most libraries and drivers David Marchand
2023-02-24 15:11 ` [PATCH v2 01/20] malloc: rework heap lock handling David Marchand
2023-02-24 15:11 ` [PATCH v2 02/20] mem: rework malloc heap init David Marchand
2023-02-24 15:11 ` [PATCH v2 03/20] mem: annotate shared memory config locks David Marchand
2023-02-24 15:11 ` [PATCH v2 04/20] hash: annotate cuckoo hash lock David Marchand
2023-02-24 15:11 ` [PATCH v2 05/20] graph: annotate graph lock David Marchand
2023-02-24 15:11 ` [PATCH v2 06/20] drivers: inherit lock annotations for Intel drivers David Marchand
2023-02-24 15:11 ` [PATCH v2 07/20] net/cxgbe: inherit lock annotations David Marchand
2023-02-24 15:11 ` [PATCH v2 08/20] net/fm10k: annotate mailbox lock David Marchand
2023-02-24 15:11 ` [PATCH v2 09/20] net/sfc: rework locking in proxy code David Marchand
2023-02-24 15:11 ` [PATCH v2 10/20] net/sfc: inherit lock annotations David Marchand
2023-02-24 15:11 ` [PATCH v2 11/20] net/virtio: annotate lock for guest announce David Marchand
2023-02-27 2:05 ` Xia, Chenbo
2023-02-27 8:24 ` David Marchand
2023-02-27 16:28 ` Maxime Coquelin
2023-02-28 2:45 ` Xia, Chenbo
2023-03-02 9:26 ` David Marchand
2023-03-02 9:28 ` Maxime Coquelin
2023-03-02 12:35 ` David Marchand
2023-02-24 15:11 ` [PATCH v2 12/20] raw/ifpga: inherit lock annotations David Marchand
2023-02-27 6:29 ` Xu, Rosen
2023-02-27 7:15 ` Huang, Wei
2023-02-24 15:11 ` [PATCH v2 13/20] vdpa/sfc: " David Marchand
2023-02-24 15:11 ` [PATCH v2 14/20] ipc: annotate pthread mutex David Marchand
2023-02-24 15:11 ` [PATCH v2 15/20] ethdev: " David Marchand
2023-02-24 15:11 ` [PATCH v2 16/20] net/failsafe: fix mutex locking David Marchand
2023-02-24 15:35 ` Gaëtan Rivet
2023-02-24 15:11 ` [PATCH v2 17/20] net/failsafe: annotate pthread mutex David Marchand
2023-02-24 15:11 ` [PATCH v2 18/20] net/hinic: " David Marchand
2023-02-24 15:11 ` [PATCH v2 19/20] eal/windows: disable lock check on alarm code David Marchand
2023-02-24 15:11 ` [PATCH v2 20/20] enable lock check David Marchand
2023-02-27 2:32 ` Xia, Chenbo
2023-02-24 15:58 ` [PATCH v2 00/20] Enable lock annotations on most libraries and drivers Gaëtan Rivet
2023-02-25 10:16 ` David Marchand
2023-02-27 16:12 ` Gaëtan Rivet
2023-03-02 8:52 ` David Marchand
2023-04-03 10:52 ` David Marchand
2023-04-03 15:03 ` Tyler Retzlaff
2023-04-03 15:36 ` Tyler Retzlaff
2023-04-04 7:45 ` David Marchand
2023-04-04 12:48 ` [PATCH v3 00/16] " David Marchand
2023-04-04 12:48 ` [PATCH v3 01/16] malloc: rework heap destroy David Marchand
2023-04-04 12:48 ` [PATCH v3 02/16] mem: rework malloc heap init David Marchand
2023-04-04 12:48 ` [PATCH v3 03/16] mem: annotate shared memory config locks David Marchand
2023-04-04 12:48 ` [PATCH v3 04/16] hash: annotate cuckoo hash lock David Marchand
2023-04-04 12:48 ` [PATCH v3 05/16] graph: annotate graph lock David Marchand
2023-04-04 12:48 ` [PATCH v3 06/16] drivers: inherit lock annotations for Intel drivers David Marchand
2023-04-04 12:48 ` [PATCH v3 07/16] net/cxgbe: inherit lock annotations David Marchand
2023-04-04 12:48 ` [PATCH v3 08/16] net/fm10k: annotate mailbox lock David Marchand
2023-04-04 12:48 ` [PATCH v3 09/16] net/sfc: rework locking in proxy code David Marchand
2023-04-04 12:48 ` [PATCH v3 10/16] net/sfc: inherit lock annotations David Marchand
2023-04-04 12:48 ` [PATCH v3 11/16] net/virtio: rework guest announce notify helper David Marchand
2023-04-04 12:48 ` [PATCH v3 12/16] raw/ifpga: inherit lock annotations David Marchand
2023-04-04 12:48 ` [PATCH v3 13/16] vdpa/sfc: " David Marchand
2023-04-04 12:48 ` [PATCH v3 14/16] net/failsafe: fix mutex locking David Marchand
2023-04-04 12:48 ` [PATCH v3 15/16] eal/windows: disable lock check on alarm code David Marchand
2023-04-04 16:08 ` Tyler Retzlaff
2023-04-04 21:02 ` Dmitry Kozlyuk
2023-04-04 12:48 ` [PATCH v3 16/16] enable lock check David Marchand
2023-04-11 3:21 ` Sachin Saxena (OSS)
2023-04-23 20:09 ` [PATCH v3 00/16] Enable lock annotations on most libraries and drivers Thomas Monjalon
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=20230224081642.2566619-4-david.marchand@redhat.com \
--to=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=thomas@monjalon.net \
/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).