From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8347E1A316E for ; Thu, 7 May 2026 00:36:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778114190; cv=none; b=CtCF5Ct9t1OLVv+wAB05DHP2gzW2ISTQzPmi15TPQm7DKZ1EEj4VAoX4gyCCGZb2RVDV1dtnq0UP7rrHaMzMRlqijvw3cSbVsQbQBVGbmRlbaT5gcaVum4WytTKZrdtkP1kFE8RWOcVwb+kiX2TLS0aHbeyt5tmcHAmExJhOwNQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778114190; c=relaxed/simple; bh=Mg+OWu4To9gP4YDNSbdHOHMDvr+4y0G1KW2eN+mAZ7U=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gTSdee+ZUHbKCJ9EmgyAGaTK/fYR3RQDY0AdzU2mqj6gicD131nplnlT4yDOCj+c4Jq2TK3+hMXdgw32G1hhAWKg9cAL6ZKXETwpJgafEKQWyV8AlBbf4jJaryiv43SvIEzpGdhvlswIxIGm8cMGZ5v9xIiR+S7+jnRRvBcVFXE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vannapurve.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=sC1wRbmG; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vannapurve.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sC1wRbmG" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2ba838c5ff1so6454355ad.3 for ; Wed, 06 May 2026 17:36:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778114188; x=1778718988; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NtFnsbFhhOhOusiCoeAQB82eTGbdASBkHtbXis4GHx4=; b=sC1wRbmGMjyyeYvZGnmJM1H4kid3UanYpZ10apemXqzPsv5uHYCivpQPaWJdlcy/qN +ZTzqzB4lYXgv6xLaT5fDf+0Ee8US/z53fk5mfImXAXRpJNctOkEQ19CeNYQ2TUlV3Zk hM8kr7z7xINslEQCHKez/i31MB9f/ylfG4y5Dr1wwlCQGYoL/t3/syIplNmiheL0pfbv a9AnAlbpWtvzglraGlvL+qxa6ZtGUwzoHSg5E4XzPoe5uDW29jq4KrUAh2VVtqB+JacN BIqHFo+FPhBXC/KCtH/wnKxGDHEIhVYYJ/Vs2uS8mpbIsi6xv71lrnBvaGcbotImfTyn gHFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778114188; x=1778718988; 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=NtFnsbFhhOhOusiCoeAQB82eTGbdASBkHtbXis4GHx4=; b=NHog4rtj1nsKkzZBs3C4f4cV/f8shkHINFmmcoeHXOIAGFbenLe1IqKXOdpBguFeS0 bhHeEEXM9sfMYdFkWMsANZH/m0faiExZluKKfIOl4/i60MILQRMGvxEGAMZHZf3wgL8E ul2+wCDcreWRJ8vC8dUVchhPxEmdJ0jH/VNWCbivWSU0VBLfAZ8/bovClzvIjeu0CqO1 rf28F8Bso0allvb7pLCepGWjc94Z+XY9dKi4/FuEFIdxvChfydQMiWKO24J9ZRqTBxsm /5nmnYPIxjv7USsTVB0J3PPDkDK2tYvdZiCeRLnUQHEnhlKHItV2mlRBIvpDvoRwPM1H 5BdQ== X-Forwarded-Encrypted: i=1; AFNElJ8vN8WaH15G/0/pSDzWKRQUOC20Wzht9psyqIAi5ZhobvwAXng6I8lHHZquL/al4xT2hpR67fMvvwN9KXk=@vger.kernel.org X-Gm-Message-State: AOJu0YwArYOa3TY2KG1H2t6lKU+bG6sw6zEoRoTUjUUQNRR6/rCVoZ5/ 4xu6XlzWzGJtOD8w/bX8gNP1k3mtt0P8ZLlH3rU9kb3LNRrjiASWpgRZ57Ex1SB5R1gQAKEDHj7 35UwM4ODSwfQN0w1NYx846w== X-Received: from plbje14.prod.google.com ([2002:a17:903:264e:b0:2ba:316c:2d88]) (user=vannapurve job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:bc4c:b0:2b0:4fb6:85ce with SMTP id d9443c01a7336-2ba79c22188mr38019025ad.21.1778114187534; Wed, 06 May 2026 17:36:27 -0700 (PDT) Date: Thu, 7 May 2026 00:36:12 +0000 In-Reply-To: <20260507003613.1784851-1-vannapurve@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260507003613.1784851-1-vannapurve@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260507003613.1784851-2-vannapurve@google.com> Subject: [PATCH v2 1/2] KVM: x86: Introduce arch specific has_protected_pmu state From: Vishal Annapurve To: seanjc@google.com, pbonzini@redhat.com, dave.hansen@linux.intel.com Cc: rick.p.edgecombe@intel.com, dapeng1.mi@linux.intel.com, mizhang@google.com, kai.huang@intel.com, jmattson@google.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Vishal Annapurve Content-Type: text/plain; charset="UTF-8" PMU state for TDX VMs is virtualized by TDX Module [1]. Introduce has_protected_pmu state to track the pmu state for such scenarios. Disable KVM's PMU virtualization framework if pmu state is protected as additional enlightenment is needed within KVM to control/manage the visibility of PMU state to such VMs. Additionally disallow userspace VMM to toggle PMU state using KVM_CAP_PMU_CAPABILITY if pmu state is protected. [1] Section 15.2: https://cdrdv2.intel.com/v1/dl/getContent/733575 Suggested-by: Sean Christopherson Signed-off-by: Vishal Annapurve --- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/x86.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index c470e40a00aa..8371dcaaed1a 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1422,6 +1422,7 @@ struct kvm_arch { bool has_private_mem; bool has_protected_state; bool has_protected_eoi; + bool has_protected_pmu; bool pre_fault_allowed; struct hlist_head *mmu_page_hash; struct list_head active_mmu_pages; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0a1b63c63d1a..4836e206f64a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6910,7 +6910,8 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, break; mutex_lock(&kvm->lock); - if (!kvm->created_vcpus && !kvm->arch.created_mediated_pmu) { + if (!kvm->created_vcpus && !kvm->arch.created_mediated_pmu && + !kvm->arch.has_protected_pmu) { kvm->arch.enable_pmu = !(cap->args[0] & KVM_PMU_CAP_DISABLE); r = 0; } @@ -13375,7 +13376,10 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) kvm->arch.default_tsc_khz = max_tsc_khz ? : tsc_khz; kvm->arch.apic_bus_cycle_ns = APIC_BUS_CYCLE_NS_DEFAULT; kvm->arch.guest_can_read_msr_platform_info = true; - kvm->arch.enable_pmu = enable_pmu; + if (kvm->arch.has_protected_pmu) + kvm->arch.enable_pmu = false; + else + kvm->arch.enable_pmu = enable_pmu; #if IS_ENABLED(CONFIG_HYPERV) spin_lock_init(&kvm->arch.hv_root_tdp_lock); -- 2.54.0.563.g4f69b47b94-goog