Commit 114143a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 updates from Will Deacon:
 "The highlights are support for Arm's "Permission Overlay Extension"
  using memory protection keys, support for running as a protected guest
  on Android as well as perf support for a bunch of new interconnect
  PMUs.

  Summary:

  ACPI:
   - Enable PMCG erratum workaround for HiSilicon HIP10 and 11
     platforms.
   - Ensure arm64-specific IORT header is covered by MAINTAINERS.

  CPU Errata:
   - Enable workaround for hardware access/dirty issue on Ampere-1A
     cores.

  Memory management:
   - Define PHYSMEM_END to fix a crash in the amdgpu driver.
   - Avoid tripping over invalid kernel mappings on the kexec() path.
   - Userspace support for the Permission Overlay Extension (POE) using
     protection keys.

  Perf and PMUs:
   - Add support for the "fixed instruction counter" extension in the
     CPU PMU architecture.
   - Extend and fix the event encodings for Apple's M1 CPU PMU.
   - Allow LSM hooks to decide on SPE permissions for physical
     profiling.
   - Add support for the CMN S3 and NI-700 PMUs.

  Confidential Computing:
   - Add support for booting an arm64 kernel as a protected guest under
     Android's "Protected KVM" (pKVM) hypervisor.

  Selftests:
   - Fix vector length issues in the SVE/SME sigreturn tests
   - Fix build warning in the ptrace tests.

  Timers:
   - Add support for PR_{G,S}ET_TSC so that 'rr' can deal with
     non-determinism arising from the architected counter.

  Miscellaneous:
   - Rework our IPI-based CPU stopping code to try NMIs if regular IPIs
     don't succeed.
   - Minor fixes and cleanups"

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (94 commits)
  perf: arm-ni: Fix an NULL vs IS_ERR() bug
  arm64: hibernate: Fix warning for cast from restricted gfp_t
  arm64: esr: Define ESR_ELx_EC_* constants as UL
  arm64: pkeys: remove redundant WARN
  perf: arm_pmuv3: Use BR_RETIRED for HW branch event if enabled
  MAINTAINERS: List Arm interconnect PMUs as supported
  perf: Add driver for Arm NI-700 interconnect PMU
  dt-bindings/perf: Add Arm NI-700 PMU
  perf/arm-cmn: Improve format attr printing
  perf/arm-cmn: Clean up unnecessary NUMA_NO_NODE check
  arm64/mm: use lm_alias() with addresses passed to memblock_free()
  mm: arm64: document why pte is not advanced in contpte_ptep_set_access_flags()
  arm64: Expose the end of the linear map in PHYSMEM_END
  arm64: trans_pgd: mark PTEs entries as valid to avoid dead kexec()
  arm64/mm: Delete __init region from memblock.reserved
  perf/arm-cmn: Support CMN S3
  dt-bindings: perf: arm-cmn: Add CMN S3
  perf/arm-cmn: Refactor DTC PMU register access
  perf/arm-cmn: Make cycle counts less surprising
  perf/arm-cmn: Improve build-time assertion
  ...
parents 8617d7d6 75078ba2

Documentation/admin-guide/perf/arm-ni.rst

0 → 100644
+17 −0
Original line number Diff line number Diff line 
====================================

Arm Network-on Chip Interconnect PMU

====================================



NI-700 and friends implement a distinct PMU for each clock domain within the

interconnect. Correspondingly, the driver exposes multiple PMU devices named

arm_ni_<x>_cd_<y>, where <x> is an (arbitrary) instance identifier and <y> is

the clock domain ID within that particular instance. If multiple NI instances

exist within a system, the PMU devices can be correlated with the underlying

hardware instance via sysfs parentage.



Each PMU exposes base event aliases for the interface types present in its clock

domain. These require qualifying with the "eventid" and "nodeid" parameters

to specify the event code to count and the interface at which to count it

(per the configured hardware ID as reflected in the xxNI_NODE_INFO register).

The exception is the "cycles" alias for the PMU cycle counter, which is encoded

with the PMU node type and needs no further qualification.

Documentation/admin-guide/perf/dwc_pcie_pmu.rst

+8 −8
Original line number Diff line number Diff line
@@ -46,16 +46,16 @@ Some of the events only exist for specific configurations. 
DesignWare Cores (DWC) PCIe PMU Driver

=======================================



This driver adds PMU devices for each PCIe Root Port named based on the BDF of

This driver adds PMU devices for each PCIe Root Port named based on the SBDF of

the Root Port. For example,



    30:03.0 PCI bridge: Device 1ded:8000 (rev 01)

    0001:30:03.0 PCI bridge: Device 1ded:8000 (rev 01)



the PMU device name for this Root Port is dwc_rootport_3018.

the PMU device name for this Root Port is dwc_rootport_13018.



The DWC PCIe PMU driver registers a perf PMU driver, which provides

description of available events and configuration options in sysfs, see

/sys/bus/event_source/devices/dwc_rootport_{bdf}.

/sys/bus/event_source/devices/dwc_rootport_{sbdf}.



The "format" directory describes format of the config fields of the

perf_event_attr structure. The "events" directory provides configuration
@@ -66,16 +66,16 @@ The "perf list" command shall list the available events from sysfs, e.g.:: 


    $# perf list | grep dwc_rootport

    <...>

    dwc_rootport_3018/Rx_PCIe_TLP_Data_Payload/        [Kernel PMU event]

    dwc_rootport_13018/Rx_PCIe_TLP_Data_Payload/        [Kernel PMU event]

    <...>

    dwc_rootport_3018/rx_memory_read,lane=?/               [Kernel PMU event]

    dwc_rootport_13018/rx_memory_read,lane=?/               [Kernel PMU event]



Time Based Analysis Event Usage

-------------------------------



Example usage of counting PCIe RX TLP data payload (Units of bytes)::



    $# perf stat -a -e dwc_rootport_3018/Rx_PCIe_TLP_Data_Payload/

    $# perf stat -a -e dwc_rootport_13018/Rx_PCIe_TLP_Data_Payload/



The average RX/TX bandwidth can be calculated using the following formula:
@@ -88,7 +88,7 @@ Lane Event Usage 
Each lane has the same event set and to avoid generating a list of hundreds

of events, the user need to specify the lane ID explicitly, e.g.::



    $# perf stat -a -e dwc_rootport_3018/rx_memory_read,lane=4/

    $# perf stat -a -e dwc_rootport_13018/rx_memory_read,lane=4/



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

work. Per-task (without "-a") perf sessions are not supported.

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

+3 −1
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ The "identifier" sysfs file allows users to identify the version of the 
PMU hardware device.



The "bus" sysfs file allows users to get the bus number of Root Ports

monitored by PMU.

monitored by PMU. Furthermore users can get the Root Ports range in

[bdf_min, bdf_max] from "bdf_min" and "bdf_max" sysfs attributes

respectively.



Example usage of perf::

Documentation/admin-guide/perf/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ Performance monitor support 
   starfive_starlink_pmu

   arm-ccn

   arm-cmn

   arm-ni

   xgene-pmu

   arm_dsu_pmu

   thunderx2-pmu

Documentation/arch/arm64/elf_hwcaps.rst

+2 −0
Original line number Diff line number Diff line
@@ -365,6 +365,8 @@ HWCAP2_SME_SF8DP2 
HWCAP2_SME_SF8DP4

    Functionality implied by ID_AA64SMFR0_EL1.SF8DP4 == 0b1.



HWCAP2_POE

    Functionality implied by ID_AA64MMFR3_EL1.S1POE == 0b0001.



4. Unused AT_HWCAP bits

-----------------------