arm64/perf: Enable branch stack sampling
Subsystems (5)
v18 cover arm64/perf: Enable branch stack sampling
This series enables perf branch stack sampling support on arm64 platform via a new arch feature called Branch Record Buffer Extension (BRBE). All the relevant register definitions could be accessed here.
https://developer.arm.com/documentation/ddi0601/2021-12/AArch64-Registers
This series applies on 6.10-rc3.
Also this series is being hosted below for quick access, review and test.
https://git.gitlab.arm.com/linux-arm/linux-anshuman.git (brbe_v18)
- Anshuman
========== Perf Branch Stack Sampling Support (arm64 platforms) ===========
Currently arm64 platform does not support perf branch stack sampling. Hence any event requesting for branch stack records i.e PERF_SAMPLE_BRANCH_STACK marked in event->attr.sample_type, will be rejected in armpmu_event_init().
static int armpmu_event_init(struct perf_event *event)
{
........
/* does not support taken branch sampling */
if (has_branch_stack(event))
return -EOPNOTSUPP;
........
}$perf record -j any,u,k ls
Error:
cycles:P: PMU Hardware or event type doesn't support branch stack sampling.
-------------------- CONFIG_ARM64_BRBE and FEAT_BRBE ----------------------
After this series, perf branch stack sampling feature gets enabled on arm64 platforms where FEAT_BRBE HW feature is supported, and CONFIG_ARM64_BRBE is also selected during build. Let's observe all all possible scenarios here.
1. Feature not built (!CONFIG_ARM64_BRBE):
Falls back to the current behaviour i.e event gets rejected.
2. Feature built but HW not supported (CONFIG_ARM64_BRBE && !FEAT_BRBE):
Falls back to the current behaviour i.e event gets rejected.
3. Feature built and HW supported (CONFIG_ARM64_BRBE && FEAT_BRBE):
Platform supports branch stack sampling requests. Let's observe through a simple example here.
$perf record -j any_call,u,k,save_type ls
[Please refer perf-record man pages for all possible branch filter options]
$perf report
-------------------------- Snip ----------------------
# Overhead Command Source Shared Object Source Symbol Target Symbol Basic Block Cycles
# ........ ....... .................... ............................................ ............................................ ..................
#
3.52% ls [kernel.kallsyms] [k] sched_clock_noinstr [k] arch_counter_get_cntpct 16
3.52% ls [kernel.kallsyms] [k] sched_clock [k] sched_clock_noinstr 9
1.85% ls [kernel.kallsyms] [k] sched_clock_cpu [k] sched_clock 5
1.80% ls [kernel.kallsyms] [k] irqtime_account_irq [k] sched_clock_cpu 20
1.58% ls [kernel.kallsyms] [k] gic_handle_irq [k] generic_handle_domain_irq 19
1.58% ls [kernel.kallsyms] [k] call_on_irq_stack [k] gic_handle_irq 9
1.58% ls [kernel.kallsyms] [k] do_interrupt_handler [k] call_on_irq_stack 23
1.58% ls [kernel.kallsyms] [k] generic_handle_domain_irq [k] __irq_resolve_mapping 6
1.58% ls [kernel.kallsyms] [k] __irq_resolve_mapping [k] __rcu_read_lock 10-------------------------- Snip ----------------------
$perf report -D | grep cycles -------------------------- Snip ----------------------
..... 1: ffff800080dd3334 -> ffff800080dd759c 39 cycles P 0 IND_CALL ..... 2: ffff800080ffaea0 -> ffff800080ffb688 16 cycles P 0 IND_CALL ..... 3: ffff800080139918 -> ffff800080ffae64 9 cycles P 0 CALL ..... 4: ffff800080dd3324 -> ffff8000801398f8 7 cycles P 0 CALL ..... 5: ffff8000800f8548 -> ffff800080dd330c 21 cycles P 0 IND_CALL ..... 6: ffff8000800f864c -> ffff8000800f84ec 6 cycles P 0 CALL ..... 7: ffff8000800f86dc -> ffff8000800f8638 11 cycles P 0 CALL ..... 8: ffff8000800f86d4 -> ffff800081008630 16 cycles P 0 CALL
-------------------------- Snip ----------------------
perf script and other tooling can also be applied on the captured perf.data Similarly branch stack sampling records can be collected via direct system call i.e perf_event_open() method after setting 'struct perf_event_attr' as required.
event->attr.sample_type |= PERF_SAMPLE_BRANCH_STACK event->attr.branch_sample_type |= PERF_SAMPLE_BRANCH_<FILTER_1> |
PERF_SAMPLE_BRANCH_<FILTER_2> | PERF_SAMPLE_BRANCH_<FILTER_3> | ...............................
But all branch filters might not be supported on the platform.
----------------------- BRBE Branch Filters Support -----------------------
- Following branch filters are supported on arm64.
PERF_SAMPLE_BRANCH_USER /* Branch privilege filters */
PERF_SAMPLE_BRANCH_KERNEL
PERF_SAMPLE_BRANCH_HV
PERF_SAMPLE_BRANCH_ANY /* Branch type filters */
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_CALL
PERF_SAMPLE_BRANCH_NO_FLAGS /* Branch record flags */
PERF_SAMPLE_BRANCH_NO_CYCLES
PERF_SAMPLE_BRANCH_TYPE_SAVE
PERF_SAMPLE_BRANCH_HW_INDEX
PERF_SAMPLE_BRANCH_PRIV_SAVE
- Following branch filters are not supported on arm64.
PERF_SAMPLE_BRANCH_ABORT_TX
PERF_SAMPLE_BRANCH_IN_TX
PERF_SAMPLE_BRANCH_NO_TX
PERF_SAMPLE_BRANCH_CALL_STACK
Events requesting above non-supported branch filters get rejected.
--------------------------- Virtualisation support ------------------------
- No guest support
-------------------------------- Testing ---------------------------------
- Cross compiled for both arm64 and arm32 platforms
- Passes all branch tests with 'perf test branch' on arm64
Changes in V18:
- Changed BRBIDR0_EL1 register fields CC and FORMAT, updated the commit message
- Replaced BRBIDR0_EL1_FORMAT_0 as BRBIDR0_EL1_FORMAT_FORMAT_0 in BRBE driver
- Dropped ifdef CONFIG_ARM64_BRBE around __init_el2_brbe()
- Updated in code comment around __init_el2_brbe()
- Dropped the write up for EL2->EL1 transition, also moved up the EL3 write up
- Unconditionally capture branch record type and privilege information
- Scan valid branch stack events in armpmu_start() to create merged filter
- Dropped branch_sample_type override in armv8pmu_branch_stack_add()
- Dropped branch filter mismatch between PMU and event in read_branch_records()
- Added SW filtering framework in read_branch_records() during filter mismatch
- Added SW filtering for privilege modes
- Used host_data_ptr() to access host_debug_state.brbcr_el1 register
- Changed DEBUG_STATE_SAVE_BRBE to use BIT(7)
- Reverted back iflags as u8
https://lore.kernel.org/all/[email protected]/
Changes in V17:
- Added back Reviewed-by tags from Mark Brown
- Updated the commit message regarding the field BRBINFx_EL1_TYPE_IMPDEF_TRAP_EL3
- Added leading 0s for all values as BRBIDR0_EL1.NUMREC is a 8 bit field
- Added leading 0s for all values as BRBFCR_EL1.BANK is a 2 bit field
- Reordered BRBCR_EL1/BRBCR_EL12/BRBCR_EL2 registers as per sysreg encodings
- Renamed s/FIRST/BANK_0 and s/SECOND/BANK_1 in BRBFCR_EL1.BANK
- Renamed s/UNCOND_DIRECT/DIRECT_UNCOND in BRBINFx_EL1.TYPE
- Renamed s/COND_DIRECT/DIRECT_COND in BRBINFx_EL1.TYPE
- Dropped __SYS_BRBINF/__SYS_BRBSRC/__SYS_BRBTGT and their expansions
- Moved all existing BRBE registers from sysreg.h header to tools/sysreg format
- Updated the commit message including about sys_insn_descs[]
- Changed KVM to use existing SYS_BRBSRC/TGT/INF_EL1(n) format
- Moved the BRBE instructions into sys_insn_descs[] array
- ARM PMUV3 changes have been moved into the BRBE driver patch instead
- Moved down branch_stack_add() in armpmu_add() after event's basic checks
- Added new callbacks in struct arm_pmu e.g branch_stack_[init|add|del]()
- Renamed struct arm_pmu callback branch_reset() as branch_stack_reset()
- Dropped the comment in armpmu_event_init()
- Renamed 'pmu_hw_events' elements from 'brbe_' to more generic 'branch_'
- Separated out from the BRBE driver implementation patch
- Dropped the comment in __init_el2_brbe()
- Updated __init_el2_brbe() with BRBCR_EL2.MPRED requirements
- Updated __init_el2_brbe() with __check_hvhe() constructs
- Updated booting.rst regarding MPRED, MDCR_EL3 and fine grained control
- Dropped Documentation/arch/arm64/brbe.rst
- Renamed armv8pmu_branch_reset() as armv8pmu_branch_stack_reset()
- Separated out booting.rst and EL2 boot requirements into a new patch
- Dropped process_branch_aborts() completely
- Added an warning if transaction states get detected unexpectedly
- Dropped enum brbe_bank_idx from the driver
- Defined armv8pmu_branch_stack_init/add/del() callbacks in the driver
- Changed BRBE driver to use existing SYS_BRBSRC/TGT/INF_EL1(n) format
- Dropped isb() call sites in __debug_[save|restore]_brbe()
- Changed to [read|write]_sysreg_el1() accessors in __debug_[save|restore]_brbe()
Changes in V16
https://lore.kernel.org/all/[email protected]/
- Updated BRBINFx_EL1.TYPE = 0b110000 as field IMPDEF_TRAP_EL3
- Updated BRBCR_ELx[9] as field FZPSS
- Updated BRBINFINJ_EL1 to use sysreg field BRBINFx_EL1
- Added BRB_INF_SRC_TGT_EL1 macro for corresponding BRB_[INF|SRC|TGT] expansion
- Renamed arm_brbe.h as arm_pmuv3_branch.h
- Updated perf_sample_save_brstack()'s new argument requirements with NULL
- Fixed typo (s/informations/information) in Documentation/arch/arm64/brbe.rst
- Added SPDX-License-Identifier in Documentation/arch/arm64/brbe.rst
- Added new PERF_SAMPLE_BRANCH_COUNTERS into BRBE_EXCLUDE_BRANCH_FILTERS
- Dropped BRBFCR_EL1 and BRBCR_EL1 from enum vcpu_sysreg
- Reverted back the KVM NVHE patch - use host_debug_state based 'brbcr_el1' element and dropped the previous dependency on Jame's coresight series
Changes in V15:
https://lore.kernel.org/all/[email protected]/
- Added a comment for armv8pmu_branch_probe() regarding single cpu probe
- Added a text in brbe.rst regarding single cpu probe
- Dropped runtime BRBE enable for setting DEBUG_STATE_SAVE_BRBE
- Dropped zero_branch_stack based zero branch records mechanism
- Replaced BRBFCR_EL1_DEFAULT_CONFIG with BRBFCR_EL1_CONFIG_MASK
- Added BRBFCR_EL1_CONFIG_MASK masking in branch_type_to_brbfcr()
- Moved BRBE helpers from arm_brbe.h into arm_brbe.c
- Moved armv8_pmu_xxx() declaration inside arm_brbe.h for arm64 (CONFIG_ARM64_BRBE)
- Moved armv8_pmu_xxx() stub definitions inside arm_brbe.h for arm32 (!CONFIG_ARM64_BRBE)
- Included arm_brbe.h header both in arm_pmuv3.c and arm_brbe.c
- Dropped BRBE custom pr_fmt()
- Dropped CONFIG_PERF_EVENTS wrapping from header entries
- Flush branch records when a cpu bound event follows a task bound event
- Dropped BRBFCR_EL1 from __debug_save_brbe()/__debug_restore_brbe()
- Always save the live SYS_BRBCR_EL1 in host context and then check if
BRBE was enabled before resetting SYS_BRBCR_EL1 for the host
Changes in V14:
https://lore.kernel.org/all/[email protected]/
- This series has been reorganised as suggested during V13
- There are just eight patches now i.e 5 enablement and 3 perf branch tests
- Fixed brackets problem in __SYS_BRBINFO/BRBSRC/BRBTGT() macros
- Renamed the macro i.e s/__SYS_BRBINFO/__SYS_BRBINF/
- Renamed s/BRB_IALL/BRB_IALL_INSN and s/BRBE_INJ/BRB_INJ_INSN
- Moved BRB_IALL_INSN and SYS_BRB_INSN instructions to sysreg patch
- Changed E1BRE as ExBRE in sysreg fields inside BRBCR_ELx
- Used BRBCR_ELx for defining all BRBCR_EL1, BRBCR_EL2, and BRBCR_EL12 (new)
- Folded the following three patches into a single patch i.e [PATCH 3/8]
drivers: perf: arm_pmu: Add new sched_task() callback arm64/perf: Add branch stack support in struct arm_pmu arm64/perf: Add branch stack support in struct pmu_hw_events arm64/perf: Add branch stack support in ARMV8 PMU arm64/perf: Add PERF_ATTACH_TASK_DATA to events with has_branch_stack()
- All armv8pmu_branch_xxxx() stub definitions have been moved inside include/linux/perf/arm_pmuv3.h for easy access from both arm32 and arm64
- Added brbe_users, brbe_context and brbe_sample_type in struct pmu_hw_events
- Added comments for all the above new elements in struct pmu_hw_events
- Added branch_reset() and sched_task() callbacks
- Changed and optimized branch records processing during a PMU IRQ
- NO branch records get captured for event with mismatched brbe_sample_type
- Branch record context is tracked from armpmu_del() & armpmu_add()
- Branch record hardware is driven from armv8pmu_start() & armv8pmu_stop()
- Dropped NULL check for 'pmu_ctx' inside armv8pmu_sched_task()
- Moved down PERF_ATTACH_TASK_DATA assignment with a preceding comment
- In conflicting branch sample type requests, first event takes precedence
- Folded the following five patches from V13 into a single patch i.e [PATCH 4/8]
arm64/perf: Enable branch stack events via FEAT_BRBE arm64/perf: Add struct brbe_regset helper functions arm64/perf: Implement branch records save on task sched out arm64/perf: Implement branch records save on PMU IRQ
- Fixed the year in copyright statement
- Added Documentation/arch/arm64/brbe.rst
- Updated Documentation/arch/arm64/booting.rst (BRBCR_EL2.CC for EL1 entry)
- Added __init_el2_brbe() which enables branch record cycle count support
- Disabled EL2 traps in __init_el2_fgt() while accessing BRBE registers and executing instructions
- Changed CONFIG_ARM64_BRBE user visible description
- Fixed a typo in CONFIG_ARM64_BRBE config option description text
- Added BUILD_BUG_ON() co-relating BRBE_BANK_MAX_ENTRIES and MAX_BRANCH_RECORDS
- Dropped arm64_create_brbe_task_ctx_kmem_cache()
- Moved down comment for PERF_SAMPLE_BRANCH_KERNEL in branch_type_to_brbcr()
- Renamed BRBCR_ELx_DEFAULT_CONFIG as BRBCR_ELx_CONFIG_MASK
- Replaced BRBCR_ELx_DEFAULT_TS with BRBCR_ELx_TS_MASK in BRBCR_ELx_CONFIG_MASK
- Replaced BRBCR_ELx_E1BRE instances with BRBCR_ELx_ExBRE
- Added BRBE specific branch stack sampling perf test patches into the series
- Added a patch to prevent guest accesses into BRBE registers and instructions
- Added a patch to save the BRBE host context in NVHE environment
- Updated most commit messages
Changes in V13:
https://lore.kernel.org/all/[email protected]/
https://lore.kernel.org/all/[email protected]/
- Added branch callback stubs for aarch32 pmuv3 based platforms
- Updated the comments for capture_brbe_regset()
- Deleted the comments in __read_brbe_regset()
- Reversed the arguments order in capture_brbe_regset() and brbe_branch_save()
- Fixed BRBE_BANK[0|1]_IDX_MAX indices comparison in armv8pmu_branch_read()
- Fixed BRBE_BANK[0|1]_IDX_MAX indices comparison in capture_brbe_regset()
Changes in V12:
https://lore.kernel.org/all/[email protected]/
- Replaced branch types with complete DIRECT/INDIRECT prefixes/suffixes
- Replaced branch types with complete INSN/ALIGN prefixes/suffixes
- Replaced return branch types as simple RET/ERET
- Replaced time field GST_PHYSICAL as GUEST_PHYSICAL
- Added 0 padding for BRBIDR0_EL1.NUMREC enum values
- Dropped helper arm_pmu_branch_stack_supported()
- Renamed armv8pmu_branch_valid() as armv8pmu_branch_attr_valid()
- Separated perf_task_ctx_cache setup from arm_pmu private allocation
- Collected changes to branch_records_alloc() in a single patch [5/10]
- Reworked and cleaned up branch_records_alloc()
- Reworked armv8pmu_branch_read() with new loop iterations in patch [6/10]
- Reworked capture_brbe_regset() with new loop iterations in patch [8/10]
- Updated the comment in branch_type_to_brbcr()
- Fixed the comment before stitch_stored_live_entries()
- Fixed BRBINFINJ_EL1 definition for VALID_FULL enum field
- Factored out helper __read_brbe_regset() from capture_brbe_regset()
- Dropped the helper copy_brbe_regset()
- Simplified stitch_stored_live_entries() with memcpy(), memmove()
- Reworked armv8pmu_probe_pmu() to bail out early with !probe.present
- Rework brbe_attributes_probe() without 'struct brbe_hw_attr'
- Dropped 'struct brbe_hw_attr' argument from capture_brbe_regset()
- Dropped 'struct brbe_hw_attr' argument from brbe_branch_save()
- Dropped arm_pmu->private and added arm_pmu->reg_trbidr instead
Changes in V11:
https://lore.kernel.org/all/[email protected]/
- Fixed the crash for per-cpu events without event->pmu_ctx->task_ctx_data
Changes in V10:
https://lore.kernel.org/all/[email protected]/
- Rebased the series on v6.4-rc2
- Moved ARMV8 PMUV3 changes inside drivers/perf/arm_pmuv3.c
- Moved BRBE driver changes inside drivers/perf/arm_brbe.[c|h]
- Moved the WARN_ON() inside the if condition in armv8pmu_handle_irq()
Changes in V9:
https://lore.kernel.org/all/[email protected]/
- Fixed build problem with has_branch_stack() in arm64 header
- BRBINF_EL1 definition has been changed from 'Sysreg' to 'SysregFields'
- Renamed all BRBINF_EL1 call sites as BRBINFx_EL1
- Dropped static const char branch_filter_error_msg[]
- Implemented a positive list check for BRBE supported perf branch filters
- Added a comment in armv8pmu_handle_irq()
- Implemented per-cpu allocation for struct branch_record records
- Skipped looping through bank 1 if an invalid record is detected in bank 0
- Added comment in armv8pmu_branch_read() explaining prohibited region etc
- Added comment warning about erroneously marking transactions as aborted
- Replaced the first argument (perf_branch_entry) in capture_brbe_flags()
- Dropped the last argument (idx) in capture_brbe_flags()
- Dropped the brbcr argument from capture_brbe_flags()
- Used perf_sample_save_brstack() to capture branch records for perf_sample_data
- Added comment explaining rationale for setting BRBCR_EL1_FZP for user only traces
- Dropped BRBE prohibited state mechanism while in armv8pmu_branch_read()
- Implemented event task context based branch records save mechanism
Changes in V8:
https://lore.kernel.org/all/[email protected]/
- Replaced arm_pmu->features as arm_pmu->has_branch_stack, updated its helper
- Added a comment and line break before arm_pmu->private element
- Added WARN_ON_ONCE() in helpers i.e armv8pmu_branch_[read|valid|enable|disable]()
- Dropped comments in armv8pmu_enable_event() and armv8pmu_disable_event()
- Replaced open bank encoding in BRBFCR_EL1 with SYS_FIELD_PREP()
- Changed brbe_hw_attr->brbe_version from 'bool' to 'int'
- Updated pr_warn() as pr_warn_once() with values in brbe_get_perf_[type|priv]()
- Replaced all pr_warn_once() as pr_debug_once() in armv8pmu_branch_valid()
- Added a comment in branch_type_to_brbcr() for the BRBCR_EL1 privilege settings
- Modified the comment related to BRBINFx_EL1.LASTFAILED in capture_brbe_flags()
- Modified brbe_get_perf_entry_type() as brbe_set_perf_entry_type()
- Renamed brbe_valid() as brbe_record_is_complete()
- Renamed brbe_source() as brbe_record_is_source_only()
- Renamed brbe_target() as brbe_record_is_target_only()
- Inverted checks for !brbe_record_is_[target|source]_only() for info capture
- Replaced 'fetch' with 'get' in all helpers that extract field value
- Dropped 'static int brbe_current_bank' optimization in select_brbe_bank()
- Dropped select_brbe_bank_index() completely, added capture_branch_entry()
- Process captured branch entries in two separate loops one for each BRBE bank
- Moved branch_records_alloc() inside armv8pmu_probe_pmu()
- Added a forward declaration for the helper has_branch_stack()
- Added new callbacks armv8pmu_private_alloc() and armv8pmu_private_free()
- Updated armv8pmu_probe_pmu() to allocate the private structure before SMP call
Changes in V7:
https://lore.kernel.org/all/[email protected]/
- Folded [PATCH 7/7] into [PATCH 3/7] which enables branch stack sampling event
- Defined BRBFCR_EL1_BRANCH_FILTERS, BRBCR_EL1_DEFAULT_CONFIG in the header
- Defined BRBFCR_EL1_DEFAULT_CONFIG in the header
- Updated BRBCR_EL1_DEFAULT_CONFIG with BRBCR_EL1_FZP
- Defined BRBCR_EL1_DEFAULT_TS in the header
- Updated BRBCR_EL1_DEFAULT_CONFIG with BRBCR_EL1_DEFAULT_TS
- Moved BRBCR_EL1_DEFAULT_CONFIG check inside branch_type_to_brbcr()
- Moved down BRBCR_EL1_CC, BRBCR_EL1_MPRED later in branch_type_to_brbcr()
- Also set BRBE in paused state in armv8pmu_branch_disable()
- Dropped brbe_paused(), set_brbe_paused() helpers
- Extracted error string via branch_filter_error_msg[] for armv8pmu_branch_valid()
- Replaced brbe_v1p1 with brbe_version in struct brbe_hw_attr
- Added valid_brbe_[cc, format, version]() helpers
- Split a separate brbe_attributes_probe() from armv8pmu_branch_probe()
- Capture event->attr.branch_sample_type earlier in armv8pmu_branch_valid()
- Defined enum brbe_bank_idx with possible values for BRBE bank indices
- Changed armpmu->hw_attr into armpmu->private
- Added missing space in stub definition for armv8pmu_branch_valid()
- Replaced both kmalloc() with kzalloc()
- Added BRBE_BANK_MAX_ENTRIES
- Updated comment for capture_brbe_flags()
- Updated comment for struct brbe_hw_attr
- Dropped space after type cast in couple of places
- Replaced inverse with negation for testing BRBCR_EL1_FZP in armv8pmu_branch_read()
- Captured cpuc->branches->branch_entries[idx] in a local variable
- Dropped saved_priv from armv8pmu_branch_read()
- Reorganize PERF_SAMPLE_BRANCH_NO_[CYCLES|NO_FLAGS] related configuration
- Replaced with FIELD_GET() and FIELD_PREP() wherever applicable
- Replaced BRBCR_EL1_TS_PHYSICAL with BRBCR_EL1_TS_VIRTUAL
- Moved valid_brbe_nr(), valid_brbe_cc(), valid_brbe_format(), valid_brbe_version() select_brbe_bank(), select_brbe_bank_index() helpers inside the C implementation
- Reorganized brbe_valid_nr() and dropped the pr_warn() message
- Changed probe sequence in brbe_attributes_probe()
- Added 'brbcr' argument into capture_brbe_flags() to ascertain correct state
- Disable BRBE before disabling the PMU event counter
- Enable PERF_SAMPLE_BRANCH_HV filters when is_kernel_in_hyp_mode()
- Guard armv8pmu_reset() & armv8pmu_sched_task() with arm_pmu_branch_stack_supported()
Changes in V6:
https://lore.kernel.org/linux-arm-kernel/[email protected]/
- Restore the exception level privilege after reading the branch records
- Unpause the buffer after reading the branch records
- Decouple BRBCR_EL1_EXCEPTION/ERTN from perf event privilege level
- Reworked BRBE implementation and branch stack sampling support on arm pmu
- BRBE implementation is now part of overall ARMV8 PMU implementation
- BRBE implementation moved from drivers/perf/ to inside arch/arm64/kernel/
- CONFIG_ARM_BRBE_PMU renamed as CONFIG_ARM64_BRBE in arch/arm64/Kconfig
- File moved - drivers/perf/arm_pmu_brbe.c -> arch/arm64/kernel/brbe.c
- File moved - drivers/perf/arm_pmu_brbe.h -> arch/arm64/kernel/brbe.h
- BRBE name has been dropped from struct arm_pmu and struct hw_pmu_events
- BRBE name has been abstracted out as 'branches' in arm_pmu and hw_pmu_events
- BRBE name has been abstracted out as 'branches' in ARMV8 PMU implementation
- Added sched_task() callback into struct arm_pmu
- Added 'hw_attr' into struct arm_pmu encapsulating possible PMU HW attributes
- Dropped explicit attributes brbe_(v1p1, nr, cc, format) from struct arm_pmu
- Dropped brbfcr, brbcr, registers scratch area from struct hw_pmu_events
- Dropped brbe_users, brbe_context tracking in struct hw_pmu_events
- Added 'features' tracking into struct arm_pmu with ARM_PMU_BRANCH_STACK flag
- armpmu->hw_attr maps into 'struct brbe_hw_attr' inside BRBE implementation
- Set ARM_PMU_BRANCH_STACK in 'arm_pmu->features' after successful BRBE probe
- Added armv8pmu_branch_reset() inside armv8pmu_branch_enable()
- Dropped brbe_supported() as events will be rejected via ARM_PMU_BRANCH_STACK
- Dropped set_brbe_disabled() as well
- Reformated armv8pmu_branch_valid() warnings while rejecting unsupported events
Changes in V5:
https://lore.kernel.org/linux-arm-kernel/[email protected]/
- Changed BRBCR_EL1.VIRTUAL from 0b1 to 0b01
- Changed BRBFCR_EL1.EnL into BRBFCR_EL1.EnI
- Changed config ARM_BRBE_PMU from 'tristate' to 'bool'
Changes in V4:
https://lore.kernel.org/all/[email protected]/
- Changed ../tools/sysreg declarations as suggested
- Set PERF_SAMPLE_BRANCH_STACK in data.sample_flags
- Dropped perfmon_capable() check in armpmu_event_init()
- s/pr_warn_once/pr_info in armpmu_event_init()
- Added brbe_format element into struct pmu_hw_events
- Changed v1p1 as brbe_v1p1 in struct pmu_hw_events
- Dropped pr_info() from arm64_pmu_brbe_probe(), solved LOCKDEP warning
Changes in V3:
https://lore.kernel.org/all/[email protected]/
- Moved brbe_stack from the stack and now dynamically allocated
- Return PERF_BR_PRIV_UNKNOWN instead of -1 in brbe_fetch_perf_priv()
- Moved BRBIDR0, BRBCR, BRBFCR registers and fields into tools/sysreg
- Created dummy BRBINF_EL1 field definitions in tools/sysreg
- Dropped ARMPMU_EVT_PRIV framework which cached perfmon_capable()
- Both exception and exception return branche records are now captured only if the event has PERF_SAMPLE_BRANCH_KERNEL which would already been checked in generic perf via perf_allow_kernel()
Changes in V2:
https://lore.kernel.org/all/[email protected]/
- Dropped branch sample filter helpers consolidation patch from this series
- Added new hw_perf_event.flags element ARMPMU_EVT_PRIV to cache perfmon_capable()
- Use cached perfmon_capable() while configuring BRBE branch record filters
Changes in V1:
https://lore.kernel.org/linux-arm-kernel/[email protected]/
- Added CONFIG_PERF_EVENTS wrapper for all branch sample filter helpers
- Process new perf branch types via PERF_BR_EXTEND_ABI
Changes in RFC V2:
https://lore.kernel.org/linux-arm-kernel/[email protected]/
- Added branch_sample_priv() while consolidating other branch sample filter helpers
- Changed all SYS_BRBXXXN_EL1 register definition encodings per Marc
- Changed the BRBE driver as per proposed BRBE related perf ABI changes (V5)
- Added documentation for struct arm_pmu changes, updated commit message
- Updated commit message for BRBE detection infrastructure patch
- PERF_SAMPLE_BRANCH_KERNEL gets checked during arm event init (outside the driver)
- Branch privilege state capture mechanism has now moved inside the driver
Changes in RFC V1:
https://lore.kernel.org/all/[email protected]/
Anshuman Khandual (6):
arm64/sysreg: Add BRBE registers and fields
KVM: arm64: Explicitly handle BRBE traps as UNDEFINED
drivers: perf: arm_pmu: Add infrastructure for branch stack sampling arm64/boot: Enable EL2 requirements for BRBE
drivers: perf: arm_pmuv3: Enable branch stack sampling via FEAT_BRBE
KVM: arm64: nvhe: Disable branch generation in nVHE guests
James Clark (3):
perf: test: Speed up running brstack test on an Arm model
perf: test: Remove empty lines from branch filter test output
perf: test: Extend branch stack sampling test for Arm64 BRBE
Documentation/arch/arm64/booting.rst | 23 +- arch/arm64/include/asm/el2_setup.h | 87 +- arch/arm64/include/asm/kvm_host.h | 3 + arch/arm64/include/asm/sysreg.h | 17 +- arch/arm64/kvm/debug.c | 5 + arch/arm64/kvm/hyp/nvhe/debug-sr.c | 31 + arch/arm64/kvm/sys_regs.c | 56 ++ arch/arm64/tools/sysreg | 131 +++ drivers/perf/Kconfig | 11 + drivers/perf/Makefile | 1 + drivers/perf/arm_brbe.c | 1198 ++++++++++++++++++++++++ drivers/perf/arm_pmu.c | 42 +- drivers/perf/arm_pmuv3.c | 160 +++- drivers/perf/arm_pmuv3_branch.h | 83 ++ include/linux/perf/arm_pmu.h | 37 +- tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/shell/test_brstack.sh | 57 +- tools/perf/tests/tests.h | 1 + tools/perf/tests/workloads/Build | 2 + tools/perf/tests/workloads/traploop.c | 39 + 20 files changed, 1959 insertions(+), 26 deletions(-) create mode 100644 drivers/perf/arm_brbe.c create mode 100644 drivers/perf/arm_pmuv3_branch.h create mode 100644 tools/perf/tests/workloads/traploop.c
Signature · 1 line
2.25.1
PATCH v18 1/9 arm64/sysreg: Add BRBE registers and fields
This patch adds definitions related to the Branch Record Buffer Extension (BRBE) as per ARM DDI 0487K.a. These will be used by KVM and a BRBE driver in subsequent patches.
Some existing BRBE definitions in asm/sysreg.h are replaced with equivalent generated definitions.
----
Changes in V18:
- Changed BRBIDR0_EL1 register fields CC and FORMAT, updated the commit message
arch/arm64/include/asm/sysreg.h | 17 ++--- arch/arm64/tools/sysreg | 131 ++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 11 deletions(-) --- arch/arm64/include/asm/sysreg.h | 17 ++--- arch/arm64/tools/sysreg | 131 ++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 11 deletions(-)
arch/arm64/include/asm/sysreg.h +6 -11
@@ -195,16 +195,8 @@#define SYS_DBGVCR32_EL2 sys_reg(2, 4, 0, 7, 0)#define SYS_BRBINF_EL1 (n) sys_reg(2, 1, 8, (n & 15), (((n & 16) >> 2) | 0)) -#define SYS_BRBINFINJ_EL1 sys_reg(2, 1, 9, 1, 0)#define SYS_BRBSRC_EL1 (n) sys_reg(2, 1, 8, (n & 15), (((n & 16) >> 2) | 1)) -#define SYS_BRBSRCINJ_EL1 sys_reg(2, 1, 9, 1, 1)#define SYS_BRBTGT_EL1 (n) sys_reg(2, 1, 8, (n & 15), (((n & 16) >> 2) | 2)) -#define SYS_BRBTGTINJ_EL1 sys_reg(2, 1, 9, 1, 2) -#define SYS_BRBTS_EL1 sys_reg(2, 1, 9, 0, 2) - -#define SYS_BRBCR_EL1 sys_reg(2, 1, 9, 0, 0) -#define SYS_BRBFCR_EL1 sys_reg(2, 1, 9, 0, 1) -#define SYS_BRBIDR0_EL1 sys_reg(2, 1, 9, 2, 0)#define SYS_TRCITECR_EL1 sys_reg(3, 0, 1, 2, 3)#define SYS_TRCACATR (m) sys_reg(2, 1, 2, ((m & 7) << 1), (2 | (m >> 3)))
@@ -270,8 +262,6 @@/* ETM */ #define SYS_TRCOSLAR sys_reg(2, 1, 1, 0, 4) -#define SYS_BRBCR_EL2 sys_reg(2, 4, 9, 0, 0) -#define SYS_MIDR_EL1 sys_reg(3, 0, 0, 0, 0)#define SYS_MPIDR_EL1 sys_reg(3, 0, 0, 0, 5)#define SYS_REVIDR_EL1 sys_reg(3, 0, 0, 0, 6)
@@ -601,7 +591,6 @@#define SYS_CNTHV_CVAL_EL2 sys_reg(3, 4, 14, 3, 2)/* VHE encodings for architectural EL0/1 system registers */ -#define SYS_BRBCR_EL12 sys_reg(2, 5, 9, 0, 0)#define SYS_SCTLR_EL12 sys_reg(3, 5, 1, 0, 0)#define SYS_CPACR_EL12 sys_reg(3, 5, 1, 0, 2)#define SYS_SCTLR2_EL12 sys_reg(3, 5, 1, 0, 3)
@@ -794,6 +783,12 @@#define OP_COSP_RCTX sys_insn(1, 3, 7, 3, 6)#define OP_CPP_RCTX sys_insn(1, 3, 7, 3, 7) +/* +* BRBE Instructions +*/ +#define BRB_IALL_INSN __emit_inst(0xd5000000 | OP_BRB_IALL | (0x1f)) +#define BRB_INJ_INSN __emit_inst(0xd5000000 | OP_BRB_INJ | (0x1f)) +/* Common SCTLR_ELx flags. */ #define SCTLR_ELx_ENTP2 (BIT(60))#define SCTLR_ELx_DSSBS (BIT(44))
arch/arm64/tools/sysreg +131 -0
137 lines not on this page · raw message
Signature · 1 line
2.25.1
Mark Rutland
maintainerRe: [PATCH V18 1/9] arm64/sysreg: Add BRBE registers and fields
Quoted 16 lines · Anshuman Khandual
This patch adds definitions related to the Branch Record Buffer Extension (BRBE) as per ARM DDI 0487K.a. These will be used by KVM and a BRBE driver in subsequent patches.
Some existing BRBE definitions in
asm/sysreg.hare replaced with equivalent generated definitions.Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Cc Marc Zyngier <[email protected]>Cc Mark Rutland <[email protected]>Reviewed-by Mark Rutland <[email protected]>Reviewed-by Mark Brown <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>
Quoted 4 lines
----
Changes in V18:- Changed
BRBIDR0_EL1register fields CC and FORMAT, updated the commit message
Thanks, I see that matches my requsts on v17, so this looks good to me.
Quoted 8 lines
arch/arm64/include/asm/sysreg.h | 17 ++--- arch/arm64/tools/sysreg | 131 ++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 11 deletions(-) --- arch/arm64/include/asm/sysreg.h | 17 ++--- arch/arm64/tools/sysreg | 131 ++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 11 deletions(-)
Something went wrong here to have this teice, but that doesn't affect the actual patch.
Mark.
Quoted 197 lines
arch/arm64/include/asm/sysreg.h +6
-11@@ -195,16 +195,8 @@#define SYS_DBGVCR32_EL2 sys_reg(2, 4, 0, 7, 0)#define SYS_BRBINF_EL1 (n) sys_reg(2, 1, 8, (n & 15), (((n & 16) >> 2) | 0)) -#define SYS_BRBINFINJ_EL1 sys_reg(2, 1, 9, 1, 0)#define SYS_BRBSRC_EL1 (n) sys_reg(2, 1, 8, (n & 15), (((n & 16) >> 2) | 1)) -#define SYS_BRBSRCINJ_EL1 sys_reg(2, 1, 9, 1, 1)#define SYS_BRBTGT_EL1 (n) sys_reg(2, 1, 8, (n & 15), (((n & 16) >> 2) | 2)) -#define SYS_BRBTGTINJ_EL1 sys_reg(2, 1, 9, 1, 2) -#define SYS_BRBTS_EL1 sys_reg(2, 1, 9, 0, 2) - -#define SYS_BRBCR_EL1 sys_reg(2, 1, 9, 0, 0) -#define SYS_BRBFCR_EL1 sys_reg(2, 1, 9, 0, 1) -#define SYS_BRBIDR0_EL1 sys_reg(2, 1, 9, 2, 0)#define SYS_TRCITECR_EL1 sys_reg(3, 0, 1, 2, 3)#define SYS_TRCACATR (m) sys_reg(2, 1, 2, ((m & 7) << 1), (2 | (m >> 3)))@@ -270,8 +262,6 @@/* ETM */ #define SYS_TRCOSLAR sys_reg(2, 1, 1, 0, 4) -#define SYS_BRBCR_EL2 sys_reg(2, 4, 9, 0, 0) -#define SYS_MIDR_EL1 sys_reg(3, 0, 0, 0, 0)#define SYS_MPIDR_EL1 sys_reg(3, 0, 0, 0, 5)#define SYS_REVIDR_EL1 sys_reg(3, 0, 0, 0, 6)@@ -601,7 +591,6 @@#define SYS_CNTHV_CVAL_EL2 sys_reg(3, 4, 14, 3, 2)/* VHE encodings for architectural EL0/1 system registers */ -#define SYS_BRBCR_EL12 sys_reg(2, 5, 9, 0, 0)#define SYS_SCTLR_EL12 sys_reg(3, 5, 1, 0, 0)#define SYS_CPACR_EL12 sys_reg(3, 5, 1, 0, 2)#define SYS_SCTLR2_EL12 sys_reg(3, 5, 1, 0, 3)@@ -794,6 +783,12 @@#define OP_COSP_RCTX sys_insn(1, 3, 7, 3, 6)#define OP_CPP_RCTX sys_insn(1, 3, 7, 3, 7) +/* +* BRBE Instructions +*/ +#define BRB_IALL_INSN __emit_inst(0xd5000000 | OP_BRB_IALL | (0x1f)) +#define BRB_INJ_INSN __emit_inst(0xd5000000 | OP_BRB_INJ | (0x1f)) +/* Common SCTLR_ELx flags. */ #define SCTLR_ELx_ENTP2 (BIT(60))#define SCTLR_ELx_DSSBS (BIT(44))arch/arm64/tools/sysreg +131
-0@@ -1025,6 +1025,137 @@ UnsignedEnum 3:0 MTEPERM EndEnum EndSysreg + +SysregFields BRBINFx_EL1 +Res0 63:47 +Field 46 CCU +Field 45:32 CC +Res0 31:18 +Field 17 LASTFAILED +Field 16 T +Res0 15:14 +Enum 13:8 TYPE + 0b000000 DIRECT_UNCOND + 0b000001 INDIRECT + 0b000010 DIRECT_LINK + 0b000011 INDIRECT_LINK + 0b000101 RET + 0b000111 ERET + 0b001000 DIRECT_COND + 0b100001 DEBUG_HALT + 0b100010 CALL + 0b100011 TRAP + 0b100100 SERROR + 0b100110 INSN_DEBUG + 0b100111 DATA_DEBUG + 0b101010 ALIGN_FAULT + 0b101011 INSN_FAULT + 0b101100 DATA_FAULT + 0b101110 IRQ + 0b101111 FIQ + 0b110000 IMPDEF_TRAP_EL3 + 0b111001 DEBUG_EXIT +EndEnum +Enum 7:6 EL + 0b00 EL0 + 0b01 EL1 + 0b10 EL2 + 0b11 EL3 +EndEnum +Field 5 MPRED +Res0 4:2 +Enum 1:0 VALID + 0b00 NONE + 0b01 TARGET + 0b10 SOURCE + 0b11 FULL +EndEnum +EndSysregFields + +SysregFields BRBCR_ELx +Res0 63:24 +Field 23 EXCEPTION +Field 22 ERTN +Res0 21:10 +Field 9 FZPSS +Field 8 FZP +Res0 7 +Enum 6:5 TS + 0b01 VIRTUAL + 0b10 GUEST_PHYSICAL + 0b11 PHYSICAL +EndEnum +Field 4 MPRED +Field 3 CC +Res0 2 +Field 1 ExBRE +Field 0 E0BRE +EndSysregFields + +Sysreg BRBCR_EL1 2 1 9 0 0 +Fields BRBCR_ELx +EndSysreg + +Sysreg BRBFCR_EL1 2 1 9 0 1 +Res0 63:30 +Enum 29:28 BANK + 0b00 BANK_0 + 0b01 BANK_1 +EndEnum +Res0 27:23 +Field 22 CONDDIR +Field 21 DIRCALL +Field 20 INDCALL +Field 19 RTN +Field 18 INDIRECT +Field 17 DIRECT +Field 16 EnI +Res0 15:8 +Field 7 PAUSED +Field 6 LASTFAILED +Res0 5:0 +EndSysreg + +Sysreg BRBTS_EL1 2 1 9 0 2 +Field 63:0 TS +EndSysreg + +Sysreg BRBINFINJ_EL1 2 1 9 1 0 +Fields BRBINFx_EL1 +EndSysreg + +Sysreg BRBSRCINJ_EL1 2 1 9 1 1 +Field 63:0 ADDRESS +EndSysreg + +Sysreg BRBTGTINJ_EL1 2 1 9 1 2 +Field 63:0 ADDRESS +EndSysreg + +Sysreg BRBIDR0_EL1 2 1 9 2 0 +Res0 63:16 +Enum 15:12 CC + 0b0101 20_BIT +EndEnum +Enum 11:8 FORMAT + 0b0000 FORMAT_0 +EndEnum +Enum 7:0 NUMREC + 0b00001000 8 + 0b00010000 16 + 0b00100000 32 + 0b01000000 64 +EndEnum +EndSysreg + +Sysreg BRBCR_EL2 2 4 9 0 0 +Fields BRBCR_ELx +EndSysreg + +Sysreg BRBCR_EL12 2 5 9 0 0 +Fields BRBCR_ELx +EndSysreg + Sysreg ID_AA64ZFR0_EL1 3 0 0 4 4 Res0 63:60 UnsignedEnum 59:56 F64MMSignature · 1 line
2.25.1
PATCH v18 2/9 KVM: arm64: Explicitly handle BRBE traps as UNDEFINED
In reply to Anshuman KhandualThe Branch Record Buffer Extension (BRBE) adds a number of system registers and instructions, which we don't currently intend to expose to guests. Our existing logic handles this safely, but this could be improved with some explicit handling of BRBE.
The presence of BRBE is currently hidden from guests as the cpufeature code's ftr_id_aa64dfr0[] table doesn't have an entry for the BRBE field, and so this will be zero in the sanitised value of ID_AA64DFR0 exposed to guests via read_sanitised_id_aa64dfr0_el1(). As the ftr_id_aa64dfr0[] table may gain an entry for the BRBE field in future, for robustness we should explicitly mask out the BRBE field in read_sanitised_id_aa64dfr0_el1().
The BRBE system registers and instructions are currently trapped by the existing configuration of the fine-grained traps. As neither the registers nor the instructions are described in the sys_reg_descs[] table, emulate_sys_reg() will warn that these are unknown before injecting an UNDEFINED exception into the guest.
Well-behaved guests shouldn't try to use the registers or instructions, but badly-behaved guests could use these, resulting in unnecessary warnings. To avoid those warnings, we should explicitly handle the BRBE registers and instructions as UNDEFINED.
Address the above by having read_sanitised_id_aa64dfr0_el1() mask out the ID_AA64DFR0.BRBE field, and explicitly handling all of the BRBE system registers and instructions as UNDEFINED.
----
Changes in V18:
- Updated the commit message
arch/arm64/kvm/sys_regs.c | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)
--- arch/arm64/kvm/sys_regs.c | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)
arch/arm64/kvm/sys_regs.c +56 -0
@@ -1304,6 +1304,11 @@ static int set_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r,return 0 ; } +#define BRB_INF_SRC_TGT_EL1 (n) \ + { SYS_DESC(SYS_BRBINF_EL1(n)), undef_access }, \ + { SYS_DESC(SYS_BRBSRC_EL1(n)), undef_access }, \ + { SYS_DESC(SYS_BRBTGT_EL1(n)), undef_access } \ +/* Silly macro to expand the DBG{BCR,BVR,WVR,WCR}n_EL1 registers in one go */ #define DBG_BCR_BVR_WCR_WVR_EL1 (n) \ { SYS_DESC(SYS_DBGBVRn_EL1(n)), \
@@ -1722,6 +1727,9 @@ static u64 read_sanitised_id_aa64dfr0_el1(struct kvm_vcpu *vcpu,/* Hide SPE from guests */ val &= ~ID_AA64DFR0_EL1_PMSVer_MASK; +/* Hide BRBE from guests */ + val &= ~ID_AA64DFR0_EL1_BRBE_MASK ; +return val; }
@@ -2240,6 +2248,52 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_DBGCLAIMCLR_EL1), trap_raz_wi }, { SYS_DESC(SYS_DBGAUTHSTATUS_EL1), trap_dbgauthstatus_el1 }, +/* +* BRBE branch record sysreg address space is interleaved between +* corresponding BRBINF<N>_EL1, BRBSRC<N>_EL1, and BRBTGT<N>_EL1. +*/ +BRB_INF_SRC_TGT_EL1 (0 ), +BRB_INF_SRC_TGT_EL1 (16 ), +BRB_INF_SRC_TGT_EL1 (1 ), +BRB_INF_SRC_TGT_EL1 (17 ), +BRB_INF_SRC_TGT_EL1 (2 ), +BRB_INF_SRC_TGT_EL1 (18 ), +BRB_INF_SRC_TGT_EL1 (3 ), +BRB_INF_SRC_TGT_EL1 (19 ), +BRB_INF_SRC_TGT_EL1 (4 ), +BRB_INF_SRC_TGT_EL1 (20 ), +BRB_INF_SRC_TGT_EL1 (5 ), +BRB_INF_SRC_TGT_EL1 (21 ), +BRB_INF_SRC_TGT_EL1 (6 ), +BRB_INF_SRC_TGT_EL1 (22 ), +BRB_INF_SRC_TGT_EL1 (7 ), +BRB_INF_SRC_TGT_EL1 (23 ), +BRB_INF_SRC_TGT_EL1 (8 ), +BRB_INF_SRC_TGT_EL1 (24 ), +BRB_INF_SRC_TGT_EL1 (9 ), +BRB_INF_SRC_TGT_EL1 (25 ), +BRB_INF_SRC_TGT_EL1 (10 ), +BRB_INF_SRC_TGT_EL1 (26 ), +BRB_INF_SRC_TGT_EL1 (11 ), +BRB_INF_SRC_TGT_EL1 (27 ), +BRB_INF_SRC_TGT_EL1 (12 ), +BRB_INF_SRC_TGT_EL1 (28 ), +BRB_INF_SRC_TGT_EL1 (13 ), +BRB_INF_SRC_TGT_EL1 (29 ), +BRB_INF_SRC_TGT_EL1 (14 ), +BRB_INF_SRC_TGT_EL1 (30 ), +BRB_INF_SRC_TGT_EL1 (15 ), +BRB_INF_SRC_TGT_EL1 (31 ), + +/* Remaining BRBE sysreg addresses space */ + { SYS_DESC(SYS_BRBCR_EL1), undef_access }, + { SYS_DESC(SYS_BRBFCR_EL1), undef_access }, + { SYS_DESC(SYS_BRBTS_EL1), undef_access }, + { SYS_DESC(SYS_BRBINFINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBSRCINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBTGTINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBIDR0_EL1), undef_access }, + { SYS_DESC(SYS_MDCCSR_EL0), trap_raz_wi }, { SYS_DESC(SYS_DBGDTR_EL0), trap_raz_wi }, // DBGDTR[TR]X_EL0 share the same encoding
@@ -2751,6 +2805,8 @@ static struct sys_reg_desc sys_insn_descs[] = { { SYS_DESC(SYS_DC_CISW), access_dcsw }, { SYS_DESC(SYS_DC_CIGSW), access_dcgsw }, { SYS_DESC(SYS_DC_CIGDSW), access_dcgsw }, + { SYS_DESC(OP_BRB_IALL), undef_access }, + { SYS_DESC(OP_BRB_INJ), undef_access }, };static const struct sys_reg_desc *first_idreg;
Signature · 1 line
2.25.1
Re: [PATCH V18 2/9] KVM: arm64: Explicitly handle BRBE traps as UNDEFINED
Quoted 27 lines · Anshuman Khandual
The Branch Record Buffer Extension (BRBE) adds a number of system registers and instructions, which we don't currently intend to expose to guests. Our existing logic handles this safely, but this could be improved with some explicit handling of BRBE.
The presence of BRBE is currently hidden from guests as the cpufeature code's ftr_id_aa64dfr0[] table doesn't have an entry for the BRBE field, and so this will be zero in the sanitised value of
ID_AA64DFR0exposed to guests viaread_sanitised_id_aa64dfr0_el1(). As the ftr_id_aa64dfr0[] table may gain an entry for the BRBE field in future, for robustness we should explicitly mask out the BRBE field inread_sanitised_id_aa64dfr0_el1().The BRBE system registers and instructions are currently trapped by the existing configuration of the fine-grained traps. As neither the registers nor the instructions are described in the sys_reg_descs[] table,
emulate_sys_reg()will warn that these are unknown before injecting an UNDEFINED exception into the guest.Well-behaved guests shouldn't try to use the registers or instructions, but badly-behaved guests could use these, resulting in unnecessary warnings. To avoid those warnings, we should explicitly handle the BRBE registers and instructions as UNDEFINED.
Address the above by having
read_sanitised_id_aa64dfr0_el1()mask out the ID_AA64DFR0.BRBE field, and explicitly handling all of the BRBE system registers and instructions as UNDEFINED.
Quoted 10 lines
Cc Marc Zyngier <[email protected]>Cc Oliver Upton <[email protected]>Cc James Morse <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>
Quoted 11 lines
----
Changes in V18:- Updated the commit message
arch/arm64/kvm/sys_regs.c | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)Reviewed-by Mark Rutland <[email protected]>--- arch/arm64/kvm/sys_regs.c | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)
Something has gone wrong here, but that doesn't affect the patch itself.
Mark.
Quoted 92 lines
arch/arm64/kvm/sys_regs.c +56
-0@@ -1304,6 +1304,11 @@ static int set_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r,return 0 ; } +#define BRB_INF_SRC_TGT_EL1 (n) \ + { SYS_DESC(SYS_BRBINF_EL1(n)), undef_access }, \ + { SYS_DESC(SYS_BRBSRC_EL1(n)), undef_access }, \ + { SYS_DESC(SYS_BRBTGT_EL1(n)), undef_access } \ +/* Silly macro to expand the DBG{BCR,BVR,WVR,WCR}n_EL1 registers in one go */ #define DBG_BCR_BVR_WCR_WVR_EL1 (n) \ { SYS_DESC(SYS_DBGBVRn_EL1(n)), \@@ -1722,6 +1727,9 @@ static u64 read_sanitised_id_aa64dfr0_el1(struct kvm_vcpu *vcpu,/* Hide SPE from guests */ val &= ~ID_AA64DFR0_EL1_PMSVer_MASK; +/* Hide BRBE from guests */ + val &= ~ID_AA64DFR0_EL1_BRBE_MASK ; +return val; }@@ -2240,6 +2248,52 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_DBGCLAIMCLR_EL1), trap_raz_wi }, { SYS_DESC(SYS_DBGAUTHSTATUS_EL1), trap_dbgauthstatus_el1 }, +/* +* BRBE branch record sysreg address space is interleaved between +* corresponding BRBINF<N>_EL1, BRBSRC<N>_EL1, and BRBTGT<N>_EL1. +*/ +BRB_INF_SRC_TGT_EL1 (0 ), +BRB_INF_SRC_TGT_EL1 (16 ), +BRB_INF_SRC_TGT_EL1 (1 ), +BRB_INF_SRC_TGT_EL1 (17 ), +BRB_INF_SRC_TGT_EL1 (2 ), +BRB_INF_SRC_TGT_EL1 (18 ), +BRB_INF_SRC_TGT_EL1 (3 ), +BRB_INF_SRC_TGT_EL1 (19 ), +BRB_INF_SRC_TGT_EL1 (4 ), +BRB_INF_SRC_TGT_EL1 (20 ), +BRB_INF_SRC_TGT_EL1 (5 ), +BRB_INF_SRC_TGT_EL1 (21 ), +BRB_INF_SRC_TGT_EL1 (6 ), +BRB_INF_SRC_TGT_EL1 (22 ), +BRB_INF_SRC_TGT_EL1 (7 ), +BRB_INF_SRC_TGT_EL1 (23 ), +BRB_INF_SRC_TGT_EL1 (8 ), +BRB_INF_SRC_TGT_EL1 (24 ), +BRB_INF_SRC_TGT_EL1 (9 ), +BRB_INF_SRC_TGT_EL1 (25 ), +BRB_INF_SRC_TGT_EL1 (10 ), +BRB_INF_SRC_TGT_EL1 (26 ), +BRB_INF_SRC_TGT_EL1 (11 ), +BRB_INF_SRC_TGT_EL1 (27 ), +BRB_INF_SRC_TGT_EL1 (12 ), +BRB_INF_SRC_TGT_EL1 (28 ), +BRB_INF_SRC_TGT_EL1 (13 ), +BRB_INF_SRC_TGT_EL1 (29 ), +BRB_INF_SRC_TGT_EL1 (14 ), +BRB_INF_SRC_TGT_EL1 (30 ), +BRB_INF_SRC_TGT_EL1 (15 ), +BRB_INF_SRC_TGT_EL1 (31 ), + +/* Remaining BRBE sysreg addresses space */ + { SYS_DESC(SYS_BRBCR_EL1), undef_access }, + { SYS_DESC(SYS_BRBFCR_EL1), undef_access }, + { SYS_DESC(SYS_BRBTS_EL1), undef_access }, + { SYS_DESC(SYS_BRBINFINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBSRCINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBTGTINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBIDR0_EL1), undef_access }, + { SYS_DESC(SYS_MDCCSR_EL0), trap_raz_wi }, { SYS_DESC(SYS_DBGDTR_EL0), trap_raz_wi }, // DBGDTR[TR]X_EL0 share the same encoding@@ -2751,6 +2805,8 @@ static struct sys_reg_desc sys_insn_descs[] = { { SYS_DESC(SYS_DC_CISW), access_dcsw }, { SYS_DESC(SYS_DC_CIGSW), access_dcgsw }, { SYS_DESC(SYS_DC_CIGDSW), access_dcgsw }, + { SYS_DESC(OP_BRB_IALL), undef_access }, + { SYS_DESC(OP_BRB_INJ), undef_access }, };static const struct sys_reg_desc *first_idreg;Signature · 1 line
2.25.1
Marc Zyngier
maintainerRe: [PATCH V18 2/9] KVM: arm64: Explicitly handle BRBE traps as UNDEFINED
In reply to Anshuman KhandualQuoted 130 lines · Anshuman Khandual
The Branch Record Buffer Extension (BRBE) adds a number of system registers and instructions, which we don't currently intend to expose to guests. Our existing logic handles this safely, but this could be improved with some explicit handling of BRBE.
The presence of BRBE is currently hidden from guests as the cpufeature code's ftr_id_aa64dfr0[] table doesn't have an entry for the BRBE field, and so this will be zero in the sanitised value of
ID_AA64DFR0exposed to guests viaread_sanitised_id_aa64dfr0_el1(). As the ftr_id_aa64dfr0[] table may gain an entry for the BRBE field in future, for robustness we should explicitly mask out the BRBE field inread_sanitised_id_aa64dfr0_el1().The BRBE system registers and instructions are currently trapped by the existing configuration of the fine-grained traps. As neither the registers nor the instructions are described in the sys_reg_descs[] table,
emulate_sys_reg()will warn that these are unknown before injecting an UNDEFINED exception into the guest.Well-behaved guests shouldn't try to use the registers or instructions, but badly-behaved guests could use these, resulting in unnecessary warnings. To avoid those warnings, we should explicitly handle the BRBE registers and instructions as UNDEFINED.
Address the above by having
read_sanitised_id_aa64dfr0_el1()mask out the ID_AA64DFR0.BRBE field, and explicitly handling all of the BRBE system registers and instructions as UNDEFINED.Cc Marc Zyngier <[email protected]>Cc Oliver Upton <[email protected]>Cc James Morse <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>----
Changes in V18:- Updated the commit message
arch/arm64/kvm/sys_regs.c | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)Reviewed-by Mark Rutland <[email protected]>--- arch/arm64/kvm/sys_regs.c | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)arch/arm64/kvm/sys_regs.c +54
-0@@ -1304,6 +1304,11 @@ static int set_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r,return 0 ; } +#define BRB_INF_SRC_TGT_EL1 (n) \ + { SYS_DESC(SYS_BRBINF_EL1(n)), undef_access }, \ + { SYS_DESC(SYS_BRBSRC_EL1(n)), undef_access }, \ + { SYS_DESC(SYS_BRBTGT_EL1(n)), undef_access } \ +/* Silly macro to expand the DBG{BCR,BVR,WVR,WCR}n_EL1 registers in one go */ #define DBG_BCR_BVR_WCR_WVR_EL1 (n) \ { SYS_DESC(SYS_DBGBVRn_EL1(n)), \@@ -1722,6 +1727,9 @@ static u64 read_sanitised_id_aa64dfr0_el1(struct kvm_vcpu *vcpu,/* Hide SPE from guests */ val &= ~ID_AA64DFR0_EL1_PMSVer_MASK; +/* Hide BRBE from guests */ + val &= ~ID_AA64DFR0_EL1_BRBE_MASK ; +return val; }@@ -2240,6 +2248,52 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_DBGCLAIMCLR_EL1), trap_raz_wi }, { SYS_DESC(SYS_DBGAUTHSTATUS_EL1), trap_dbgauthstatus_el1 }, +/* +* BRBE branch record sysreg address space is interleaved between +* corresponding BRBINF<N>_EL1, BRBSRC<N>_EL1, and BRBTGT<N>_EL1. +*/ +BRB_INF_SRC_TGT_EL1 (0 ), +BRB_INF_SRC_TGT_EL1 (16 ), +BRB_INF_SRC_TGT_EL1 (1 ), +BRB_INF_SRC_TGT_EL1 (17 ), +BRB_INF_SRC_TGT_EL1 (2 ), +BRB_INF_SRC_TGT_EL1 (18 ), +BRB_INF_SRC_TGT_EL1 (3 ), +BRB_INF_SRC_TGT_EL1 (19 ), +BRB_INF_SRC_TGT_EL1 (4 ), +BRB_INF_SRC_TGT_EL1 (20 ), +BRB_INF_SRC_TGT_EL1 (5 ), +BRB_INF_SRC_TGT_EL1 (21 ), +BRB_INF_SRC_TGT_EL1 (6 ), +BRB_INF_SRC_TGT_EL1 (22 ), +BRB_INF_SRC_TGT_EL1 (7 ), +BRB_INF_SRC_TGT_EL1 (23 ), +BRB_INF_SRC_TGT_EL1 (8 ), +BRB_INF_SRC_TGT_EL1 (24 ), +BRB_INF_SRC_TGT_EL1 (9 ), +BRB_INF_SRC_TGT_EL1 (25 ), +BRB_INF_SRC_TGT_EL1 (10 ), +BRB_INF_SRC_TGT_EL1 (26 ), +BRB_INF_SRC_TGT_EL1 (11 ), +BRB_INF_SRC_TGT_EL1 (27 ), +BRB_INF_SRC_TGT_EL1 (12 ), +BRB_INF_SRC_TGT_EL1 (28 ), +BRB_INF_SRC_TGT_EL1 (13 ), +BRB_INF_SRC_TGT_EL1 (29 ), +BRB_INF_SRC_TGT_EL1 (14 ), +BRB_INF_SRC_TGT_EL1 (30 ), +BRB_INF_SRC_TGT_EL1 (15 ), +BRB_INF_SRC_TGT_EL1 (31 ), + +/* Remaining BRBE sysreg addresses space */ + { SYS_DESC(SYS_BRBCR_EL1), undef_access }, + { SYS_DESC(SYS_BRBFCR_EL1), undef_access }, + { SYS_DESC(SYS_BRBTS_EL1), undef_access }, + { SYS_DESC(SYS_BRBINFINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBSRCINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBTGTINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBIDR0_EL1), undef_access }, + { SYS_DESC(SYS_MDCCSR_EL0), trap_raz_wi }, { SYS_DESC(SYS_DBGDTR_EL0), trap_raz_wi }, // DBGDTR[TR]X_EL0 share the same encoding
arch/arm64/kvm/sys_regs.c static struct sys_reg_desc sys_insn_descs[] = { · line 2812
Quoted 8 lines
arch/arm64/kvm/sys_regs.c +2
-0@@ -2751,6 +2805,8 @@ static struct sys_reg_desc sys_insn_descs[] = { { SYS_DESC(SYS_DC_CISW), access_dcsw }, { SYS_DESC(SYS_DC_CIGSW), access_dcgsw }, { SYS_DESC(SYS_DC_CIGDSW), access_dcgsw }, + { SYS_DESC(OP_BRB_IALL), undef_access }, + { SYS_DESC(OP_BRB_INJ), undef_access }, };static const struct sys_reg_desc *first_idreg;
I don't think we need any update to the sys_reg table to handle this. Instead, we should make use of the FGU infrastructure that has been in since 6.9 to make this stuff UNDEF unconditionally.
It should be as simple as:
arch/arm64/kvm/sys_regs.c +5 -0
@@ -4964,6 +4964,11 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu) kvm->arch.fgu[HAFGRTR_GROUP ] |= ~(HAFGRTR_EL2_RES0 |HAFGRTR_EL2_RES1 ); +if (!kvm_has_feat (kvm,ID_AA64DFR0_EL1 ,BRBE ,IMP )) + kvm->arch.fgu[HDFGRTR_GROUP ] |= (HDFGRTR_nBRBDATA | + HDFGRTR_nBRBCTL | + HDFGRTR_nBRBIDR); +set_bit (KVM_ARCH_FLAG_FGU_INITIALIZED , &kvm->arch.flags); out:mutex_unlock (&kvm->arch.config_lock);
which is of course untested, but that I expect to be correct.
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Marc Zyngier
maintainerRe: [PATCH V18 2/9] KVM: arm64: Explicitly handle BRBE traps as UNDEFINED
Quoted 165 lines · Marc Zyngier
Quoted 130 lines · Anshuman Khandual
The Branch Record Buffer Extension (BRBE) adds a number of system registers and instructions, which we don't currently intend to expose to guests. Our existing logic handles this safely, but this could be improved with some explicit handling of BRBE.
The presence of BRBE is currently hidden from guests as the cpufeature code's ftr_id_aa64dfr0[] table doesn't have an entry for the BRBE field, and so this will be zero in the sanitised value of
ID_AA64DFR0exposed to guests viaread_sanitised_id_aa64dfr0_el1(). As the ftr_id_aa64dfr0[] table may gain an entry for the BRBE field in future, for robustness we should explicitly mask out the BRBE field inread_sanitised_id_aa64dfr0_el1().The BRBE system registers and instructions are currently trapped by the existing configuration of the fine-grained traps. As neither the registers nor the instructions are described in the sys_reg_descs[] table,
emulate_sys_reg()will warn that these are unknown before injecting an UNDEFINED exception into the guest.Well-behaved guests shouldn't try to use the registers or instructions, but badly-behaved guests could use these, resulting in unnecessary warnings. To avoid those warnings, we should explicitly handle the BRBE registers and instructions as UNDEFINED.
Address the above by having
read_sanitised_id_aa64dfr0_el1()mask out the ID_AA64DFR0.BRBE field, and explicitly handling all of the BRBE system registers and instructions as UNDEFINED.Cc Marc Zyngier <[email protected]>Cc Oliver Upton <[email protected]>Cc James Morse <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>----
Changes in V18:- Updated the commit message
arch/arm64/kvm/sys_regs.c | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)Reviewed-by Mark Rutland <[email protected]>--- arch/arm64/kvm/sys_regs.c | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)arch/arm64/kvm/sys_regs.c +54
-0@@ -1304,6 +1304,11 @@ static int set_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r,return 0 ; } +#define BRB_INF_SRC_TGT_EL1 (n) \ + { SYS_DESC(SYS_BRBINF_EL1(n)), undef_access }, \ + { SYS_DESC(SYS_BRBSRC_EL1(n)), undef_access }, \ + { SYS_DESC(SYS_BRBTGT_EL1(n)), undef_access } \ +/* Silly macro to expand the DBG{BCR,BVR,WVR,WCR}n_EL1 registers in one go */ #define DBG_BCR_BVR_WCR_WVR_EL1 (n) \ { SYS_DESC(SYS_DBGBVRn_EL1(n)), \@@ -1722,6 +1727,9 @@ static u64 read_sanitised_id_aa64dfr0_el1(struct kvm_vcpu *vcpu,/* Hide SPE from guests */ val &= ~ID_AA64DFR0_EL1_PMSVer_MASK; +/* Hide BRBE from guests */ + val &= ~ID_AA64DFR0_EL1_BRBE_MASK ; +return val; }@@ -2240,6 +2248,52 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_DBGCLAIMCLR_EL1), trap_raz_wi }, { SYS_DESC(SYS_DBGAUTHSTATUS_EL1), trap_dbgauthstatus_el1 }, +/* +* BRBE branch record sysreg address space is interleaved between +* corresponding BRBINF<N>_EL1, BRBSRC<N>_EL1, and BRBTGT<N>_EL1. +*/ +BRB_INF_SRC_TGT_EL1 (0 ), +BRB_INF_SRC_TGT_EL1 (16 ), +BRB_INF_SRC_TGT_EL1 (1 ), +BRB_INF_SRC_TGT_EL1 (17 ), +BRB_INF_SRC_TGT_EL1 (2 ), +BRB_INF_SRC_TGT_EL1 (18 ), +BRB_INF_SRC_TGT_EL1 (3 ), +BRB_INF_SRC_TGT_EL1 (19 ), +BRB_INF_SRC_TGT_EL1 (4 ), +BRB_INF_SRC_TGT_EL1 (20 ), +BRB_INF_SRC_TGT_EL1 (5 ), +BRB_INF_SRC_TGT_EL1 (21 ), +BRB_INF_SRC_TGT_EL1 (6 ), +BRB_INF_SRC_TGT_EL1 (22 ), +BRB_INF_SRC_TGT_EL1 (7 ), +BRB_INF_SRC_TGT_EL1 (23 ), +BRB_INF_SRC_TGT_EL1 (8 ), +BRB_INF_SRC_TGT_EL1 (24 ), +BRB_INF_SRC_TGT_EL1 (9 ), +BRB_INF_SRC_TGT_EL1 (25 ), +BRB_INF_SRC_TGT_EL1 (10 ), +BRB_INF_SRC_TGT_EL1 (26 ), +BRB_INF_SRC_TGT_EL1 (11 ), +BRB_INF_SRC_TGT_EL1 (27 ), +BRB_INF_SRC_TGT_EL1 (12 ), +BRB_INF_SRC_TGT_EL1 (28 ), +BRB_INF_SRC_TGT_EL1 (13 ), +BRB_INF_SRC_TGT_EL1 (29 ), +BRB_INF_SRC_TGT_EL1 (14 ), +BRB_INF_SRC_TGT_EL1 (30 ), +BRB_INF_SRC_TGT_EL1 (15 ), +BRB_INF_SRC_TGT_EL1 (31 ), + +/* Remaining BRBE sysreg addresses space */ + { SYS_DESC(SYS_BRBCR_EL1), undef_access }, + { SYS_DESC(SYS_BRBFCR_EL1), undef_access }, + { SYS_DESC(SYS_BRBTS_EL1), undef_access }, + { SYS_DESC(SYS_BRBINFINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBSRCINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBTGTINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBIDR0_EL1), undef_access }, + { SYS_DESC(SYS_MDCCSR_EL0), trap_raz_wi }, { SYS_DESC(SYS_DBGDTR_EL0), trap_raz_wi }, // DBGDTR[TR]X_EL0 share the same encodingarch/arm64/kvm/sys_regs.c static struct sys_reg_desc sys_insn_descs[] = { · line 2812
Quoted 8 lines
arch/arm64/kvm/sys_regs.c +2
-0@@ -2751,6 +2805,8 @@ static struct sys_reg_desc sys_insn_descs[] = { { SYS_DESC(SYS_DC_CISW), access_dcsw }, { SYS_DESC(SYS_DC_CIGSW), access_dcgsw }, { SYS_DESC(SYS_DC_CIGDSW), access_dcgsw }, + { SYS_DESC(OP_BRB_IALL), undef_access }, + { SYS_DESC(OP_BRB_INJ), undef_access }, };static const struct sys_reg_desc *first_idreg;I don't think we need any update to the
sys_regtable to handle this. Instead, we should make use of the FGU infrastructure that has been in since 6.9 to make this stuff UNDEF unconditionally.It should be as simple as:
arch/arm64/kvm/sys_regs.c +5
-0@@ -4964,6 +4964,11 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu) kvm->arch.fgu[HAFGRTR_GROUP ] |= ~(HAFGRTR_EL2_RES0 |HAFGRTR_EL2_RES1 ); +if (!kvm_has_feat (kvm,ID_AA64DFR0_EL1 ,BRBE ,IMP )) + kvm->arch.fgu[HDFGRTR_GROUP ] |= (HDFGRTR_nBRBDATA | + HDFGRTR_nBRBCTL | + HDFGRTR_nBRBIDR); +set_bit (KVM_ARCH_FLAG_FGU_INITIALIZED , &kvm->arch.flags); out:mutex_unlock (&kvm->arch.config_lock);
Quoted 1 line
which is of course untested, but that I expect to be correct.
Actually, to disable the *instructions*, a similar hack must be applied to HFGITR_EL2. The resulting patch should be something like:
arch/arm64/kvm/sys_regs.c +9 -0
@@ -4964,6 +4964,15 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu) kvm->arch.fgu[HAFGRTR_GROUP ] |= ~(HAFGRTR_EL2_RES0 |HAFGRTR_EL2_RES1 ); +if (!kvm_has_feat (kvm,ID_AA64DFR0_EL1 ,BRBE ,IMP )) { + kvm->arch.fgu[HDFGRTR_GROUP ] |= (HDFGRTR_nBRBDATA | + HDFGRTR_nBRBCTL | + HDFGRTR_nBRBIDR); + kvm->arch.fgu[HFGITR_GROUP ] |= (HFGITR_EL2_nBRBINJ | + HFGITR_EL2_nBRBIALL); + } + +set_bit (KVM_ARCH_FLAG_FGU_INITIALIZED , &kvm->arch.flags); out:mutex_unlock (&kvm->arch.config_lock);
The implicit dependency here is that FGT is always present on a system that implements BRBE. The architecture supports this assertion:
- BRBE is not available before ARMv9.1
- FGT is mandatory from ARMv8.6
Given that v9.1 is congruent to v8.6, we have the required overlap.
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Re: [PATCH V18 2/9] KVM: arm64: Explicitly handle BRBE traps as UNDEFINED
Quoted 182 lines · Marc Zyngier
Quoted 165 lines · Marc Zyngier
Quoted 130 lines · Anshuman Khandual
The Branch Record Buffer Extension (BRBE) adds a number of system registers and instructions, which we don't currently intend to expose to guests. Our existing logic handles this safely, but this could be improved with some explicit handling of BRBE.
The presence of BRBE is currently hidden from guests as the cpufeature code's ftr_id_aa64dfr0[] table doesn't have an entry for the BRBE field, and so this will be zero in the sanitised value of
ID_AA64DFR0exposed to guests viaread_sanitised_id_aa64dfr0_el1(). As the ftr_id_aa64dfr0[] table may gain an entry for the BRBE field in future, for robustness we should explicitly mask out the BRBE field inread_sanitised_id_aa64dfr0_el1().The BRBE system registers and instructions are currently trapped by the existing configuration of the fine-grained traps. As neither the registers nor the instructions are described in the sys_reg_descs[] table,
emulate_sys_reg()will warn that these are unknown before injecting an UNDEFINED exception into the guest.Well-behaved guests shouldn't try to use the registers or instructions, but badly-behaved guests could use these, resulting in unnecessary warnings. To avoid those warnings, we should explicitly handle the BRBE registers and instructions as UNDEFINED.
Address the above by having
read_sanitised_id_aa64dfr0_el1()mask out the ID_AA64DFR0.BRBE field, and explicitly handling all of the BRBE system registers and instructions as UNDEFINED.Cc Marc Zyngier <[email protected]>Cc Oliver Upton <[email protected]>Cc James Morse <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>----
Changes in V18:- Updated the commit message
arch/arm64/kvm/sys_regs.c | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)Reviewed-by Mark Rutland <[email protected]>--- arch/arm64/kvm/sys_regs.c | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)arch/arm64/kvm/sys_regs.c +54
-0@@ -1304,6 +1304,11 @@ static int set_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r,return 0 ; } +#define BRB_INF_SRC_TGT_EL1 (n) \ + { SYS_DESC(SYS_BRBINF_EL1(n)), undef_access }, \ + { SYS_DESC(SYS_BRBSRC_EL1(n)), undef_access }, \ + { SYS_DESC(SYS_BRBTGT_EL1(n)), undef_access } \ +/* Silly macro to expand the DBG{BCR,BVR,WVR,WCR}n_EL1 registers in one go */ #define DBG_BCR_BVR_WCR_WVR_EL1 (n) \ { SYS_DESC(SYS_DBGBVRn_EL1(n)), \@@ -1722,6 +1727,9 @@ static u64 read_sanitised_id_aa64dfr0_el1(struct kvm_vcpu *vcpu,/* Hide SPE from guests */ val &= ~ID_AA64DFR0_EL1_PMSVer_MASK; +/* Hide BRBE from guests */ + val &= ~ID_AA64DFR0_EL1_BRBE_MASK ; +return val; }@@ -2240,6 +2248,52 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_DBGCLAIMCLR_EL1), trap_raz_wi }, { SYS_DESC(SYS_DBGAUTHSTATUS_EL1), trap_dbgauthstatus_el1 }, +/* +* BRBE branch record sysreg address space is interleaved between +* corresponding BRBINF<N>_EL1, BRBSRC<N>_EL1, and BRBTGT<N>_EL1. +*/ +BRB_INF_SRC_TGT_EL1 (0 ), +BRB_INF_SRC_TGT_EL1 (16 ), +BRB_INF_SRC_TGT_EL1 (1 ), +BRB_INF_SRC_TGT_EL1 (17 ), +BRB_INF_SRC_TGT_EL1 (2 ), +BRB_INF_SRC_TGT_EL1 (18 ), +BRB_INF_SRC_TGT_EL1 (3 ), +BRB_INF_SRC_TGT_EL1 (19 ), +BRB_INF_SRC_TGT_EL1 (4 ), +BRB_INF_SRC_TGT_EL1 (20 ), +BRB_INF_SRC_TGT_EL1 (5 ), +BRB_INF_SRC_TGT_EL1 (21 ), +BRB_INF_SRC_TGT_EL1 (6 ), +BRB_INF_SRC_TGT_EL1 (22 ), +BRB_INF_SRC_TGT_EL1 (7 ), +BRB_INF_SRC_TGT_EL1 (23 ), +BRB_INF_SRC_TGT_EL1 (8 ), +BRB_INF_SRC_TGT_EL1 (24 ), +BRB_INF_SRC_TGT_EL1 (9 ), +BRB_INF_SRC_TGT_EL1 (25 ), +BRB_INF_SRC_TGT_EL1 (10 ), +BRB_INF_SRC_TGT_EL1 (26 ), +BRB_INF_SRC_TGT_EL1 (11 ), +BRB_INF_SRC_TGT_EL1 (27 ), +BRB_INF_SRC_TGT_EL1 (12 ), +BRB_INF_SRC_TGT_EL1 (28 ), +BRB_INF_SRC_TGT_EL1 (13 ), +BRB_INF_SRC_TGT_EL1 (29 ), +BRB_INF_SRC_TGT_EL1 (14 ), +BRB_INF_SRC_TGT_EL1 (30 ), +BRB_INF_SRC_TGT_EL1 (15 ), +BRB_INF_SRC_TGT_EL1 (31 ), + +/* Remaining BRBE sysreg addresses space */ + { SYS_DESC(SYS_BRBCR_EL1), undef_access }, + { SYS_DESC(SYS_BRBFCR_EL1), undef_access }, + { SYS_DESC(SYS_BRBTS_EL1), undef_access }, + { SYS_DESC(SYS_BRBINFINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBSRCINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBTGTINJ_EL1), undef_access }, + { SYS_DESC(SYS_BRBIDR0_EL1), undef_access }, + { SYS_DESC(SYS_MDCCSR_EL0), trap_raz_wi }, { SYS_DESC(SYS_DBGDTR_EL0), trap_raz_wi }, // DBGDTR[TR]X_EL0 share the same encodingarch/arm64/kvm/sys_regs.c static struct sys_reg_desc sys_insn_descs[] = { · line 2812
Quoted 8 lines
arch/arm64/kvm/sys_regs.c +2
-0@@ -2751,6 +2805,8 @@ static struct sys_reg_desc sys_insn_descs[] = { { SYS_DESC(SYS_DC_CISW), access_dcsw }, { SYS_DESC(SYS_DC_CIGSW), access_dcgsw }, { SYS_DESC(SYS_DC_CIGDSW), access_dcgsw }, + { SYS_DESC(OP_BRB_IALL), undef_access }, + { SYS_DESC(OP_BRB_INJ), undef_access }, };static const struct sys_reg_desc *first_idreg;I don't think we need any update to the
sys_regtable to handle this. Instead, we should make use of the FGU infrastructure that has been in since 6.9 to make this stuff UNDEF unconditionally.It should be as simple as:
arch/arm64/kvm/sys_regs.c +5
-0@@ -4964,6 +4964,11 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu) kvm->arch.fgu[HAFGRTR_GROUP ] |= ~(HAFGRTR_EL2_RES0 |HAFGRTR_EL2_RES1 ); +if (!kvm_has_feat (kvm,ID_AA64DFR0_EL1 ,BRBE ,IMP )) + kvm->arch.fgu[HDFGRTR_GROUP ] |= (HDFGRTR_nBRBDATA | + HDFGRTR_nBRBCTL | + HDFGRTR_nBRBIDR); +set_bit (KVM_ARCH_FLAG_FGU_INITIALIZED , &kvm->arch.flags); out:mutex_unlock (&kvm->arch.config_lock);Quoted 1 line
which is of course untested, but that I expect to be correct.
Actually, to disable the *instructions*, a similar hack must be applied to
HFGITR_EL2. The resulting patch should be something like:arch/arm64/kvm/sys_regs.c +2
-0@@ -4964,6 +4964,15 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu) kvm->arch.fgu[HAFGRTR_GROUP ] |= ~(HAFGRTR_EL2_RES0 |HAFGRTR_EL2_RES1 ); +if (!kvm_has_feat (kvm,ID_AA64DFR0_EL1 ,BRBE ,IMP )) { + kvm->arch.fgu[HDFGRTR_GROUP] |= (HDFGRTR_nBRBDATA |
arch/arm64/kvm/sys_regs.c void kvm_init_sysreg(struct kvm_vcpu *vcpu) · line 4978
Quoted 10 lines
arch/arm64/kvm/sys_regs.c +7
-0+ HDFGRTR_nBRBCTL | + HDFGRTR_nBRBIDR); + kvm->arch.fgu[HFGITR_GROUP ] |= (HFGITR_EL2_nBRBINJ | + HFGITR_EL2_nBRBIALL); + } + +set_bit (KVM_ARCH_FLAG_FGU_INITIALIZED , &kvm->arch.flags); out:mutex_unlock (&kvm->arch.config_lock);
This makes sense, will remove all the changes to sys_reg table and instead fold the above suggestion into the patch.
Quoted 8 lines
The implicit dependency here is that FGT is always present on a system that implements BRBE. The architecture supports this assertion:
- BRBE is not available before ARMv9.1
- FGT is mandatory from ARMv8.6Given that v9.1 is congruent to v8.6, we have the required overlap.
So this overlap need not be asserted in software again ?
Marc Zyngier
maintainerRe: [PATCH V18 2/9] KVM: arm64: Explicitly handle BRBE traps as UNDEFINED
Quoted 14 lines · Anshuman Khandual
Quoted 13 lines · Marc Zyngier
On Fri, 14 Jun 2024 13:33:37 +0100,
Actually, to disable the *instructions*, a similar hack must be applied to
HFGITR_EL2. The resulting patch should be something like:arch/arm64/kvm/sys_regs.c +0
-0@@ -4964,6 +4964,15 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu) kvm->arch.fgu[HAFGRTR_GROUP ] |= ~(HAFGRTR_EL2_RES0 |HAFGRTR_EL2_RES1 );
Quoted 4 lines
arch/arm64/kvm/sys_regs.c void kvm_init_sysreg(struct kvm_vcpu *vcpu) · line 4970
Quoted 4 lines
arch/arm64/kvm/sys_regs.c +4
-0+if (!kvm_has_feat (kvm,ID_AA64DFR0_EL1 ,BRBE ,IMP )) { + kvm->arch.fgu[HDFGRTR_GROUP ] |= (HDFGRTR_nBRBDATA | + HDFGRTR_nBRBCTL | + HDFGRTR_nBRBIDR);
Obviously, this needs to be spelled HDFGRTR_EL2_nBRB* so that it actually compiles.
Quoted 16 lines
arch/arm64/kvm/sys_regs.c void kvm_init_sysreg(struct kvm_vcpu *vcpu) · line 4978
Quoted 8 lines
arch/arm64/kvm/sys_regs.c +5
-0+ kvm->arch.fgu[HFGITR_GROUP ] |= (HFGITR_EL2_nBRBINJ | + HFGITR_EL2_nBRBIALL); + } + +set_bit (KVM_ARCH_FLAG_FGU_INITIALIZED , &kvm->arch.flags); out:mutex_unlock (&kvm->arch.config_lock);This makes sense, will remove all the changes to
sys_regtable and instead fold the above suggestion into the patch.Quoted 4 lines
The implicit dependency here is that FGT is always present on a system that implements BRBE. The architecture supports this assertion:
Quoted 6 lines
Quoted 4 lines
- BRBE is not available before ARMv9.1
- FGT is mandatory from ARMv8.6Given that v9.1 is congruent to v8.6, we have the required overlap.
So this overlap need not be asserted in software again ?
I don't think there's a need for that.
We went through the same thing with SME (which has the exact same dependency), and concluded that there was no need to paper over broken implementations at the moment (only QEMU was affected, and that was quickly fixed). If we find an implementation in the wild that didn't get the memo, we can add a workaround at that time.
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
PATCH v18 3/9 drivers: perf: arm_pmu: Add infrastructure for branch stack sampling
In reply to Anshuman KhandualIn order to support the Branch Record Buffer Extension (BRBE), we need to extend the arm_pmu framework with some basic infrastructure for branch stack sampling which arm_pmu drivers can opt-in to using. Subsequent patches will use this to add support for BRBE in the PMUv3 driver.
With BRBE, the hardware records branches into a hardware FIFO, which will be sampled by software when perf events overflow. A task may be context- switched an arbitrary number of times between overflows, and to avoid losing samples we need to save the current records when a task is context- switched out. To do these we'll need to use the pmu::sched_task() callback, and we'll also need to allocate some per-task storage space via event flag PERF_ATTACH_TASK_DATA.
----
Changes in V18:
- Scan valid branch stack events in armpmu_start() to create merged filter
- Updated the commit message
drivers/perf/arm_pmu.c | 42 +++++++++++++++++++++++++++++++++--- include/linux/perf/arm_pmu.h | 32 ++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 4 deletions(-)
drivers/perf/arm_pmu.c +39 -3
@@ -289,6 +289,23 @@ static void armpmu_start(struct perf_event *event, int flags) {struct arm_pmu *armpmu =to_arm_pmu (event->pmu);struct hw_perf_event *hwc = &event->hw; +struct pmu_hw_events *cpuc =this_cpu_ptr (armpmu->hw_events); +int idx; + +/* +* Merge all branch filter requests from different perf +* events being added into this PMU. This includes both +* privilege and branch type filters. +*/ +if (armpmu->has_branch_stack) { + cpuc->branch_sample_type =0 ; +for (idx =0 ; idx <ARMPMU_MAX_HWEVENTS ; idx++) { +struct perf_event *event_idx = cpuc->events[idx]; + +if (event_idx &&has_branch_stack (event_idx)) + cpuc->branch_sample_type |= event_idx->attr.branch_sample_type; + } + }/* * ARM pmu always has to reprogram the period, so ignore
@@ -317,6 +334,9 @@ armpmu_del(struct perf_event *event, int flags)struct hw_perf_event *hwc = &event->hw;int idx = hwc->idx; +if (has_branch_stack (event)) + armpmu->branch_stack_del (event, hw_events); +armpmu_stop (event,PERF_EF_UPDATE ); hw_events->events[idx] =NULL ; armpmu->clear_event_idx (hw_events, event);
@@ -342,6 +362,9 @@ armpmu_add(struct perf_event *event, int flags)if (idx <0 )return idx; +if (has_branch_stack (event)) + armpmu->branch_stack_add (event, hw_events); +/* * If there is an event in the counter we are going to use then make * sure it is disabled.
@@ -511,13 +534,25 @@ static int armpmu_event_init(struct perf_event *event) !cpumask_test_cpu(event->cpu, &armpmu->supported_cpus)) return -ENOENT; -/* does not support taken branch sampling */ -if (has_branch_stack (event)) -return -EOPNOTSUPP ; +if (has_branch_stack (event)) { +if (!armpmu->has_branch_stack) +return -EOPNOTSUPP ; + +if (!armpmu->branch_stack_init (event)) +return -EOPNOTSUPP ; + }return __hw_perf_event_init (event); } +static void armpmu_sched_task (struct perf_event_pmu_context *pmu_ctx,bool sched_in) +{ +struct arm_pmu *armpmu =to_arm_pmu (pmu_ctx->pmu); + +if (armpmu->sched_task) + armpmu->sched_task (pmu_ctx, sched_in); +} +static void armpmu_enable (struct pmu *pmu) {struct arm_pmu *armpmu =to_arm_pmu (pmu);
@@ -864,6 +899,7 @@ struct arm_pmu *armpmu_alloc(void) } pmu->pmu = (struct pmu ) { + .sched_task = armpmu_sched_task, .pmu_enable = armpmu_enable, .pmu_disable = armpmu_disable, .event_init = armpmu_event_init,
include/linux/perf/arm_pmu.h +31 -1
@@ -46,6 +46,18 @@ static_assert((PERF_EVENT_FLAG_ARCH & ARMPMU_EVT_63BIT) == ARMPMU_EVT_63BIT); }, \ } +/* +* Maximum branch record entries which could be processed +* for core perf branch stack sampling support, regardless +* of the hardware support available on a given ARM PMU. +*/ +#define MAX_BRANCH_RECORDS 64 + +struct branch_records { +struct perf_branch_stack branch_stack; +struct perf_branch_entry branch_entries[MAX_BRANCH_RECORDS ]; +}; +/* The events for a given PMU register set. */ struct pmu_hw_events {/*
@@ -66,6 +78,17 @@ struct pmu_hw_events {struct arm_pmu *percpu_pmu;int irq; + +struct branch_records *branches; + +/* Active context for task events */ +void *branch_context; + +/* Active events requesting branch records */ +unsigned int branch_users; + +/* Active branch sample type filters */ +unsigned long branch_sample_type; };enum armpmu_attr_groups {
@@ -96,8 +119,15 @@ struct arm_pmu {void (*stop)(struct arm_pmu *);void (*reset)(void *);int (*map_event)(struct perf_event *event); +void (*sched_task)(struct perf_event_pmu_context *pmu_ctx,bool sched_in); +bool (*branch_stack_init)(struct perf_event *event); +void (*branch_stack_add)(struct perf_event *event,struct pmu_hw_events *cpuc); +void (*branch_stack_del)(struct perf_event *event,struct pmu_hw_events *cpuc); +void (*branch_stack_reset)(void );int num_events; -bool secure_access;/* 32-bit ARM only */ + unsigned int secure_access : 1, /* 32-bit ARM only */ + has_branch_stack: 1, /* 64-bit ARM only */ + reserved : 30;#define ARMV8_PMUV3_MAX_COMMON_EVENTS 0x40DECLARE_BITMAP (pmceid_bitmap,ARMV8_PMUV3_MAX_COMMON_EVENTS );#define ARMV8_PMUV3_EXT_COMMON_EVENT_BASE 0x4000
Signature · 1 line
2.25.1
Mark Rutland
maintainerRe: [PATCH V18 3/9] drivers: perf: arm_pmu: Add infrastructure for branch stack sampling
Quoted 11 lines · Anshuman Khandual
drivers/perf/arm_pmu.c +7
-0@@ -289,6 +289,23 @@ static void armpmu_start(struct perf_event *event, int flags) {struct arm_pmu *armpmu =to_arm_pmu (event->pmu);struct hw_perf_event *hwc = &event->hw; +struct pmu_hw_events *cpuc =this_cpu_ptr (armpmu->hw_events); +int idx; + +/* +* Merge all branch filter requests from different perf +* events being added into this PMU. This includes both +* privilege and branch type filters.
drivers/perf/arm_pmu.c static void armpmu_start(struct perf_event *event, int flags) · line 308
Quoted 10 lines
drivers/perf/arm_pmu.c +10
-0+*/ +if (armpmu->has_branch_stack) { + cpuc->branch_sample_type =0 ; +for (idx =0 ; idx <ARMPMU_MAX_HWEVENTS ; idx++) { +struct perf_event *event_idx = cpuc->events[idx]; + +if (event_idx &&has_branch_stack (event_idx)) + cpuc->branch_sample_type |= event_idx->attr.branch_sample_type; + } + }
When we spoke about this, I meant that we should do this under armpmu::start(), or a callee or caller thereof once we know all the events are configured, just before we actually enable the PMU.
For example, this could live in armv8pmu_branch_enable(), which'd allow all the actual logic to be added in the BRBE enablement patch.
Doing this in armpmu_start() doesn't work as well because it won't handle events being removed.
[...]
Quoted 24 lines
include/linux/perf/arm_pmu.h +12
-0@@ -46,6 +46,18 @@ static_assert((PERF_EVENT_FLAG_ARCH & ARMPMU_EVT_63BIT) == ARMPMU_EVT_63BIT); }, \ } +/* +* Maximum branch record entries which could be processed +* for core perf branch stack sampling support, regardless +* of the hardware support available on a given ARM PMU. +*/ +#define MAX_BRANCH_RECORDS 64 + +struct branch_records { +struct perf_branch_stack branch_stack; +struct perf_branch_entry branch_entries[MAX_BRANCH_RECORDS ]; +}; +/* The events for a given PMU register set. */ struct pmu_hw_events {/*
include/linux/perf/arm_pmu.h struct pmu_hw_events { · line 85
Quoted 8 lines
include/linux/perf/arm_pmu.h +5
-0@@ -66,6 +78,17 @@ struct pmu_hw_events {struct arm_pmu *percpu_pmu;int irq; + +struct branch_records *branches; + +/* Active context for task events */ +void *branch_context;
Using 'void *' here makes this harder to reason about and hides type safety issues.
Give this a real type. IIUC it should be 'perf_event_context *'.
Quoted 10 lines
include/linux/perf/arm_pmu.h +6
-0+ +/* Active events requesting branch records */ +unsigned int branch_users; + +/* Active branch sample type filters */ +unsigned long branch_sample_type; };enum armpmu_attr_groups {
include/linux/perf/arm_pmu.h struct arm_pmu { · line 126
Quoted 8 lines
include/linux/perf/arm_pmu.h +5
-0@@ -96,8 +119,15 @@ struct arm_pmu {void (*stop)(struct arm_pmu *);void (*reset)(void *);int (*map_event)(struct perf_event *event); +void (*sched_task)(struct perf_event_pmu_context *pmu_ctx,bool sched_in); +bool (*branch_stack_init)(struct perf_event *event); +void (*branch_stack_add)(struct perf_event *event,struct pmu_hw_events *cpuc); +void (*branch_stack_del)(struct perf_event *event,struct pmu_hw_events *cpuc); +void (*branch_stack_reset)(void );
The reset callback isn't used in this series; s
Subsequent patches call armv8pmu_branch_stack_reset() directly from PMUv3 and the BRBE driver, and arm_pmu::branch_stack_reset() is never used, so we can delete it.
Mark.
Re: [PATCH V18 3/9] drivers: perf: arm_pmu: Add infrastructure for branch stack sampling
Quoted 27 lines · Mark Rutland
Quoted 11 lines · Anshuman Khandual
(quoted diff) +7
-0@@ -289,6 +289,23 @@ static void armpmu_start(struct perf_event *event, int flags) { struct arm_pmu *armpmu = to_arm_pmu(event->pmu); struct hw_perf_event *hwc = &event->hw; + struct pmu_hw_events *cpuc = this_cpu_ptr(armpmu->hw_events); + int idx; + + /* + * Merge all branch filter requests from different perf + * events being added into this PMU. This includes both + * privilege and branch type filters.Review static void armpmu_start(struct perf_event *event, int flags) · line 308
Quoted 10 lines
(quoted diff) +10
-0+ */ + if (armpmu->has_branch_stack) { + cpuc->branch_sample_type = 0; + for (idx = 0; idx < ARMPMU_MAX_HWEVENTS; idx++) { + struct perf_event *event_idx = cpuc->events[idx]; + + if (event_idx && has_branch_stack(event_idx)) + cpuc->branch_sample_type |= event_idx->attr.branch_sample_type; + } + }When we spoke about this, I meant that we should do this under
armpmu::start(), or a callee or caller thereof once we know all the events are configured, just before we actually enable the PMU.
Quoted 5 lines
For example, this could live in
armv8pmu_branch_enable(), which'd allow all the actual logic to be added in the BRBE enablement patch.Doing this in
armpmu_start()doesn't work as well because it won't handle events being removed.
Sure, will move this filter aggregation inside armv8pmu_branch_enable() instead which is being added via the BRBE driver.
drivers/perf/arm_brbe.c +16 -0
@@ -856,6 +856,22 @@ void armv8pmu_branch_enable(struct arm_pmu *arm_pmu) {struct pmu_hw_events *cpuc =this_cpu_ptr (arm_pmu->hw_events);u64 brbfcr, brbcr; +int idx; + +/* +* Merge all branch filter requests from different perf +* events being added into this PMU. This includes both +* privilege and branch type filters. +*/ +if (arm_pmu->has_branch_stack) { + cpuc->branch_sample_type =0 ; +for (idx =0 ; idx <ARMPMU_MAX_HWEVENTS ; idx++) { +struct perf_event *event_idx = cpuc->events[idx]; + +if (event_idx &&has_branch_stack (event_idx)) + cpuc->branch_sample_type |= event_idx->attr.branch_sample_type; + } + }if (!(cpuc->branch_sample_type && cpuc->branch_users))return ;
Quoted 39 lines
[...]
Quoted 24 lines
include/linux/perf/arm_pmu.h +12
-0@@ -46,6 +46,18 @@ static_assert((PERF_EVENT_FLAG_ARCH & ARMPMU_EVT_63BIT) == ARMPMU_EVT_63BIT); }, \ } +/* +* Maximum branch record entries which could be processed +* for core perf branch stack sampling support, regardless +* of the hardware support available on a given ARM PMU. +*/ +#define MAX_BRANCH_RECORDS 64 + +struct branch_records { +struct perf_branch_stack branch_stack; +struct perf_branch_entry branch_entries[MAX_BRANCH_RECORDS ]; +}; +/* The events for a given PMU register set. */ struct pmu_hw_events {/* include/linux/perf/arm_pmu.h struct pmu_hw_events { · line 85
Quoted 8 lines
include/linux/perf/arm_pmu.h +5
-0@@ -66,6 +78,17 @@ struct pmu_hw_events {struct arm_pmu *percpu_pmu;int irq; + +struct branch_records *branches; + +/* Active context for task events */ +void *branch_context;Using 'void *' here makes this harder to reason about and hides type safety issues.
Quoted 1 line
Give this a real type. IIUC it should be '
perf_event_context*'.
Sure, will change the type.
Quoted 22 lines
Quoted 11 lines
include/linux/perf/arm_pmu.h +6
-0+ +/* Active events requesting branch records */ +unsigned int branch_users; + +/* Active branch sample type filters */ +unsigned long branch_sample_type; };enum armpmu_attr_groups {include/linux/perf/arm_pmu.h struct arm_pmu { · line 126
Quoted 8 lines
include/linux/perf/arm_pmu.h +5
-0@@ -96,8 +119,15 @@ struct arm_pmu {void (*stop)(struct arm_pmu *);void (*reset)(void *);int (*map_event)(struct perf_event *event); +void (*sched_task)(struct perf_event_pmu_context *pmu_ctx,bool sched_in); +bool (*branch_stack_init)(struct perf_event *event); +void (*branch_stack_add)(struct perf_event *event,struct pmu_hw_events *cpuc); +void (*branch_stack_del)(struct perf_event *event,struct pmu_hw_events *cpuc); +void (*branch_stack_reset)(void );The reset callback isn't used in this series; s
Quoted 3 lines
Subsequent patches call
armv8pmu_branch_stack_reset()directly from PMUv3 and the BRBE driver, andarm_pmu::branch_stack_reset()is never used, so we can delete it.
Sure, will drop branch_stack_reset() callback.
PATCH v18 4/9 arm64/boot: Enable EL2 requirements for BRBE
In reply to Anshuman KhandualFine grained trap control for BRBE registers, and instructions access need to be configured in HDFGRTR_EL2, HDFGWTR_EL2 and HFGITR_EL2 registers when kernel enters at EL1 but EL2 is present. This changes __init_el2_fgt() as required.
Similarly cycle and mis-prediction capture need to be enabled in BRBCR_EL1 and BRBCR_EL2 when the kernel enters either into EL1 or EL2. This adds new __init_el2_brbe() to achieve this objective.
This also updates Documentation/arch/arm64/booting.rst with all the above EL2 along with MDRC_EL3.SBRBE requirements.
First this replaces an existing hard encoding (1 << 62) with corresponding applicable macro HDFGRTR_EL2_nPMSNEVFR_EL1_MASK.
----
Changes in V18:
- Dropped ifdef CONFIG_ARM64_BRBE around __init_el2_brbe()
- Updated the in code comment around __init_el2_brbe()
- Dropped the write up for EL2->EL1 transition, moved up the EL3 write up
Documentation/arch/arm64/booting.rst | 21 +++++++ arch/arm64/include/asm/el2_setup.h | 87 +++++++++++++++++++++++++++- 2 files changed, 105 insertions(+), 3 deletions(-)
Documentation/arch/arm64/booting.rst +21 -0
@@ -349,6 +349,27 @@ Before jumping into the kernel, the following conditions must be met: - HWFGWTR_EL2.nSMPRI_EL1 (bit 54) must be initialised to 0b01. + For CPUs with feature Branch Record Buffer Extension (FEAT_BRBE): + + - If EL3 is present: + + - MDCR_EL3.SBRBE (bits 33:32) must be initialised to 0b11. + + - If the kernel is entered at EL1 and EL2 is present: + + - BRBCR_EL2.CC (bit 3) must be initialised to 0b1. + - BRBCR_EL2.MPRED (bit 4) must be initialised to 0b1. + + - HDFGRTR_EL2.nBRBDATA (bit 61) must be initialised to 0b1. + - HDFGRTR_EL2.nBRBCTL (bit 60) must be initialised to 0b1. + - HDFGRTR_EL2.nBRBIDR (bit 59) must be initialised to 0b1. + + - HDFGWTR_EL2.nBRBDATA (bit 61) must be initialised to 0b1. + - HDFGWTR_EL2.nBRBCTL (bit 60) must be initialised to 0b1. + + - HFGITR_EL2.nBRBIALL (bit 56) must be initialised to 0b1. + - HFGITR_EL2.nBRBINJ (bit 55) must be initialised to 0b1. + For CPUs with the Scalable Matrix Extension FA64 feature (FEAT_SME_FA64): - If EL3 is present:
arch/arm64/include/asm/el2_setup.h +84 -3
119 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v18 5/9 drivers: perf: arm_pmuv3: Enable branch stack sampling via FEAT_BRBE
In reply to Anshuman KhandualThis extends recently added branch stack sampling framework in ARMV8 PMU to enable such events via new architecture feature called Branch Record Buffer Extension aka BRBE. This implements all the armv8pmu_branch_xxx() callbacks as expected at ARMV8 PMU level required to drive perf branch stack sampling events. This adds a new config option CONFIG_ARM64_BRBE to encapsulate this BRBE based implementation, available only on ARM64 platforms.
BRBE hardware captures a branch record via three distinct system registers representing branch source address, branch target address, and other branch information. A BRBE buffer implementation is organized as multiple banks of 32 branch records each, which is a collection of BRBSRC_EL1, BRBTGT_EL1 and BRBINF_EL1 registers. Though total BRBE record entries i.e BRBE_MAX_ENTRIES cannot exceed MAX_BRANCH_RECORDS as defined for ARM PMU.
Branch stack sampling is enabled and disabled along with regular PMU events . This adds required function callbacks in armv8pmu_branch_xxx() format, to drive the PMU branch stack hardware when supported. This also adds fallback stub definitions for these callbacks for PMUs which would not have required support.
BRBE hardware attributes get captured in a new reg_brbidr element in struct arm_pmu during armv8pmu_branch_probe() which is called from broader probing function __armv8pmu_probe_pmu(). Attributes such as number of branch record entries implemented in the hardware can be derived from armpmu->reg_brbidr.
BRBE gets enabled via armv8pmu_branch_enable() where it also derives branch filter, and additional requirements from event's 'attr.branch_sample_type' and configures them via BRBFCR_EL1 and BRBCR_EL1 registers.
PMU event overflow triggers IRQ, where current branch records get captured, stitched along with older records available in 'task_ctx', before getting processed for core perf ring buffer. Task context switch outs incrementally save current branch records in event's 'pmu_ctx->task_ctx_data' to optimize workload's branch record samples.
In case multiple events with different branch sample type requests converge on the same PMU, BRBE gets enabled for the merged branch filter accommoding all those event's branch sample type. Captured branch records get filterted in software for an overflown event if BRBE hardware config does not match its branch sample type, while handling the PMU IRQ.
----
Changes in V18:
- Replaced BRBIDR0_EL1_FORMAT_0 as BRBIDR0_EL1_FORMAT_FORMAT_0 in BRBE driver
- Added SW filtering framework in read_branch_records() during filter mismatch
- Added SW filtering for both privilege modes and branch types
drivers/perf/Kconfig | 11 + drivers/perf/Makefile | 1 + drivers/perf/arm_brbe.c | 1198 +++++++++++++++++++++++++++++++ drivers/perf/arm_pmuv3.c | 160 ++++- drivers/perf/arm_pmuv3_branch.h | 83 +++ include/linux/perf/arm_pmu.h | 5 + 6 files changed, 1457 insertions(+), 1 deletion(-) create mode 100644 drivers/perf/arm_brbe.c create mode 100644 drivers/perf/arm_pmuv3_branch.h
drivers/perf/Kconfig +11 -0
@@ -204,6 +204,17 @@ config ARM_SPE_PMU Extension, which provides periodic sampling of operations in the CPU pipeline and reports this via the perf AUX interface. +config ARM64_BRBE + bool "Enable support for branch stack sampling using FEAT_BRBE" + depends on PERF_EVENTS && ARM64 && ARM_PMU + default y + help + Enable perf support for Branch Record Buffer Extension (BRBE) which + records all branches taken in an execution path. This supports some + branch types and privilege based filtering. It captures additional + relevant information such as cycle count, misprediction and branch + type, branch privilege level etc. + config ARM_DMC620_PMU tristate "Enable PMU support for the ARM DMC-620 memory controller" depends on (ARM64 && ACPI) || COMPILE_TEST
drivers/perf/Makefile +1 -0
@@ -19,6 +19,7 @@ obj-$(CONFIG_STARFIVE_STARLINK_PMU) += starfive_starlink_pmu.o obj-$(CONFIG_THUNDERX2_PMU) += thunderx2_pmu.o obj-$(CONFIG_XGENE_PMU) += xgene_pmu.o obj-$(CONFIG_ARM_SPE_PMU) += arm_spe_pmu.o +obj-$(CONFIG_ARM64_BRBE) += arm_brbe.o obj-$(CONFIG_ARM_DMC620_PMU) += arm_dmc620_pmu.o obj-$(CONFIG_MARVELL_CN10K_TAD_PMU) += marvell_cn10k_tad_pmu.o obj-$(CONFIG_MARVELL_CN10K_DDR_PMU) += marvell_cn10k_ddr_pmu.o
drivers/perf/arm_brbe.c new file +1198 -0
1,198 lines not on this page · raw message
drivers/perf/arm_pmuv3.c +159 -1
228 lines not on this page · raw message
drivers/perf/arm_pmuv3_branch.h new file +83 -0
83 lines not on this page · raw message
include/linux/perf/arm_pmu.h +5 -0
@@ -141,6 +141,11 @@ struct arm_pmu {/* store the PMMIR_EL1 to expose slots */ u64 reg_pmmir; +#ifdef CONFIG_ARM64_BRBE +/* store the BRBIDR0_EL1 capturing attributes */ +u64 reg_brbidr; +#endif +/* Only to be used by ACPI probing code */ unsigned long acpi_cpuid; };
Signature · 1 line
2.25.1
PATCH v18 6/9 KVM: arm64: nvhe: Disable branch generation in nVHE guests
In reply to Anshuman KhandualDisable the BRBE before we enter the guest, saving the status and enable it back once we get out of the guest. This avoids capturing branch records in the guest kernel or userspace, which would be confusing the host samples.
----
Changes in V18:
- Used host_data_ptr() to access host_debug_state.brbcr_el1 register
- Changed DEBUG_STATE_SAVE_BRBE to use BIT(7)
- Reverted back iflags as u8
arch/arm64/include/asm/kvm_host.h | 3 +++ arch/arm64/kvm/debug.c | 5 +++++ arch/arm64/kvm/hyp/nvhe/debug-sr.c | 31 ++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+)
arch/arm64/include/asm/kvm_host.h +3 -0
@@ -579,6 +579,7 @@ struct kvm_host_data {u64 trfcr_el1;/* Values of trap registers for the host before guest entry. */ u64 mdcr_el2; +u64 brbcr_el1; } host_debug_state; };
@@ -842,6 +843,8 @@ struct kvm_vcpu_arch {#define DEBUG_STATE_SAVE_SPE __vcpu_single_flag(iflags, BIT(5))/* Save TRBE context if active */ #define DEBUG_STATE_SAVE_TRBE __vcpu_single_flag(iflags, BIT(6)) +/* Save BRBE context if active */ +#define DEBUG_STATE_SAVE_BRBE __vcpu_single_flag(iflags, BIT(7))/* SVE enabled for host EL0 */ #define HOST_SVE_ENABLED __vcpu_single_flag(sflags, BIT(0))
arch/arm64/kvm/debug.c +5 -0
@@ -336,10 +336,15 @@ void kvm_arch_vcpu_load_debug_state_flags(struct kvm_vcpu *vcpu)if (cpuid_feature_extract_unsigned_field (dfr0, ID_AA64DFR0_EL1_TraceBuffer_SHIFT) && !(read_sysreg_s (SYS_TRBIDR_EL1 ) &TRBIDR_EL1_P ))vcpu_set_flag (vcpu,DEBUG_STATE_SAVE_TRBE ); + +/* Check if we have BRBE implemented and available at the host */ +if (cpuid_feature_extract_unsigned_field (dfr0,ID_AA64DFR0_EL1_BRBE_SHIFT )) +vcpu_set_flag (vcpu,DEBUG_STATE_SAVE_BRBE ); }void kvm_arch_vcpu_put_debug_state_flags (struct kvm_vcpu *vcpu) {vcpu_clear_flag (vcpu,DEBUG_STATE_SAVE_SPE );vcpu_clear_flag (vcpu,DEBUG_STATE_SAVE_TRBE ); +vcpu_clear_flag (vcpu,DEBUG_STATE_SAVE_BRBE ); }
arch/arm64/kvm/hyp/nvhe/debug-sr.c +31 -0
@@ -79,6 +79,32 @@ static void __debug_restore_trace(u64 trfcr_el1)write_sysreg_el1 (trfcr_el1,SYS_TRFCR ); } +static void __debug_save_brbe (u64 *brbcr_el1) +{ + *brbcr_el1 =0 ; + +/* Check if the BRBE is enabled */ +if (!(read_sysreg_el1 (SYS_BRBCR ) & (BRBCR_ELx_E0BRE | BRBCR_ELx_ExBRE))) +return ; + +/* +* Prohibit branch record generation while we are in guest. +* Since access to BRBCR_EL1 is trapped, the guest can't +* modify the filtering set by the host. +*/ + *brbcr_el1 =read_sysreg_el1 (SYS_BRBCR ); +write_sysreg_el1 (0 ,SYS_BRBCR ); +} + +static void __debug_restore_brbe (u64 brbcr_el1) +{ +if (!brbcr_el1) +return ; + +/* Restore BRBE controls */ +write_sysreg_el1 (brbcr_el1,SYS_BRBCR ); +} +void __debug_save_host_buffers_nvhe (struct kvm_vcpu *vcpu) {/* Disable and flush SPE data generation */
@@ -87,6 +113,9 @@ void __debug_save_host_buffers_nvhe(struct kvm_vcpu *vcpu)/* Disable and flush Self-Hosted Trace generation */ if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_TRBE ))__debug_save_trace (host_data_ptr (host_debug_state.trfcr_el1)); +/* Disable BRBE branch records */ +if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_BRBE )) +__debug_save_brbe (host_data_ptr (host_debug_state.brbcr_el1)); }void __debug_switch_to_guest (struct kvm_vcpu *vcpu)
@@ -100,6 +129,8 @@ void __debug_restore_host_buffers_nvhe(struct kvm_vcpu *vcpu)__debug_restore_spe (*host_data_ptr (host_debug_state.pmscr_el1));if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_TRBE ))__debug_restore_trace (*host_data_ptr (host_debug_state.trfcr_el1)); +if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_BRBE )) +__debug_restore_brbe (*host_data_ptr (host_debug_state.brbcr_el1)); }void __debug_switch_to_host (struct kvm_vcpu *vcpu)
Signature · 1 line
2.25.1
Mark Rutland
maintainerRe: [PATCH V18 6/9] KVM: arm64: nvhe: Disable branch generation in nVHE guests
Quoted 3 lines · Anshuman Khandual
Disable the BRBE before we enter the guest, saving the status and enable it back once we get out of the guest. This avoids capturing branch records in the guest kernel or userspace, which would be confusing the host samples.
It'd be good to explain why we need to do this for nVHE, but not for VHE. I *think* that you're relying on BRBCR_EL2.EL0HBRE being ignored when HCR_EL2.TGE == 0, and BRBCR_EL1.E{1,0}BRE being initialized to 0 out-of-reset.
What should a user do if they *want* samples from a guest? Is that possible to do on other architectures, or do is that always prevented?
Mark.
Quoted 123 lines
Cc Marc Zyngier <[email protected]>Cc Oliver Upton <[email protected]>Cc James Morse <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>----
Changes in V18:- Used
host_data_ptr()to access host_debug_state.brbcr_el1 register
- ChangedDEBUG_STATE_SAVE_BRBEto use BIT(7)
- Reverted back iflags as u8arch/arm64/include/asm/kvm_host.h | 3 +++ arch/arm64/kvm/debug.c | 5 +++++ arch/arm64/kvm/hyp/nvhe/debug-sr.c | 31 ++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+)arch/arm64/include/asm/kvm_host.h +3
-0@@ -579,6 +579,7 @@ struct kvm_host_data {u64 trfcr_el1;/* Values of trap registers for the host before guest entry. */ u64 mdcr_el2; +u64 brbcr_el1; } host_debug_state; };@@ -842,6 +843,8 @@ struct kvm_vcpu_arch {#define DEBUG_STATE_SAVE_SPE __vcpu_single_flag(iflags, BIT(5))/* Save TRBE context if active */ #define DEBUG_STATE_SAVE_TRBE __vcpu_single_flag(iflags, BIT(6)) +/* Save BRBE context if active */ +#define DEBUG_STATE_SAVE_BRBE __vcpu_single_flag(iflags, BIT(7))/* SVE enabled for host EL0 */ #define HOST_SVE_ENABLED __vcpu_single_flag(sflags, BIT(0))arch/arm64/kvm/debug.c +5
-0@@ -336,10 +336,15 @@ void kvm_arch_vcpu_load_debug_state_flags(struct kvm_vcpu *vcpu)if (cpuid_feature_extract_unsigned_field (dfr0, ID_AA64DFR0_EL1_TraceBuffer_SHIFT) && !(read_sysreg_s (SYS_TRBIDR_EL1 ) &TRBIDR_EL1_P ))vcpu_set_flag (vcpu,DEBUG_STATE_SAVE_TRBE ); + +/* Check if we have BRBE implemented and available at the host */ +if (cpuid_feature_extract_unsigned_field (dfr0,ID_AA64DFR0_EL1_BRBE_SHIFT )) +vcpu_set_flag (vcpu,DEBUG_STATE_SAVE_BRBE ); }void kvm_arch_vcpu_put_debug_state_flags (struct kvm_vcpu *vcpu) {vcpu_clear_flag (vcpu,DEBUG_STATE_SAVE_SPE );vcpu_clear_flag (vcpu,DEBUG_STATE_SAVE_TRBE ); +vcpu_clear_flag (vcpu,DEBUG_STATE_SAVE_BRBE ); }arch/arm64/kvm/hyp/nvhe/debug-sr.c +31
-0@@ -79,6 +79,32 @@ static void __debug_restore_trace(u64 trfcr_el1)write_sysreg_el1 (trfcr_el1,SYS_TRFCR ); } +static void __debug_save_brbe (u64 *brbcr_el1) +{ + *brbcr_el1 =0 ; + +/* Check if the BRBE is enabled */ +if (!(read_sysreg_el1 (SYS_BRBCR ) & (BRBCR_ELx_E0BRE | BRBCR_ELx_ExBRE))) +return ; + +/* +* Prohibit branch record generation while we are in guest. +* Since access to BRBCR_EL1 is trapped, the guest can't +* modify the filtering set by the host. +*/ + *brbcr_el1 =read_sysreg_el1 (SYS_BRBCR ); +write_sysreg_el1 (0 ,SYS_BRBCR ); +} + +static void __debug_restore_brbe (u64 brbcr_el1) +{ +if (!brbcr_el1) +return ; + +/* Restore BRBE controls */ +write_sysreg_el1 (brbcr_el1,SYS_BRBCR ); +} +void __debug_save_host_buffers_nvhe (struct kvm_vcpu *vcpu) {/* Disable and flush SPE data generation */ @@ -87,6 +113,9 @@ void __debug_save_host_buffers_nvhe(struct kvm_vcpu *vcpu)/* Disable and flush Self-Hosted Trace generation */ if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_TRBE ))__debug_save_trace (host_data_ptr (host_debug_state.trfcr_el1)); +/* Disable BRBE branch records */ +if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_BRBE )) +__debug_save_brbe (host_data_ptr (host_debug_state.brbcr_el1)); }void __debug_switch_to_guest (struct kvm_vcpu *vcpu)@@ -100,6 +129,8 @@ void __debug_restore_host_buffers_nvhe(struct kvm_vcpu *vcpu)__debug_restore_spe (*host_data_ptr (host_debug_state.pmscr_el1));if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_TRBE ))__debug_restore_trace (*host_data_ptr (host_debug_state.trfcr_el1)); +if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_BRBE )) +__debug_restore_brbe (*host_data_ptr (host_debug_state.brbcr_el1)); }void __debug_switch_to_host (struct kvm_vcpu *vcpu)Signature · 1 line
2.25.1
Re: [PATCH V18 6/9] KVM: arm64: nvhe: Disable branch generation in nVHE guests
Quoted 9 lines · Mark Rutland
Quoted 3 lines · Anshuman Khandual
Disable the BRBE before we enter the guest, saving the status and enable it back once we get out of the guest. This avoids capturing branch records in the guest kernel or userspace, which would be confusing the host samples.
It'd be good to explain why we need to do this for nVHE, but not for VHE. I *think* that you're relying on BRBCR_EL2.EL0HBRE being ignored when HCR_EL2.TGE == 0, and BRBCR_EL1.E{1,0}BRE being initialized to 0 out-of-reset.
That's right, there is no possibility for the host and guest BRBE config to overlap.
Quoted 2 lines
What should a user do if they *want* samples from a guest? Is that
That is not supported currently. But in order to enable capturing guest branch samples from inside the host - BRBCR_EL2 configs need to migrate into BRBCR_EL1 when the guest runs on the cpu.
Quoted 1 line
possible to do on other architectures, or do is that always prevented?
I am not sure about other architectures, but for now this falls within guest support which might be looked into later. But is not the proposed patch complete in itself without any further guest support ?
Quoted 126 lines
Mark.
Quoted 123 lines
Cc Marc Zyngier <[email protected]>Cc Oliver Upton <[email protected]>Cc James Morse <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>----
Changes in V18:- Used
host_data_ptr()to access host_debug_state.brbcr_el1 register
- ChangedDEBUG_STATE_SAVE_BRBEto use BIT(7)
- Reverted back iflags as u8arch/arm64/include/asm/kvm_host.h | 3 +++ arch/arm64/kvm/debug.c | 5 +++++ arch/arm64/kvm/hyp/nvhe/debug-sr.c | 31 ++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+)arch/arm64/include/asm/kvm_host.h +3
-0@@ -579,6 +579,7 @@ struct kvm_host_data {u64 trfcr_el1;/* Values of trap registers for the host before guest entry. */ u64 mdcr_el2; +u64 brbcr_el1; } host_debug_state; };@@ -842,6 +843,8 @@ struct kvm_vcpu_arch {#define DEBUG_STATE_SAVE_SPE __vcpu_single_flag(iflags, BIT(5))/* Save TRBE context if active */ #define DEBUG_STATE_SAVE_TRBE __vcpu_single_flag(iflags, BIT(6)) +/* Save BRBE context if active */ +#define DEBUG_STATE_SAVE_BRBE __vcpu_single_flag(iflags, BIT(7))/* SVE enabled for host EL0 */ #define HOST_SVE_ENABLED __vcpu_single_flag(sflags, BIT(0))arch/arm64/kvm/debug.c +5
-0@@ -336,10 +336,15 @@ void kvm_arch_vcpu_load_debug_state_flags(struct kvm_vcpu *vcpu)if (cpuid_feature_extract_unsigned_field (dfr0, ID_AA64DFR0_EL1_TraceBuffer_SHIFT) && !(read_sysreg_s (SYS_TRBIDR_EL1 ) &TRBIDR_EL1_P ))vcpu_set_flag (vcpu,DEBUG_STATE_SAVE_TRBE ); + +/* Check if we have BRBE implemented and available at the host */ +if (cpuid_feature_extract_unsigned_field (dfr0,ID_AA64DFR0_EL1_BRBE_SHIFT )) +vcpu_set_flag (vcpu,DEBUG_STATE_SAVE_BRBE ); }void kvm_arch_vcpu_put_debug_state_flags (struct kvm_vcpu *vcpu) {vcpu_clear_flag (vcpu,DEBUG_STATE_SAVE_SPE );vcpu_clear_flag (vcpu,DEBUG_STATE_SAVE_TRBE ); +vcpu_clear_flag (vcpu,DEBUG_STATE_SAVE_BRBE ); }arch/arm64/kvm/hyp/nvhe/debug-sr.c +31
-0@@ -79,6 +79,32 @@ static void __debug_restore_trace(u64 trfcr_el1)write_sysreg_el1 (trfcr_el1,SYS_TRFCR ); } +static void __debug_save_brbe (u64 *brbcr_el1) +{ + *brbcr_el1 =0 ; + +/* Check if the BRBE is enabled */ +if (!(read_sysreg_el1 (SYS_BRBCR ) & (BRBCR_ELx_E0BRE | BRBCR_ELx_ExBRE))) +return ; + +/* +* Prohibit branch record generation while we are in guest. +* Since access to BRBCR_EL1 is trapped, the guest can't +* modify the filtering set by the host. +*/ + *brbcr_el1 =read_sysreg_el1 (SYS_BRBCR ); +write_sysreg_el1 (0 ,SYS_BRBCR ); +} + +static void __debug_restore_brbe (u64 brbcr_el1) +{ +if (!brbcr_el1) +return ; + +/* Restore BRBE controls */ +write_sysreg_el1 (brbcr_el1,SYS_BRBCR ); +} +void __debug_save_host_buffers_nvhe (struct kvm_vcpu *vcpu) {/* Disable and flush SPE data generation */ @@ -87,6 +113,9 @@ void __debug_save_host_buffers_nvhe(struct kvm_vcpu *vcpu)/* Disable and flush Self-Hosted Trace generation */ if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_TRBE ))__debug_save_trace (host_data_ptr (host_debug_state.trfcr_el1)); +/* Disable BRBE branch records */ +if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_BRBE )) +__debug_save_brbe (host_data_ptr (host_debug_state.brbcr_el1)); }void __debug_switch_to_guest (struct kvm_vcpu *vcpu)@@ -100,6 +129,8 @@ void __debug_restore_host_buffers_nvhe(struct kvm_vcpu *vcpu)__debug_restore_spe (*host_data_ptr (host_debug_state.pmscr_el1));if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_TRBE ))__debug_restore_trace (*host_data_ptr (host_debug_state.trfcr_el1)); +if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_BRBE )) +__debug_restore_brbe (*host_data_ptr (host_debug_state.brbcr_el1)); }void __debug_switch_to_host (struct kvm_vcpu *vcpu)Signature · 1 line
2.25.1
Mark Rutland
maintainerRe: [PATCH V18 6/9] KVM: arm64: nvhe: Disable branch generation in nVHE guests
Quoted 22 lines · Anshuman Khandual
Quoted 9 lines · Mark Rutland
Quoted 3 lines · Anshuman Khandual
Disable the BRBE before we enter the guest, saving the status and enable it back once we get out of the guest. This avoids capturing branch records in the guest kernel or userspace, which would be confusing the host samples.
It'd be good to explain why we need to do this for nVHE, but not for VHE. I *think* that you're relying on BRBCR_EL2.EL0HBRE being ignored when HCR_EL2.TGE == 0, and BRBCR_EL1.E{1,0}BRE being initialized to 0 out-of-reset.
That's right, there is no possibility for the host and guest BRBE config to overlap.
Quoted 1 line
What should a user do if they *want* samples from a guest? Is that
That is not supported currently. But in order to enable capturing guest branch samples from inside the host -
BRBCR_EL2configs need to migrate intoBRBCR_EL1when the guest runs on the cpu.
Quoted 5 lines
Quoted 1 line
possible to do on other architectures, or do is that always prevented?
I am not sure about other architectures, but for now this falls within guest support which might be looked into later. But is not the proposed patch complete in itself without any further guest support ?
My concern here is ABI rather than actual support.
It's not clear to me how this works across architectures, and we should have some idea of how this would work (e.g. if we're going to require new ABI or not), so that we don't have to break ABI later on.
Mark.
Quoted 127 lines
Quoted 127 lines
Mark.
Quoted 123 lines
Cc Marc Zyngier <[email protected]>Cc Oliver Upton <[email protected]>Cc James Morse <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>----
Changes in V18:- Used
host_data_ptr()to access host_debug_state.brbcr_el1 register
- ChangedDEBUG_STATE_SAVE_BRBEto use BIT(7)
- Reverted back iflags as u8arch/arm64/include/asm/kvm_host.h | 3 +++ arch/arm64/kvm/debug.c | 5 +++++ arch/arm64/kvm/hyp/nvhe/debug-sr.c | 31 ++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+)arch/arm64/include/asm/kvm_host.h +3
-0@@ -579,6 +579,7 @@ struct kvm_host_data {u64 trfcr_el1;/* Values of trap registers for the host before guest entry. */ u64 mdcr_el2; +u64 brbcr_el1; } host_debug_state; };@@ -842,6 +843,8 @@ struct kvm_vcpu_arch {#define DEBUG_STATE_SAVE_SPE __vcpu_single_flag(iflags, BIT(5))/* Save TRBE context if active */ #define DEBUG_STATE_SAVE_TRBE __vcpu_single_flag(iflags, BIT(6)) +/* Save BRBE context if active */ +#define DEBUG_STATE_SAVE_BRBE __vcpu_single_flag(iflags, BIT(7))/* SVE enabled for host EL0 */ #define HOST_SVE_ENABLED __vcpu_single_flag(sflags, BIT(0))arch/arm64/kvm/debug.c +5
-0@@ -336,10 +336,15 @@ void kvm_arch_vcpu_load_debug_state_flags(struct kvm_vcpu *vcpu)if (cpuid_feature_extract_unsigned_field (dfr0, ID_AA64DFR0_EL1_TraceBuffer_SHIFT) && !(read_sysreg_s (SYS_TRBIDR_EL1 ) &TRBIDR_EL1_P ))vcpu_set_flag (vcpu,DEBUG_STATE_SAVE_TRBE ); + +/* Check if we have BRBE implemented and available at the host */ +if (cpuid_feature_extract_unsigned_field (dfr0,ID_AA64DFR0_EL1_BRBE_SHIFT )) +vcpu_set_flag (vcpu,DEBUG_STATE_SAVE_BRBE ); }void kvm_arch_vcpu_put_debug_state_flags (struct kvm_vcpu *vcpu) {vcpu_clear_flag (vcpu,DEBUG_STATE_SAVE_SPE );vcpu_clear_flag (vcpu,DEBUG_STATE_SAVE_TRBE ); +vcpu_clear_flag (vcpu,DEBUG_STATE_SAVE_BRBE ); }arch/arm64/kvm/hyp/nvhe/debug-sr.c +31
-0@@ -79,6 +79,32 @@ static void __debug_restore_trace(u64 trfcr_el1)write_sysreg_el1 (trfcr_el1,SYS_TRFCR ); } +static void __debug_save_brbe (u64 *brbcr_el1) +{ + *brbcr_el1 =0 ; + +/* Check if the BRBE is enabled */ +if (!(read_sysreg_el1 (SYS_BRBCR ) & (BRBCR_ELx_E0BRE | BRBCR_ELx_ExBRE))) +return ; + +/* +* Prohibit branch record generation while we are in guest. +* Since access to BRBCR_EL1 is trapped, the guest can't +* modify the filtering set by the host. +*/ + *brbcr_el1 =read_sysreg_el1 (SYS_BRBCR ); +write_sysreg_el1 (0 ,SYS_BRBCR ); +} + +static void __debug_restore_brbe (u64 brbcr_el1) +{ +if (!brbcr_el1) +return ; + +/* Restore BRBE controls */ +write_sysreg_el1 (brbcr_el1,SYS_BRBCR ); +} +void __debug_save_host_buffers_nvhe (struct kvm_vcpu *vcpu) {/* Disable and flush SPE data generation */ @@ -87,6 +113,9 @@ void __debug_save_host_buffers_nvhe(struct kvm_vcpu *vcpu)/* Disable and flush Self-Hosted Trace generation */ if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_TRBE ))__debug_save_trace (host_data_ptr (host_debug_state.trfcr_el1)); +/* Disable BRBE branch records */ +if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_BRBE )) +__debug_save_brbe (host_data_ptr (host_debug_state.brbcr_el1)); }void __debug_switch_to_guest (struct kvm_vcpu *vcpu)@@ -100,6 +129,8 @@ void __debug_restore_host_buffers_nvhe(struct kvm_vcpu *vcpu)__debug_restore_spe (*host_data_ptr (host_debug_state.pmscr_el1));if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_TRBE ))__debug_restore_trace (*host_data_ptr (host_debug_state.trfcr_el1)); +if (vcpu_get_flag (vcpu,DEBUG_STATE_SAVE_BRBE )) +__debug_restore_brbe (*host_data_ptr (host_debug_state.brbcr_el1)); }void __debug_switch_to_host (struct kvm_vcpu *vcpu)Signature · 1 line
2.25.1
Re: [PATCH V18 6/9] KVM: arm64: nvhe: Disable branch generation in nVHE guests
Quoted 23 lines · Mark Rutland
Quoted 22 lines · Anshuman Khandual
Quoted 9 lines · Mark Rutland
Quoted 3 lines · Anshuman Khandual
Disable the BRBE before we enter the guest, saving the status and enable it back once we get out of the guest. This avoids capturing branch records in the guest kernel or userspace, which would be confusing the host samples.
It'd be good to explain why we need to do this for nVHE, but not for VHE. I *think* that you're relying on BRBCR_EL2.EL0HBRE being ignored when HCR_EL2.TGE == 0, and BRBCR_EL1.E{1,0}BRE being initialized to 0 out-of-reset.
That's right, there is no possibility for the host and guest BRBE config to overlap.
Quoted 1 line
What should a user do if they *want* samples from a guest? Is that
That is not supported currently. But in order to enable capturing guest branch samples from inside the host -
BRBCR_EL2configs need to migrate intoBRBCR_EL1when the guest runs on the cpu.
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
possible to do on other architectures, or do is that always prevented?
I am not sure about other architectures, but for now this falls within guest support which might be looked into later. But is not the proposed patch complete in itself without any further guest support ?
My concern here is ABI rather than actual support.
I am trying to understand how this is an ABI problem. Because perf debug tools could be described as - a best effort based sample collection. All samples that could be collected for a given perf_event_attr request might change if the underlying assumptions change later on. AFAICT semantics of expectations for a given attribute request is not a hard ABI requirement.
Quoted 4 lines
It's not clear to me how this works across architectures, and we should have some idea of how this would work (e.g. if we're going to require new ABI or not), so that we don't have to break ABI later on.
BRBE HW does not have any guest filter in itself, unless BRBCR_EL2 gets migrated across BRBCR_EL1 during guest transition, guest branch records would not be captured.
event->attr.exclude_guest = 0 could have been denied during armpmu_add() for preventing events with guest branch sample requests being scheduled on the PMU. But it turns out to be not a very reliable parameter in that sense as well.
event->attr.exclude_guest = 0 remains clear even for a standard session.
./perf record -e instructions:k -j any_call,save_type ls
perf tools will need some changes in order to avoid the above scenarios as a default behaviour which would not be desirable as well.
These semantics could be worked out later on when BRBE guest support gets included, and the current proposal would not prevent any potential future changes in this regard.
Quoted 2 lines
Mark.
Mark Rutland
maintainerRe: [PATCH V18 6/9] KVM: arm64: nvhe: Disable branch generation in nVHE guests
Quoted 28 lines · Anshuman Khandual
Quoted 27 lines · Mark Rutland
Quoted 25 lines · Anshuman Khandual
Quoted 9 lines · Mark Rutland
Quoted 3 lines · Anshuman Khandual
Disable the BRBE before we enter the guest, saving the status and enable it back once we get out of the guest. This avoids capturing branch records in the guest kernel or userspace, which would be confusing the host samples.
It'd be good to explain why we need to do this for nVHE, but not for VHE. I *think* that you're relying on BRBCR_EL2.EL0HBRE being ignored when HCR_EL2.TGE == 0, and BRBCR_EL1.E{1,0}BRE being initialized to 0 out-of-reset.
That's right, there is no possibility for the host and guest BRBE config to overlap.
Quoted 1 line
What should a user do if they *want* samples from a guest? Is that
That is not supported currently. But in order to enable capturing guest branch samples from inside the host -
BRBCR_EL2configs need to migrate intoBRBCR_EL1when the guest runs on the cpu.Quoted 1 line
possible to do on other architectures, or do is that always prevented?
I am not sure about other architectures, but for now this falls within guest support which might be looked into later. But is not the proposed patch complete in itself without any further guest support ?
Quoted 6 lines
Quoted 1 line
My concern here is ABI rather than actual support.
I am trying to understand how this is an ABI problem. Because perf debug tools could be described as - a best effort based sample collection. All samples that could be collected for a given
perf_event_attrrequest might change if the underlying assumptions change later on. AFAICT semantics of expectations for a given attribute request is not a hard ABI requirement.
The ABI requirements are certainly unclear, but people get *very* upset when behaviour changes, so I think we need to have some certainty that we're not backing ourselves into a corner where we have to make substantial behavioural changes later.
Surely we can figure out how this works on other architectures today?
There's a substantial argument for aligning with x86, so can we figure out under which conditions x86 would provide guest samples? e.g. is that always, never, or when certain attr options are configured?
Quoted 13 lines
Quoted 3 lines
It's not clear to me how this works across architectures, and we should have some idea of how this would work (e.g. if we're going to require new ABI or not), so that we don't have to break ABI later on.
BRBE HW does not have any guest filter in itself, unless
BRBCR_EL2gets migrated acrossBRBCR_EL1during guest transition, guest branch records would not be captured.
event->attr.exclude_guest= 0 could have been denied duringarmpmu_add()for preventing events with guest branch sample requests being scheduled on the PMU. But it turns out to be not a very reliable parameter in that sense as well.
Quoted 6 lines
event->attr.exclude_guest= 0 remains clear even for a standard session../perf record -e instructions:k -j any_call,save_type ls
perf tools will need some changes in order to avoid the above scenarios as a default behaviour which would not be desirable as well.
If we're liable to need perf tool changes, then we *definitely* need to understand this better.
Quoted 3 lines
These semantics could be worked out later on when BRBE guest support gets included, and the current proposal would not prevent any potential future changes in this regard.
That depends entirely on what changes we'd expect would be necessary in the perf tools. We need to be certain that we don't enable some use case that subseuqent changes break.
Mark.
PATCH v18 7/9 perf: test: Speed up running brstack test on an Arm model
In reply to Anshuman KhandualFrom: James Clark <[email protected]>
The test runs quite slowly in the model, so replace "xargs -n1" with "tr ' ' '\n'" which does the same thing but in single digit minutes instead of double digit minutes.
Also reduce the number of loops in the test application. Unfortunately this causes intermittent failures on x86, presumably because the sampling interval is too big to pickup any loops, so keep it the same there.
--- tools/perf/tests/shell/test_brstack.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
tools/perf/tests/shell/test_brstack.sh +12 -3
@@ -18,7 +18,6 @@ fi skip_test_missing_symbol brstack_bench TMPDIR=$(mktemp -d /tmp/__perf_test.program.XXXXX) -TESTPROG="perf test -w brstack" cleanup() { rm -rf $TMPDIR
@@ -26,11 +25,21 @@ cleanup() { trap cleanup EXIT TERM INT +is_arm64() { + uname -m | grep -q aarch64 +} + +if is_arm64; then + TESTPROG="perf test -w brstack 5000" +else + TESTPROG="perf test -w brstack" +fi + test_user_branches() { echo "Testing user branch stack sampling" perf record -o $TMPDIR/perf.data --branch-filter any,save_type,u -- ${TESTPROG} > /dev/null 2>&1 - perf script -i $TMPDIR/perf.data --fields brstacksym | xargs -n1 > $TMPDIR/perf.script + perf script -i $TMPDIR/perf.data --fields brstacksym | tr ' ' '\n' > $TMPDIR/perf.script # example of branch entries: # brstack_foo+0x14/brstack_bar+0x40/P/-/-/0/CALL
@@ -59,7 +68,7 @@ test_filter() { echo "Testing branch stack filtering permutation ($test_filter_filter,$test_filter_expect)" perf record -o $TMPDIR/perf.data --branch-filter $test_filter_filter,save_type,u -- ${TESTPROG} > /dev/null 2>&1 - perf script -i $TMPDIR/perf.data --fields brstack | xargs -n1 > $TMPDIR/perf.script + perf script -i $TMPDIR/perf.data --fields brstack | tr ' ' '\n' > $TMPDIR/perf.script # fail if we find any branch type that doesn't match any of the expected ones # also consider UNKNOWN branch types (-)
Signature · 1 line
2.25.1
PATCH v18 8/9 perf: test: Remove empty lines from branch filter test output
In reply to Anshuman KhandualFrom: James Clark <[email protected]>
In the perf script command, spaces are turned into newlines. But when there is a double space this results in empty lines which fail the following inverse grep test, so strip the empty lines.
--- tools/perf/tests/shell/test_brstack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/shell/test_brstack.sh +1 -1
@@ -68,7 +68,7 @@ test_filter() { echo "Testing branch stack filtering permutation ($test_filter_filter,$test_filter_expect)" perf record -o $TMPDIR/perf.data --branch-filter $test_filter_filter,save_type,u -- ${TESTPROG} > /dev/null 2>&1 - perf script -i $TMPDIR/perf.data --fields brstack | tr ' ' '\n' > $TMPDIR/perf.script + perf script -i $TMPDIR/perf.data --fields brstack | tr ' ' '\n' | sed '/^[[:space:]]*$/d' > $TMPDIR/perf.script # fail if we find any branch type that doesn't match any of the expected ones # also consider UNKNOWN branch types (-)
Signature · 1 line
2.25.1
PATCH v18 9/9 perf: test: Extend branch stack sampling test for Arm64 BRBE
In reply to Anshuman KhandualFrom: James Clark <[email protected]>
Add Arm64 BRBE-specific testing to the existing branch stack sampling test. The test currently passes on the Arm FVP RevC model, but no hardware has been tested yet.
--- tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/shell/test_brstack.sh | 42 ++++++++++++++++++++++++-- tools/perf/tests/tests.h | 1 + tools/perf/tests/workloads/Build | 2 ++ tools/perf/tests/workloads/traploop.c | 39 ++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 tools/perf/tests/workloads/traploop.c
tools/perf/tests/builtin-test.c +1 -0
@@ -152,6 +152,7 @@ static struct test_workload *workloads[] = { &workload__sqrtloop, &workload__brstack, &workload__datasym, + &workload__traploop };static int num_subtests (const struct test_suite *t)
tools/perf/tests/shell/test_brstack.sh +39 -3
62 lines not on this page · raw message
tools/perf/tests/tests.h +1 -0
@@ -205,6 +205,7 @@ DECLARE_WORKLOAD(leafloop);DECLARE_WORKLOAD (sqrtloop);DECLARE_WORKLOAD (brstack);DECLARE_WORKLOAD (datasym); +DECLARE_WORKLOAD (traploop);extern const char *dso_to_test;extern const char *test_objdump_path;
tools/perf/tests/workloads/Build +2 -0
@@ -6,8 +6,10 @@ perf-y += leafloop.o perf-y += sqrtloop.o perf-y += brstack.o perf-y += datasym.o +perf-y += traploop.o CFLAGS_sqrtloop.o = -g -O0 -fno-inline -U_FORTIFY_SOURCE CFLAGS_leafloop.o = -g -O0 -fno-inline -fno-omit-frame-pointer -U_FORTIFY_SOURCE CFLAGS_brstack.o = -g -O0 -fno-inline -U_FORTIFY_SOURCE CFLAGS_datasym.o = -g -O0 -fno-inline -U_FORTIFY_SOURCE +CFLAGS_traploop.o = -g -O0 -fno-inline -U_FORTIFY_SOURCE
tools/perf/tests/workloads/traploop.c new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdlib.h> +#include "../tests.h" + +#define BENCH_RUNS 999999 + +static volatile int cnt; + +#ifdef __aarch64__ +static void trap_bench (void ) +{ +unsigned long val; + + asm("mrs %0, ID_AA64ISAR0_EL1" :"=r" (val));/* TRAP + ERET */ +} +#else +static void trap_bench (void ) +{ + +} +#endif + +static int traploop (int argc,const char **argv) +{ +int num_loops =BENCH_RUNS ; + +if (argc >0 ) + num_loops =atoi (argv[0 ]); + +while (1 ) { +if ((cnt++) > num_loops) +break ; + +trap_bench (); + } +return 0 ; +} + +DEFINE_WORKLOAD (traploop);
Signature · 1 line
2.25.1