Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp714538pxf; Wed, 10 Mar 2021 16:10:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJx6T5GEi9V3nkICj040BDSQGU6OLc35mIh3PeETD16+4OfZw8LEjvDXaCwTq94p2sz9Q27m X-Received: by 2002:a17:906:4d96:: with SMTP id s22mr422829eju.189.1615421429132; Wed, 10 Mar 2021 16:10:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615421429; cv=none; d=google.com; s=arc-20160816; b=ZAOVIYFAOE1uSgjw6Bmni2ipcLCrM+rQq2FrIvqJrM6YEYU7SPTjspoNuaYjqbMwvO nmhblhqge8T/pSxSddvE1YBF+yyRuTG21P0cqlIeaqQ9eGUm9nXcYSmSaKOHY6p1/eH3 SsKOJoAC5cpuxLF1gPD0g5GT3BPtgzmx5Qw7071GngeTwR29HNmuWcbD75nOf+8Fsylr SvBNalC/l6R4Kk6pnz0zEKng4jsOFCsfWHR3rVNETUsp/zWE60yffkLMxOlbFDbAVvLs lmhwdo3WJMP9UPtuVjH42tOhC2ocSj41akb6rVQ5R+00MAWyIHo74CPcMsnHboTTcp7B 8Meg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=s1wy/6w1d7kEybhQtPfH/2ykzP9iJ2VgjNl1TdZoTCs=; b=WFZweNmYY6GV8NYNhoMZeNRtMeJKJWH1Rsz+8aYqpIcqLoWH1EA2WNaKqOQcFClvWM wyasTA/hPtg/lHbywZg3b+4Z5Uvt0R2rsQW8fb9FlU3KxEBgcuoTSasn2xiDbcrkgS+N YNe0mjva6S2pO3cq0BowttNtUSHP3flYfpU1lSAsRGHHR7ib0hizoMuxp/ONf2k2w/iy +wVMG2uZVgJssN3BgPPznnDG6nIW0VzV3DwXGnvwj+ITs4sv0NdXJWDzUYK5ZUSZdyBw YykL+up0k06n6VYNUQ0Vzp49Ic5F2aAnLzRm5+cNt3T+oHoGO5EcSIpu9RusYSZHASZP u6RA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ka21si572120ejc.323.2021.03.10.16.10.06; Wed, 10 Mar 2021 16:10:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229893AbhCKAJR (ORCPT + 99 others); Wed, 10 Mar 2021 19:09:17 -0500 Received: from mail-io1-f49.google.com ([209.85.166.49]:36910 "EHLO mail-io1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229712AbhCKAJA (ORCPT ); Wed, 10 Mar 2021 19:09:00 -0500 Received: by mail-io1-f49.google.com with SMTP id y20so1658690iot.4 for ; Wed, 10 Mar 2021 16:09:00 -0800 (PST) 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=s1wy/6w1d7kEybhQtPfH/2ykzP9iJ2VgjNl1TdZoTCs=; b=N3k3WomyH7VIN/GUooLzf2AWYCgkxUzaPx891o6YuHHK7LKvMMhuI9Z6+PSW7EewjX POv9OiJqaPMS47kUS1yR4E9//YKN34Nz3oY1zMZ+5uXdNRXJFYTEnUIhcF5OF0JInwm1 9tVRwPQYBRBXLlfxY/Iwu0hgBhckeDnVKo3h86i/8Qb9McEDcL/omcXSu4AfVBcjQwso WEnkc2O5S7DFZ9SMW0BxRMLn43JMyVPXd8ZAIrwZqyBT4AJ8r8zL89Ns0M2mikdtJmtZ Idb0wX0boIePrCC0A0XCtkZi3y6uloD7gq/18dL5qesqRRYsDdsv5HmieAuOPiqkHyY7 ncvA== X-Gm-Message-State: AOAM533MOcctiwAs8LJCwVBb1c5UACqesPRNmkkiyyJYSmh0X0vaTVUy ExAAo+xFHaHnSXmjnR2XMg== X-Received: by 2002:a5d:9f4a:: with SMTP id u10mr4312321iot.186.1615421340333; Wed, 10 Mar 2021 16:09:00 -0800 (PST) Received: from xps15.herring.priv ([64.188.179.253]) by smtp.googlemail.com with ESMTPSA id x17sm484351ilm.40.2021.03.10.16.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 16:08:59 -0800 (PST) From: Rob Herring To: Will Deacon , Catalin Marinas , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Jiri Olsa , Mark Rutland Cc: Ian Rogers , Alexander Shishkin , honnappa.nagarahalli@arm.com, Zachary.Leaf@arm.com, Raphael Gault , Jonathan Cameron , Namhyung Kim , Itaru Kitayama , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 07/10] libperf: Add arm64 support to perf_mmap__read_self() Date: Wed, 10 Mar 2021 17:08:34 -0700 Message-Id: <20210311000837.3630499-8-robh@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210311000837.3630499-1-robh@kernel.org> References: <20210311000837.3630499-1-robh@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the arm64 variants for read_perf_counter() and read_timestamp(). Unfortunately the counter number is encoded into the instruction, so the code is a bit verbose to enumerate all possible counters. Signed-off-by: Rob Herring --- tools/lib/perf/mmap.c | 98 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/tools/lib/perf/mmap.c b/tools/lib/perf/mmap.c index 915469f00cf4..216e6c6212a2 100644 --- a/tools/lib/perf/mmap.c +++ b/tools/lib/perf/mmap.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "internal.h" void perf_mmap__init(struct perf_mmap *map, struct perf_mmap *prev, @@ -294,6 +295,103 @@ static u64 read_timestamp(void) return low | ((u64)high) << 32; } +#elif defined(__aarch64__) +#define read_sysreg(r) ({ \ + u64 __val; \ + asm volatile("mrs %0, " __stringify(r) : "=r" (__val)); \ + __val; \ +}) + +static u64 read_pmccntr(void) +{ + return read_sysreg(pmccntr_el0); +} + +#define PMEVCNTR_READ(idx) \ + static u64 read_pmevcntr_##idx(void) { \ + return read_sysreg(pmevcntr##idx##_el0); \ + } + +PMEVCNTR_READ(0); +PMEVCNTR_READ(1); +PMEVCNTR_READ(2); +PMEVCNTR_READ(3); +PMEVCNTR_READ(4); +PMEVCNTR_READ(5); +PMEVCNTR_READ(6); +PMEVCNTR_READ(7); +PMEVCNTR_READ(8); +PMEVCNTR_READ(9); +PMEVCNTR_READ(10); +PMEVCNTR_READ(11); +PMEVCNTR_READ(12); +PMEVCNTR_READ(13); +PMEVCNTR_READ(14); +PMEVCNTR_READ(15); +PMEVCNTR_READ(16); +PMEVCNTR_READ(17); +PMEVCNTR_READ(18); +PMEVCNTR_READ(19); +PMEVCNTR_READ(20); +PMEVCNTR_READ(21); +PMEVCNTR_READ(22); +PMEVCNTR_READ(23); +PMEVCNTR_READ(24); +PMEVCNTR_READ(25); +PMEVCNTR_READ(26); +PMEVCNTR_READ(27); +PMEVCNTR_READ(28); +PMEVCNTR_READ(29); +PMEVCNTR_READ(30); + +/* + * Read a value direct from PMEVCNTR + */ +static u64 read_perf_counter(unsigned int counter) +{ + static u64 (* const read_f[])(void) = { + read_pmevcntr_0, + read_pmevcntr_1, + read_pmevcntr_2, + read_pmevcntr_3, + read_pmevcntr_4, + read_pmevcntr_5, + read_pmevcntr_6, + read_pmevcntr_7, + read_pmevcntr_8, + read_pmevcntr_9, + read_pmevcntr_10, + read_pmevcntr_11, + read_pmevcntr_13, + read_pmevcntr_12, + read_pmevcntr_14, + read_pmevcntr_15, + read_pmevcntr_16, + read_pmevcntr_17, + read_pmevcntr_18, + read_pmevcntr_19, + read_pmevcntr_20, + read_pmevcntr_21, + read_pmevcntr_22, + read_pmevcntr_23, + read_pmevcntr_24, + read_pmevcntr_25, + read_pmevcntr_26, + read_pmevcntr_27, + read_pmevcntr_28, + read_pmevcntr_29, + read_pmevcntr_30, + read_pmccntr + }; + + if (counter < ARRAY_SIZE(read_f)) + return (read_f[counter])(); + + return 0; +} + +static u64 read_timestamp(void) { return read_sysreg(cntvct_el0); } + #else static u64 read_perf_counter(unsigned int counter) { return 0; } static u64 read_timestamp(void) { return 0; } -- 2.27.0