From: "H.J. Lu" <hjl.tools@gmail.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: libc-alpha@sourceware.org, Wilco Dijkstra <Wilco.Dijkstra@arm.com>
Subject: Re: [PATCH v2] elf: Use C11 atomics on _dl_mcount
Date: Mon, 5 Sep 2022 12:50:53 -0700 [thread overview]
Message-ID: <CAMe9rOrkUE+XdwmUqkeNedxu3evwysF1BE_dhSNKM-6TGzFk2w@mail.gmail.com> (raw)
In-Reply-To: <20220905191411.1930373-1-adhemerval.zanella@linaro.org>
On Mon, Sep 5, 2022 at 12:14 PM Adhemerval Zanella via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
> All atomic operation are counters, so relaxed MO should be suffice.
>
> Checked on x86_64-linux-gnu.
> ---
> elf/dl-profile.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/elf/dl-profile.c b/elf/dl-profile.c
> index ec57e3a965..67a356bf66 100644
> --- a/elf/dl-profile.c
> +++ b/elf/dl-profile.c
> @@ -548,7 +548,7 @@ _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc)
> size_t newfromidx;
> to_index = (data[narcs].self_pc
> / (HASHFRACTION * sizeof (*tos)));
> - newfromidx = catomic_exchange_and_add (&fromidx, 1) + 1;
> + newfromidx = atomic_fetch_add_relaxed (&fromidx, 1) + 1;
> froms[newfromidx].here = &data[narcs];
> froms[newfromidx].link = tos[to_index];
> tos[to_index] = newfromidx;
> @@ -558,14 +558,14 @@ _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc)
> /* If we still have no entry stop searching and insert. */
> if (*topcindex == 0)
> {
> - unsigned int newarc = catomic_exchange_and_add (narcsp, 1);
> + unsigned int newarc = atomic_fetch_add_relaxed (narcsp, 1) + 1;
Shouldn't it be
unsigned int newarc = atomic_fetch_add_relaxed (narcsp, 1);
>
> /* In rare cases it could happen that all entries in FROMS are
> occupied. So we cannot count this anymore. */
> if (newarc >= fromlimit)
> goto done;
>
> - *topcindex = catomic_exchange_and_add (&fromidx, 1) + 1;
> + *topcindex = atomic_fetch_add_acquire (&fromidx, 1) + 1;
> fromp = &froms[*topcindex];
>
> fromp->here = &data[newarc];
> @@ -573,7 +573,7 @@ _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc)
> data[newarc].self_pc = selfpc;
> data[newarc].count = 0;
> fromp->link = 0;
> - catomic_increment (&narcs);
> + atomic_fetch_add_relaxed (&narcs, 1);
>
> break;
> }
> @@ -586,7 +586,7 @@ _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc)
> }
>
> /* Increment the counter. */
> - catomic_increment (&fromp->here->count);
> + atomic_fetch_add_relaxed (&fromp->here->count, 1);
>
> done:
> ;
> --
> 2.34.1
>
--
H.J.
next prev parent reply other threads:[~2022-09-05 19:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-05 19:14 Adhemerval Zanella
2022-09-05 19:50 ` H.J. Lu [this message]
2022-09-06 10:22 ` Wilco Dijkstra
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=CAMe9rOrkUE+XdwmUqkeNedxu3evwysF1BE_dhSNKM-6TGzFk2w@mail.gmail.com \
--to=hjl.tools@gmail.com \
--cc=Wilco.Dijkstra@arm.com \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.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 read-only IMAP folder(s) and NNTP newsgroup(s).