From mboxrd@z Thu Jan 1 00:00:00 1970 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 6D1443D88E7 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=1778260049; cv=none; b=HLQ99hV2j7hjJ1VT2pyDt+aTHVCcsJauRorUr2LDWp6oYI/WaTqKpSo8y7uhQh7ktXN7HwX+k1TS9dMcA3jZ06GP6HJJY7Ulb0Wlk1VNiM+fS34FVHA6fhvktopL6n24+H6ezg84tQuo4b14Q53oy7vpugQTVgIcjT+oAnNG1/o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778260049; c=relaxed/simple; bh=o9f9jO84OCJa0WZgWeC13Nym6FnQBtWqM5hYOE31yWw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BH8vppFVZ4DiUm5zIseUCSGBULxQZAmSe5e7FONzFN2aPUxQZfcrlMBWPSQVWMZpzzOVoJmqVZz8otq2Vq6M9XNjKGFTx5SYiiVRhM6juds8hVyNfBANEbp6+5YA9LQ4D6YBRMvl78vWbaFYew0Hc3Qk29xGEeV9wHlKhI7QN8I= 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-365c5ca76fdso1827989a91.2 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=eD0RKZLXF2zp2afzOrkKO8vAO9p2W1EYXvOCovneMau10qNRK5hAuYw2g/Mtc7I/oo ivFk3wDvVKOEM3n7dl5fWMRaYD/evBRE32QDs+qM+GUDs5kiRh7AiVOBHV5BzIxpU47l 2NbvOfbUk/lganjMxYVsKX2/wq2O4DgYnAMLfE3Fhh949fyMBZuid3sbM94y7swPvWzk gQPMurv5MiwrNo7pCVsQbqAOZ0WkgRdxbV1qYOw475DojZ8Yr50aOk/AE2YdlOWkbQmd xr2eq886UAFYhiI90LTuGFkaVnommmb9/ZryTnjX+N7Wz87kjMYcpXKh1rX7hPUII95b d9xA== X-Forwarded-Encrypted: i=1; AFNElJ98eSY69N2tD/lBBrjh0tFTqDe/pJistWsGDDj4P0l2pjx/NvxniE14CpYSaco5L7SEl1j1Np7cSwrahJCeepk=@vger.kernel.org X-Gm-Message-State: AOJu0Yzx/RJZtQMLaH94gUMKIcdkIPbLnMyjfTMshbNo0xySBksKDdus hxoQGgnma/1qfDq4p2e0xqMDbxdewHTJZmFuZraBMGCBeZF1B0BtFbV3ZfGh7dYnp/YkpavxElZ O0J7kZpTS/tpmng== 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-kselftest@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-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); } -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 = data; break; -- 2.54.0.563.g4f69b47b94-goog