From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97E67C7619A for ; Sat, 15 Apr 2023 16:41:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229820AbjDOQlC (ORCPT ); Sat, 15 Apr 2023 12:41:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229505AbjDOQlB (ORCPT ); Sat, 15 Apr 2023 12:41:01 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46D9A4223 for ; Sat, 15 Apr 2023 09:41:00 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-517c01e6c98so1060465a12.2 for ; Sat, 15 Apr 2023 09:41:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1681576860; x=1684168860; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=z2M63eTttyiy9/bDAykyJM/0pATtpC5A2Oom8LHCZ9k=; b=TUQUCtCJib3y4up2QnqFd/naObQKhfNVY7afy7u9JkA8pMqyu4rdiZKWgXORmpq/fC X5ETMMDTvclo+ScvAxMF9E/5ES7fjYYlbnpHGVn1KIa247m/sTbKp1LiKYm6cFlrVB+9 XJj2oiTUGiZTx6tK+D078A/8/ov0MU+lI1lPjGAmeyBl4wMC1K+hALb+JCsaHRRWmJ5e 93bbVzLDiknxQxkPfOURflcbszH6G2+bbVV2z8VBou27F05tmm53aUSC0YIqpjh6cTos XXaytsJlLmhKUoGamjBghxs9fpVneoIo45c+V5bb8+/zyfK9yOB08NqssaJWxbQfZV03 zXbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681576860; x=1684168860; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=z2M63eTttyiy9/bDAykyJM/0pATtpC5A2Oom8LHCZ9k=; b=dGrU9XCcI1Lkd4mkln04e5Kosr3ux1u2f6J6RVEIpecW2DPK3+qmN1/N+pGLPnUU64 MpomD+A3YDX4hf5sc6t6ezhQv3+O2wr5/+rH0XBHvaX0gnkE1SAN+lC8uqFatRPSJbRt BVUdG0C/bmH1nYxM5bH/L6B5TLe9HV4xFGEkq+09Vc5/GOmOn9Axs2+kWlNPl1vrxrJq XAyfxaz5QyP5NaS3lAigM1mZ6eJvlZ35ikw2BeFdo0MfbKcnYeJx38uGZIKtBIt+h0o0 J4i1dFnhoVwf6enaJGp1ADyU9lVyl69Qt36S/zaFrOR25vLZ28Hi8h44dZMncRVEQ8cG 4y3w== X-Gm-Message-State: AAQBX9cAoj/5i3l970eFAGjkz6DKsgOmuqQ41Syl+IrYI1SUMDM3rNBW /2vlUTmjCofYMPGIW7ti3RK/aA21NCA= X-Google-Smtp-Source: AKy350brZ9cJoLoaZNJmMW+tpDxq5a3i0icYIzxJIjiLPR3atdE1a+olD8DSeBPpLqiSycbYFskGMVlrt64= X-Received: from reijiw-west4.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:aa1]) (user=reijiw job=sendgmr) by 2002:a05:6a00:a1d:b0:63b:6e47:8646 with SMTP id p29-20020a056a000a1d00b0063b6e478646mr2576065pfh.3.1681576859816; Sat, 15 Apr 2023 09:40:59 -0700 (PDT) Date: Sat, 15 Apr 2023 09:40:28 -0700 In-Reply-To: <20230415164029.526895-1-reijiw@google.com> Mime-Version: 1.0 References: <20230415164029.526895-1-reijiw@google.com> X-Mailer: git-send-email 2.40.0.634.g4ca3ef3211-goog Message-ID: <20230415164029.526895-2-reijiw@google.com> Subject: [PATCH v3 1/2] KVM: arm64: PMU: Restore the host's PMUSERENR_EL0 From: Reiji Watanabe To: Marc Zyngier , Mark Rutland , Oliver Upton , Will Deacon , Catalin Marinas , kvmarm@lists.linux.dev Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, James Morse , Alexandru Elisei , Zenghui Yu , Suzuki K Poulose , Paolo Bonzini , Ricardo Koller , Jing Zhang , Raghavendra Rao Anata , Shaoqin Huang , Rob Herring , Reiji Watanabe Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Restore the host's PMUSERENR_EL0 value instead of clearing it, before returning back to userspace, as the host's EL0 might have a direct access to PMU registers (some bits of PMUSERENR_EL0 for might not be zero for the host EL0). Fixes: 83a7a4d643d3 ("arm64: perf: Enable PMU counter userspace access for perf event") Signed-off-by: Reiji Watanabe --- arch/arm64/kvm/hyp/include/hyp/switch.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h index 07d37ff88a3f..6718731729fd 100644 --- a/arch/arm64/kvm/hyp/include/hyp/switch.h +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h @@ -81,7 +81,12 @@ static inline void __activate_traps_common(struct kvm_vcpu *vcpu) * EL1 instead of being trapped to EL2. */ if (kvm_arm_support_pmu_v3()) { + struct kvm_cpu_context *hctxt; + write_sysreg(0, pmselr_el0); + + hctxt = &this_cpu_ptr(&kvm_host_data)->host_ctxt; + ctxt_sys_reg(hctxt, PMUSERENR_EL0) = read_sysreg(pmuserenr_el0); write_sysreg(ARMV8_PMU_USERENR_MASK, pmuserenr_el0); } @@ -105,8 +110,12 @@ static inline void __deactivate_traps_common(struct kvm_vcpu *vcpu) write_sysreg(vcpu->arch.mdcr_el2_host, mdcr_el2); write_sysreg(0, hstr_el2); - if (kvm_arm_support_pmu_v3()) - write_sysreg(0, pmuserenr_el0); + if (kvm_arm_support_pmu_v3()) { + struct kvm_cpu_context *hctxt; + + hctxt = &this_cpu_ptr(&kvm_host_data)->host_ctxt; + write_sysreg(ctxt_sys_reg(hctxt, PMUSERENR_EL0), pmuserenr_el0); + } if (cpus_have_final_cap(ARM64_SME)) { sysreg_clear_set_s(SYS_HFGRTR_EL2, 0, -- 2.40.0.634.g4ca3ef3211-goog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D2B7BC7619A for ; Sat, 15 Apr 2023 16:41:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=tIZn8GI1GEOqon2F6ADkEVlr8dYeIrGLMVhFylaZIp4=; b=O7R7kkk2bPN9jCpH5R79+sDIRy HjGOx5C4nPvKmSu4qTGcvEQn0nnRB7rW1YyJQqvuR+SXdsBmTDptxxKuiYXGoU2MDd09amoczk+x9 aJjLSmuwmaOOfl1XxTqQNeitEJf3nSQRdx8cFFxPWtA3M+Niw7xTDBtXhl/h0rHFGWX4fKdstJkGu a6tkDyjPRRAcn7tDrN9zAaOFmC1szzNzN0nZwm6qYn/WwKMjF1sOZDNvmAiqH3f7sHjgObeMv42pA pF7HTTLdnkXTzZQAGJv9+UuatG448mErJSW1ftxGfij7gDLezP6xamdN3isksv7KK4k9zRzYFSt42 qId279iA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pnixZ-00CTMF-0Y; Sat, 15 Apr 2023 16:41:09 +0000 Received: from mail-pg1-x549.google.com ([2607:f8b0:4864:20::549]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pnixW-00CTKr-0f for linux-arm-kernel@lists.infradead.org; Sat, 15 Apr 2023 16:41:07 +0000 Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-517bad1b8c5so1064165a12.0 for ; Sat, 15 Apr 2023 09:41:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1681576860; x=1684168860; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=z2M63eTttyiy9/bDAykyJM/0pATtpC5A2Oom8LHCZ9k=; b=TUQUCtCJib3y4up2QnqFd/naObQKhfNVY7afy7u9JkA8pMqyu4rdiZKWgXORmpq/fC X5ETMMDTvclo+ScvAxMF9E/5ES7fjYYlbnpHGVn1KIa247m/sTbKp1LiKYm6cFlrVB+9 XJj2oiTUGiZTx6tK+D078A/8/ov0MU+lI1lPjGAmeyBl4wMC1K+hALb+JCsaHRRWmJ5e 93bbVzLDiknxQxkPfOURflcbszH6G2+bbVV2z8VBou27F05tmm53aUSC0YIqpjh6cTos XXaytsJlLmhKUoGamjBghxs9fpVneoIo45c+V5bb8+/zyfK9yOB08NqssaJWxbQfZV03 zXbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681576860; x=1684168860; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=z2M63eTttyiy9/bDAykyJM/0pATtpC5A2Oom8LHCZ9k=; b=S5FRdFZ8fSKwiXa9WzyUpz174bf2ene3lHnzEJ4Gao2NftKWMFUSt/e2ktk43tzfjF kb5247kkTBz9QHtItljVkCuKLhiqlRAWZdmCidOuvoaa/lZqfHvxBcbeiuMOV2Oo1SaV rKfi5ur8IW1z2p14apYd/hovHrZuXXah/ScToxbPuQr/ibNZVQPwvb50BosL81PXNoN9 eeqRvpMmIweGPnZr5TvlISXP+rXll+qQZxiZcV+VM7TxhOZsZ7zEi7j5L9TZrlrtdKlN 1XsP6ZVFFvjj2n68QX7Xm9Y1QDTwwKdMqZ1CFglXWrlm5t4IHW6GcpzK7/k3Y1Zb1bs4 bKsA== X-Gm-Message-State: AAQBX9c/mopGYsNxYDg61gTIe5TvYoB7tWkrfDAIfiOclz6UDd7EgZqx KfzHn8xGxBi0RX34F7uRv3zA+Aa+v5I= X-Google-Smtp-Source: AKy350brZ9cJoLoaZNJmMW+tpDxq5a3i0icYIzxJIjiLPR3atdE1a+olD8DSeBPpLqiSycbYFskGMVlrt64= X-Received: from reijiw-west4.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:aa1]) (user=reijiw job=sendgmr) by 2002:a05:6a00:a1d:b0:63b:6e47:8646 with SMTP id p29-20020a056a000a1d00b0063b6e478646mr2576065pfh.3.1681576859816; Sat, 15 Apr 2023 09:40:59 -0700 (PDT) Date: Sat, 15 Apr 2023 09:40:28 -0700 In-Reply-To: <20230415164029.526895-1-reijiw@google.com> Mime-Version: 1.0 References: <20230415164029.526895-1-reijiw@google.com> X-Mailer: git-send-email 2.40.0.634.g4ca3ef3211-goog Message-ID: <20230415164029.526895-2-reijiw@google.com> Subject: [PATCH v3 1/2] KVM: arm64: PMU: Restore the host's PMUSERENR_EL0 From: Reiji Watanabe To: Marc Zyngier , Mark Rutland , Oliver Upton , Will Deacon , Catalin Marinas , kvmarm@lists.linux.dev Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, James Morse , Alexandru Elisei , Zenghui Yu , Suzuki K Poulose , Paolo Bonzini , Ricardo Koller , Jing Zhang , Raghavendra Rao Anata , Shaoqin Huang , Rob Herring , Reiji Watanabe X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230415_094106_249615_CA820D0A X-CRM114-Status: GOOD ( 12.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Restore the host's PMUSERENR_EL0 value instead of clearing it, before returning back to userspace, as the host's EL0 might have a direct access to PMU registers (some bits of PMUSERENR_EL0 for might not be zero for the host EL0). Fixes: 83a7a4d643d3 ("arm64: perf: Enable PMU counter userspace access for perf event") Signed-off-by: Reiji Watanabe --- arch/arm64/kvm/hyp/include/hyp/switch.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h index 07d37ff88a3f..6718731729fd 100644 --- a/arch/arm64/kvm/hyp/include/hyp/switch.h +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h @@ -81,7 +81,12 @@ static inline void __activate_traps_common(struct kvm_vcpu *vcpu) * EL1 instead of being trapped to EL2. */ if (kvm_arm_support_pmu_v3()) { + struct kvm_cpu_context *hctxt; + write_sysreg(0, pmselr_el0); + + hctxt = &this_cpu_ptr(&kvm_host_data)->host_ctxt; + ctxt_sys_reg(hctxt, PMUSERENR_EL0) = read_sysreg(pmuserenr_el0); write_sysreg(ARMV8_PMU_USERENR_MASK, pmuserenr_el0); } @@ -105,8 +110,12 @@ static inline void __deactivate_traps_common(struct kvm_vcpu *vcpu) write_sysreg(vcpu->arch.mdcr_el2_host, mdcr_el2); write_sysreg(0, hstr_el2); - if (kvm_arm_support_pmu_v3()) - write_sysreg(0, pmuserenr_el0); + if (kvm_arm_support_pmu_v3()) { + struct kvm_cpu_context *hctxt; + + hctxt = &this_cpu_ptr(&kvm_host_data)->host_ctxt; + write_sysreg(ctxt_sys_reg(hctxt, PMUSERENR_EL0), pmuserenr_el0); + } if (cpus_have_final_cap(ARM64_SME)) { sysreg_clear_set_s(SYS_HFGRTR_EL2, 0, -- 2.40.0.634.g4ca3ef3211-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel