From patchwork Wed May 19 07:19:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 12266467 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 228C4C433B4 for ; Wed, 19 May 2021 07:22:16 +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 9E81C60725 for ; Wed, 19 May 2021 07:22:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E81C60725 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=YWZJTg/cdkDxtdM/B79r3NWT8x1BFgBeBGjs9c0lvjk=; b=U7YPqpk0CD453zdsQP2yuw86/ XWzjoDEZi6NlVmPagAsg+kvSKbd7LlLXyDf0rcXvx9CcxtDrCY0QKcolE3XwNPrrbFYM2uIVd6MfU 8fA5IWtUbGTHt0zegP4lu77GDSKiWROgT/vzqDpZDJKKHSqfH5IoB237q8LhRssPqQkAjTL748sjA DtD8hdO60fRQeMqCWRrQ44ymYNL9ruOjy4rq/ovNLNiFIouTrt4f15SR4G5jZ78OtAIfsv1xItKM0 CWitdklgxN6HnF6PoaL2QukRhrKKU4x6UrhxLMZ/jcRpdcA1kjdOwhyelgLfnI9MoLz8/3uZk84+7 yLT6HZZgg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1ljGUs-0038bK-Ii; Wed, 19 May 2021 07:20:02 +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 1ljGUk-0038Zo-2E for linux-arm-kernel@desiato.infradead.org; Wed, 19 May 2021 07:19:54 +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=ikMzLhYHgW5Z/4bQ0Gq8qCGP1swc3iELZAURTBpDjSc=; b=ePuRw9cpcIwmrffZudut0tgZqI dIKZ/3E8nEhlkdkIL3vldKXjvXHMg0fOlCEeqz8DtzXpN/+tPxyyiqggfM2FurXCGdNkenFdnZmGu pXy9nrjaY9XOr3UTAnE6Qr2mFXF0UhfZy4otFin8XNSeAbQEL2A5NB4geGJ8C8M/ZSvjkukCla4+C trazGKjeuYKOXBtxf7UNi7cKiRMdwLYyJUNZOWGaKFL5S7HymqCpXdTC6oB5ymSNe4Ns/oJBEy5/f xa/IHejENOQgTnzRAkMz/gA2yZLVIUjs3OWDm3nBJl49vNI8Oqd/9nxR5rSj2sbIaZyU8FhvDixIv 0Y5qvLXA==; Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljGUh-00FDHm-Em for linux-arm-kernel@lists.infradead.org; Wed, 19 May 2021 07:19:52 +0000 Received: by mail-pg1-x52e.google.com with SMTP id i5so8852627pgm.0 for ; Wed, 19 May 2021 00:19:50 -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=ikMzLhYHgW5Z/4bQ0Gq8qCGP1swc3iELZAURTBpDjSc=; b=TMGySE+iYwVL2D64hw50nAoVv8hZz6tKc0YxapGtDEd4WjYHVnU/ooPRoyMu/Zf3p2 yhfKY1TD9QxTWAmUS9jIrAr1BITawhRV+F1/3wrBEEt51S2LlF31rAWg3Ks+EpRlVmwd NjgkaEdxAJ93s0zy94cCRPqShs1GZnyfI4/ZNaFtd/B66V3yKRRiJLviWkmpL44altk8 8ybkltQrLCgFHQKt3w7yK3RPdaMWsOxfY6JRFzDY6PVV95Qvhm8Xd7OgWDknNjZBiDjq YMgCtFSGIUN3NZ0voD87H+1ttKUZYBbgRZA+obcKTsAXGMTn67oIS8Crc4x3p4xJzFu5 EtNA== 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=ikMzLhYHgW5Z/4bQ0Gq8qCGP1swc3iELZAURTBpDjSc=; b=HfheyrT/YsuitXiV4lj7Ij5UU/RpP/kO/Ful6n1zj067y9EnRFt+W3z1k95Uypv3Dp TYIOoleCQ+p8vxMQqRhkwLO435Aau8huhe9qF9781eJjv8GS42+7khPRm4WJYhU/FmSK kge3N9LrGVd7r6mM9IS0oB5AxxsE6OGxgfnAl3pQJs0FWmOFNaSva9pXNYoSn0YTI8Y2 wDqOGb1W/5VsP16uATMl7q5RUX79QmYILz5BNzlHSlaHmmO/3LWwTjZEcQn7EnJoY1uz /DXRPmKfYxpV4l5+WuArZr7iK0zFOfdaXG5qkn4bA0CDi16Tb5FO7M+o8hSh/Bj/6hPT HKmw== X-Gm-Message-State: AOAM5331o70btjbkQPojxAL34cODfOUDYHjyOjxQxlw+mUPMhW0rpH5K MJTjxpfgUaiL+viwrww8qbXX8Q== X-Google-Smtp-Source: ABdhPJznM7CZjOHFdLYcTo+2TQoISjuHu+CGZSXrSlocSRHWq4Znr0MOsQz7Bm5d23RgRcSkZG2pew== X-Received: by 2002:a63:205b:: with SMTP id r27mr9573031pgm.95.1621408789750; Wed, 19 May 2021 00:19:49 -0700 (PDT) Received: from localhost ([103.207.71.35]) by smtp.gmail.com with ESMTPSA id g4sm14533696pgu.46.2021.05.19.00.19.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 00:19:49 -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 , Dave Martin , Al Grant , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan Subject: [PATCH v5 1/5] perf arm-spe: Save clock parameters from TIME_CONV event Date: Wed, 19 May 2021 15:19:35 +0800 Message-Id: <20210519071939.1598923-2-leo.yan@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210519071939.1598923-1-leo.yan@linaro.org> References: <20210519071939.1598923-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-20210519_001951_514049_94A1FEDB X-CRM114-Status: GOOD ( 18.46 ) 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 During the recording phase, "perf record" tool synthesizes event PERF_RECORD_TIME_CONV for the hardware clock parameters and saves the event into the data file. Afterwards, when processing the data file, the event TIME_CONV will be processed at the very early time and is stored into session context. This patch extracts these parameters from the session context and saves into the structure "spe->tc" with the type perf_tsc_conversion, so that the parameters are ready for conversion between clock counter and time stamp. Signed-off-by: Leo Yan --- tools/perf/util/arm-spe.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c index 2539d4baec44..d2ae5a5c13ee 100644 --- a/tools/perf/util/arm-spe.c +++ b/tools/perf/util/arm-spe.c @@ -26,6 +26,7 @@ #include "symbol.h" #include "thread.h" #include "thread-stack.h" +#include "tsc.h" #include "tool.h" #include "util/synthetic-events.h" @@ -45,6 +46,8 @@ struct arm_spe { struct machine *machine; u32 pmu_type; + struct perf_tsc_conversion tc; + u8 timeless_decoding; u8 data_queued; @@ -1006,6 +1009,7 @@ int arm_spe_process_auxtrace_info(union perf_event *event, { struct perf_record_auxtrace_info *auxtrace_info = &event->auxtrace_info; size_t min_sz = sizeof(u64) * ARM_SPE_AUXTRACE_PRIV_MAX; + struct perf_record_time_conv *tc = &session->time_conv; struct arm_spe *spe; int err; @@ -1027,6 +1031,28 @@ int arm_spe_process_auxtrace_info(union perf_event *event, spe->pmu_type = auxtrace_info->priv[ARM_SPE_PMU_TYPE]; spe->timeless_decoding = arm_spe__is_timeless_decoding(spe); + + /* + * The synthesized event PERF_RECORD_TIME_CONV has been handled ahead + * and the parameters for hardware clock are stored in the session + * context. Passes these parameters to the struct perf_tsc_conversion + * in "spe->tc", which is used for later conversion between clock + * counter and timestamp. + * + * For backward compatibility, copies the fields starting from + * "time_cycles" only if they are contained in the event. + */ + spe->tc.time_shift = tc->time_shift; + spe->tc.time_mult = tc->time_mult; + spe->tc.time_zero = tc->time_zero; + + if (event_contains(*tc, time_cycles)) { + spe->tc.time_cycles = tc->time_cycles; + spe->tc.time_mask = tc->time_mask; + spe->tc.cap_user_time_zero = tc->cap_user_time_zero; + spe->tc.cap_user_time_short = tc->cap_user_time_short; + } + spe->auxtrace.process_event = arm_spe_process_event; spe->auxtrace.process_auxtrace_event = arm_spe_process_auxtrace_event; spe->auxtrace.flush_events = arm_spe_flush;