From patchwork Fri Oct 27 14:39:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawan Gupta X-Patchwork-Id: 158967 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp652376vqb; Fri, 27 Oct 2023 07:39:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHi8LHYZuX9GUVQ+D0opyx+n6cyuVcpBv06BqE6R3jVMCyuzOYQEbuHeb+vwimKcqYWv3wt X-Received: by 2002:a25:8b0d:0:b0:da0:6876:a8eb with SMTP id i13-20020a258b0d000000b00da06876a8ebmr2497528ybl.46.1698417575123; Fri, 27 Oct 2023 07:39:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698417575; cv=none; d=google.com; s=arc-20160816; b=qshldcx+vtCbXnylQk1eK/NVFpnGBxw4y/zMp34LtSP0i8K/gcj5tZQZXJ46CNdDBB gN4bwJlxtVnHSoAiEpW4syAukHopRcd2zY/5hnsOV5nXdEpFFwrPo2Y5BkdcsbiLXArM HnozpVsQdy85stYh4FcHZfKr5nah978YPL4tY7eXfAzyVYTTBpFQdCkgYX5QLwDMCmOR zsuo7+K9mQEzuB2msaEuuj2q3NDrS2KEO2t+ghe02wnKZ4V9KPyCWOa3pCp1YR8gZeox oGOP865BzpJuiS6mP8RcZc+iAfwmRF6BVWkQMF635nXcD6ZJxuCtoGnAgT7H4/9vq1yq V8eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=ilqGXAQjD0Zw0p+0QS0PhsqpTUKzsxY97u90wwaRZ8Y=; fh=9bGxxPI+IiFttPs3QhfhBAZDnxipaVmWpf+QSj2Bc/s=; b=sXUVpgl7OYjM5m3SxJw9Qrj1kWdsfFEOr8ZIx5iheJPikUvTVllep3B2ubFRgKZjJK /AK0etmPBGN5ABdqGWHMmxVBtfcX89540JNNmLVNd/ekKHRrZCIJsMVpwUOpQCHkoniz xYFXi5BLN7ERPqtsAmoFVbct2FCX0uryFGHI/8esbyoI/Weg57DygI9/i/iTyDgOg9S5 zMvYJTxCdlg6kcf740uGT8NN9Yn+McsNmEiOfmD7XxWGlooZ4XfSAtE5pn+t0GJsKWLn vcCrbBwLFwnJYtZKVN+66X3L2IbGkpYcniKkbnk1Y9T6NSz25mBh2/Fxn1+LdlAsxLxR +UcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=hHufNRh+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id b145-20020a25cb97000000b00d9a56bfe8c9si3312619ybg.418.2023.10.27.07.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 07:39:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=hHufNRh+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id D64BF837B2EB; Fri, 27 Oct 2023 07:39:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345977AbjJ0OjO (ORCPT + 25 others); Fri, 27 Oct 2023 10:39:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346135AbjJ0OjK (ORCPT ); Fri, 27 Oct 2023 10:39:10 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB9D2D72; Fri, 27 Oct 2023 07:39:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698417547; x=1729953547; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=rpFgire7Svqru/HfpQ1b16RkVx0842HOL7xbgXY2vaQ=; b=hHufNRh+NLW/FgsdNwC6c6agifg4xg51awEAQIrprz+89E75AAsigGyP DlvtX4f6HiXQMi0Sm040LMlR/RHXBwoyBJ/zRj8XXDwDBAwWJja7fY34E K/GdO1Byc8TK0RRuOt3ziPQNWJcQLKEKJkMUgmdti9C8yokm+3TY+VJZa FABVIUeQ7PNiu+Zqqs8Ntmb8dEYrSfS8CZgIIWELY1a32ecfbrwbgYd2l cnjOqKnnZ5yGoiQ/UZZ2elR8Rnl4b+80aw+IOA9Cl/r/92/xYa6+tHKFE 8/g3A/y8ZUTZdegnNBeXyP4h2m/TDo5/bb7k68z1Dwn5IIai+t5DGdalV w==; X-IronPort-AV: E=McAfee;i="6600,9927,10876"; a="367994398" X-IronPort-AV: E=Sophos;i="6.03,256,1694761200"; d="scan'208";a="367994398" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2023 07:39:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,256,1694761200"; d="scan'208";a="7658585" Received: from dmnassar-mobl.amr.corp.intel.com (HELO desk) ([10.212.203.39]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2023 07:38:54 -0700 Date: Fri, 27 Oct 2023 07:39:05 -0700 From: Pawan Gupta To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Andy Lutomirski , Jonathan Corbet , Sean Christopherson , Paolo Bonzini , tony.luck@intel.com, ak@linux.intel.com, tim.c.chen@linux.intel.com, Andrew Cooper , Nikolay Borisov Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, kvm@vger.kernel.org, Alyssa Milburn , Daniel Sneddon , antonio.gomez.iglesias@linux.intel.com, Greg Kroah-Hartman , Pawan Gupta Subject: [PATCH v4 5/6] KVM: VMX: Use BT+JNC, i.e. EFLAGS.CF to select VMRESUME vs. VMLAUNCH Message-ID: <20231027-delay-verw-v4-5-9a3622d4bcf7@linux.intel.com> X-Mailer: b4 0.12.3 References: <20231027-delay-verw-v4-0-9a3622d4bcf7@linux.intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20231027-delay-verw-v4-0-9a3622d4bcf7@linux.intel.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 27 Oct 2023 07:39:33 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780919907522586351 X-GMAIL-MSGID: 1780919907522586351 From: Sean Christopherson Use EFLAGS.CF instead of EFLAGS.ZF to track whether to use VMRESUME versus VMLAUNCH. Freeing up EFLAGS.ZF will allow doing VERW, which clobbers ZF, for MDS mitigations as late as possible without needing to duplicate VERW for both paths. Reviewed-by: Nikolay Borisov Signed-off-by: Sean Christopherson Signed-off-by: Pawan Gupta --- arch/x86/kvm/vmx/run_flags.h | 7 +++++-- arch/x86/kvm/vmx/vmenter.S | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/vmx/run_flags.h b/arch/x86/kvm/vmx/run_flags.h index edc3f16cc189..6a9bfdfbb6e5 100644 --- a/arch/x86/kvm/vmx/run_flags.h +++ b/arch/x86/kvm/vmx/run_flags.h @@ -2,7 +2,10 @@ #ifndef __KVM_X86_VMX_RUN_FLAGS_H #define __KVM_X86_VMX_RUN_FLAGS_H -#define VMX_RUN_VMRESUME (1 << 0) -#define VMX_RUN_SAVE_SPEC_CTRL (1 << 1) +#define VMX_RUN_VMRESUME_SHIFT 0 +#define VMX_RUN_SAVE_SPEC_CTRL_SHIFT 1 + +#define VMX_RUN_VMRESUME BIT(VMX_RUN_VMRESUME_SHIFT) +#define VMX_RUN_SAVE_SPEC_CTRL BIT(VMX_RUN_SAVE_SPEC_CTRL_SHIFT) #endif /* __KVM_X86_VMX_RUN_FLAGS_H */ diff --git a/arch/x86/kvm/vmx/vmenter.S b/arch/x86/kvm/vmx/vmenter.S index be275a0410a8..b3b13ec04bac 100644 --- a/arch/x86/kvm/vmx/vmenter.S +++ b/arch/x86/kvm/vmx/vmenter.S @@ -139,7 +139,7 @@ SYM_FUNC_START(__vmx_vcpu_run) mov (%_ASM_SP), %_ASM_AX /* Check if vmlaunch or vmresume is needed */ - test $VMX_RUN_VMRESUME, %ebx + bt $VMX_RUN_VMRESUME_SHIFT, %ebx /* Load guest registers. Don't clobber flags. */ mov VCPU_RCX(%_ASM_AX), %_ASM_CX @@ -161,8 +161,8 @@ SYM_FUNC_START(__vmx_vcpu_run) /* Load guest RAX. This kills the @regs pointer! */ mov VCPU_RAX(%_ASM_AX), %_ASM_AX - /* Check EFLAGS.ZF from 'test VMX_RUN_VMRESUME' above */ - jz .Lvmlaunch + /* Check EFLAGS.CF from the VMX_RUN_VMRESUME bit test above. */ + jnc .Lvmlaunch /* * After a successful VMRESUME/VMLAUNCH, control flow "magically"