Received: by 2002:a05:7412:1703:b0:e2:908c:2ebd with SMTP id dm3csp813655rdb; Fri, 25 Aug 2023 01:39:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFIVWMnCuyUNyMunFFsj1TRsD0m7KzEpj7UnC4QwqgdoDPUALZR1VzpPnxwgk3uOWeDRJh X-Received: by 2002:a17:907:2c64:b0:9a1:f7e5:2ecf with SMTP id ib4-20020a1709072c6400b009a1f7e52ecfmr3444632ejc.11.1692952761346; Fri, 25 Aug 2023 01:39:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692952761; cv=none; d=google.com; s=arc-20160816; b=wO9voLSqMaNcraUxJVeegGBUh/kZU9LM1oKf3oXShSRgskd3zmDZgfYqs9nDSwwr/y o72A3n2YKSCpGloUXp2PvT+eAKN0FBR47HQC6tYzw0jUGmeGtZPg6pt0ThpJuAoYOH/A iOU6UrNtpQPOJ1CyGS7XkIGjnMxB4vlSQf4LlJnUiFaAz1qPbU8jvMvafH3wAGOPhpLZ OnCFJGk/icqfDjjrM/tDkEB94UGOcfDldk0x6jU7Yu5l5TybCSZGjELu6y1V2LRIiLfo e5fFXEGmGZEf9vzsLpzyJAIdPkWR1qTm8LXfZ+xVjeu05yFJmL9fRR1J4dg4eokyDncq 2oFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7vjL68efeCJdI5KAntFY3A9Z6Z8ha8dnF5fd6gq0upo=; fh=ZwaEcDYNCnlh+U7YxZ1LCEcet9pcdhSkEX0cCEOksvY=; b=cNF03EI4uFbdh1iTxFCwE+8K6chmAL5g1MSR9XxpEPwAF+wwvBQBIwncdRRBXfCewP LSUINMbS+RRDkzCowMLaXWO3LoK1TfZ/k5o51Rg039w7X6L7aHuw6Gn8q+yy8UHF57ls iEBteqsnSg5koklcUeQ4zC3TwdUUZloSEXWFXIldSz0SXkL6i9npNKYOO+AEf36+6h/M oTijxWkZ5Ie/vAyZq83if76Yt3fZ9YygTmHI4vSviajZhYSMNbgGyssKKEuHZ97JX8tX AcAu8jZsSemOOXWsohtBN0F0LV+bAHJ42yYKpYN+XP9eJJiOqZUErKH6fQao1G8mzNJv 8W6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fUUxSqj8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k24-20020a17090646d800b00992ad2f72fesi671544ejs.537.2023.08.25.01.38.51; Fri, 25 Aug 2023 01:39:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fUUxSqj8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242765AbjHYHCS (ORCPT + 99 others); Fri, 25 Aug 2023 03:02:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241362AbjHYHCH (ORCPT ); Fri, 25 Aug 2023 03:02:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC271199E for ; Fri, 25 Aug 2023 00:02:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 41C186404D for ; Fri, 25 Aug 2023 07:02:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A777C433C7; Fri, 25 Aug 2023 07:02:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692946924; bh=rP86MMvPG+dPyCsGymZiEpaBrzyflZRcfpq/e1xxDGw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fUUxSqj8+im2BF0zGrFhKs+Ot5aK2AT501tpHBA45dLJN/se28FTTIRBJzyofXCEe /7XWe3i+bXm+Y26wCx99PQgiPLzeuloJRRXjyniureJzqE5hAqEVHnz9NDu/mj5egc cKf1Frj2xYl41MtvEuKInbtXyhLlD0dIFrdAPUQl/WSkHSAjBZuBSmGJRSOJ+7weh1 yqiouRnM66vDScQRvfJQpbIjBwRr7+Pc0AoGF1hZFVAetDtt9CRV4vvwml/fClCZlE r/38jsC7OqqP7p9hHho6Eg816M3Z6SFSEswwcpkElFNKI7vIFv6RnkygYuZ9Q/D4Co NpmUBiGNgu6+w== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Borislav Petkov , Peter Zijlstra , Babu Moger , Paolo Bonzini , Sean Christopherson , David.Kaplan@amd.com, Andrew Cooper , Nikolay Borisov , gregkh@linuxfoundation.org, Thomas Gleixner Subject: [PATCH 04/23] KVM: x86: Add IBPB_BRTYPE support Date: Fri, 25 Aug 2023 00:01:35 -0700 Message-ID: <79d5f5914fb42c2c62418ffbcd78f138645ded21.1692919072.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support for the IBPB_BRTYPE CPUID flag, which indicates that IBPB includes branch type prediction flushing. Signed-off-by: Josh Poimboeuf --- arch/x86/kvm/cpuid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index d3432687c9e6..c65f3ff1c79d 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -729,8 +729,8 @@ void kvm_set_cpu_caps(void) F(NULL_SEL_CLR_BASE) | F(AUTOIBRS) | 0 /* PrefetchCtlMsr */ ); - if (cpu_feature_enabled(X86_FEATURE_SRSO_NO)) - kvm_cpu_cap_set(X86_FEATURE_SRSO_NO); + kvm_cpu_cap_check_and_set(X86_FEATURE_IBPB_BRTYPE); + kvm_cpu_cap_check_and_set(X86_FEATURE_SRSO_NO); kvm_cpu_cap_init_kvm_defined(CPUID_8000_0022_EAX, F(PERFMON_V2) -- 2.41.0