From patchwork Tue Jan 28 04:59:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atish Kumar Patra X-Patchwork-Id: 13952003 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 400B51DC04A for ; Tue, 28 Jan 2025 05:00:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738040413; cv=none; b=UT0by8lRxnMzD7faHts8Qh+Nspo2Oi1C642vwxy8/eEJuZlD1I7kTwN3UpZmViQWzR2ZzSBd40LIc+zW8+F3Xq2WckzcsLCpU9PJ7zEL/SOxO6dVoPoXxlru/EExRfr7Io6BpyVUp7zCez1aVLk8lr+QIIsxGZEuLvmMQgUhBIg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738040413; c=relaxed/simple; bh=D26Mz7N1pZVpB7ZSRh7CV+vm7XrT3DFpbyMeC4eMdE4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fBWLCbD2mzNEkV2yR/aIO3yx71AYH6Or8nSPnZHjvKjTXaKZ4NKn5byjVltNc7REC2kWzchdEmU0jA/Ebau1KNsRY3osOSiceJUehQ90ZtZj6Y4bO3WohNKZyYcnWD+lNfkA98fGDr6dTdyMJZX1+k+jHWAnr1KVL+6m2L3wi5M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=KdqQ7h6y; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="KdqQ7h6y" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2ef714374c0so8024814a91.0 for ; Mon, 27 Jan 2025 21:00:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738040410; x=1738645210; darn=vger.kernel.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=xSrHfq1ODaepQOo+hHypeE7yxwo5oeqvpXeWUiwKXOQ=; b=KdqQ7h6yuzuljV54s1IK6CuIFlVeaz+siN9SRqjfqDkM2UbkZnGUBr/AyLf7sP2pjf vDv10UdM9ZGeqNI5RJYC/EB1tM4EiGbLrmXeUXBqPXCqUkc1pgeO5gJYkZZnAZD3qxU+ aM98g0T0hwOY+uVS9ZYqNmhUsmYC/7xWNChGkAj9V19Pk+bXepiJjdWqWc760Io1L40v 2o7mfsM0tpY5PR8CUUyQZySZTE+4HOYeEDS5eG2qV/VagWU+4kFB+bgMa1CKT8WjGSPq 0rNVgsatL3I9oscngKST9uqhdIGRVrnCN9agTuZDfmATUG0o7WqDLOVPVX5LD2d8blxc GTJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738040410; x=1738645210; 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=xSrHfq1ODaepQOo+hHypeE7yxwo5oeqvpXeWUiwKXOQ=; b=Srrfai1d57HnbHw3q566wl2V39jnwcvkqhZtpYJiqgyySQi5gSMoG5IwTvPhJHQC+D kdxa4IG3tf0nNh1Hr94X+k9qByDUZMit7QjbKIN74rgbLn+4GmrFszBWn3pO1FR8wcht 3sTNuyQBQQkksFKW2Hx4QoAcdF1hzycWIfzauZjAXErlGGl+8nug62qlqcGWsuMBC+MB AUW3Qls/1E2ibRQv+A1yGAYXLyoyTcECSZcegVg6OBsDRpONwSELayHpW0w9n/RDS4pQ Olz/08rd9yfyj2X3Ajl6eGRQSUa8WVAvz9CDbzN9IXx8IojQyHzsBUxMMvw17ZpMaif0 QEmg== X-Forwarded-Encrypted: i=1; AJvYcCUxP5zXAN4vjoPJuh0dCrvpjEIsiOtW98udW+pF9wMS8ESgzNJzijwLXE/1pTJpND0X61A=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2mhkYDT5R9ekqmk84hOaiCvN905pw8qfws8cR00RCqE1AvT1A 7odf070LouWunQHrjB+NgOVpaQQ3Qhu5CLE03IKpoI7kTZg8/KrRGEuYecXHc/Y= X-Gm-Gg: ASbGnctbLoU8zdg/1YjtnWUPTrycZDqPKEW4+pEJuij47wwei9KIhCSRI+EqpIH+t7W nmvKB59v768MMIi9exYvksDjHhtT9hVBV6gLCkZTtfmyKm4rh5dKAmCPNZmk0dQYCDcTKdJOYdj z9ywz9VRirSO3u9ogtJwq9L9nmZJKPp0nfhOetblLfVoihtxLWKWnDnGQaDUODfkI9IdyLy0iiF dDRfFQbPfjO5tWQFYa3gQQf6bYQqbfAUQFckfnn5JuthrGV/76LMJ5xGe7BwP6lfTZ92ZJFeTrB YcTqCkU8ssAar0AGAbGoojFdXNWg X-Google-Smtp-Source: AGHT+IFvlfPVqMCu2zkoZbhcnulgbZV3w347S9tQLlvr5tqQ00LyLOv3SR3w4dBEc2GE4tcYLaucAw== X-Received: by 2002:a17:90b:5208:b0:2f7:4c7a:b5f with SMTP id 98e67ed59e1d1-2f82bfa1bc4mr3200150a91.2.1738040410254; Mon, 27 Jan 2025 21:00:10 -0800 (PST) Received: from atishp.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f7ffa5a7f7sm8212776a91.11.2025.01.27.21.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2025 21:00:10 -0800 (PST) From: Atish Patra Date: Mon, 27 Jan 2025 20:59:54 -0800 Subject: [PATCH v3 13/21] RISC-V: perf: Add a mechanism to defined legacy event encoding Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250127-counter_delegation-v3-13-64894d7e16d5@rivosinc.com> References: <20250127-counter_delegation-v3-0-64894d7e16d5@rivosinc.com> In-Reply-To: <20250127-counter_delegation-v3-0-64894d7e16d5@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-13183 RISC-V ISA doesn't define any standard event encodings or specify any event to counter mapping. Thus, event encoding information and corresponding counter mapping fot those events needs to be provided in the driver for each vendor. Add a framework to support that. The individual platform events will be added later. Signed-off-by: Atish Patra --- drivers/perf/riscv_pmu_dev.c | 51 ++++++++++++++++++++++++++++++++++++++++++ include/linux/perf/riscv_pmu.h | 13 +++++++++++ 2 files changed, 64 insertions(+) diff --git a/drivers/perf/riscv_pmu_dev.c b/drivers/perf/riscv_pmu_dev.c index c7adda948b5d..7742eb6d1ed2 100644 --- a/drivers/perf/riscv_pmu_dev.c +++ b/drivers/perf/riscv_pmu_dev.c @@ -307,6 +307,56 @@ static struct sbi_pmu_event_data pmu_cache_event_sbi_map[PERF_COUNT_HW_CACHE_MAX }, }; +/* + * Vendor specific PMU events. + */ +struct riscv_pmu_event { + u64 event_id; + u32 counter_mask; +}; + +struct riscv_vendor_pmu_events { + unsigned long vendorid; + unsigned long archid; + unsigned long implid; + const struct riscv_pmu_event *hw_event_map; + const struct riscv_pmu_event (*cache_event_map)[PERF_COUNT_HW_CACHE_OP_MAX] + [PERF_COUNT_HW_CACHE_RESULT_MAX]; +}; + +#define RISCV_VENDOR_PMU_EVENTS(_vendorid, _archid, _implid, _hw_event_map, _cache_event_map) \ + { .vendorid = _vendorid, .archid = _archid, .implid = _implid, \ + .hw_event_map = _hw_event_map, .cache_event_map = _cache_event_map }, + +static struct riscv_vendor_pmu_events pmu_vendor_events_table[] = { +}; + +const struct riscv_pmu_event *current_pmu_hw_event_map; +const struct riscv_pmu_event (*current_pmu_cache_event_map)[PERF_COUNT_HW_CACHE_OP_MAX] + [PERF_COUNT_HW_CACHE_RESULT_MAX]; + +static void rvpmu_vendor_register_events(void) +{ + int cpu = raw_smp_processor_id(); + unsigned long vendor_id = riscv_cached_mvendorid(cpu); + unsigned long impl_id = riscv_cached_mimpid(cpu); + unsigned long arch_id = riscv_cached_marchid(cpu); + + for (int i = 0; i < ARRAY_SIZE(pmu_vendor_events_table); i++) { + if (pmu_vendor_events_table[i].vendorid == vendor_id && + pmu_vendor_events_table[i].implid == impl_id && + pmu_vendor_events_table[i].archid == arch_id) { + current_pmu_hw_event_map = pmu_vendor_events_table[i].hw_event_map; + current_pmu_cache_event_map = pmu_vendor_events_table[i].cache_event_map; + break; + } + } + + if (!current_pmu_hw_event_map || !current_pmu_cache_event_map) { + pr_info("No default PMU events found\n"); + } +} + static void rvpmu_sbi_check_event(struct sbi_pmu_event_data *edata) { struct sbiret ret; @@ -1547,6 +1597,7 @@ static int __init rvpmu_devinit(void) riscv_isa_extension_available(NULL, SSCSRIND)) { static_branch_enable(&riscv_pmu_cdeleg_available); cdeleg_available = true; + rvpmu_vendor_register_events(); } if (!(sbi_available || cdeleg_available)) diff --git a/include/linux/perf/riscv_pmu.h b/include/linux/perf/riscv_pmu.h index 525acd6d96d0..a3e1fdd5084a 100644 --- a/include/linux/perf/riscv_pmu.h +++ b/include/linux/perf/riscv_pmu.h @@ -28,6 +28,19 @@ #define RISCV_PMU_CONFIG1_GUEST_EVENTS 0x1 +#define HW_OP_UNSUPPORTED 0xFFFF +#define CACHE_OP_UNSUPPORTED 0xFFFF + +#define PERF_MAP_ALL_UNSUPPORTED \ + [0 ... PERF_COUNT_HW_MAX - 1] = {HW_OP_UNSUPPORTED, 0x0} + +#define PERF_CACHE_MAP_ALL_UNSUPPORTED \ +[0 ... C(MAX) - 1] = { \ + [0 ... C(OP_MAX) - 1] = { \ + [0 ... C(RESULT_MAX) - 1] = {CACHE_OP_UNSUPPORTED, 0x0} \ + }, \ +} + struct cpu_hw_events { /* currently enabled events */ int n_events;