From patchwork Wed Jul 19 02:45:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zeng Guang X-Patchwork-Id: 122375 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2183996vqt; Tue, 18 Jul 2023 21:19:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlF3NRFz3/oHU6llvqxaftFCTb4LBpbQI2lUgWNzHkvu63euY+EvgvAZ1RZQbwLrb7xC1vmO X-Received: by 2002:a17:906:5187:b0:993:d7c4:1a78 with SMTP id y7-20020a170906518700b00993d7c41a78mr1425172ejk.10.1689740382847; Tue, 18 Jul 2023 21:19:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689740382; cv=none; d=google.com; s=arc-20160816; b=HzrRyl7dwpSlnijMZ3/zAYa9gJpqHie7cYWT5Uj/B9eFva1cgmSj1cHXqVAhAPhMfg cqzJ8srFBZEPXczHoJCw8JlDu0ZMhK9nCH5WIg17dNFBmjKAqkF6WmD8olTWTTwUgLXk DvtwvOo7S6cvwSwoM3xdfVIAn6B7wARBypcm3NqzM6zdYEOyfOFRHItAG87Cda08v8UN x/iI1mAfSYen9oDFcMsH+qjLnrmEjOWP8zMyOpVtdQAo/dIz6QybSGoNyoKIkui/7IrI ZU74VGJi8UQ919TlngcIuqwq7gcM/idKUL+S8hKQH9TFoFdvKgIagkXA/x8KjyIc4U/j 79xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=wwiXSBPk+dY3CrNHeUGrNMy7ccWowgVBojpHuErLMbc=; fh=+xhtI/L+Xuj71uPNZC5AflMRtyY3k03T8mZbd4IgqqY=; b=fPpMCDb3Gvpnm33zbJneR3yUtZU94UHqEjA6TvkDC7jfHI1OSzynCqn/Fc4hjyUYZV 7pxWk/m8b3U9CU0pOLGSv/pumxSgK5dItAmZtXi0UG1b6h0ZQC6c2Gub9nOBADr+i4pp Bw5r2IMd/+0p4cGr0M6skuI70Gfv1CMvKSljhaS7PiJpmHQKq76op10y8Kov+2+D5739 pK2/OPX+/lsTn9535CjhEpVXdvO/uUDGjzqBSjD8zf9zHYmwF4Sp+yjlsMfXJ8jIMvL6 IOfWKy9BE1RGdXgfldmHmfs32T+pPDMSM+wqVb5Bq4BIw6PEc2oEDy3Vq/lpd31PbIeq 5WGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=hntBO0iJ; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u13-20020a170906408d00b009769ff4d234si2317101ejj.58.2023.07.18.21.19.18; Tue, 18 Jul 2023 21:19:42 -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=@intel.com header.s=Intel header.b=hntBO0iJ; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231130AbjGSD0y (ORCPT + 99 others); Tue, 18 Jul 2023 23:26:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230484AbjGSD0c (ORCPT ); Tue, 18 Jul 2023 23:26:32 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF86C2127; Tue, 18 Jul 2023 20:26:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689737164; x=1721273164; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=Zge9RC4suOhS4WSxzkRjdvntcW7BQ3V/JThuasqgeWI=; b=hntBO0iJTXHRRPb4sZZnGbjc6mvapaDkoLOVqumJkqT/rp2iGL4WXCB4 0+QQm1qyIeegy84thbCag9Tw8j4aGJ1/eO+rRzSSLWKrLMQ1GRnD1lKaw gicuHghPud5IjUa2qiIY+9vmLeG7vs0eagZWXKVT+biuwF0L4dvaxeLPn 1GjlqI2EbSoZt0lcWFggRRWvolgoon5nOilnMON6tW57Ylb00WFTEh+ZW /sVOM+Hc/U+hXzeMu9kyqP+FosvvN2NveVsD7dURXOhggIQyTguN2P2Gg T5B5o7daPiHTo2XuZl/ulVcSCkp3SNeuPAho2TFOI0SsguKP+GIQRrbn6 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10775"; a="346665874" X-IronPort-AV: E=Sophos;i="6.01,215,1684825200"; d="scan'208";a="346665874" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2023 20:26:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10775"; a="813980290" X-IronPort-AV: E=Sophos;i="6.01,215,1684825200"; d="scan'208";a="813980290" Received: from arthur-vostro-3668.sh.intel.com ([10.238.200.123]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2023 20:26:01 -0700 From: Zeng Guang To: Paolo Bonzini , Sean Christopherson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , H Peter Anvin , kvm@vger.kernel.org Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Zeng Guang Subject: [PATCH v2 7/8] KVM: x86: Virtualize CR4.LASS Date: Wed, 19 Jul 2023 10:45:57 +0800 Message-Id: <20230719024558.8539-8-guang.zeng@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230719024558.8539-1-guang.zeng@intel.com> References: <20230719024558.8539-1-guang.zeng@intel.com> 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_NONE,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1771821211992563694 X-GMAIL-MSGID: 1771821211992563694 Virtualize CR4.LASS[bit 27] under KVM control instead of being guest-owned as CR4.LASS generally set once for each vCPU at boot time and won't be toggled at runtime. Besides, only if VM has LASS capability enumerated with CPUID.(EAX=07H.ECX=1):EAX.LASS[bit 6], KVM allows guest software to be able to set CR4.LASS. Updating cr4_fixed1 to set CR4.LASS bit in the emulated IA32_VMX_CR4_FIXED1 MSR for guests and allow guests to enable LASS in nested VMX operation as well. Notes: Setting CR4.LASS to 1 enable LASS in IA-32e mode. It doesn't take effect in legacy mode even if CR4.LASS is set. Signed-off-by: Zeng Guang Tested-by: Xuelian Guo --- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/vmx/vmx.c | 3 +++ arch/x86/kvm/x86.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 791f0dd48cd9..a881b0518a18 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -125,7 +125,7 @@ | X86_CR4_PGE | X86_CR4_PCE | X86_CR4_OSFXSR | X86_CR4_PCIDE \ | X86_CR4_OSXSAVE | X86_CR4_SMEP | X86_CR4_FSGSBASE \ | X86_CR4_OSXMMEXCPT | X86_CR4_LA57 | X86_CR4_VMXE \ - | X86_CR4_SMAP | X86_CR4_PKE | X86_CR4_UMIP)) + | X86_CR4_SMAP | X86_CR4_PKE | X86_CR4_UMIP | X86_CR4_LASS)) #define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 15a7c6e7a25d..e74991bed362 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -7603,6 +7603,9 @@ static void nested_vmx_cr_fixed1_bits_update(struct kvm_vcpu *vcpu) cr4_fixed1_update(X86_CR4_UMIP, ecx, feature_bit(UMIP)); cr4_fixed1_update(X86_CR4_LA57, ecx, feature_bit(LA57)); + entry = kvm_find_cpuid_entry_index(vcpu, 0x7, 1); + cr4_fixed1_update(X86_CR4_LASS, eax, feature_bit(LASS)); + #undef cr4_fixed1_update } diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index c544602d07a3..e1295f490308 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -529,6 +529,8 @@ bool kvm_msr_allowed(struct kvm_vcpu *vcpu, u32 index, u32 type); __reserved_bits |= X86_CR4_VMXE; \ if (!__cpu_has(__c, X86_FEATURE_PCID)) \ __reserved_bits |= X86_CR4_PCIDE; \ + if (!__cpu_has(__c, X86_FEATURE_LASS)) \ + __reserved_bits |= X86_CR4_LASS; \ __reserved_bits; \ })