From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (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 8838840FDBC for ; Fri, 8 May 2026 17:07:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778260049; cv=none; b=D4O+hPGDjoZ9wm/2xB81k9ci/ri68Tv237ytrvM9FW13ma1aTql7N0O/x0bGqm0Wl8g7vHlSDpD0TpoLSLWLkZhJfy5yFH587TTJB4dmE9rEgThZUHtG5omJfZhsxU6sIEzp7/M3DLUDtMyC5CID1ZERw+YkbvkeHqyK+BEsRxw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778260049; c=relaxed/simple; bh=MrGjQ4HWAdYvkD0eUuvTAyi7epRc7ljtg5YdO1PiTn8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=lzKQIStvYphdvbbpfl/6xSoTenUMCtdda8pzpgBQiDijA7R0BN+DEoxs1+ZriCyjU7aRwxNHAKpZ2/uwixDnqxjQKNlMQ8cRgc0gVRxIXoMfHNbNAe45h8RH5r1Ive/wvE0b3WR9oBwJfIf8Vk2sN715CaTNRnrWy6OI9moTUEY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jmattson.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=qz/wq38U; arc=none smtp.client-ip=209.85.215.201 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--jmattson.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="qz/wq38U" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c8252a4a1b7so495757a12.3 for ; Fri, 08 May 2026 10:07:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778260045; x=1778864845; 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=PYkAOVRIhnDcm5m8BRbL+GbCpCTtOZQWAsAfzCP5X/g=; b=qz/wq38UaOquRTIEuXvlCKTodEwAaH5jxRSNKy18GsRNAE3/W02DSZIsLPSl6LNHJ0 2TZl7dmJIGzFg/7KLOZJ2RdMOqQRIV1GKe1gABvNldJwLRXisMbygnhulTSRyg9MCGS8 fgvY078UOe1EEm/f1KVo2bm8OtIjGegkNfTnNKlzdoZ6ByiVkdMo9z0gciIdibaCtBim /MKsuxE9Djcar0kTykNQrOA45XZO+ugHHw1uChCrbQoo/gmoxkuHkPe6W9AQhNHVXaoh bk/Y73pCbwdGIjKyP1gwtGd2MNNQDVl6uSz2U8SeXiA/CWaWopkeqFXlYSpYSbEFyE87 96DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778260045; x=1778864845; 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=PYkAOVRIhnDcm5m8BRbL+GbCpCTtOZQWAsAfzCP5X/g=; b=SDDKm34Xk0vbO4Vm7EKftVEEV6TzqjK+zXJwPLyeb85L0aKB0eIeD1cSrR7wySo07l 7+6HZWcXoxsuSrp5aNj5tMGeU4npIXFvZSchD8/sreY61/FnVo/ND9mD4OQtTSEdct6m EiITIMElio4GB7R0oJRwoOPMK9WDsd+AmINCtu6WxE7eB1IflWxJEmDZWFZINleGTqWo as1CbbFplDhUNK/E+Ymh36MbFeMUpsIMsOgDFK76vuJJcy1OOOlcwhky9DoEhY4+4O0v GYJ8DTfFOhEwunJ9e6r5ZMZbSEIVi2MxUDAs2GY0fejjEMmLdERmYVmy6cc8UTdBhnhO L7/A== X-Forwarded-Encrypted: i=1; AFNElJ/920sUZqYJj6dXF1GnD5zoMhNSw4naWCRWDmWoG1R2ADbDHs4+JzcJ6cEiGGGuYsquIsTuxT/XG8WxhrM=@vger.kernel.org X-Gm-Message-State: AOJu0YxaIH//bzVkwpFdtLT/o48Yqg33cO5as332mswzAc0htqHebt8b j5LP16xkNX7/Ho9w1Tfo7Qfqk5/jY3XcJjORWwI1Y1hajEP8ynxleIxa0fqeAEnb+nu8AKEjkH+ zqoJhez+oA8PisQ== X-Received: from pfva8.prod.google.com ([2002:a05:6a00:c88:b0:837:8d8a:cd3e]) (user=jmattson job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4655:b0:81f:9b4c:81c0 with SMTP id d2e1a72fcca58-83a5dd58261mr13131084b3a.41.1778260044765; Fri, 08 May 2026 10:07:24 -0700 (PDT) Date: Fri, 8 May 2026 10:07:03 -0700 In-Reply-To: <20260508170714.489136-1-jmattson@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260508170714.489136-1-jmattson@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260508170714.489136-3-jmattson@google.com> Subject: [PATCH v2 2/3] KVM: x86: Virtualize AMD CPUID faulting From: Jim Mattson To: Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Shuah Khan , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Clayton Pence Cc: Jim Mattson Content-Type: text/plain; charset="UTF-8" On AMD CPUs, CPUID faulting support is advertised via CPUID.80000021H:EAX.CpuidUserDis[bit 17] and enabled by setting HWCR.CpuidUserDis[bit 35]. Advertise the feature to userspace regardless of host CPU support. Allow writes to HWCR to set bit 35 when the guest CPUID advertises CpuidUserDis. Update cpuid_fault_enabled() and em_cpuid() to check HWCR.CpuidUserDis[bit 35] as well as MSR_FEATURE_ENABLES.CPUID_GP_ON_CPL_GT_0[bit 0]. Signed-off-by: Jim Mattson --- arch/x86/kvm/cpuid.c | 2 +- arch/x86/kvm/cpuid.h | 6 ++++-- arch/x86/kvm/emulate.c | 14 ++++++++------ arch/x86/kvm/x86.c | 19 +++++++++++++------ 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index e69156b54cff..db54fac61da9 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -1248,7 +1248,7 @@ void kvm_initialize_cpu_caps(void) F(AUTOIBRS), EMULATED_F(NO_SMM_CTL_MSR), /* PrefetchCtlMsr */ - /* GpOnUserCpuid */ + EMULATED_F(GP_ON_USER_CPUID), /* EPSF */ F(PREFETCHI), F(AVX512_BMM), diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h index 8b64d863e19c..7312cb0591f4 100644 --- a/arch/x86/kvm/cpuid.h +++ b/arch/x86/kvm/cpuid.h @@ -183,8 +183,10 @@ static inline int guest_cpuid_stepping(struct kvm_vcpu *vcpu) static inline bool cpuid_fault_enabled(struct kvm_vcpu *vcpu) { - return vcpu->arch.msr_misc_features_enables & - MSR_MISC_FEATURES_ENABLES_CPUID_FAULT; + return (vcpu->arch.msr_misc_features_enables & + MSR_MISC_FEATURES_ENABLES_CPUID_FAULT) || + (vcpu->arch.msr_hwcr & + BIT_ULL(MSR_K7_HWCR_CPUID_USER_DIS_BIT)); } static __always_inline void kvm_cpu_cap_clear(unsigned int x86_feature) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index c8c6cc0406d6..127d031d3310 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -3593,13 +3593,15 @@ static int em_sti(struct x86_emulate_ctxt *ctxt) static int em_cpuid(struct x86_emulate_ctxt *ctxt) { u32 eax, ebx, ecx, edx; - u64 msr = 0; + u64 msr[2] = {}; - ctxt->ops->get_msr(ctxt, MSR_MISC_FEATURES_ENABLES, &msr); - if (!ctxt->ops->is_smm(ctxt) && - (msr & MSR_MISC_FEATURES_ENABLES_CPUID_FAULT) && - ctxt->ops->cpl(ctxt)) - return emulate_gp(ctxt, 0); + if (!ctxt->ops->is_smm(ctxt) && ctxt->ops->cpl(ctxt)) { + ctxt->ops->get_msr(ctxt, MSR_MISC_FEATURES_ENABLES, &msr[0]); + ctxt->ops->get_msr(ctxt, MSR_K7_HWCR, &msr[1]); + if ((msr[0] & MSR_MISC_FEATURES_ENABLES_CPUID_FAULT) || + (msr[1] & BIT_ULL(MSR_K7_HWCR_CPUID_USER_DIS_BIT))) + return emulate_gp(ctxt, 0); + } eax = reg_read(ctxt, VCPU_REGS_RAX); ecx = reg_read(ctxt, VCPU_REGS_RCX); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 7d5b66287593..5f64f67ba083 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4002,22 +4002,29 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) break; case MSR_EFER: return set_efer(vcpu, msr_info); - case MSR_K7_HWCR: - data &= ~(u64)0x40; /* ignore flush filter disable */ - data &= ~(u64)0x100; /* ignore ignne emulation enable */ - data &= ~(u64)0x8; /* ignore TLB cache disable */ - + case MSR_K7_HWCR: { /* * Allow McStatusWrEn and TscFreqSel. (Linux guests from v3.2 * through at least v6.6 whine if TscFreqSel is clear, * depending on F/M/S. */ - if (data & ~(BIT_ULL(18) | BIT_ULL(24))) { + u64 valid = BIT_ULL(18) | BIT_ULL(24); + + data &= ~(u64)0x40; /* ignore flush filter disable */ + data &= ~(u64)0x100; /* ignore ignne emulation enable */ + data &= ~(u64)0x8; /* ignore TLB cache disable */ + + if (guest_cpu_cap_has(vcpu, X86_FEATURE_GP_ON_USER_CPUID)) + valid |= BIT_ULL(MSR_K7_HWCR_CPUID_USER_DIS_BIT); + + + if (data & ~valid) { kvm_pr_unimpl_wrmsr(vcpu, msr, data); return 1; } vcpu->arch.msr_hwcr = data; break; + } case MSR_FAM10H_MMIO_CONF_BASE: if (data != 0) { kvm_pr_unimpl_wrmsr(vcpu, msr, data); -- 2.54.0.563.g4f69b47b94-goog