Commit 42e7ddba authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/perf' into for-next/core 

* for-next/perf: (41 commits)
  arm64: Add USER_STACKTRACE support
  drivers/perf: hisi: hns3: Actually use devm_add_action_or_reset()
  drivers/perf: hisi: hns3: Fix out-of-bound access when valid event group
  drivers/perf: hisi_pcie: Fix out-of-bound access when valid event group
  perf/arm-spe: Assign parents for event_source device
  perf/arm-smmuv3: Assign parents for event_source device
  perf/arm-dsu: Assign parents for event_source device
  perf/arm-dmc620: Assign parents for event_source device
  perf/arm-ccn: Assign parents for event_source device
  perf/arm-cci: Assign parents for event_source device
  perf/alibaba_uncore: Assign parents for event_source device
  perf/arm_pmu: Assign parents for event_source devices
  perf/imx_ddr: Assign parents for event_source devices
  perf/qcom: Assign parents for event_source devices
  Documentation: qcom-pmu: Use /sys/bus/event_source/devices paths
  perf/riscv: Assign parents for event_source devices
  perf/thunderx2: Assign parents for event_source devices
  Documentation: thunderx2-pmu: Use /sys/bus/event_source/devices paths
  perf/xgene: Assign parents for event_source devices
  Documentation: xgene-pmu: Use /sys/bus/event_source/devices paths
  ...
parents a5a5ce57 410e471f

Documentation/admin-guide/perf/hisi-pmu.rst

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ interrupt, and the PMU driver shall register perf PMU drivers like L3C, 
HHA and DDRC etc. The available events and configuration options shall

be described in the sysfs, see:



/sys/devices/hisi_sccl{X}_<l3c{Y}/hha{Y}/ddrc{Y}>/, or

/sys/bus/event_source/devices/hisi_sccl{X}_<l3c{Y}/hha{Y}/ddrc{Y}>.

The "perf list" command shall list the available events from sysfs.

Documentation/admin-guide/perf/hns3-pmu.rst

+4 −4
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ HNS3 PMU driver 


The HNS3 PMU driver registers a perf PMU with the name of its sicl id.::



  /sys/devices/hns3_pmu_sicl_<sicl_id>

  /sys/bus/event_source/devices/hns3_pmu_sicl_<sicl_id>



PMU driver provides description of available events, filter modes, format,

identifier and cpumask in sysfs.
@@ -40,9 +40,9 @@ device. 


Example usage of checking event code and subevent code::



  $# cat /sys/devices/hns3_pmu_sicl_0/events/dly_tx_normal_to_mac_time

  $# cat /sys/bus/event_source/devices/hns3_pmu_sicl_0/events/dly_tx_normal_to_mac_time

  config=0x00204

  $# cat /sys/devices/hns3_pmu_sicl_0/events/dly_tx_normal_to_mac_packet_num

  $# cat /sys/bus/event_source/devices/hns3_pmu_sicl_0/events/dly_tx_normal_to_mac_packet_num

  config=0x10204



Each performance statistic has a pair of events to get two values to
@@ -60,7 +60,7 @@ computation to calculate real performance data is::: 


Example usage of checking supported filter mode::



  $# cat /sys/devices/hns3_pmu_sicl_0/filtermode/bw_ssu_rpu_byte_num

  $# cat /sys/bus/event_source/devices/hns3_pmu_sicl_0/filtermode/bw_ssu_rpu_byte_num

  filter mode supported: global/port/port-tc/func/func-queue/



Example usage of perf::

Documentation/admin-guide/perf/qcom_l2_pmu.rst

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ There is one logical L2 PMU exposed, which aggregates the results from 
the physical PMUs.



The driver provides a description of its available events and configuration

options in sysfs, see /sys/devices/l2cache_0.

options in sysfs, see /sys/bus/event_source/devices/l2cache_0.



The "format" directory describes the format of the events.

Documentation/admin-guide/perf/qcom_l3_pmu.rst

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ PMU with device name l3cache_<socket>_<instance>. User space is responsible 
for aggregating across slices.



The driver provides a description of its available events and configuration

options in sysfs, see /sys/devices/l3cache*. Given that these are uncore PMUs

options in sysfs, see /sys/bus/event_source/devices/l3cache*. Given that these are uncore PMUs

the driver also exposes a "cpumask" sysfs attribute which contains a mask

consisting of one CPU per socket which will be used to handle all the PMU

events on that socket.

Documentation/admin-guide/perf/thunderx2-pmu.rst

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ The thunderx2_pmu driver registers per-socket perf PMUs for the DMC and 
L3C devices.  Each PMU can be used to count up to 4 (DMC/L3C) or up to 8

(CCPI2) events simultaneously. The PMUs provide a description of their

available events and configuration options under sysfs, see

/sys/devices/uncore_<l3c_S/dmc_S/ccpi2_S/>; S is the socket id.

/sys/bus/event_source/devices/uncore_<l3c_S/dmc_S/ccpi2_S/>; S is the socket id.



The driver does not support sampling, therefore "perf record" will not

work. Per-task perf sessions are also not supported.