From nobody Fri Jun 12 13:23:19 2026 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 6FEB83F54CE for ; Fri, 8 May 2026 17:07:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778260048; cv=none; b=uCsbHuK2EvgzmW0rv2Y2Eq4v0zHiPsv7feDE1B+Vdxc5igdUvcM97XuhR6EvHdSsPAdm2YjU3FhldKQ5PfKKs+m5+a3Ehrca5hQfgfa+QT5ATsxxdENv0f62cp0qD7XMLMi6t/c0bTMAHLf8FZWhJUAYZV40jODsBpExKlT0eDM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778260048; c=relaxed/simple; bh=o9f9jO84OCJa0WZgWeC13Nym6FnQBtWqM5hYOE31yWw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qRZidHYQQsUSYJqEZ5FOPILt6Pq5bS4thXB/oNFT9kWgLxOfBJ9NtkKB++7jp06+0JvHy2wEQt2ytDZhRcid5/LkNLg+gMbU03+kMc+JAxKjs/b/lOL019VqS6cAVBB72hVJB2mJVz8iSrF3tPpm39jTHbUWBg6R57od7LXMLJY= 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=OJbwjA6i; arc=none smtp.client-ip=209.85.216.74 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="OJbwjA6i" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-36521936155so2404313a91.3 for ; Fri, 08 May 2026 10:07:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778260044; x=1778864844; 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=WTcWclaBrFY7lmTfxYojZT9xYgxKLfO3eM6ShqstUZo=; b=OJbwjA6ilOyoBymUZ0u8bZUS6+UMYv1BcPS6xbPttJEYnQiZtRWBeMjIuog2GTOnmb 6VYGelv+oUVuAXHD/L47ukxcfUyXSkL6L8irk0PZj4hj7rEOm1VwtIAVSJI5KpD6JseY JEwPbZ5Onnkl4PQODQPsC5CxIy9MQMPskIZ76j9SN8LZEFHQZ8n2yigrhoRm2ojvSGlO JAzeUGG0MNZq6FRrEyPzPAS4R5MPpg3E57ZW4SoK7qltnZGu3AKhMi9gUelAglftdVHJ x4DcLxCTWWBwhxlaIUG44pNiR+0pPZanQ1sFex4ylhsALiDgxD2/WRKent/+VrU5vJIP DHsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778260044; x=1778864844; 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=WTcWclaBrFY7lmTfxYojZT9xYgxKLfO3eM6ShqstUZo=; b=q9+reCP1wOfRFTIK5ta4lUEWMOE5q7ucN5QBvJGnYWNe02mX/i5bG2GBCx5P6TaLD9 SD5Z8nLaqCxlLDlCXgJCwgjPXOYzjxhmna0SAka4WtLyC0pljGjDll0liP7AqVoT662j FrjY0S0dgh+AFxqU+aRQrNl9n/dVXNWOnLlB7b3VxAVcwnt/vFLFycXBAfjUiX3LJ2Ta 9a7rCFwsziUdixSj6L7wzF1HMy4rlsFDhIA27Qrj2eOTXFaHvhRc3NQRsiOj/aoMzFOh Aag6F5vKaHjAbpx13Q6TjSD3XxJ04wfUJaTD4L+QVvI1SyZijyH3M19aXaHmEuh/l21z d00Q== X-Forwarded-Encrypted: i=1; AFNElJ8dYQ7aC1zR3j2Z63DTSzo7h2Dt5cMsevngOK2Ve2rJwsmXaoaNP3pLkjiVG4eJMxXfPIV1njZhB3tv1E8=@vger.kernel.org X-Gm-Message-State: AOJu0YxBI9j2NlaEMgaWK8abfID2PlfdoiZHV78bGG0nn8wwYLOJFVni uARsW2m0HamoCAVbXtGdaOUVsM9X40KYrS+pTtZENkSMcCC/F0E7OiJnKeH5hV/hMpcWv4y7yqu o2ojJiHaC8WSyJQ== X-Received: from pjbsk11.prod.google.com ([2002:a17:90b:2dcb:b0:364:a306:a903]) (user=jmattson job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3d0b:b0:35e:577c:c9f with SMTP id 98e67ed59e1d1-365abcdf135mr14784898a91.9.1778260043856; Fri, 08 May 2026 10:07:23 -0700 (PDT) Date: Fri, 8 May 2026 10:07:02 -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-2-jmattson@google.com> Subject: [PATCH v2 1/3] KVM: x86: Remove supports_cpuid_fault() helper 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The function, supports_cpuid_fault(), tests specifically for guest support of Intel's CPUID faulting feature. It does not test for guest support of AMD's CPUID faulting feature. To avoid confusion, remove the helper. Signed-off-by: Jim Mattson --- arch/x86/kvm/cpuid.h | 5 ----- arch/x86/kvm/x86.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h index 039b8e6f40ba..8b64d863e19c 100644 --- a/arch/x86/kvm/cpuid.h +++ b/arch/x86/kvm/cpuid.h @@ -181,11 +181,6 @@ static inline int guest_cpuid_stepping(struct kvm_vcpu= *vcpu) return x86_stepping(best->eax); } =20 -static inline bool supports_cpuid_fault(struct kvm_vcpu *vcpu) -{ - return vcpu->arch.msr_platform_info & MSR_PLATFORM_INFO_CPUID_FAULT; -} - static inline bool cpuid_fault_enabled(struct kvm_vcpu *vcpu) { return vcpu->arch.msr_misc_features_enables & diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0a1b63c63d1a..7d5b66287593 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4264,7 +4264,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct = msr_data *msr_info) case MSR_MISC_FEATURES_ENABLES: if (data & ~MSR_MISC_FEATURES_ENABLES_CPUID_FAULT || (data & MSR_MISC_FEATURES_ENABLES_CPUID_FAULT && - !supports_cpuid_fault(vcpu))) + !(vcpu->arch.msr_platform_info & MSR_PLATFORM_INFO_CPUID_FAULT))) return 1; vcpu->arch.msr_misc_features_enables =3D data; break; --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:23:19 2026 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-Transfer-Encoding: quoted-printable 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) =20 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)); } =20 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 =3D 0; + u64 msr[2] =3D {}; =20 - 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); + } =20 eax =3D reg_read(ctxt, VCPU_REGS_RAX); ecx =3D 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, struc= t msr_data *msr_info) break; case MSR_EFER: return set_efer(vcpu, msr_info); - case MSR_K7_HWCR: - data &=3D ~(u64)0x40; /* ignore flush filter disable */ - data &=3D ~(u64)0x100; /* ignore ignne emulation enable */ - data &=3D ~(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 =3D BIT_ULL(18) | BIT_ULL(24); + + data &=3D ~(u64)0x40; /* ignore flush filter disable */ + data &=3D ~(u64)0x100; /* ignore ignne emulation enable */ + data &=3D ~(u64)0x8; /* ignore TLB cache disable */ + + if (guest_cpu_cap_has(vcpu, X86_FEATURE_GP_ON_USER_CPUID)) + valid |=3D 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 =3D data; break; + } case MSR_FAM10H_MMIO_CONF_BASE: if (data !=3D 0) { kvm_pr_unimpl_wrmsr(vcpu, msr, data); --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:23:19 2026 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.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 68D5B40FDA2 for ; Fri, 8 May 2026 17:07:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778260049; cv=none; b=SCaPqpv5d1ULz/psagUSKFTNBOwZRwEf+OBHhMAP3SrPiTluDlMe/SBgIrp17oIRgG4K4Yqfw6oboe4shsPr0T3yzXlNTfbtna4qWYne7K+TzoRreSvDiJhSK42YVxZWe0qjHTjjUyfPPn+2ZGINKS+NjG3OsW/qCKB+sQNtlSY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778260049; c=relaxed/simple; bh=+26E9CbE37jv7Fg8ytpJOSAeNgt95r8WPVH7/l19efQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qAKXmL4rswKqHuKdcB3VPxmtlNWpFbeRppHObtYNhtv8CNbtsmndj4ru4wqv1Fu+Yx0Y70ga7dJh9Vq7vFlVTA30sYHB6aUq1nQZmJITYrE7O6q6nlOvk1MXr2Kj19wVJBtvocUOG6KU5FEGFfjBBjX9coAOHAaL2vawsLAuJhA= 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=JUbccXuF; arc=none smtp.client-ip=209.85.215.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--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="JUbccXuF" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c7948640854so1334250a12.1 for ; Fri, 08 May 2026 10:07:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778260046; x=1778864846; 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=PQE3P6HpTGBqI9wxzvuYOH/BPNcSAUGenCPQXQBGxb4=; b=JUbccXuFpfN8x6JYnGudaDa7B9u2huAYx96yiME/J8Q7Cyrr5225S3lG72ju11ylkF f9Zy/9G1fRv702//9cCPaS+buiw++j6umwEO8cfw/esD28lbbhD+oGJLHe7/SWSSfAHd LL6iDJn0zOJiCbNMvRSThOA1pLG8rf/nnfJ0geKO5kz1sQH3EQw2WrlfVJ1ioLsRuDkL gxHmtsewZc9I5n1nRxNYX0Lyh4q3yYPFruDO+zfGrE3PfzknkY6fgVmWYngRU54ikPSd nMbcV7FuiwsjezEFQmCd//x14bMqdFBPPfHgO9oT3So0UpGZPJW1gOUuC8E7aSUqtWAI /R/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778260046; x=1778864846; 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=PQE3P6HpTGBqI9wxzvuYOH/BPNcSAUGenCPQXQBGxb4=; b=LYMMG3MrDEmfYNcXCtUOThONUWHf42W8aoFDIoFKl8vmrQvJkwEgF7qxWmRZqAb4KQ 9KQPmZPhdyOdT3TnrLXBtZjTKKl+2PXWb4+pgvq8pIRwrCxDdcc92HlQ8falUoXtE9f9 P93b7h1KhKKRHMv4D9XaLAMIogLtNxuZefZTioVMmc3ILqmP2NRg7zYwUMLhAyXruYR4 O7uTTw6SuJNs22a6/ogVANCaegDwhnPfFupVaF0OnKvdbY70+wlodBLKFFjzTL3TmRj6 JZ4VU+VVB0DlaAEYi6Rc1Qj+UNAmk7f+JTty02Rrfa33Xb0w3j8kVNlRsAkke9kwcRL9 szpQ== X-Forwarded-Encrypted: i=1; AFNElJ9ciagtYh+I2pl9r5Xj9PPPokLQa0LMzOm1dJf8nsiUMSEF5kc12tQ2HHhAa3SjbaQcImTgZHOIPqrVGss=@vger.kernel.org X-Gm-Message-State: AOJu0YwnrWjaqUeKBo7QjaHRup6TGCslCxQE1Ad9B6vBEKLkCW8wqs3c gV8suCzsVNgsKtLmkV4dzoMcMltngGPscLYjODSPWlubjA6ergILMgSmShCy4QliJLRTWfXGzUK 3smuJKpAs8hd1FA== X-Received: from pgbg18.prod.google.com ([2002:a63:5212:0:b0:c73:bdbf:6a66]) (user=jmattson job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:7d86:b0:3a2:d79c:416c with SMTP id adf61e73a8af0-3aa5a9b09admr15325660637.32.1778260045679; Fri, 08 May 2026 10:07:25 -0700 (PDT) Date: Fri, 8 May 2026 10:07:04 -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-4-jmattson@google.com> Subject: [PATCH v2 3/3] KVM: selftests: Update hwcr_msr_test for CPUID faulting bit 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add BIT_ULL(35) (CpuidUserDis) to the valid mask in hwcr_msr_test, now that KVM accepts writes to this bit when the guest CPUID advertises CpuidUserDis. Signed-off-by: Jim Mattson --- tools/testing/selftests/kvm/x86/hwcr_msr_test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/kvm/x86/hwcr_msr_test.c b/tools/testin= g/selftests/kvm/x86/hwcr_msr_test.c index 8e20a03b3329..5357281e6e4e 100644 --- a/tools/testing/selftests/kvm/x86/hwcr_msr_test.c +++ b/tools/testing/selftests/kvm/x86/hwcr_msr_test.c @@ -10,11 +10,11 @@ =20 void test_hwcr_bit(struct kvm_vcpu *vcpu, unsigned int bit) { - const u64 ignored =3D BIT_ULL(3) | BIT_ULL(6) | BIT_ULL(8); - const u64 valid =3D BIT_ULL(18) | BIT_ULL(24); - const u64 legal =3D ignored | valid; - u64 val =3D BIT_ULL(bit); - u64 actual; + const uint64_t ignored =3D BIT_ULL(3) | BIT_ULL(6) | BIT_ULL(8); + const uint64_t valid =3D BIT_ULL(18) | BIT_ULL(24) | BIT_ULL(35); + const uint64_t legal =3D ignored | valid; + uint64_t val =3D BIT_ULL(bit); + uint64_t actual; int r; =20 r =3D _vcpu_set_msr(vcpu, MSR_K7_HWCR, val); --=20 2.54.0.563.g4f69b47b94-goog