From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2f.google.com (mail-oa1-x2f.google.com [IPv6:2001:4860:4864:20::2f]) by sourceware.org (Postfix) with ESMTPS id 9DD3B3838D57 for ; Mon, 5 Sep 2022 19:14:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9DD3B3838D57 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x2f.google.com with SMTP id 586e51a60fabf-1272fc7f51aso9997057fac.12 for ; Mon, 05 Sep 2022 12:14:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date; bh=Mp7Jf0tsGcr7XjcPWa/vZAs/2/FVMlhdZ/vYql7Z1yY=; b=vDIRZG8aKu1xyQDyzpxCwMEd0NcysKhGLcf+4EcLRhN1Q+rU3hMa/MNE6o5znUWyEn sGay6zoSx4Oj4hBT0X+iWIsLN2L5exJvSxMQY6zrzeITwY6gwdAHZQFEB3slIKin7ID2 HBwJ6kbTu1PaWJRGciruow/wQ1Ww5n5ROwa9HCYiHidAaZ9cq4j/Uvtgz7dUEEXTgO1F BLOGjN1jtRST+K1RWSzUL06rJ7Nn8+zH2t0V5wMsnyt6roQjBL3fFUWHslerFm/QaBkp GQ6samCxbPQiDfnXG/Sn+rcVEgmxxnAqQ6sWR1svWq5aUBlAqmOABRc2bLfqRLFvdunE 5vSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=Mp7Jf0tsGcr7XjcPWa/vZAs/2/FVMlhdZ/vYql7Z1yY=; b=Y3Q/auXLIuFCNmMH4qCsO+xB3lADodJd3n6e3wU9U3FxjenkMzVWnNNbWC/K2UAHnR HaFond+5jZZBVNBgKsVPJE7lPsMcUWRXqRGEuB8WWO8E+Wu1n0eY6Q99UV3VX8PgXbJB rW1rQV8tTejmxDHFa0hvkfQ+5mlqyk/hug11BdOilkzB8OSmeCH/PZW5jdoi/iksnZI2 90z830XuttgsEVdiP990ueIZbu13dkqZNyhRDir3aEsGjy7nlEJYjxC4nTEbEGnRCTQR 0lfFa6+BXFNjOKqLpImXleVFwqyQc/048zfwJmMHhqyHMCRu699WhFeljoZ0MC54xrKc hwog== X-Gm-Message-State: ACgBeo0H9KsKwYOprBmYKXY3rrtskjDSoORlX3FRednHfsmkLzuWda0l wQi1ajeXJQOyXhpp0cc6YCrPqgxfrXIqhg== X-Google-Smtp-Source: AA6agR5OMsS9Yq80NK8tipspA0d+2Upzy2Njmm23LtCCybDJgbSAVFm28p2znkftXEPAwwqjs+DEJw== X-Received: by 2002:a05:6808:df1:b0:344:5db2:e25a with SMTP id g49-20020a0568080df100b003445db2e25amr8613468oic.1.1662405255816; Mon, 05 Sep 2022 12:14:15 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:dfed:bb5a:e5ae:49e6:4d1b]) by smtp.gmail.com with ESMTPSA id h6-20020a9d6406000000b00636f7059b27sm4966324otl.5.2022.09.05.12.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 12:14:15 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org, Wilco Dijkstra Subject: [PATCH v2] elf: Use C11 atomics on _dl_mcount Date: Mon, 5 Sep 2022 16:14:11 -0300 Message-Id: <20220905191411.1930373-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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; /* 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