From patchwork Sun Jul 11 10:41:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 12369097 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.5 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,USER_AGENT_GIT autolearn=ham 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 AA875C07E96 for ; Sun, 11 Jul 2021 10:47:48 +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 7069561159 for ; Sun, 11 Jul 2021 10:47:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7069561159 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=+PJ0ZLFS9dIUD63Oj+L7GNSd0jqNFo91uFXWX2p98Fg=; b=a++UKhjg8sbmzW OOuLv3SI1FuZjnnf4IWUJZSsjWzJGtHBejcoMxXHCDUQ2vEqppo+pNFrSfOUtQJvSBYyFwXNO0cp8 FNXlQFXSAWx0TNYJZeS1SHKaVih4fHPjaqXOWUmupVJUNmmaOwpnWXf/8jaOCKxFCYe3e6aYOJFfC GeMjn1cgHbgJkY6Z+icsXsW2jf3XT47bG6NO811JPd3KgBFV+pTEZlMIlWrxlM5Gso9r46RkoPkS/ +cgwgKpFbKCHoiE2eEgdI89OY1iHtkgyy0gm+WjgwgOtvvUg+AdLKLroLTSv3MHmoY3t5VpxcUIkN FK/zWU1jr48KnAQP0qvQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2WyQ-004u1H-Qj; Sun, 11 Jul 2021 10:46:11 +0000 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2Wu1-004sI6-GB for linux-arm-kernel@lists.infradead.org; Sun, 11 Jul 2021 10:41:39 +0000 Received: by mail-pf1-x42f.google.com with SMTP id 21so13364619pfp.3 for ; Sun, 11 Jul 2021 03:41:37 -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=kkEOllshRjQL/AsgC277Y/O2zCWNhcoUJsl5iahG6Xw=; b=r3t5DXxk87nwQDHus4OE2UYk3L5lCMZPuk8LKYFoc2efl9wNS9ahDC8vcfVXCH6fVj 6V+uMPygEXUnDeQIEvQEMj7fhKp7NlQXmZgMoh9X6ey1cmg7qJ5++ls9gWmrPjbx8C2b u2HG3UdYr+xEPTOzSxdnMs+/TbdQPbonvkfHLbsdeAmFNZND59AZiAzS1U0H391JBMsE YDiP6hK5my9hr1FDYdY4ITiDcKPzHd6ehrfma3b0WEgKveWAopvImUn7C6m45mhiBn0D nxt8Xm1idtUpe96NCmnHMlvFUfOX+RoveJfFZ3DxaOD0RRh/s2uutrWWDUWkuZAgpAnE I+Xg== 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=kkEOllshRjQL/AsgC277Y/O2zCWNhcoUJsl5iahG6Xw=; b=dCtWjdA7ou2h/RNG8ihQ9EUXrJYNI13Kex/1Tq9GQ9EHHDS+kM3WvNFwyEUlnyB/yX wBAi6lxHOUWQiK7rmJcAs7hHO2UT1pkAKAVPZ25t61fzb1MSnU9RyRoBuqtghFFtVAvB cU72S7o05UrOeH4QZjocvxYcjnkIMU9ROOV7oLLngry5xL+cOQhEWGOzNSFW+gHfmut1 LA9sxpZ7YRbHpbdVAcB5xv/P6JCr8WeJZWxyLIjD2rJJu0kPFnwT+oXHmI+hD23h3eD6 Nf0gEywO0MBNvMaXn6b1QYY4tEnVjeQ9nNCEZxkktNHP7/OQ5g2VJbxH1SSk37jYWVj6 pV7w== X-Gm-Message-State: AOAM530nTns+s8LpxvPR3OAVd6RjD8iL8hIYtAuDMQ2NZErVPzIiO51I d5ByNH+bubgpdNxALz0ql6D5fA== X-Google-Smtp-Source: ABdhPJyrTBXR/XJLZhNLxu4wpVEIzMB1TraRsWe2fJghWktdvMaDePg5OxUllSODwoErCx4C+msgGw== X-Received: by 2002:a63:170b:: with SMTP id x11mr20913040pgl.253.1626000096511; Sun, 11 Jul 2021 03:41:36 -0700 (PDT) Received: from localhost ([103.127.241.250]) by smtp.gmail.com with ESMTPSA id g9sm8281997pfr.133.2021.07.11.03.41.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jul 2021 03:41:36 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Thomas Gleixner , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Mathieu Poirier , Suzuki K Poulose , Mike Leach , 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 v4 07/11] perf auxtrace: Remove auxtrace_mmap__read_snapshot_head() Date: Sun, 11 Jul 2021 18:41:01 +0800 Message-Id: <20210711104105.505728-8-leo.yan@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210711104105.505728-1-leo.yan@linaro.org> References: <20210711104105.505728-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-20210711_034137_603346_668D284F X-CRM114-Status: GOOD ( 15.69 ) 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 Since the function auxtrace_mmap__read_snapshot_head() is exactly same with auxtrace_mmap__read_head(), whether the session is in snapshot mode or not, it's unified to use function auxtrace_mmap__read_head() for reading AUX buffer head. And the function auxtrace_mmap__read_snapshot_head() is unused so this patch removes it. Signed-off-by: Leo Yan --- tools/perf/util/auxtrace.c | 5 ++--- tools/perf/util/auxtrace.h | 10 ---------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index cb19669d2a5b..7958e17229ea 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -1686,13 +1686,12 @@ static int __auxtrace_mmap__read(struct mmap *map, union perf_event ev; void *data1, *data2; + head = auxtrace_mmap__read_head(mm); + if (snapshot) { - head = auxtrace_mmap__read_snapshot_head(mm); if (auxtrace_record__find_snapshot(itr, mm->idx, mm, data, &head, &old)) return -1; - } else { - head = auxtrace_mmap__read_head(mm); } if (old == head) diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h index 4f9176368134..d68a5e80b217 100644 --- a/tools/perf/util/auxtrace.h +++ b/tools/perf/util/auxtrace.h @@ -440,16 +440,6 @@ struct auxtrace_cache; #ifdef HAVE_AUXTRACE_SUPPORT -static inline u64 auxtrace_mmap__read_snapshot_head(struct auxtrace_mmap *mm) -{ - struct perf_event_mmap_page *pc = mm->userpg; - u64 head = READ_ONCE(pc->aux_head); - - /* Ensure all reads are done after we read the head */ - smp_rmb(); - return head; -} - static inline u64 auxtrace_mmap__read_head(struct auxtrace_mmap *mm) { struct perf_event_mmap_page *pc = mm->userpg;