Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp5781135pxb; Wed, 26 Jan 2022 22:10:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJzn+vEoueE8indPAWQ1LRRIhw48r7kVsEq72M58J8/zGM/yhl8XgnCqpMKIjiV0U3aJit4r X-Received: by 2002:aa7:d949:: with SMTP id l9mr2278577eds.348.1643263846241; Wed, 26 Jan 2022 22:10:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643263846; cv=none; d=google.com; s=arc-20160816; b=LPsyABdccKJ/pwmpqMOubiEKBGJZXBILKeqZEShLwZTeEQPTNxy2Y4OXOU5eyS2w6a AJQpdqwuzP+i2tdRPy3BngXbet492ny2+3UkfUdL7vgPp7zjsYGtaLJBOXM6CZV9OxpO /EO6/cIXTuB6BTvEiTd0qTLYvCy28fNp2+xQVq4P3ShXummQy5NGDMwxEGJIO17kgILf VtOe+cG6DZBSqLTOfCNODdLqhNStBVYKQMltdDrEsUTgl9afB4zgDQqXhJzzZYyhOnoO kQExiCqGQgKsz4Gwwf2fPQ7P6qTWsrVaJ9sBkflnTEZw2avTEBOUSgEzJxSjxdvfOikJ vP9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:mime-version:message-id:date :dkim-signature; bh=uRxu1ekh/P1Cn+pjTYdSfUMUg0bD8ZbpLT/iEdHDF5M=; b=Scjb5JVr+anuOsoqhT4J2F374/QW9+TpvlU9/yHccBDZmhndVeifRMAjexLhnYe8ba mVD8hPbEpe4BoXOFBKL8hayCighoPJMLk8fG5r/vDErxxPFnqosrh3Z8d8nOKhWRKeXE sv5zve2y96qVkQzo62wZO7q90RlbnRXC/G45z0UU5OLVTcdGkEYkec+5mbOidLASKc3c TjrI1MhVjuwz8VSfpCcbBYc8v4k8L385OZgJJwy3nhOlo32oJyMzfYs7v8MCW8vOZXF1 pe7oGP5qtrwLQ86y5Qmsd6WRuw8bnaqscYyFZoqpCg9M9WrvmbatCi301tc/UQYpqNKB jXyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=VlNcAikA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f25si818147edv.569.2022.01.26.22.10.08; Wed, 26 Jan 2022 22:10:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=VlNcAikA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233629AbiAZXfQ (ORCPT + 99 others); Wed, 26 Jan 2022 18:35:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233650AbiAZXfO (ORCPT ); Wed, 26 Jan 2022 18:35:14 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C09FC061748 for ; Wed, 26 Jan 2022 15:35:14 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id n198-20020a2540cf000000b00614c2ee23b7so2443154yba.9 for ; Wed, 26 Jan 2022 15:35:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=uRxu1ekh/P1Cn+pjTYdSfUMUg0bD8ZbpLT/iEdHDF5M=; b=VlNcAikAcD9umMDwRpax0ZtWmVeSiodBQ2W0hotrOGg+DY7SypIvp9jbuJyFk+kroA CwV1o8P8UI38+wGNhifQlEaWCrVQZBJ0nBsr2BfK9skJozQFWQ2FHl1h42qbb3NncR/0 65N+wKXN/YhotxXVIgJsijxM69Dc3aD3uLD0u0Vz9EzhDbQDmJQ9JqxvYoe2/RV4Qg/a Eh6cgz4ucslWn/nMM9vMxrqpuCP2mqzJ/trxLKTiYd3nDYjBiKosdzbhJBt2CIpDoJVR L8tyeIBu86YKhhX30cTKTxKcb935ZOtNRCgR9bPbXlo5GM5xr7SPTY2FVGpU2kmIqhOc 5iag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=uRxu1ekh/P1Cn+pjTYdSfUMUg0bD8ZbpLT/iEdHDF5M=; b=tHNhIk3EMyecvT3ed/CjjEVkRUXYYIslkT6AHQoAH3uBaZaF7tKYCyl0Wonnd6cS5/ VSXt6lu1VHjueXCSkujwLKBNKkbSZLSjMb7XAiwzMS/WYnzib+TJ4WHC18EWLs75HrbZ LggJ1BR98bNAhH+R19fCI3I4/BdCnTgNNZovWAw1FWDHt0sYMNe5VrgVsVOqho8cAkFu zivqBj5Uju+vXSRp96QETA3J5vVY7hGhIL5QPrpfhxNbgfxK09fk9bMDI6JuwxMOwRW6 ioY4YnubsbB1nogU0f4a4S2FU0m9AHbteTi2LiwvLluys/ALMV/cfzXHfsqyoKwPhrwf 5pRw== X-Gm-Message-State: AOAM532CuP4yQRbPLs5dAtKLbZ8sLiAc7IYENiYZTOZy9FwGCovb4EbE KmV5fuOb0ivzJzieP3XQGz+Ldd7sJPX2ICC8VwDMOTQRTE77FXaNIo38ZBp0z4BLJLKZx/5XzCO GQFJ9yCd/fMwHFxpPq+LIyNcX+ChhRJcueLUlNlv0MbuRE2X3krRG6tr4fXUx0DtrP5VYcunH X-Received: from uluru3.svl.corp.google.com ([2620:15c:2cd:202:9ce0:6f20:c145:eac]) (user=eranian job=sendgmr) by 2002:a25:ca0c:: with SMTP id a12mr2096767ybg.446.1643240113149; Wed, 26 Jan 2022 15:35:13 -0800 (PST) Date: Wed, 26 Jan 2022 15:34:41 -0800 Message-Id: <20220126233454.3362047-1-eranian@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.35.0.rc0.227.g00780c9af4-goog Subject: [PATCH v5 00/14] perf/x86/amd: Add AMD Fam19h Branch Sampling support From: Stephane Eranian To: linux-kernel@vger.kernel.org Cc: peterz@infradead.org, kim.phillips@amd.com, acme@redhat.com, jolsa@redhat.com, songliubraving@fb.com Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch series adds support for the AMD Fam19h 16-deep branch sampling feature as described in the AMD PPR Fam19h Model 01h Revision B1 section 2.1.13. This is a model specific extension. It is not an architected AMD feature. The Branch Sampling Feature (BRS) provides the statistical taken branch information necessary to enable autoFDO-style optimization by compilers, i.e., basic block execution counts. BRS operates with a 16-deep saturating buffer in MSR registers. There is no hardware branch type filtering. All control flow changes are captured. BRS relies on specific programming of the core PMU of Fam19h. In particular, the following requirements must be met: - the sampling period be greater than 16 (BRS depth) - the sampling period must use fixed and not frequency mode BRS interacts with the NMI interrupt as well. Because enabling BRS is expensive, it is only activated after P event occurrences, where P is the desired sampling period. At P occurrences of the event, the counter overflows, the CPU catches the NMI interrupt, activates BRS for 16 branches until it saturates, and then delivers the NMI to the kernel. Between the overflow and the time BRS activates more branches may be executed skewing the period. All along, the sampling event keeps counting. The skid may be attenuated by reducing the sampling period by 16. BRS is integrated into perf_events seamlessly via the same PERF_RECORD_BRANCH_STACK sample format. BRS generates branch perf_branch_entry records in the sampling buffer. There is no prediction or latency information supported. The branches are stored in reverse order of execution. The most recent branch is the first entry in each record. Because BRS must be stopped when a CPU goes into low power mode, the series includes patches to add callbacks on ACPI low power entry and exit which is used on AMD processors. Given that there is no privilege filterting with BRS, the kernel implements filtering on privlege level. This version adds a few simple modifications to perf record and report. 1. add the branch-brs event as a builtin such as it can used directly: perf record -e branch-brs ... 2. improve error handling for AMD IBS and is contributed by Kim Phillips. 3. use the better error handling to improve error handling for BRS. 4. add two new sort dimensions to help display the branch sampling information. Because there is no latency information associated with the branch sampling feature perf report would collapse all samples within a function into a single histogram entry. This is expected because the default sort mode for PERF_SAMPLE_BRANCH_STACK is symbol_from/symbol_to. This propagates to the annotation. For more detailed view of the branch samples, the new sort dimensions addr_from,addr_to can be used instead as follows: $ perf report --sort=overhead,comm,dso,addr_from,addr_to # Overhead Command Shared Object Source Address Target Address # ........ .......... .............. .............. .............. # 4.21% test_prg test_prg [.] test_threa+0x3c [.] test_threa+0x4 4.14% test_prg test_prg [.] test_threa+0x3e [.] test_threa+0x2 4.10% test_prg test_prg [.] test_threa+0x4 [.] test_threa+0x3a 4.07% test_prg test_prg [.] test_threa+0x2 [.] test_threa+0x3c Versus the default output: $ perf report # Overhead Command Source Shared Object Source Symbol Target Symbol Basic Block Cycles # ........ ......... .................... ................ ................. .................. # 99.52% test_prg test_prg [.] test_thread [.] test_thread - BRS can be used with any sampling event. However, it is recommended to use the RETIRED_BRANCH event because it matches what the BRS captures. For convenience, a pseudo event matching the branches captured by BRS is exported by the kernel (branch-brs): $ perf record -b -e cpu/branch-brs/ -c 1000037 test $ perf report -D 56531696056126 0x193c000 [0x1a8]: PERF_RECORD_SAMPLE(IP, 0x2): 18122/18230: 0x401d24 period: 1000037 addr: 0 ... branch stack: nr:16 ..... 0: 0000000000401d24 -> 0000000000401d5a 0 cycles 0 ..... 1: 0000000000401d5c -> 0000000000401d24 0 cycles 0 ..... 2: 0000000000401d22 -> 0000000000401d5c 0 cycles 0 ..... 3: 0000000000401d5e -> 0000000000401d22 0 cycles 0 ..... 4: 0000000000401d20 -> 0000000000401d5e 0 cycles 0 ..... 5: 0000000000401d3e -> 0000000000401d20 0 cycles 0 ..... 6: 0000000000401d42 -> 0000000000401d3e 0 cycles 0 ..... 7: 0000000000401d3c -> 0000000000401d42 0 cycles 0 ..... 8: 0000000000401d44 -> 0000000000401d3c 0 cycles 0 ..... 9: 0000000000401d3a -> 0000000000401d44 0 cycles 0 ..... 10: 0000000000401d46 -> 0000000000401d3a 0 cycles 0 ..... 11: 0000000000401d38 -> 0000000000401d46 0 cycles 0 ..... 12: 0000000000401d48 -> 0000000000401d38 0 cycles 0 ..... 13: 0000000000401d36 -> 0000000000401d48 0 cycles 0 ..... 14: 0000000000401d4a -> 0000000000401d36 0 cycles 0 ..... 15: 0000000000401d34 -> 0000000000401d4a 0 cycles 0 ... thread: test:18230 ...... dso: test Special thanks to Kim Phillips @ AMD for the testing, reviews and contributions. V2 makes the following changes: - the low power callback code has be reworked completly. It is not impacting the generic perf_events code anymore. This is all handled via x86 code and only for ACPI low power driver which seems to be the default on AMD. The change in acpi_pad.c and processor_idle.c has no impact on non x86 architectures, on Intel x86 or AMD without BRS, a jump label is used to void the code unless necessary - BRS is an opt-in compile time option for the kernel - branch_stack bit clearing helper is introduced - As for the fact that BRS holds the NMI and that it may conflict with other sampling events and introduced skid, this is not really a problem because AMD PMI skid is already very large prompting special handling in amd_pmu_wait_on_overflow(), so adding a few cycles while the CPU executes at most 16 taken branches is not a problem. V3 makes the following changes: - simplifies the handling of BRS enable/disable to mimic the Intel LBR code path more closely. That removes some callbacks in generic x86 code - add config option to compile BRS as an opt-in (off by default) - updated perf tool error reporting patch updates by Kim Phillips V4 makes the following changes: - rebase to latest tip.git (commit 6f5ac142e5df) - integrate Kim Phillips latest perf tool error handling patches V5 makes the following changes: - rebased to 5.17-rc1 - integrated feedback from PeterZ about AMD perf_events callbacks - fix cpufeature macros name X86_FEATURE_BRS - integrated all perf tool error handling from kim Phillips Kim Phillips (2): perf evsel: Make evsel__env always return a valid env perf tools: Improve IBS error handling Stephane Eranian (11): perf/core: add perf_clear_branch_entry_bitfields() helper x86/cpufeatures: add AMD Fam19h Branch Sampling feature perf/x86/amd: add AMD Fam19h Branch Sampling support perf/x86/amd: add branch-brs helper event for Fam19h BRS perf/x86/amd: enable branch sampling priv level filtering perf/x86/amd: add AMD branch sampling period adjustment perf/x86/amd: make Zen3 branch sampling opt-in ACPI: add perf low power callback perf/x86/amd: add idle hooks for branch sampling perf tools: Improve error handling of AMD Branch Sampling perf report: add addr_from/addr_to sort dimensions arch/x86/events/Kconfig | 8 + arch/x86/events/amd/Makefile | 1 + arch/x86/events/amd/brs.c | 363 +++++++++++++++++++++++++++++ arch/x86/events/amd/core.c | 217 ++++++++++++++++- arch/x86/events/core.c | 17 +- arch/x86/events/intel/lbr.c | 36 ++- arch/x86/events/perf_event.h | 143 ++++++++++-- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/msr-index.h | 4 + arch/x86/include/asm/perf_event.h | 21 ++ drivers/acpi/acpi_pad.c | 6 + drivers/acpi/processor_idle.c | 5 + include/linux/perf_event.h | 22 ++ tools/perf/util/evsel.c | 40 +++- tools/perf/util/hist.c | 2 + tools/perf/util/hist.h | 2 + tools/perf/util/sort.c | 128 ++++++++++ tools/perf/util/sort.h | 2 + 18 files changed, 977 insertions(+), 41 deletions(-) create mode 100644 arch/x86/events/amd/brs.c -- 2.35.0.rc0.227.g00780c9af4-goog