From patchwork Mon May 9 12:03:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 12843376 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 24966C433EF for ; Mon, 9 May 2022 12:05:21 +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:References: Mime-Version:Message-Id: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=akr2XHxc/CQJ1eEoKxZdXz6XA82xRh47J3BFdg95MIY=; b=1pyMpGX1OCBUpVPp4Wbr99ZCGY OTIe0s1EXYyVs0RSUMTVscLFsO3/JzcfdngAI7vB+97Oa+VY0izqWVYA4EAqAyfCdXHwjXD1inSgZ lIz12vnuqPES421fBYW+D7PPxI3opgBjjefcCJXsSQtQrtjWhCy+6jYC3pZM03jkMcDzoIt2QjO/w CAAwuqcwC5uGjNpbL29x1thEec5YSrMOBjDjtoyvZfNrWdtg0tRGDywwsv8g0y8x9JtqN5wU4misW QfjYMu+f5FIfG4brLJihxpXS+0+eR0Van56FGTlNfQjcym94lbOU2zphAATEuRrofMFp4rVrGuoLm XxAX4QoQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1no27d-00EEb9-0V; Mon, 09 May 2022 12:04:17 +0000 Received: from mail-wm1-x34a.google.com ([2a00:1450:4864:20::34a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1no274-00EELz-Iw for linux-arm-kernel@lists.infradead.org; Mon, 09 May 2022 12:03:43 +0000 Received: by mail-wm1-x34a.google.com with SMTP id z23-20020a05600c221700b003942fd37764so9778534wml.8 for ; Mon, 09 May 2022 05:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=AP8BJD+QDHGic4f82rKNyxQyu5IcsR8wiJftz0kCt7w=; b=W11ZAb9BcG9FC5CiXzLMy3NvRJU0fY73utyk+2sxKwqh7oxt0JGbE3o+2OqGw1ZP7B Snzx+FZjjyoeeWvqA2rDLmWvt7aHk3+GdNkPuiMDfTMCXY5en2gPKcqaI345EMLz5HN3 y/+BRqcIBawmTf6NMgUCFRt59jv97GtBRALFDfQvPLCdm0AveeEAmUG87L+hxhr5w+F7 wL1mo2lw+xOLv0NDTJ8K7/F39Y66HNLIye1wupFitjjnlQ9w3KAbg0HFU7tcw0RgddO4 E0ahmiWGfdDIb19XCz4vqt0pCSVBjuaAfaOtHNc3XDNXDbvwNl5hamcVeRca7l98CTEj bUow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=AP8BJD+QDHGic4f82rKNyxQyu5IcsR8wiJftz0kCt7w=; b=1mLWBGPitYbpIJfwT/g5PX/jgUTVPOVko2hryBQFlVHIA+sOixlXSENS4BpHz63eBi cF21muPPTZcAyogbcLwHFgLkpseRqy05aGx9sgqIAt8Qy1zlmt+z0eV68hI2/dNkpv4P yJFQov4oaN7Inw4UFepTVD6Yas2p6UYi7Qf/MWc3vEMzAqU3p6vLO+1XbQqxlrk4ldaF A2tPLNdJo3btBqYiUEXKzQEUSX2pzY3ZTHqQu4ZgAcuhGSXD/uotL/NSqxu6MqlBMLoI ZSKtR70ayduUOx9Z4kokHWXtWE7edMAosk6lU9txl2zuj/g5ppj1/q6ZBKS+1Xtmrxuf f80Q== X-Gm-Message-State: AOAM533059jwrG6QlXplwEB8HkTYwaXRlOBMAAgd4iOXUwOe3ckxRBn5 necwEQLeywJy5o1aN/d1YrE2RyneDg== X-Google-Smtp-Source: ABdhPJwemWETEq1o00ZMXUdhOoB7QdauU8SdFbTVGnRprJ6KJ0RRhEQq4CvyqFrJFc7AIjTkqjO43sRKhQ== X-Received: from fuad.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1613]) (user=tabba job=sendgmr) by 2002:a05:600c:4e51:b0:394:513b:934 with SMTP id e17-20020a05600c4e5100b00394513b0934mr15673131wmq.164.1652097820617; Mon, 09 May 2022 05:03:40 -0700 (PDT) Date: Mon, 9 May 2022 12:03:30 +0000 In-Reply-To: <20220509120330.3043773-1-tabba@google.com> Message-Id: <20220509120330.3043773-5-tabba@google.com> Mime-Version: 1.0 References: <20220509120330.3043773-1-tabba@google.com> X-Mailer: git-send-email 2.36.0.512.ge40c2bad7a-goog Subject: [PATCH v3 4/4] KVM: arm64: Reenable pmu in Protected Mode From: Fuad Tabba To: kvmarm@lists.cs.columbia.edu Cc: maz@kernel.org, will@kernel.org, qperret@google.com, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, drjones@redhat.com, linux-arm-kernel@lists.infradead.org, tabba@google.com, kernel-team@android.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220509_050342_639862_2F2D2893 X-CRM114-Status: GOOD ( 10.98 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now that the pmu code does not access hyp data, reenable it in protected mode. Signed-off-by: Fuad Tabba --- arch/arm64/kvm/pmu-emul.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c index 3dc990ac4f44..11c43bed5f97 100644 --- a/arch/arm64/kvm/pmu-emul.c +++ b/arch/arm64/kvm/pmu-emul.c @@ -774,8 +774,7 @@ void kvm_host_pmu_init(struct arm_pmu *pmu) { struct arm_pmu_entry *entry; - if (pmu->pmuver == 0 || pmu->pmuver == ID_AA64DFR0_PMUVER_IMP_DEF || - is_protected_kvm_enabled()) + if (pmu->pmuver == 0 || pmu->pmuver == ID_AA64DFR0_PMUVER_IMP_DEF) return; mutex_lock(&arm_pmus_lock);