From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 D031020F970 for ; Tue, 14 Jan 2025 10:59:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736852384; cv=none; b=Ka5XM7bYfXrgycnGFEEp4k/zqsBQLw7pS2lo2PrVfxxW1UPlODCPAK95ebCOBUe7mVgpiTwNToIPWQy/Siyhgm+Jr4zwaEFy+Mm631pIJlKLvZmzoVRkZZ6GEPMJDU3rXLBIxL0MP0vkhHU2ZOcYyOKNjBR6U4hlsCwmm3HJLso= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736852384; c=relaxed/simple; bh=9n3+/+4YsD8Xfp3vEUEespsKGqLzinPRW/XuvoxZArc=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=aB6+H8GHWKyCNJmlchxEaFwz2J0ealBN9hHspZM9lhUKGGQwMAZz6R3M6U7Nix1fCs2Zkg1cOlIp0ktTcNomTc0sNshjcimqL5ichcUMql/9CZ9n4dUMZaI69+kQPzqLSFkXHUe+xCE1xifaJ/OdX2iKC3SCc0aZsB4kvRkq2pI= 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=n8UQ4+Lz; arc=none smtp.client-ip=209.85.128.51 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="n8UQ4+Lz" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4361f796586so55281175e9.3 for ; Tue, 14 Jan 2025 02:59:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1736852379; x=1737457179; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=mKiltzKPGCPIvbBEmKYykmlnCABDI1yuo/s2oPiTYjo=; b=n8UQ4+LzdqdUji0XlhrCiBi8ybI0v3rFaQF2UhlA8QfBxFJQdYO38NjDmlVlF2jAVe hjP9tSpRualdT6RW9DqwLPY27aZKHN1aUDBD4AkJoaRNME9ICNU+GkDQFjM25Vr3BMXW 0in32iSuw8HVldcBflUjnAlJ8u9ipcLm4blydfOrskQS4vrUvwJ+IjT0aJMdmJHnwlvA 5p68TBXQcpXOPX6fz7XbXmzaOVNlzk6yOIpt7OlfZZlG9YU2GDXc5oEhlpPpWU2Iv0JJ Sw8IIs1jWgAnNghxAx794U+8stEjYjCmUZqkewPuHdqN9wxtvSJNkrQvVwUkOumWU4jq tenA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736852379; x=1737457179; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mKiltzKPGCPIvbBEmKYykmlnCABDI1yuo/s2oPiTYjo=; b=ulUmjXZDcSW5szH4prbuj/Q5PZ/qfV0WWsei66KCuX85TTjLoTMerGE2PZQ48Sdf8B W9WEM7iB+RLUD8uL7xPSl5DhOEHpi5Fz2bl4zHqY2BT6YD7/5d6wiOBL25IOLpoC08Mu UKFN1a2e1VFPci3mNKD8TBCVGgp7PxLHw8DR/1DFVhH/vUIuWSEf1bDNEFdj7odZZdXD D5DoxuVUbhowFlo9ktq8MudrsMq7kn72aboKxj55RT2FCTCkQBMVOTHFpi99lVh6fyo0 AR84KgPaQoawGAFtwjMxgBPUnHY3tZUpDtJd0iZsMAA3Ibp2SBlA1DTDCfCwRbaAg/Yn FTUg== X-Forwarded-Encrypted: i=1; AJvYcCXUMf3+2HQby4oOc+154mUCpN/62+g2RVi3VtFN8x/6mxUoV4TfyJzJVEUrJ+A3KSJwqVebgT5FK54xPx5/Fk91@vger.kernel.org X-Gm-Message-State: AOJu0Yx9YcBxLgNPU9FeKPco3/hLfcXxuuwuqc92La8cUTArYDPTK0q6 rZ6DldjRnwZ7azU/nPPaMJC6YF+H8ZwfRtshIrnybIckWAOhPlBY8aQJ9kRK0GH3ByMn0uVnExt 1s0B++FoXCybhL5RzrG709F+aKeNvo9s2pXBFww== X-Gm-Gg: ASbGncvF9wP+TFOA5tSHzyB+nCiAveCdMqIT74MKhHFtZ7WBqE9O2V1185NxYrxn/5+ jaORUzfxHpVWh5wmR98eKBUG7vosWZ9YcfoPC X-Google-Smtp-Source: AGHT+IFXZQ2ha11xLIgCWqSdm3+Xp+oyI44F2O36Umhgb/5FxsxPh6CNP8bzvNLvZ5kUll9h1aaHjw+a4F+o8rYTsNk= X-Received: by 2002:a05:600c:1f81:b0:434:f739:7cd9 with SMTP id 5b1f17b1804b1-436e26995b8mr228325935e9.9.1736852378900; Tue, 14 Jan 2025 02:59:38 -0800 (PST) Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20240529185337.182722-1-rkanwal@rivosinc.com> <20240529185337.182722-6-rkanwal@rivosinc.com> In-Reply-To: From: Rajnesh Kanwal Date: Tue, 14 Jan 2025 10:59:27 +0000 X-Gm-Features: AbW1kvYqIYw3se7uq1t1pXURv_BxW0wtFkkphY-k8SeaMMbSXTNkZHDI-w4BQ88 Message-ID: Subject: Re: [PATCH RFC 5/6] riscv: perf: Add driver for Control Transfer Records Ext. To: Charlie Jenkins Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-riscv@lists.infradead.org, adrian.hunter@intel.com, alexander.shishkin@linux.intel.com, ajones@ventanamicro.com, anup@brainfault.org, acme@kernel.org, atishp@rivosinc.com, beeman@rivosinc.com, brauner@kernel.org, conor@kernel.org, heiko@sntech.de, irogers@google.com, mingo@redhat.com, james.clark@arm.com, renyu.zj@linux.alibaba.com, jolsa@kernel.org, jisheng.teoh@starfivetech.com, palmer@dabbelt.com, tech-control-transfer-records@lists.riscv.org, will@kernel.org, kaiwenxue1@gmail.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Sep 5, 2024 at 10:52=E2=80=AFPM Charlie Jenkins wrote: > > On Wed, May 29, 2024 at 07:53:36PM +0100, Rajnesh Kanwal wrote: > > This adds support for CTR Ext defined in [0]. The extension > > allows to records a maximum for 256 last branch records. > > > > CTR extension depends on s[m|s]csrind and Sscofpmf extensions. > > > > Signed-off-by: Rajnesh Kanwal > > --- > > MAINTAINERS | 1 + > > drivers/perf/Kconfig | 11 + > > drivers/perf/Makefile | 1 + > > drivers/perf/riscv_ctr.c | 469 +++++++++++++++++++++++++++++++++ > > include/linux/perf/riscv_pmu.h | 33 +++ > > 5 files changed, 515 insertions(+) > > create mode 100644 drivers/perf/riscv_ctr.c > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index d6b42d5f62da..868e4b0808ab 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -19056,6 +19056,7 @@ M: Atish Patra > > R: Anup Patel > > L: linux-riscv@lists.infradead.org > > S: Supported > > +F: drivers/perf/riscv_ctr.c > > F: drivers/perf/riscv_pmu_common.c > > F: drivers/perf/riscv_pmu_dev.c > > F: drivers/perf/riscv_pmu_legacy.c > > diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig > > index 3c37577b25f7..cca6598be739 100644 > > --- a/drivers/perf/Kconfig > > +++ b/drivers/perf/Kconfig > > @@ -110,6 +110,17 @@ config ANDES_CUSTOM_PMU > > > > If you don't know what to do here, say "Y". > > > > +config RISCV_CTR > > + bool "Enable support for Control Transfer Records (CTR)" > > + depends on PERF_EVENTS && RISCV_PMU > > + default y > > + help > > + Enable support for Control Transfer Records (CTR) which > > + allows recording branches, Jumps, Calls, returns etc taken in= an > > + execution path. This also supports privilege based filtering.= It > > + captures additional relevant information such as cycle count, > > + branch misprediction etc. > > + > > config ARM_PMU_ACPI > > depends on ARM_PMU && ACPI > > def_bool y > > diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile > > index ba809cc069d5..364b1f66f410 100644 > > --- a/drivers/perf/Makefile > > +++ b/drivers/perf/Makefile > > @@ -16,6 +16,7 @@ obj-$(CONFIG_RISCV_PMU_COMMON) +=3D riscv_pmu_common.= o > > obj-$(CONFIG_RISCV_PMU_LEGACY) +=3D riscv_pmu_legacy.o > > obj-$(CONFIG_RISCV_PMU) +=3D riscv_pmu_dev.o > > obj-$(CONFIG_STARFIVE_STARLINK_PMU) +=3D starfive_starlink_pmu.o > > +obj-$(CONFIG_RISCV_CTR) +=3D riscv_ctr.o > > obj-$(CONFIG_THUNDERX2_PMU) +=3D thunderx2_pmu.o > > obj-$(CONFIG_XGENE_PMU) +=3D xgene_pmu.o > > obj-$(CONFIG_ARM_SPE_PMU) +=3D arm_spe_pmu.o > > diff --git a/drivers/perf/riscv_ctr.c b/drivers/perf/riscv_ctr.c > > new file mode 100644 > > index 000000000000..95fda1edda4f > > --- /dev/null > > +++ b/drivers/perf/riscv_ctr.c > > @@ -0,0 +1,469 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Control transfer records extension Helpers. > > + * > > + * Copyright (C) 2024 Rivos Inc. > > + * > > + * Author: Rajnesh Kanwal > > + */ > > + > > +#define pr_fmt(fmt) "CTR: " fmt > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#define CTR_BRANCH_FILTERS_INH (CTRCTL_EXCINH | \ > > + CTRCTL_INTRINH | \ > > + CTRCTL_TRETINH | \ > > + CTRCTL_TKBRINH | \ > > + CTRCTL_INDCALL_INH | \ > > + CTRCTL_DIRCALL_INH | \ > > + CTRCTL_INDJUMP_INH | \ > > + CTRCTL_DIRJUMP_INH | \ > > + CTRCTL_CORSWAP_INH | \ > > + CTRCTL_RET_INH | \ > > + CTRCTL_INDOJUMP_INH | \ > > + CTRCTL_DIROJUMP_INH) > > + > > +#define CTR_BRANCH_ENABLE_BITS (CTRCTL_KERNEL_ENABLE | CTRCTL_U_ENABLE= ) > > + > > +/* Branch filters not-supported by CTR extension. */ > > +#define CTR_EXCLUDE_BRANCH_FILTERS (PERF_SAMPLE_BRANCH_ABORT_TX = | \ > > + PERF_SAMPLE_BRANCH_IN_TX |= \ > > + PERF_SAMPLE_BRANCH_PRIV_SAVE |= \ > > + PERF_SAMPLE_BRANCH_NO_TX |= \ > > + PERF_SAMPLE_BRANCH_COUNTERS) > > + > > +/* Branch filters supported by CTR extension. */ > > +#define CTR_ALLOWED_BRANCH_FILTERS (PERF_SAMPLE_BRANCH_USER |= \ > > + PERF_SAMPLE_BRANCH_KERNEL |= \ > > + PERF_SAMPLE_BRANCH_HV |= \ > > + PERF_SAMPLE_BRANCH_ANY |= \ > > + PERF_SAMPLE_BRANCH_ANY_CALL |= \ > > + PERF_SAMPLE_BRANCH_ANY_RETURN |= \ > > + PERF_SAMPLE_BRANCH_IND_CALL |= \ > > + PERF_SAMPLE_BRANCH_COND |= \ > > + PERF_SAMPLE_BRANCH_IND_JUMP |= \ > > + PERF_SAMPLE_BRANCH_HW_INDEX |= \ > > + PERF_SAMPLE_BRANCH_NO_FLAGS |= \ > > + PERF_SAMPLE_BRANCH_NO_CYCLES |= \ > > + PERF_SAMPLE_BRANCH_CALL_STACK |= \ > > + PERF_SAMPLE_BRANCH_CALL |= \ > > + PERF_SAMPLE_BRANCH_TYPE_SAVE) > > + > > +#define CTR_PERF_BRANCH_FILTERS (CTR_ALLOWED_BRANCH_FILTERS = | \ > > + CTR_EXCLUDE_BRANCH_FILTERS) > > + > > +static u64 allowed_filters __read_mostly; > > + > > +struct ctr_regset { > > + unsigned long src; > > + unsigned long target; > > + unsigned long ctr_data; > > +}; > > + > > +static inline u64 get_ctr_src_reg(unsigned int ctr_idx) > > +{ > > + return csr_ind_read(CSR_IREG, CTR_ENTRIES_FIRST, ctr_idx); > > +} > > + > > +static inline u64 get_ctr_tgt_reg(unsigned int ctr_idx) > > +{ > > + return csr_ind_read(CSR_IREG2, CTR_ENTRIES_FIRST, ctr_idx); > > +} > > + > > +static inline u64 get_ctr_data_reg(unsigned int ctr_idx) > > +{ > > + return csr_ind_read(CSR_IREG3, CTR_ENTRIES_FIRST, ctr_idx); > > +} > > + > > +static inline bool ctr_record_valid(u64 ctr_src) > > +{ > > + return !!FIELD_GET(CTRSOURCE_VALID, ctr_src); > > +} > > + > > +static inline int ctr_get_mispredict(u64 ctr_target) > > +{ > > + return FIELD_GET(CTRTARGET_MISP, ctr_target); > > +} > > + > > +static inline unsigned int ctr_get_cycles(u64 ctr_data) > > +{ > > + const unsigned int cce =3D FIELD_GET(CTRDATA_CCE_MASK, ctr_data); > > + const unsigned int ccm =3D FIELD_GET(CTRDATA_CCM_MASK, ctr_data); > > + > > + if (ctr_data & CTRDATA_CCV) > > + return 0; > > + > > + /* Formula to calculate cycles from spec: (2^12 + CCM) << CCE-1 *= / > > + if (cce > 0) > > + return (4096 + ccm) << (cce - 1); > > + > > + return FIELD_GET(CTRDATA_CCM_MASK, ctr_data); > > +} > > + > > +static inline unsigned int ctr_get_type(u64 ctr_data) > > +{ > > + return FIELD_GET(CTRDATA_TYPE_MASK, ctr_data); > > +} > > + > > +static inline unsigned int ctr_get_depth(u64 ctr_depth) > > +{ > > + /* Depth table from CTR Spec: 2.4 sctrdepth. > > + * > > + * sctrdepth.depth Depth > > + * 000 - 16 > > + * 001 - 32 > > + * 010 - 64 > > + * 011 - 128 > > + * 100 - 256 > > + * > > + * Depth =3D 16 * 2 ^ (ctrdepth.depth) > > + * or > > + * Depth =3D 16 << ctrdepth.depth. > > + */ > > + return 16 << FIELD_GET(SCTRDEPTH_MASK, ctr_depth); > > +} > > + > > +/* Reads CTR entry at idx and stores it in entry struct. */ > > +static bool capture_ctr_regset(struct ctr_regset *entry, unsigned int = idx) > > +{ > > + entry->src =3D get_ctr_src_reg(idx); > > + > > + if (!ctr_record_valid(entry->src)) > > + return false; > > + > > + entry->src =3D entry->src & (~CTRSOURCE_VALID); > > + entry->target =3D get_ctr_tgt_reg(idx); > > + entry->ctr_data =3D get_ctr_data_reg(idx); > > + > > + return true; > > +} > > + > > +static u64 branch_type_to_ctr(int branch_type) > > +{ > > + u64 config =3D CTR_BRANCH_FILTERS_INH | CTRCTL_LCOFIFRZ; > > + > > + if (branch_type & PERF_SAMPLE_BRANCH_USER) > > + config |=3D CTRCTL_U_ENABLE; > > + > > + if (branch_type & PERF_SAMPLE_BRANCH_KERNEL) > > + config |=3D CTRCTL_KERNEL_ENABLE; > > + > > + if (branch_type & PERF_SAMPLE_BRANCH_HV) { > > + if (riscv_isa_extension_available(NULL, h)) > > + config |=3D CTRCTL_KERNEL_ENABLE; > > + } > > + > > + if (branch_type & PERF_SAMPLE_BRANCH_ANY) { > > + config &=3D ~CTR_BRANCH_FILTERS_INH; > > + return config; > > + } > > + > > + if (branch_type & PERF_SAMPLE_BRANCH_ANY_CALL) { > > + config &=3D ~CTRCTL_INDCALL_INH; > > + config &=3D ~CTRCTL_DIRCALL_INH; > > + config &=3D ~CTRCTL_EXCINH; > > + config &=3D ~CTRCTL_INTRINH; > > + } > > + > > + if (branch_type & PERF_SAMPLE_BRANCH_ANY_RETURN) > > + config &=3D ~(CTRCTL_RET_INH | CTRCTL_TRETINH); > > + > > + if (branch_type & PERF_SAMPLE_BRANCH_IND_CALL) > > + config &=3D ~CTRCTL_INDCALL_INH; > > + > > + if (branch_type & PERF_SAMPLE_BRANCH_COND) > > + config &=3D ~CTRCTL_TKBRINH; > > + > > + if (branch_type & PERF_SAMPLE_BRANCH_CALL_STACK) { > > + config &=3D ~(CTRCTL_INDCALL_INH | CTRCTL_DIRCALL_INH | > > + CTRCTL_RET_INH); > > + config |=3D CTRCTL_RASEMU; > > + } > > + > > + if (branch_type & PERF_SAMPLE_BRANCH_IND_JUMP) { > > + config &=3D ~CTRCTL_INDJUMP_INH; > > + config &=3D ~CTRCTL_INDOJUMP_INH; > > + } > > + > > + if (branch_type & PERF_SAMPLE_BRANCH_CALL) > > + config &=3D ~CTRCTL_DIRCALL_INH; > > + > > + return config; > > +} > > + > > +static const int ctr_perf_map[] =3D { > > + [CTRDATA_TYPE_NONE] =3D PERF_BR_UNKNOWN, > > + [CTRDATA_TYPE_EXCEPTION] =3D PERF_BR_SYSCALL, > > + [CTRDATA_TYPE_INTERRUPT] =3D PERF_BR_IRQ, > > + [CTRDATA_TYPE_TRAP_RET] =3D PERF_BR_ERET, > > + [CTRDATA_TYPE_NONTAKEN_BRANCH] =3D PERF_BR_COND, > > + [CTRDATA_TYPE_TAKEN_BRANCH] =3D PERF_BR_COND, > > + [CTRDATA_TYPE_RESERVED_6] =3D PERF_BR_UNKNOWN, > > + [CTRDATA_TYPE_RESERVED_7] =3D PERF_BR_UNKNOWN, > > + [CTRDATA_TYPE_INDIRECT_CALL] =3D PERF_BR_IND_CALL, > > + [CTRDATA_TYPE_DIRECT_CALL] =3D PERF_BR_CALL, > > + [CTRDATA_TYPE_INDIRECT_JUMP] =3D PERF_BR_UNCOND, > > + [CTRDATA_TYPE_DIRECT_JUMP] =3D PERF_BR_UNKNOWN, > > + [CTRDATA_TYPE_CO_ROUTINE_SWAP] =3D PERF_BR_UNKNOWN, > > + [CTRDATA_TYPE_RETURN] =3D PERF_BR_RET, > > + [CTRDATA_TYPE_OTHER_INDIRECT_JUMP] =3D PERF_BR_IND, > > + [CTRDATA_TYPE_OTHER_DIRECT_JUMP] =3D PERF_BR_UNKNOWN, > > +}; > > + > > +static void ctr_set_perf_entry_type(struct perf_branch_entry *entry, > > + u64 ctr_data) > > +{ > > + int ctr_type =3D ctr_get_type(ctr_data); > > + > > + entry->type =3D ctr_perf_map[ctr_type]; > > + if (entry->type =3D=3D PERF_BR_UNKNOWN) > > + pr_warn("%d - unknown branch type captured\n", ctr_type); > > +} > > + > > +static void capture_ctr_flags(struct perf_branch_entry *entry, > > + struct perf_event *event, u64 ctr_data, > > + u64 ctr_target) > > +{ > > + if (branch_sample_type(event)) > > + ctr_set_perf_entry_type(entry, ctr_data); > > + > > + if (!branch_sample_no_cycles(event)) > > + entry->cycles =3D ctr_get_cycles(ctr_data); > > + > > + if (!branch_sample_no_flags(event)) { > > + entry->abort =3D 0; > > + entry->mispred =3D ctr_get_mispredict(ctr_target); > > + entry->predicted =3D !entry->mispred; > > + } > > + > > + if (branch_sample_priv(event)) > > + entry->priv =3D PERF_BR_PRIV_UNKNOWN; > > +} > > + > > + > > +static void ctr_regset_to_branch_entry(struct cpu_hw_events *cpuc, > > + struct perf_event *event, > > + struct ctr_regset *regset, > > + unsigned int idx) > > +{ > > + struct perf_branch_entry *entry =3D &cpuc->branches->branch_entri= es[idx]; > > + > > + perf_clear_branch_entry_bitfields(entry); > > + entry->from =3D regset->src; > > + entry->to =3D regset->target & (~CTRTARGET_MISP); > > + capture_ctr_flags(entry, event, regset->ctr_data, regset->target)= ; > > +} > > + > > +static void ctr_read_entries(struct cpu_hw_events *cpuc, > > + struct perf_event *event, > > + unsigned int depth) > > +{ > > + struct ctr_regset entry =3D {}; > > + u64 ctr_ctl; > > + int i; > > + > > + ctr_ctl =3D csr_read_clear(CSR_CTRCTL, CTR_BRANCH_ENABLE_BITS); > > + > > + for (i =3D 0; i < depth; i++) { > > + if (!capture_ctr_regset(&entry, i)) > > + break; > > + > > + ctr_regset_to_branch_entry(cpuc, event, &entry, i); > > + } > > + > > + csr_set(CSR_CTRCTL, ctr_ctl & CTR_BRANCH_ENABLE_BITS); > > + > > + cpuc->branches->branch_stack.nr =3D i; > > + cpuc->branches->branch_stack.hw_idx =3D 0; > > +} > > + > > +bool riscv_pmu_ctr_valid(struct perf_event *event) > > +{ > > + u64 branch_type =3D event->attr.branch_sample_type; > > + > > + if (branch_type & ~allowed_filters) { > > + pr_debug_once("Requested branch filters not supported 0x%= llx\n", > > + branch_type & ~allowed_filters); > > + return false; > > + } > > + > > + return true; > > +} > > + > > +void riscv_pmu_ctr_consume(struct cpu_hw_events *cpuc, struct perf_eve= nt *event) > > +{ > > + unsigned int depth =3D to_riscv_pmu(event->pmu)->ctr_depth; > > + > > + ctr_read_entries(cpuc, event, depth); > > + > > + /* Clear frozen bit. */ > > + csr_clear(CSR_SCTRSTATUS, SCTRSTATUS_FROZEN); > > +} > > + > > +static void riscv_pmu_ctr_clear(void) > > +{ > > + /* FIXME: Replace with sctrclr instruction once support is merged > > + * into toolchain. > > + */ > > + asm volatile(".4byte 0x10400073\n" ::: "memory"); > > + csr_write(CSR_SCTRSTATUS, 0); > > +} > > + > > +/* > > + * On context switch in, we need to make sure no samples from previous= user > > + * are left in the CTR. > > + * > > + * On ctxswin, sched_in =3D true, called after the PMU has started > > + * On ctxswout, sched_in =3D false, called before the PMU is stopped > > + */ > > +void riscv_pmu_ctr_sched_task(struct perf_event_pmu_context *pmu_ctx, > > + bool sched_in) > > +{ > > + struct riscv_pmu *rvpmu =3D to_riscv_pmu(pmu_ctx->pmu); > > + struct cpu_hw_events *cpuc =3D this_cpu_ptr(rvpmu->hw_events); > > + > > + if (cpuc->ctr_users && sched_in) > > + riscv_pmu_ctr_clear(); > > +} > > + > > +void riscv_pmu_ctr_enable(struct perf_event *event) > > +{ > > + struct riscv_pmu *rvpmu =3D to_riscv_pmu(event->pmu); > > + struct cpu_hw_events *cpuc =3D this_cpu_ptr(rvpmu->hw_events); > > + u64 branch_type =3D event->attr.branch_sample_type; > > + u64 ctr; > > + > > + if (!cpuc->ctr_users++ && !event->total_time_running) > > + riscv_pmu_ctr_clear(); > > + > > + ctr =3D branch_type_to_ctr(branch_type); > > + csr_write(CSR_CTRCTL, ctr); > > + > > + perf_sched_cb_inc(event->pmu); > > +} > > + > > +void riscv_pmu_ctr_disable(struct perf_event *event) > > +{ > > + struct riscv_pmu *rvpmu =3D to_riscv_pmu(event->pmu); > > + struct cpu_hw_events *cpuc =3D this_cpu_ptr(rvpmu->hw_events); > > + > > + /* Clear CTRCTL to disable the recording. */ > > + csr_write(CSR_CTRCTL, 0); > > + > > + cpuc->ctr_users--; > > + WARN_ON_ONCE(cpuc->ctr_users < 0); > > + > > + perf_sched_cb_dec(event->pmu); > > +} > > + > > +/* > > + * Check for hardware supported perf filters here. To avoid missing > > + * any new added filter in perf, we do a BUILD_BUG_ON check, so make s= ure > > + * to update CTR_ALLOWED_BRANCH_FILTERS or CTR_EXCLUDE_BRANCH_FILTERS > > + * defines when adding support for it in below function. > > + */ > > +static void __init check_available_filters(void) > > +{ > > + u64 ctr_ctl; > > + > > + /* > > + * Ensure both perf branch filter allowed and exclude > > + * masks are always in sync with the generic perf ABI. > > + */ > > + BUILD_BUG_ON(CTR_PERF_BRANCH_FILTERS !=3D (PERF_SAMPLE_BRANCH_MAX= - 1)); > > + > > + allowed_filters =3D PERF_SAMPLE_BRANCH_USER | > > + PERF_SAMPLE_BRANCH_KERNEL | > > + PERF_SAMPLE_BRANCH_ANY | > > + PERF_SAMPLE_BRANCH_HW_INDEX | > > + PERF_SAMPLE_BRANCH_NO_FLAGS | > > + PERF_SAMPLE_BRANCH_NO_CYCLES | > > + PERF_SAMPLE_BRANCH_TYPE_SAVE; > > + > > + csr_write(CSR_CTRCTL, ~0); > > + ctr_ctl =3D csr_read(CSR_CTRCTL); > > + > > + if (riscv_isa_extension_available(NULL, h)) > > + allowed_filters |=3D PERF_SAMPLE_BRANCH_HV; > > + > > + if (ctr_ctl & (CTRCTL_INDCALL_INH | CTRCTL_DIRCALL_INH)) > > + allowed_filters |=3D PERF_SAMPLE_BRANCH_ANY_CALL; > > + > > + if (ctr_ctl & (CTRCTL_RET_INH | CTRCTL_TRETINH)) > > + allowed_filters |=3D PERF_SAMPLE_BRANCH_ANY_RETURN; > > + > > + if (ctr_ctl & CTRCTL_INDCALL_INH) > > + allowed_filters |=3D PERF_SAMPLE_BRANCH_IND_CALL; > > + > > + if (ctr_ctl & CTRCTL_TKBRINH) > > + allowed_filters |=3D PERF_SAMPLE_BRANCH_COND; > > + > > + if (ctr_ctl & CTRCTL_RASEMU) > > + allowed_filters |=3D PERF_SAMPLE_BRANCH_CALL_STACK; > > + > > + if (ctr_ctl & (CTRCTL_INDOJUMP_INH | CTRCTL_INDJUMP_INH)) > > + allowed_filters |=3D PERF_SAMPLE_BRANCH_IND_JUMP; > > + > > + if (ctr_ctl & CTRCTL_DIRCALL_INH) > > + allowed_filters |=3D PERF_SAMPLE_BRANCH_CALL; > > +} > > + > > +void riscv_pmu_ctr_starting_cpu(void) > > +{ > > + if (!riscv_isa_extension_available(NULL, SxCTR) || > > + !riscv_isa_extension_available(NULL, SSCOFPMF) || > > + !riscv_isa_extension_available(NULL, SxCSRIND)) > > + return; > > + > > + /* Set depth to maximum. */ > > + csr_write(CSR_SCTRDEPTH, SCTRDEPTH_MASK); > > +} > > + > > +void riscv_pmu_ctr_dying_cpu(void) > > +{ > > + if (!riscv_isa_extension_available(NULL, SxCTR) || > > + !riscv_isa_extension_available(NULL, SSCOFPMF) || > > + !riscv_isa_extension_available(NULL, SxCSRIND)) > > + return; > > + > > + /* Clear and reset CTR CSRs. */ > > + csr_write(CSR_SCTRDEPTH, 0); > > + csr_write(CSR_CTRCTL, 0); > > + riscv_pmu_ctr_clear(); > > +} > > + > > +void __init riscv_pmu_ctr_init(struct riscv_pmu *riscv_pmu) > > +{ > > + if (!riscv_isa_extension_available(NULL, SxCTR) || > > + !riscv_isa_extension_available(NULL, SSCOFPMF) || > > + !riscv_isa_extension_available(NULL, SxCSRIND)) > > + return; > > + > > + check_available_filters(); > > + > > + /* Set depth to maximum. */ > > + csr_write(CSR_SCTRDEPTH, SCTRDEPTH_MASK); > > + riscv_pmu->ctr_depth =3D ctr_get_depth(csr_read(CSR_SCTRDEPTH)); > > + > > + pr_info("Perf CTR available, with %d depth\n", riscv_pmu->ctr_dep= th); > > +} > > + > > +void __init riscv_pmu_ctr_finish(struct riscv_pmu *riscv_pmu) > > I don't think it is valid for this function and riscv_pmu_ctr_init() to > be marked as __init since they are called from rvpmu_device_probe() > which is not marked as __init. modpost highlights this issue with the > warnings: > > WARNING: modpost: vmlinux: section mismatch in reference: rvpmu_device_pr= obe+0x18c (section: .text) -> riscv_pmu_ctr_init (section: .init.text) > WARNING: modpost: vmlinux: section mismatch in reference: rvpmu_device_pr= obe+0x288 (section: .text) -> riscv_pmu_ctr_finish (section: .init.text) > > - Charlie > Thanks Charlie I am fixing this in v2. > > +{ > > + if (!riscv_pmu_ctr_supported(riscv_pmu)) > > + return; > > + > > + csr_write(CSR_SCTRDEPTH, 0); > > + csr_write(CSR_CTRCTL, 0); > > + riscv_pmu_ctr_clear(); > > + riscv_pmu->ctr_depth =3D 0; > > +} > > diff --git a/include/linux/perf/riscv_pmu.h b/include/linux/perf/riscv_= pmu.h > > index 5a6b840018bd..455d2386936f 100644 > > --- a/include/linux/perf/riscv_pmu.h > > +++ b/include/linux/perf/riscv_pmu.h > > @@ -104,6 +104,39 @@ struct riscv_pmu *riscv_pmu_alloc(void); > > int riscv_pmu_get_hpm_info(u32 *hw_ctr_width, u32 *num_hw_ctr); > > #endif > > > > +static inline bool riscv_pmu_ctr_supported(struct riscv_pmu *pmu) > > +{ > > + return !!pmu->ctr_depth; > > +} > > + > > #endif /* CONFIG_RISCV_PMU_COMMON */ > > > > +#ifdef CONFIG_RISCV_CTR > > + > > +bool riscv_pmu_ctr_valid(struct perf_event *event); > > +void riscv_pmu_ctr_consume(struct cpu_hw_events *cpuc, struct perf_eve= nt *event); > > +void riscv_pmu_ctr_sched_task(struct perf_event_pmu_context *pmu_ctx, = bool sched_in); > > +void riscv_pmu_ctr_enable(struct perf_event *event); > > +void riscv_pmu_ctr_disable(struct perf_event *event); > > +void riscv_pmu_ctr_dying_cpu(void); > > +void riscv_pmu_ctr_starting_cpu(void); > > +void riscv_pmu_ctr_init(struct riscv_pmu *riscv_pmu); > > +void riscv_pmu_ctr_finish(struct riscv_pmu *riscv_pmu); > > + > > +#else > > + > > +static inline bool riscv_pmu_ctr_valid(struct perf_event *event) { ret= urn false; } > > +static inline void riscv_pmu_ctr_consume(struct cpu_hw_events *cpuc, > > + struct perf_event *event) { } > > +static inline void riscv_pmu_ctr_sched_task(struct perf_event_pmu_cont= ext *, > > + bool sched_in) { } > > +static inline void riscv_pmu_ctr_enable(struct perf_event *event) { } > > +static inline void riscv_pmu_ctr_disable(struct perf_event *event) { } > > +static inline void riscv_pmu_ctr_dying_cpu(void) { } > > +static inline void riscv_pmu_ctr_starting_cpu(void) { } > > +static inline void riscv_pmu_ctr_init(struct riscv_pmu *riscv_pmu) { } > > +static inline void riscv_pmu_ctr_finish(struct riscv_pmu *riscv_pmu) {= } > > + > > +#endif /* CONFIG_RISCV_CTR */ > > + > > #endif /* _RISCV_PMU_H */ > > -- > > 2.34.1 > > > > > > _______________________________________________ > > linux-riscv mailing list > > linux-riscv@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-riscv