From patchwork Tue Jul 18 13:18:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zeng Guang X-Patchwork-Id: 122070 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1789474vqt; Tue, 18 Jul 2023 07:31:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlEQgzWs8id/yBOqb3U7w16NwVKpWzPcP0n35eKKEE17u/jL2GIRVzcNDIM0ZqwXskrshtkI X-Received: by 2002:aa7:c943:0:b0:51e:5254:1d89 with SMTP id h3-20020aa7c943000000b0051e52541d89mr84305edt.19.1689690678305; Tue, 18 Jul 2023 07:31:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689690678; cv=none; d=google.com; s=arc-20160816; b=Cf0lmMz/Z1nr0gVVVN62r0/exckFIG3KVc2vWX3CmjNWlcQi8OpUuaORK1dCsxNMa8 55AqcYfaJay2/OrsIgpcGCGWhWkn8fWSmsVaSus9ngkKjqiHGgrqLPefK4Yk9MRYI7cQ LdH+EIWAplTEoJqEYAoNu8dpq70WNUCQE3RYZWcKGHwoZTIt9D+EmTnNuCTyJdGAGrPU erZDf16+9ztJ85itmf+2zw9F8kGUan7kgJzaItPFvOWhCg/4lborCBV3dSbZZ5UdM3Rv tSZWw+3RQZS4E6I48+XI2BNSOwWaCla7k8kWVcZRgbTLZgLk7FwASsUI04RehagfoJK+ 2uEw== 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=rYu1KyzSuDFz6ZNEdM+8IQU7W648EYyKZbyy1pIYxt3l6ecMNVD2hdzctR2k7TXfcc HPoUJErhJZ2bC4qazqrZqls7jFLCNEMOTBXS13HhtjBAFU4TaeNMrZ1nkZBKYtBdOnfW WVQ289K7RCveywGdxXgI3sdjD5MClqrF+ODLrNpzSMeQLsXZhfMZs1C17uU2MqiQ5VuV fscetVXGVJQkMSDATUpqaDCGCZCZv4xaG9JwsZbXJLudC5R/jq/Nvk7cTMdEQFxEPHOe P/2STpNjnLyqLmkiZ1fbvU/KOe8QAgMjNLKHWOzJBdM+XydYiyEDh3GUPKQEIda36euQ 68gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kS1aGROF; 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 a21-20020a50ff15000000b0051a7bccf383si1292939edu.86.2023.07.18.07.30.55; Tue, 18 Jul 2023 07:31:18 -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=kS1aGROF; 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 S233181AbjGROBT (ORCPT + 99 others); Tue, 18 Jul 2023 10:01:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233118AbjGROAy (ORCPT ); Tue, 18 Jul 2023 10:00:54 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC0131BC3; Tue, 18 Jul 2023 07:00:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689688837; x=1721224837; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=Zge9RC4suOhS4WSxzkRjdvntcW7BQ3V/JThuasqgeWI=; b=kS1aGROFRzzHFqLIS4HE7RkA3kUHg8k4PPGBGorq1wveatdflDN1uklC n3xUAeob+JZ4nBvMp9xSzZg1oZr9hTdu6SY5V9juJIJkyqurVfkgwVdYe YhJ5IiJpr1KCA/uKyTdMlqCKhk6G/tikc9+AUFatbJeOIVM/vvSY9f2hU QZjS3/ddawd32y5mkzc7za3LdFhn5qtZRVE/5iMALDrrgEeZq2+7kG8Xz RZmMVLQuYGUTP1b/p8mqedyVx0ffwV4VUkw+oLYyDnzyU2aslgrkUQrk1 1ZXTi6c9C9EZRcHB01wadXPZCPfO9oJO0DvYKl/pUMhhlWdUdcs7qU7qu w==; X-IronPort-AV: E=McAfee;i="6600,9927,10775"; a="363676199" X-IronPort-AV: E=Sophos;i="6.01,214,1684825200"; d="scan'208";a="363676199" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2023 06:59:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10775"; a="1054291194" X-IronPort-AV: E=Sophos;i="6.01,214,1684825200"; d="scan'208";a="1054291194" Received: from arthur-vostro-3668.sh.intel.com ([10.238.200.123]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2023 06:58:59 -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: Tue, 18 Jul 2023 21:18:43 +0800 Message-Id: <20230718131844.5706-8-guang.zeng@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230718131844.5706-1-guang.zeng@intel.com> References: <20230718131844.5706-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: 1771769093112669011 X-GMAIL-MSGID: 1771769093112669011 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; \ })