From patchwork Thu Mar 27 19:35:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atish Patra X-Patchwork-Id: 14031423 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2490FC3600B for ; Thu, 27 Mar 2025 20:06:48 +0000 (UTC) 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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bPGfwk3FUqo5G0p623bSoJwI7c5so+SZwotTenEycaI=; b=jnHWTuO6YO0x9b RtGVP2v0qsQQGOylaF6wGbBdO7+fk17xJYi1yteqZJBhT+v8mv5atoRRf3FQO5IZHnbNcbvRbzs+l TschPW3hIxNzbZp75S/6Kbj0/Vdqm9lKpkECNJ+86vOcRzrcJEilytzvEMwFuXd3pUyYOzKiTnTsz 5z3W/ubzcQWCHSHFEcU/dHSJ47sQ6ZJ8n3ExEtw/1EpNB1JDfuFoAdha43bCDCMl+pRoAnKQBiUQT cxwU6sPVQxl1UrRTnuEIlsfjS05uv5v6g0rTjgGkP1WugXZBkho83QLMFNaGwhcybGSp4OlQ7OY4Y bSF4V0soKfdwJAGOVodg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1txtUx-0000000BvjP-3YNf; Thu, 27 Mar 2025 20:06:43 +0000 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1txt1t-0000000BpsE-3shb for linux-riscv@lists.infradead.org; Thu, 27 Mar 2025 19:36:43 +0000 Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-2ff85fec403so5156713a91.1 for ; Thu, 27 Mar 2025 12:36:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1743104201; x=1743709001; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=nKAfCqQ7Qjy4MJYkAdCHV9zfU4kl+sMGOwwGVOQa3Ms=; b=ql+sORbg4ad08+K0hcP/WFo7pRjpRK8oLdsgEfyntrSkxgiVN6htInp8/DY5MRzTCj pnThLm6a1x1XHjTEFL624QEoHtaPj2yOGPGDrswlTzaE+S4hg8akF5CVnZvOHyqkDRQk DU+YRD7INeKacKR17m3Ap1eppa2dN1esnQ+GtCjMzY/1nnH17nFKy+NDZhFxbiKngStz 43mzoQu4smxV2McRYTcN/dWnBmmWjLWrjBEMpLl58tPBLINK137GGw8zup3HK0PQMT4R 0FAuAMARTsP5Fyg/pyZX3p4E3voNN3z8imJ5mtuGkjr6vkYRChrKS++JG6ler8za1c3W a0Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743104201; x=1743709001; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nKAfCqQ7Qjy4MJYkAdCHV9zfU4kl+sMGOwwGVOQa3Ms=; b=R0dwQ3B6iOEAZBPWfBJ8ssinXAMOraFcfQR//hy9qjQ02r5gcUilvHAtxJt7TPYf3E O+CMKjDJNATxsWEOu4DindJ+CoRRkCaQZVXe14A+JZ7RZaBdnkv5unEa8zNXp4TvVelW m1lR9/+dfgMGi7gefnMP2jE6b5Mvz9m0cD33oSs5pD2FZkuHupDA+8AWe9erRescbbuF q/BiFfOUseOc6iIeB0lTjfjylo1xRR1fwyKX4b7YradJm7XthTKAOm1FQdcFKd+osOlp mqhtUWyHb4SwFcxnxelX1LT5tfhxSwjTzpxx0ulB5+SbnhS8lM1Wmlw5iu3QwImqabSq 8NTg== X-Gm-Message-State: AOJu0YyVBl4WPk1fCr59N4TJh7Sh3IszQtaMIaT6Gi6beY1NRrjKrb9M w0QYirAb18E0N9KHcnqpbidaWw0ZWBhEJjLIwhZuK2UCQEvJp/FB0QBR4Rkj/2A= X-Gm-Gg: ASbGncsXQLwfvQME6CvIVzxyD7UkhBsRFDEL1XdhEGNhv7S3IuDHTnvZUgGNI4H0dQo iXMhWGotbXZA5GHB2W5qDgPik7BU+nh4zsMhQk6c4j2CJQ5KxmAM0N85DiHNNlfrOM9oFcwV/u2 5042HCoifDnrF9z3kzuXB6J5xtXN9vk+0c5Vk3IekzWocsOrtkdEQF3pbgLMh23HwCPMZmZ/J5I QO/Ny+zG52GAJiVcYd9HRwor8JOcTZL88oLxTHiKTYtweMMTmhKGx27IjinIpGxTyEuOLvHxOcR bG76xvVa1p9QyOFv7avLsByX1nopp7X8qOpzBo5OVzbKR4Fx4lcpwwG4mw== X-Google-Smtp-Source: AGHT+IHMf2f5UBv5DVE142wh0oBPFx9moUIGj7INCFxWN59jTOUXk2pfw5aEvm/YJFqWLspysjUW3w== X-Received: by 2002:a17:90a:dfc7:b0:2fa:42f3:e3e4 with SMTP id 98e67ed59e1d1-3051c85e607mr159363a91.3.1743104201222; Thu, 27 Mar 2025 12:36:41 -0700 (PDT) Received: from atishp.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3039f6b638csm2624220a91.44.2025.03.27.12.36.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Mar 2025 12:36:40 -0700 (PDT) From: Atish Patra Date: Thu, 27 Mar 2025 12:35:59 -0700 Subject: [PATCH v5 18/21] RISC-V: perf: Add Qemu virt machine events MIME-Version: 1.0 Message-Id: <20250327-counter_delegation-v5-18-1ee538468d1b@rivosinc.com> References: <20250327-counter_delegation-v5-0-1ee538468d1b@rivosinc.com> In-Reply-To: <20250327-counter_delegation-v5-0-1ee538468d1b@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Anup Patel , Atish Patra , Will Deacon , Mark Rutland , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , weilin.wang@intel.com Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Conor Dooley , devicetree@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, Atish Patra X-Mailer: b4 0.15-dev-42535 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250327_123642_060319_CB949522 X-CRM114-Status: GOOD ( 12.31 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Qemu virt machine supports a very minimal set of legacy perf events. Add them to the vendor table so that users can use them when counter delegation is enabled. Signed-off-by: Atish Patra --- arch/riscv/include/asm/vendorid_list.h | 4 ++++ drivers/perf/riscv_pmu_dev.c | 36 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/arch/riscv/include/asm/vendorid_list.h b/arch/riscv/include/asm/vendorid_list.h index a5150cdf34d8..0eefc844923e 100644 --- a/arch/riscv/include/asm/vendorid_list.h +++ b/arch/riscv/include/asm/vendorid_list.h @@ -10,4 +10,8 @@ #define SIFIVE_VENDOR_ID 0x489 #define THEAD_VENDOR_ID 0x5b7 +#define QEMU_VIRT_VENDOR_ID 0x000 +#define QEMU_VIRT_IMPL_ID 0x000 +#define QEMU_VIRT_ARCH_ID 0x000 + #endif diff --git a/drivers/perf/riscv_pmu_dev.c b/drivers/perf/riscv_pmu_dev.c index 8a079949e3a4..cd2ac4cf34f1 100644 --- a/drivers/perf/riscv_pmu_dev.c +++ b/drivers/perf/riscv_pmu_dev.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -391,7 +392,42 @@ struct riscv_vendor_pmu_events { .hw_event_map = _hw_event_map, .cache_event_map = _cache_event_map, \ .attrs_events = _attrs }, +/* QEMU virt PMU events */ +static const struct riscv_pmu_event qemu_virt_hw_event_map[PERF_COUNT_HW_MAX] = { + PERF_MAP_ALL_UNSUPPORTED, + [PERF_COUNT_HW_CPU_CYCLES] = {0x01, 0xFFFFFFF8}, + [PERF_COUNT_HW_INSTRUCTIONS] = {0x02, 0xFFFFFFF8} +}; + +static const struct riscv_pmu_event qemu_virt_cache_event_map[PERF_COUNT_HW_CACHE_MAX] + [PERF_COUNT_HW_CACHE_OP_MAX] + [PERF_COUNT_HW_CACHE_RESULT_MAX] = { + PERF_CACHE_MAP_ALL_UNSUPPORTED, + [C(DTLB)][C(OP_READ)][C(RESULT_MISS)] = {0x10019, 0xFFFFFFF8}, + [C(DTLB)][C(OP_WRITE)][C(RESULT_MISS)] = {0x1001B, 0xFFFFFFF8}, + + [C(ITLB)][C(OP_READ)][C(RESULT_MISS)] = {0x10021, 0xFFFFFFF8}, +}; + +RVPMU_EVENT_CMASK_ATTR(cycles, cycles, 0x01, 0xFFFFFFF8); +RVPMU_EVENT_CMASK_ATTR(instructions, instructions, 0x02, 0xFFFFFFF8); +RVPMU_EVENT_CMASK_ATTR(dTLB-load-misses, dTLB_load_miss, 0x10019, 0xFFFFFFF8); +RVPMU_EVENT_CMASK_ATTR(dTLB-store-misses, dTLB_store_miss, 0x1001B, 0xFFFFFFF8); +RVPMU_EVENT_CMASK_ATTR(iTLB-load-misses, iTLB_load_miss, 0x10021, 0xFFFFFFF8); + +static struct attribute *qemu_virt_event_group[] = { + RVPMU_EVENT_ATTR_PTR(cycles), + RVPMU_EVENT_ATTR_PTR(instructions), + RVPMU_EVENT_ATTR_PTR(dTLB_load_miss), + RVPMU_EVENT_ATTR_PTR(dTLB_store_miss), + RVPMU_EVENT_ATTR_PTR(iTLB_load_miss), + NULL, +}; + static struct riscv_vendor_pmu_events pmu_vendor_events_table[] = { + RISCV_VENDOR_PMU_EVENTS(QEMU_VIRT_VENDOR_ID, QEMU_VIRT_ARCH_ID, QEMU_VIRT_IMPL_ID, + qemu_virt_hw_event_map, qemu_virt_cache_event_map, + qemu_virt_event_group) }; const struct riscv_pmu_event *current_pmu_hw_event_map;