From: Eric Wong <mwrap-perl@80x24.org>
To: mwrap-perl@80x24.org
Subject: [PATCH 4/4] workaround breakage from urcu v0.11.4
Date: Sat, 3 Sep 2022 11:18:28 +0000 [thread overview]
Message-ID: <20220903111828.2316808-5-mwrap-perl@80x24.org> (raw)
In-Reply-To: <20220903111828.2316808-1-mwrap-perl@80x24.org>
urcu v0.11.4+ introduced commit
7ca7fe9c03 (Make temporary variable in _rcu_dereference non-const, 2021-07-29)
which conflicts with our use of _LGPL_SOURCE. In retrospect,
CMM_LOAD_SHARED and CMM_STORE_SHARED seem sufficient for our use
of the `totals' cds_lfht pointer since the constructur should always
fire before any threads are running.
This is fixed in urcu v0.12.4 and v0.13.2 (released 2022-08-18)
but I suspect older versions will live on in enterprise/LTS
distros for a long while.
Link: https://lore.kernel.org/lttng-dev/20220809181927.GA3718@dcvr/
---
Mwrap.xs | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Mwrap.xs b/Mwrap.xs
index 9e9f571..9a85f36 100644
--- a/Mwrap.xs
+++ b/Mwrap.xs
@@ -298,7 +298,7 @@ static struct src_loc *totals_add_rcu(struct src_loc *k)
struct cds_lfht *t;
again:
- t = rcu_dereference(totals);
+ t = CMM_LOAD_SHARED(totals);
if (!t) goto out_unlock;
cds_lfht_lookup(t, k->hval, loc_eq, k, &iter);
cur = cds_lfht_iter_get_node(&iter);
@@ -341,7 +341,7 @@ update_stats_rcu_lock(size_t *generation, size_t size, uintptr_t caller)
static const size_t xlen = sizeof(caller);
char *dst;
const COP *cop;
- struct cds_lfht *t = rcu_dereference(totals);
+ struct cds_lfht *t = CMM_LOAD_SHARED(totals);
if (caa_unlikely(!t)) return 0;
if (locating++) goto out; /* do not recurse into another *alloc */
@@ -684,7 +684,7 @@ static void *dump_to_file(struct dump_arg *a)
++locating;
rcu_read_lock();
- t = rcu_dereference(totals);
+ t = CMM_LOAD_SHARED(totals);
if (!t)
goto out_unlock;
cds_lfht_for_each_entry(t, &iter, l, hnode) {
@@ -805,8 +805,8 @@ BOOT:
#ifndef PERL_IMPLICIT_CONTEXT
root_locating = &locating;
#endif
- totals = lfht_new();
- if (!totals)
+ CMM_STORE_SHARED(totals, lfht_new());
+ if (!CMM_LOAD_SHARED(totals))
fprintf(stderr, "failed to allocate totals table\n");
PROTOTYPES: ENABLE
@@ -851,7 +851,7 @@ PREINIT:
CODE:
++locating;
rcu_read_lock();
- t = rcu_dereference(totals);
+ t = CMM_LOAD_SHARED(totals);
if (t) {
bool err = false;
@@ -903,7 +903,7 @@ CODE:
uatomic_set(&total_bytes_dec, 0);
rcu_read_lock();
- t = rcu_dereference(totals);
+ t = CMM_LOAD_SHARED(totals);
cds_lfht_for_each_entry(t, &iter, l, hnode) {
uatomic_set(&l->total, 0);
uatomic_set(&l->allocations, 0);
@@ -949,7 +949,7 @@ CODE:
XSRETURN_UNDEF;
rcu_read_lock();
- t = rcu_dereference(totals);
+ t = CMM_LOAD_SHARED(totals);
if (!t) goto out_unlock;
cds_lfht_lookup(t, k->hval, loc_eq, k, &iter);
prev parent reply other threads:[~2022-09-03 11:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-03 11:18 [PATCH 0/4] various cleanups and fixes from the Ruby side Eric Wong
2022-09-03 11:18 ` [PATCH 1/4] favor _Thread_local under C11 Eric Wong
2022-09-03 11:18 ` [PATCH 2/4] cleanup some FreeBSD-related workarounds Eric Wong
2022-09-04 7:01 ` Eric Wong
2022-09-03 11:18 ` [PATCH 3/4] use macro to quiet uninitialized and unused variable warnings Eric Wong
2022-09-03 11:18 ` Eric Wong [this message]
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=20220903111828.2316808-5-mwrap-perl@80x24.org \
--to=mwrap-perl@80x24.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mwrap-perl.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).