From patchwork Thu Apr 29 15:01:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 12231447 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.0 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 079F4C433B4 for ; Thu, 29 Apr 2021 15:03:17 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 67F846143B for ; Thu, 29 Apr 2021 15:03:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67F846143B 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=desiato.20200630; 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=BqQSyPG2K40O5cbP2M4XRvbmNmUMM2bMZwJWEoE+Hew=; b=IDLuBjPipDAcOCJoXMUjO5D8X BauBuHDxbQULhrxdJeoA+Bdh3RoPdP7zOMHnZsKmQE/05sP5kWiIaugcjafgayA1I68LouASkS3W8 Et2AiUCfepGuqp0GEKtuT/twz4dHvFbxigp6kaue36hMgbBUyRInslXVyyPrfniSfjrgSJZWWFkuN ExKu3N/ozPqqbmL7Y8sDy32pjnnCtybg95TZWIy7b6szIvbjCoXu7K+U1bE5etX0Fp0BLnMjOndXG f1Ile4nD6wkt3TRrt3LoqXEXeG49i1rYFvZUIyBJLiWvqTt9k/8uN9x+R5dtLvYKF6pUNlywrvyVn ejZDhgCgg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lc8Am-005sar-SO; Thu, 29 Apr 2021 15:01:49 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lc8AO-005sWl-2H for linux-arm-kernel@desiato.infradead.org; Thu, 29 Apr 2021 15:01:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=XKzTGaXq5BgNlLNQghWJCOtAajFRMnz38uWkb37Btq0=; b=cr4FTtnpTBg71p0uY7+m4i2k0o Du4p+dvUtIc+PVF5oHvmRnRwaQS+fouUY8K+6824i3g3F/3eB7OABwUSA0wE7CmiNCUA2g5+i9jmJ jw9rCPbA1/M5VroMNJKr3joVVrQ9LHEiWBBamebkrh2Z2DCPDLz9/fX7tj/048gBKLYegBUQIVIKk uguQk7kwhUwPblmu/C1DURUR2NeFCia8NqAPC5/fEoImgXMEbWDG1tTaICyRu7fjsUv1vbwbC8nPF Lf2SnVrLjufnFO6iWyRTVdFHGl67kvGHkgALTXTUQZB1CjTnSx/V+D4s+rufGCozOKnGR1B0QdxaU VUBnYwOg==; Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lc8AL-000i47-Gp for linux-arm-kernel@lists.infradead.org; Thu, 29 Apr 2021 15:01:22 +0000 Received: by mail-pf1-x42c.google.com with SMTP id a12so3960125pfc.7 for ; Thu, 29 Apr 2021 08:01:20 -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=XKzTGaXq5BgNlLNQghWJCOtAajFRMnz38uWkb37Btq0=; b=vdjfp6T9ELO/U/TE5+KkR/ljxb5dDEpn3eDZXxEznvnTdj+ZlDuigDbJwQjcvfNe2f 1RcVpsKvKgb/ZD7swSBbi63tgsGSduD86CHVXwlIuLk/ujREs7DH0bElJskIzdbDFvhW mYUOe3rnGk8q9s477H8WBr/1YeX2hfIOawdSqcwQEfKVhmj+kC8adnIDT4lYJoknNNhP QCLIRTG94fjMOCZF4jRqd5AmS+SKMXDwY83iJp7jm8KQAH0WGSnot94JmMopYJA428aS gut3YCjn5qIm5pyTaXBrEXnhZ4QOx10MH/XmrW3l9W2XmLalk+ihm3ZQxs7DauIo53e9 4QUQ== 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=XKzTGaXq5BgNlLNQghWJCOtAajFRMnz38uWkb37Btq0=; b=B3Ft0lfurNMwQecR6p+7LnszSHWDDr/c6iMOLeKNdTsS3/7VVZnZ2zGuUL5gFgUnEq UowqG4UbnYA0e4gSX2+XsyxY0MvedX8NniDgnhoM6AclOagpW0aJkMH2JyFG0x23UBfo VrKz/HeJiHYlaEtjYyaVyNR1Cl84qphedmWsLfbLloTjvtAOL2gQ2LhWGGtjvc9S7RXH Sn80BulHgFmnqL4L+5Od/k2k9Y6uOQpomjZVyu1UFPSayBYVP9MM7SQE1oOPKkjN8b1x JwEK7d9U/Lmo+qkJGame2d6z170uXTAbhTTaNgfzsfPU620TvL3dfyL7U4HhTjT0HyXc Z+EQ== X-Gm-Message-State: AOAM532Xt/SsKT3uRFEwieBecZUJ4yFxlGaDId2OPAVHymTCn61MBLsj aj2H4R59FUKLOLI13v02TJGNgg== X-Google-Smtp-Source: ABdhPJxlUPcxM98q94BIRDqtl6qiB6XI4IIX8WgyoEZUYoolY68FW0vRSchkJ6LPoCXuhU9Ncw4q7Q== X-Received: by 2002:a62:55c6:0:b029:21c:4dfc:d6e2 with SMTP id j189-20020a6255c60000b029021c4dfcd6e2mr127505pfb.60.1619708479686; Thu, 29 Apr 2021 08:01:19 -0700 (PDT) Received: from localhost ([204.124.180.30]) by smtp.gmail.com with ESMTPSA id f135sm2726924pfa.102.2021.04.29.08.01.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Apr 2021 08:01:19 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , James Clark , John Garry , Will Deacon , Mathieu Poirier , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Al Grant Cc: Leo Yan Subject: [PATCH v1 3/3] perf arm-spe: Enable timestamp for per-cpu mode Date: Thu, 29 Apr 2021 23:01:00 +0800 Message-Id: <20210429150100.282180-4-leo.yan@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210429150100.282180-1-leo.yan@linaro.org> References: <20210429150100.282180-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-20210429_080121_564903_3C178FB7 X-CRM114-Status: GOOD ( 18.08 ) 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 For per-cpu mmap, it should enable timestamp tracing for Arm SPE; this is helpful for samples correlation. To automatically enable the timestamp, a helper arm_spe_set_timestamp() is introduced for setting "ts_enable" format bit. Signed-off-by: Leo Yan --- tools/perf/arch/arm64/util/arm-spe.c | 33 ++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c index f6eec0900604..dae115dd458e 100644 --- a/tools/perf/arch/arm64/util/arm-spe.c +++ b/tools/perf/arch/arm64/util/arm-spe.c @@ -14,6 +14,7 @@ #include "../../../util/cpumap.h" #include "../../../util/event.h" #include "../../../util/evsel.h" +#include "../../../util/evsel_config.h" #include "../../../util/evlist.h" #include "../../../util/session.h" #include // page_size @@ -32,6 +33,29 @@ struct arm_spe_recording { struct evlist *evlist; }; +static void arm_spe_set_timestamp(struct auxtrace_record *itr, + struct evsel *evsel) +{ + struct arm_spe_recording *ptr; + struct perf_pmu *arm_spe_pmu; + struct evsel_config_term *term = evsel__get_config_term(evsel, CFG_CHG); + u64 user_bits = 0, bit; + + ptr = container_of(itr, struct arm_spe_recording, itr); + arm_spe_pmu = ptr->arm_spe_pmu; + + if (term) + user_bits = term->val.cfg_chg; + + bit = perf_pmu__format_bits(&arm_spe_pmu->format, "ts_enable"); + + /* Skip if user has set it */ + if (bit & user_bits) + return; + + evsel->core.attr.config |= bit; +} + static size_t arm_spe_info_priv_size(struct auxtrace_record *itr __maybe_unused, struct evlist *evlist __maybe_unused) @@ -120,9 +144,14 @@ static int arm_spe_recording_options(struct auxtrace_record *itr, */ evlist__to_front(evlist, arm_spe_evsel); - /* In the case of per-cpu mmaps, sample CPU for AUX event. */ - if (!perf_cpu_map__empty(cpus)) + /* + * In the case of per-cpu mmaps, sample CPU for AUX event; + * also enable the timestamp tracing for samples correlation. + */ + if (!perf_cpu_map__empty(cpus)) { evsel__set_sample_bit(arm_spe_evsel, CPU); + arm_spe_set_timestamp(itr, arm_spe_evsel); + } /* Add dummy event to keep tracking */ if (opts->full_auxtrace) {