Skip to content

Commit 722625c

Browse files
Fuad TabbaMarc Zyngier
authored andcommitted
KVM: arm64: Reenable pmu in Protected Mode
Now that the pmu code does not access hyp data, reenable it in protected mode. Once fully supported, protected VMs will not have pmu support, since that could leak information. However, non-protected VMs in protected mode should have pmu support if available. Signed-off-by: Fuad Tabba <tabba@google.com> Reviewed-by: Oliver Upton <oupton@google.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20220510095710.148178-5-tabba@google.com
1 parent 84d751a commit 722625c

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

arch/arm64/kvm/pmu-emul.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -756,8 +756,7 @@ void kvm_host_pmu_init(struct arm_pmu *pmu)
756756
{
757757
struct arm_pmu_entry *entry;
758758

759-
if (pmu->pmuver == 0 || pmu->pmuver == ID_AA64DFR0_PMUVER_IMP_DEF ||
760-
is_protected_kvm_enabled())
759+
if (pmu->pmuver == 0 || pmu->pmuver == ID_AA64DFR0_PMUVER_IMP_DEF)
761760
return;
762761

763762
mutex_lock(&arm_pmus_lock);

0 commit comments

Comments
 (0)