From patchwork Fri Nov 4 14:47:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Kuznetsov X-Patchwork-Id: 15610 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp452115wru; Fri, 4 Nov 2022 07:56:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ZVEDU/O79Odx9uuLlImydgeil90EQXFVibpRLHdH2xr/UsJXUeay4Fld16Yar0crOBcSa X-Received: by 2002:a17:90b:e86:b0:213:8092:e19a with SMTP id fv6-20020a17090b0e8600b002138092e19amr44695176pjb.56.1667573780100; Fri, 04 Nov 2022 07:56:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667573780; cv=none; d=google.com; s=arc-20160816; b=iNos72QcikbKl1gwS/4HAXhIfAHw8g3UZkVpt02Oym3472qNpbO3SF7YHXFKXs9zB0 Y5oUC4ozYbNbVaf0ZqHDQkMLpDax2A2WT8R4XbhzohJKN4FWmvwkPWHDDKGDRILHIsWs 1EatLsyx69ECqbSt0ecKhKvHI8BA2wmqAr6FpfmYPJR+/utDRezLcG/gN48mvsVUB+4p wNaJ3KPtdcHnFVqQ21+G9Fs0X8mEKQagN4OUj7u9yC3kPzInZiJDUUF1tZn8kidX/VAs CGuvt6riDe82i/SIkQ2/AYGGwnYLMYCpwVNyhib3tO1kDDQOJ4y8T7aqRCLXtUxXjunA IEYA== 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=x3rQzKrQXAi/9BH92e4CJYU8l9iFtv05ST7kt/Kr7v4=; b=HZyMWJVM8kPvXWqn1S6oeUqP5E7AuRrKydXiZn3EOWQ0hErQPGMqUHGsn72RIRA3Gx B0OrOGTsoeiyTjkVKLjyo+yQqVgyzU3Fg0dFaG5z6/5rqKVErHu1yiCj9HKarmDcZftk HEs/JuKbTU8saeXr4usOuI9M/jY3c2OPNiUQUGib5qC66XTyZB1lGizAUF1m72FNigCs NdD8YEKPNWiLmgVsa2R/ciOHzcojVgZjMazY2MDp4QzuckPuZYwSgJjtXtE8HezkoFxi onZu0gkKK8t6XMMHr5bu2d5ob9PGRyzt9Yn0wiIunTs/IaXEEMlxDSm0gwN0vxZb79kl nF7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZwICAys6; 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=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d10-20020a056a0024ca00b0056d964fa5f7si5346717pfv.14.2022.11.04.07.56.06; Fri, 04 Nov 2022 07:56:20 -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=@redhat.com header.s=mimecast20190719 header.b=ZwICAys6; 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=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232109AbiKDOsd (ORCPT + 99 others); Fri, 4 Nov 2022 10:48:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231328AbiKDOsW (ORCPT ); Fri, 4 Nov 2022 10:48:22 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B89A32E6BA for ; Fri, 4 Nov 2022 07:47:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667573239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x3rQzKrQXAi/9BH92e4CJYU8l9iFtv05ST7kt/Kr7v4=; b=ZwICAys6fugot+K2YB5Lv034RgOU6FgX0UyIiHEvtkkY+jL7y5FrLzxs+Vu8D1rYd5fYWb 4DWuBbBpiuOlUjMkyHGikzjZIPZAPB8FwENiVOJtikTW7nElZmYMMbLzKUp9D3zQrUbOfN lo280B3fHxLC2Nzsp5g2bZHx79Bu2ZE= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-417-dV285eEVMAO5IZRfMODYEA-1; Fri, 04 Nov 2022 10:47:18 -0400 X-MC-Unique: dV285eEVMAO5IZRfMODYEA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 249772823817; Fri, 4 Nov 2022 14:47:18 +0000 (UTC) Received: from ovpn-192-136.brq.redhat.com (ovpn-192-136.brq.redhat.com [10.40.192.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 682B0C2DF65; Fri, 4 Nov 2022 14:47:16 +0000 (UTC) From: Vitaly Kuznetsov To: kvm@vger.kernel.org, Paolo Bonzini , Sean Christopherson Cc: Wanpeng Li , Jim Mattson , Maxim Levitsky , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/4] KVM: nVMX: Prepare to sanitize tertiary execution controls with eVMCS Date: Fri, 4 Nov 2022 15:47:07 +0100 Message-Id: <20221104144708.435865-4-vkuznets@redhat.com> In-Reply-To: <20221104144708.435865-1-vkuznets@redhat.com> References: <20221104144708.435865-1-vkuznets@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748577844016015486?= X-GMAIL-MSGID: =?utf-8?q?1748577844016015486?= In preparation to restoring vmcs_conf sanitization for KVM-on-Hyper-V, (and for completeness) add tertiary VM-execution controls to 'evmcs_supported_ctrls'. No functional change intended as KVM doesn't yet expose MSR_IA32_VMX_PROCBASED_CTLS3 to its guests. Signed-off-by: Vitaly Kuznetsov --- arch/x86/kvm/vmx/evmcs.c | 4 ++++ arch/x86/kvm/vmx/evmcs.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/arch/x86/kvm/vmx/evmcs.c b/arch/x86/kvm/vmx/evmcs.c index 0f031d27741a..47f6d1cbd428 100644 --- a/arch/x86/kvm/vmx/evmcs.c +++ b/arch/x86/kvm/vmx/evmcs.c @@ -370,6 +370,7 @@ enum evmcs_ctrl_type { EVMCS_ENTRY_CTRLS, EVMCS_EXEC_CTRL, EVMCS_2NDEXEC, + EVMCS_3RDEXEC, EVMCS_PINCTRL, EVMCS_VMFUNC, NR_EVMCS_CTRLS, @@ -388,6 +389,9 @@ static const u32 evmcs_supported_ctrls[NR_EVMCS_CTRLS][NR_EVMCS_REVISIONS] = { [EVMCS_2NDEXEC] = { [EVMCSv1_LEGACY] = EVMCS1_SUPPORTED_2NDEXEC & ~SECONDARY_EXEC_TSC_SCALING, }, + [EVMCS_3RDEXEC] = { + [EVMCSv1_LEGACY] = EVMCS1_SUPPORTED_3RDEXEC, + }, [EVMCS_PINCTRL] = { [EVMCSv1_LEGACY] = EVMCS1_SUPPORTED_PINCTRL, }, diff --git a/arch/x86/kvm/vmx/evmcs.h b/arch/x86/kvm/vmx/evmcs.h index 4c351f334446..205b5b467617 100644 --- a/arch/x86/kvm/vmx/evmcs.h +++ b/arch/x86/kvm/vmx/evmcs.h @@ -96,6 +96,8 @@ DECLARE_STATIC_KEY_FALSE(enable_evmcs); SECONDARY_EXEC_NOTIFY_VM_EXITING | \ SECONDARY_EXEC_ENCLS_EXITING) +#define EVMCS1_SUPPORTED_3RDEXEC (0ULL) + #define EVMCS1_SUPPORTED_VMEXIT_CTRL \ (VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR | \ VM_EXIT_SAVE_DEBUG_CONTROLS | \