From patchwork Wed Jun 2 10:30:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 12293701 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1BECC47083 for ; Wed, 2 Jun 2021 10:34:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6412461090 for ; Wed, 2 Jun 2021 10:34:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6412461090 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1/k1NBEyHv7iCMwE5o+y0PyxAy4AyPqv7MRDfqrNqFg=; b=n0eeIwFOPaCwye xXubi5LrmpiSwdrKj2gyTbehevsqAsvsvW+/5/pw+KjAZayItVd/DKtSrJhWGyE374vlFChG9QE2U zQQ8yt5eeKY0tFxH4PeoPCR7MVkEo13M5KDAO4mCUUz8N0fgUVqPAcoYX8Ee3P43i1Xc1cyDz7/ZC mdVUtgK7nWQhqNN6Nwd9I94PEFz4m7A2rwjelsXTvpFtq4Zj61cb8Tq1wnNL0N9KDxsinPv5Z8v92 3ioISCizp50e8sUmJWadejNx3IEG3TyMIxRavJOirgUwyPpeocnAhBsvlMhziekyMycyB1JVR9vws npY+OyOeNwr4TF+w1y6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1loOAf-003Lob-3e; Wed, 02 Jun 2021 10:32:21 +0000 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1loO8x-003L3t-Oe for linux-arm-kernel@lists.infradead.org; Wed, 02 Jun 2021 10:30:40 +0000 Received: by mail-pj1-x102c.google.com with SMTP id m13-20020a17090b068db02901656cc93a75so3195646pjz.3 for ; Wed, 02 Jun 2021 03:30:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CUGVcjWHAFZiSQpFiWcs46u9/hPtHfCUkPW2QO50s/E=; b=qWBMODYkIE7TtEUAD2cnjvNDYoN9T6k+wDhbdTbYweTRWm0/BluYjDGdJ3RtKnWRxA ZoIDaE4fheb8TK7/Z36LlFC/X8bcaNNj9jP1FBjpnknsKIPQXtsDAdCc0wPwyxspEkXe 9kt9HLXb4abGreF5MiG6kU1qeYe2tPZpBKdL4f3GN2TTX41IDdyKu3dQhXkMeyIKQOSj cxlzxyp5JwtElocmliTV6usnPMu4s4vInem5hafNKawKcAtgMIHjzHdUNA24lNNDIU4K big+EhLIxSoP5BjeOw7SkD+8vOOnIBymiw8ZyqSRSnYj2w4TZVz0Wp+HRxRiSKu8t369 WmpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CUGVcjWHAFZiSQpFiWcs46u9/hPtHfCUkPW2QO50s/E=; b=qzqIjBwRRb7UVKtjaIW+6EKZwC39WmNF0nqKc/lHnicKQIxpf04ufA+FXdLQCEOBxz 8ryT1NP/PEeQmVNLWN8LHsmT7yOREJKLIsuwx7NxLY7qezbMYfBFu1hdC/boru/AVdsa bymMSBbcSDBawaukSckLxaqvgUoDrL+3l4Ct7Wkcw0YsOD8KXqhF+08g/0JiDl8ebkeA Z6EXWlVCCganj+VO2vbmO3EI8JLfdYdtzLQE5zqzQJn7wzBMUPelED2ww3lTjfDkJ8EW ym2Cb1y/5PpzUm2rAm0or9zKXEmYSeyvngWRw3occTrIumq11GNkBrpNSqVSxLDpKd1p 9NJg== X-Gm-Message-State: AOAM5309Xr6XuFNiKCScawU4KJFhQ1bbR/HvkSqvQMNYhn0S/d5Rd2dd jHapI/A5S1bnCbI97gz38/D6Og== X-Google-Smtp-Source: ABdhPJxmZMOSfAqVmnZSxw6MnC3/8NbTY5FMoti3qh2swJ0OWGwlfyD47F9PecdyLuj4O2+EPLfQNQ== X-Received: by 2002:a17:902:7244:b029:f5:2ffd:37f9 with SMTP id c4-20020a1709027244b02900f52ffd37f9mr30314548pll.26.1622629834563; Wed, 02 Jun 2021 03:30:34 -0700 (PDT) Received: from localhost (ec2-18-167-84-74.ap-east-1.compute.amazonaws.com. [18.167.84.74]) by smtp.gmail.com with ESMTPSA id j16sm2094111pgi.73.2021.06.02.03.30.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 03:30:34 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Thomas Gleixner , x86@kernel.org, "H. Peter Anvin" , Mathieu Poirier , Suzuki K Poulose , Mike Leach , Adrian Hunter , Andi Kleen , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v2 6/8] perf auxtrace: Drop legacy __sync functions Date: Wed, 2 Jun 2021 18:30:05 +0800 Message-Id: <20210602103007.184993-7-leo.yan@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210602103007.184993-1-leo.yan@linaro.org> References: <20210602103007.184993-1-leo.yan@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210602_033035_838908_50043D8E X-CRM114-Status: GOOD ( 18.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The main purpose for using __sync built-in functions is to support compat mode for 32-bit perf with 64-bit kernel. But using these built-in functions might cause couple potential issues. Firstly, __sync functions originally support Intel Itanium processoer [1] but it cannot promise to support all 32-bit archs. Now these functions have become the legacy functions. As Peter also pointed out the logic issue in the function auxtrace_mmap__write_tail(), it does a cmpxchg with 0 values to load old_tail, and then executes a further cmpxchg with old_tail to write the new tail. If consider the aux_tail might be assigned to '0' in the middle of loops, this can introduce mess for AUX buffer if the kernel fetches the temporary value '0'. Considering __sync functions cannot really fix the 64-bit value atomicity on 32-bit archs, thus this patch drops __sync functions. Credits to Peter for detailed analysis. [1] https://gcc.gnu.org/onlinedocs/gcc/_005f_005fsync-Builtins.html#g_t_005f_005fsync-Builtins Suggested-by: Peter Zijlstra Signed-off-by: Leo Yan --- tools/perf/util/auxtrace.h | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h index 42b7ef811bde..e625bc76cdde 100644 --- a/tools/perf/util/auxtrace.h +++ b/tools/perf/util/auxtrace.h @@ -432,12 +432,6 @@ struct auxtrace_cache; #ifdef HAVE_AUXTRACE_SUPPORT -/* - * In snapshot mode the mmapped page is read-only which makes using - * __sync_val_compare_and_swap() problematic. However, snapshot mode expects - * the buffer is not updated while the snapshot is made (e.g. Intel PT disables - * the event) so there is not a race anyway. - */ static inline u64 auxtrace_mmap__read_snapshot_head(struct auxtrace_mmap *mm) { struct perf_event_mmap_page *pc = mm->userpg; @@ -451,11 +445,7 @@ static inline u64 auxtrace_mmap__read_snapshot_head(struct auxtrace_mmap *mm) static inline u64 auxtrace_mmap__read_head(struct auxtrace_mmap *mm) { struct perf_event_mmap_page *pc = mm->userpg; -#if BITS_PER_LONG == 64 || !defined(HAVE_SYNC_COMPARE_AND_SWAP_SUPPORT) u64 head = READ_ONCE(pc->aux_head); -#else - u64 head = __sync_val_compare_and_swap(&pc->aux_head, 0, 0); -#endif /* Ensure all reads are done after we read the head */ smp_rmb(); @@ -465,19 +455,10 @@ static inline u64 auxtrace_mmap__read_head(struct auxtrace_mmap *mm) static inline void auxtrace_mmap__write_tail(struct auxtrace_mmap *mm, u64 tail) { struct perf_event_mmap_page *pc = mm->userpg; -#if BITS_PER_LONG != 64 && defined(HAVE_SYNC_COMPARE_AND_SWAP_SUPPORT) - u64 old_tail; -#endif /* Ensure all reads are done before we write the tail out */ smp_mb(); -#if BITS_PER_LONG == 64 || !defined(HAVE_SYNC_COMPARE_AND_SWAP_SUPPORT) pc->aux_tail = tail; -#else - do { - old_tail = __sync_val_compare_and_swap(&pc->aux_tail, 0, 0); - } while (!__sync_bool_compare_and_swap(&pc->aux_tail, old_tail, tail)); -#endif } int auxtrace_mmap__mmap(struct auxtrace_mmap *mm,