From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.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 E1F2A377004 for ; Fri, 10 Apr 2026 22:21:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775859669; cv=none; b=tFyi8y9nJR79AVXOoTm1LicOiqcRxep2fVav2nymVVWj/qR6zynGnWkZklY6jUJtQeNDXaYPuSzc0W1MFhtReA7qOOh4NJPLCBP1eUiHXwRajzbvAeSmHJy4Zm4VBTyj6+mTvuuRqkfZFMVhw7KW+iHGmEKFcH5N6MOUfnFFD2w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775859669; c=relaxed/simple; bh=9/8WqCFepXx+i5+ghZ6Y69Au4rXMKwm4NYm/KXQRyAM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=pWdUDHOv9OcYnyRCOw7p9l3Wq/47ApeuxovWQ1i0XC74q1H2An3g31TGdyiAAaT/sBtTzLLaeMaQhGcMqxXmb2KaLnK2QyP+FmyZDkawFZFJuL2R+KwEmWmx4JjXqoFyt1BTB+TtDhhl5RX2dqqH3JFAeJ8O0+SC5ohcdWHXH8U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ZNfFtQ9U; arc=none smtp.client-ip=209.85.210.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--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ZNfFtQ9U" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-82f0f2b2641so838834b3a.3 for ; Fri, 10 Apr 2026 15:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775859666; x=1776464466; 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=UhZ/Ltw66Ex5f+gr2Z+6oCt2Y2I6rxgzOwsvUIVNGec=; b=ZNfFtQ9UeOeAVs750C66HjW6hFjTlJtflkOvOdQnCboBj9ZimU/itxUssVnizz8o3c zoIa0sPI/hnKLPDuOTnY6VMKrY2oHJc5DCLdqMH86MK4XxAeC5eDwc20jX1W2qUZMo9L aeCbLqkJvDDvdk7JcoBtmm2NZzDROp5xj3hYqN8l1vc4BS2SXiVmplV/n/eq4KONYT0o VGzylTO0I2M4E8wk7/a7drPNH++n5+YViza+6pvW78jF7o+gS6+uLZax4rkkUkzr2f+L xwsd3v6csWEnf5US8QClIrYKcHFVc/GDVILSaKVBI0gwxDhkmYpDcI1PUPu3YZhdQNfZ 9WcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775859666; x=1776464466; 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=UhZ/Ltw66Ex5f+gr2Z+6oCt2Y2I6rxgzOwsvUIVNGec=; b=pB4CoIRAxAH/duVvSQvRgunJk4Xka+AKiBA70g/JmpA87vZCognQ2HHQn6MUwbiDYu uWgrTluTI4GJCa5Og86Nitj2O5SV8xEXKSuruWvB203VWFES/p2Evbfx7I7hOliVfCJR l2S785dTAmM2Z4wIMNc6liRswlLv9/UyOHak8gfiRRbcZC0QepJJYJ9gF1uCPF7Bm4e/ AvveBa+Sf3gIH7pg0clvO4Uiv+2zr+vfUtGV7vlu86ioyvbeLqfyTzi7XnD7QQOmHcDj GtFyHW6ZNG8OBuI/5gnGfeU44a+xObpPQMf2xMVsZigyR+18IejfqwH0NbNZOjT1RjSM Y5mA== X-Forwarded-Encrypted: i=1; AJvYcCVXtNJKAKiz3aBP+F2iu5GscBADeXmN8fmeln0fzG7a5Uw/0atplDW9i60SmGhp24XP87qLF+QgrxivluU=@vger.kernel.org X-Gm-Message-State: AOJu0YybX6k6UxmjGkCqCCeJAFUs5sdLmZ85KJb0sSjZ+czH2vbma0ot 9QRWvBZ1ZTFGaIZ6EqB+aMI5GTrwarePjPndWvyEPIJMU+AqOZHhargBsl3jZimXYBhPXRiJ9wc FMk+fgA== X-Received: from pfbdh12.prod.google.com ([2002:a05:6a00:478c:b0:82c:e148:ec37]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2387:b0:81f:ac81:d597 with SMTP id d2e1a72fcca58-82f0bf6da94mr5531243b3a.0.1775859665961; Fri, 10 Apr 2026 15:21:05 -0700 (PDT) Date: Fri, 10 Apr 2026 15:21:04 -0700 In-Reply-To: <20260402223108.650572-2-jmattson@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260402223108.650572-1-jmattson@google.com> <20260402223108.650572-2-jmattson@google.com> Message-ID: Subject: Re: [PATCH 1/3] KVM: x86: Rename supports_cpuid_fault to supports_intel_cpuid_fault From: Sean Christopherson To: Jim Mattson Cc: 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 Content-Type: text/plain; charset="us-ascii" On Thu, Apr 02, 2026, Jim Mattson wrote: > The function, supports_cpuid_fault(), tests for guest support of Intel's > CPUID faulting feature. Rename the function to supports_intel_cpuid_fault() > for clarity. > > Signed-off-by: Jim Mattson > --- > arch/x86/kvm/cpuid.h | 2 +- > arch/x86/kvm/x86.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h > index 039b8e6f40ba..51cbe67c992a 100644 > --- a/arch/x86/kvm/cpuid.h > +++ b/arch/x86/kvm/cpuid.h > @@ -181,7 +181,7 @@ static inline int guest_cpuid_stepping(struct kvm_vcpu *vcpu) > return x86_stepping(best->eax); > } > > -static inline bool supports_cpuid_fault(struct kvm_vcpu *vcpu) > +static inline bool supports_intel_cpuid_fault(struct kvm_vcpu *vcpu) *sigh* I was going to suggest supports_misc_enables_cpuid_fault(), since KVM emulates the MSR for all CPU vendors, but the enable is in MISC_FEATURE_ENABLES, not IA32_MISC_ENABLES. What if we just drop the helper? There's only one user. I.e. 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); } -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 2410401c57d8..c72ea99422ca 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4262,7 +4262,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 = data; break;