From patchwork Thu Mar 28 10:37:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Murray X-Patchwork-Id: 10874767 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 495C5922 for ; Thu, 28 Mar 2019 10:37:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A828287FA for ; Thu, 28 Mar 2019 10:37:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EAA828B7D; Thu, 28 Mar 2019 10:37:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A6BFE28A8B for ; Thu, 28 Mar 2019 10:37:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=PAVZK2imorZP2N8Vqbnp6nVjF4NBjv7bweQz3SglnC0=; b=Bb9bhchIF5N4dR r+QFgiASMjRp6shdCIwTNIC5xejpApH6XjSqjaeWT0UkOXBLpgQ7lQ6km3gdcaN5WdqOkBqi3C+ke 3MYEcUpEAOLDpMT3iai4WyBfBNa86u3/HwY2+sCtlcuRltOMDiKjGKpjBliHvkcSf6YUk0azfejUF Qp8k/fK4TyGxxS6kpXVBmoqm8qnuq8u2q93hnmsT100g4Sp6eKPOrbOyRawkBGw10DaKRaKuDIMfP kRYI7qUw06HENszyjp76bTI165vFEtbMgDki8XzP+6BDdD8/qmKTuGMcamr24OSyjUuEVz5a5XhU+ PRI4wLweRn2h3tx9d9bQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h9SPl-0006Sb-BN; Thu, 28 Mar 2019 10:37:41 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h9SPj-0006S3-1I for linux-arm-kernel@lists.infradead.org; Thu, 28 Mar 2019 10:37:40 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A0A2B15AB; Thu, 28 Mar 2019 03:37:37 -0700 (PDT) Received: from e119886-lin.cambridge.arm.com (unknown [10.37.6.20]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B12B63F59C; Thu, 28 Mar 2019 03:37:35 -0700 (PDT) From: Andrew Murray To: Christoffer Dall , Marc Zyngier , Catalin Marinas , Will Deacon , Mark Rutland Subject: [PATCH v12 0/8] arm64: Support perf event modifiers :G and :H Date: Thu, 28 Mar 2019 10:37:23 +0000 Message-Id: <20190328103731.27264-1-andrew.murray@arm.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190328_033739_095397_663A3DC2 X-CRM114-Status: GOOD ( 17.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julien Thierry , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Suzuki K Poulose Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patchset provides support for perf event modifiers :G and :H which allows for filtering of PMU events between host and guests when used with KVM. As the underlying hardware cannot distinguish between guest and host context we must switch the performance counters upon entry/exit to the guest. For non-VHE the counters must be stopped and started upon entry/exit to the guest in __kvm_vcpu_run_nvhe. For VHE we keep the counters enabled but instead change the event type to include/exclude EL0 as appropriate. This allows us to perform this switch outside the critical section of world-switch code in vcpu_load. This has been tested with VHE and non-VHE kernels with a KVM guest. Changes from v11: - Rebased to v5.1-rc2 - Minor changes to commit messages, fixing typos, removing superfluous comments, code. - Change ^ to != in kvm_pmu_switch_needed Changes from v10: - Remove counter switch code from kvm_vcpu_run_vhe and replace with enable/disable EL0 event type in kvm_arch_vcpu_load instead - Reduce counter switch code in __kvm_vcpu_run_nvhe by moving some logic to kvm_set_pmu_events (kvm_pmu_switch_needed) - Simplify code by removing need for KVM_PMU_EVENTS_{HOST,GUEST} - Add kvm_host helper function to let PMU determine if event should start counting when it is enabled - Exclude EL2 on !VHE when exclude_host (to avoid counting host events as guest during entry/exit) - Moved PMU switching code to its own file - Rebased to v5.0 - Added documentation - Removed Reviewed-By's for changed patches and updated commit messages Changes from v9: - Rebased to v5.0-rc2 - Ensure get_host_ctxt considers host_ctxt offset Changes from v8: - Added additional comments - Fixed bisect build failure - Renamed cpu_ctxt variable to cpu_data Changes from v7: - Added additional patch to encapsulate kvm_cpu_context in kvm_host_data Changes from v6: - Move events_host/events_guest out of kvm_cpu_context Changes from v5: - Tweak logic in use of kvm_set_pmu_events Changes from v4: - Prevent unnecessary write_sysreg calls by improving __pmu_switch_to_xxx logic. Changes from v3: - Remove confusing _only suffix from bitfields in kvm_cpu_context - Remove unnecessary condition when clearing event bits in disable - Simplify API of KVM accessors - Prevent unnecessary setting of pmcnten when guest/host events are the same. Changes from v2: - Ensured that exclude_kernel works for guest - Removed unnecessary exclusion of EL2 with exclude_host on !VHE - Renamed kvm_clr_set_host_pmu_events to reflect args order - Added additional information to isb patch Changes from v1: - Removed unnecessary exclusion of EL1 with exclude_guest on VHE - Removed unnecessary isb from existing perf_event.c driver - Folded perf_event.c patches together - Added additional information to last patch commit message Andrew Murray (8): arm64: arm_pmu: remove unnecessary isb instruction arm64: KVM: encapsulate kvm_cpu_context in kvm_host_data arm64: KVM: add accessors to track guest/host only counters arm64: arm_pmu: Add !VHE support for exclude_host/exclude_guest attributes arm64: KVM: Enable !VHE support for :G/:H perf event modifiers arm64: KVM: Enable VHE support for :G/:H perf event modifiers arm64: KVM: avoid isb's by using direct pmxevtyper sysreg arm64: docs: document perf event attributes Documentation/arm64/perf.txt | 74 ++++++++++ arch/arm/include/asm/kvm_host.h | 11 +- arch/arm64/include/asm/kvm_asm.h | 3 +- arch/arm64/include/asm/kvm_host.h | 39 ++++- arch/arm64/kernel/asm-offsets.c | 1 + arch/arm64/kernel/perf_event.c | 50 +++++-- arch/arm64/kvm/Makefile | 2 +- arch/arm64/kvm/hyp/switch.c | 6 + arch/arm64/kvm/pmu.c | 232 ++++++++++++++++++++++++++++++ arch/arm64/kvm/sys_regs.c | 3 + virt/kvm/arm/arm.c | 16 ++- 11 files changed, 412 insertions(+), 25 deletions(-) create mode 100644 Documentation/arm64/perf.txt create mode 100644 arch/arm64/kvm/pmu.c