Received: by 2002:ab2:1149:0:b0:1f3:1f8c:d0c6 with SMTP id z9csp1258380lqz; Sun, 31 Mar 2024 23:28:17 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVSAImIJR67VBgVkapMI3dAdYZoNsBq1zuZHzZdN1YN41pHwyLyDGNcxpaH7A6RBAeG9kU/CAByp5+SliO5RwZY2hfT1TrCYdaaFeCrkw== X-Google-Smtp-Source: AGHT+IF+xhiiA4YqT+8vKLn+0kWlz4ojgRQuO3NsbyqYrx5I4Pv8qMyiW5etYpd0ecPZ/qIz9tfh X-Received: by 2002:a05:6870:6587:b0:221:c58f:a8b with SMTP id fp7-20020a056870658700b00221c58f0a8bmr9918135oab.17.1711952896793; Sun, 31 Mar 2024 23:28:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711952896; cv=pass; d=google.com; s=arc-20160816; b=pY6ikjRhoBZaGwMKitlo0Ew+wdMbUEYS8rKRn6Lg90vTW+UL9hgRV8GT/dZapLbsZW /+FnjriklgTfPgkWVHQcEFOztS6bQ4cQy2DMso9Cnj5cA4u6MHZBCLoPmPiEfyxdjVcK 678n+jLCDiPfPlBiWyZJCEykcdre1PxOaDX5Fr520PGvuCOc2/1boF9m2zPapNXi+eZv SMnyWpRyoBSbZEN5VhWheZxoxFBy6E+nzssKkbONbSQymkuoyx8yEeBh2aMntjQ6jYAx aD8fZfnIJmf7pbNyR3jaev3Jjia62NUu3UWWq+FcoYDfUnCapb+t2tbwJagpPywe/kfv xCNw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id:dkim-signature; bh=kM5nqwMCuV17UaHU1XoT5vD4wrft/NlcsxRLBHvVgAg=; fh=4j/deCWTCk4RRfeyEtgBZSSqoooQHsyNN0THRZ65LNo=; b=WgbQaqaGfI2VxgLTrEP2lqOGFPCXMRJjNyxlya133mPEe6c/uX7TZbCqdfhmiNfNOR +wnd2zCxgdvUmEu+UJKbo/+a9lqmBAjhzmqcD4eBOlOs1bfk1duMzoA49aLGL5WH30f+ 6Wr7FlCLkr09xvNR3V7R2FNc7RO82tL9e5H78Ghn/EFatQ06gcHR14KsqOWGcJl9zJY0 k3V9HzimH5kR1LQGzLqPDWj3ko6qsDxVozHpv0XxQeYauHgNvcP9YJCMC4YgnSwt2jDq D6wr4bjDxeOh1ymQytYcKOxZo3Fe4n/Xzyjh2xWekuPYpIjbGFQgjOB6Pvd0C5TRUZRF F9sg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=PO+6ArL9; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-126464-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-126464-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id r33-20020a635161000000b005f02d3b1260si8521696pgl.221.2024.03.31.23.28.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Mar 2024 23:28:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-126464-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=PO+6ArL9; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-126464-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-126464-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 24F4DB210F3 for ; Mon, 1 Apr 2024 06:28:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9F9FB9468; Mon, 1 Apr 2024 06:27:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="PO+6ArL9" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F0B30BE4B; Mon, 1 Apr 2024 06:27:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711952866; cv=none; b=Gyxvgs+AdptxaO3zM98Rbuh0tBInvlY/4R+RRZm+CpX2ejPtmKCoaLJwZyOPOKSH/f/jngeQX2XhYuMFf/DDpSEZpgtkBBHlh9/ZVyuQlpb1A1z6/0oae5OBS6WXF26mwz+brIAUwutOyPW53bIR3Rpb43xofBnyjpJdoHFy/iE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711952866; c=relaxed/simple; bh=FRDWwGwoWrT2hdGyeXRnP8I/oB4ub4bNpO9ycKIRPhk=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=UpcyuPPYnBIFTkrRXTMpV6gbcEq3Gvrg8TBpVUa/uX64bfnJDLH/WNkbLgnv/pXGmXWm1qdkYju5szaCw/fKzgC0nXzYiGTl78Zzt4xeIyYaoJa1nrIeK9lQccO78Fg5En8yDLq1g3xpcXoQ4QiPqK1Ovn1V9W3a3Cwqn5zZk14= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=PO+6ArL9; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711952865; x=1743488865; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=FRDWwGwoWrT2hdGyeXRnP8I/oB4ub4bNpO9ycKIRPhk=; b=PO+6ArL9RzVcZUfJBdIhXMhRltt3+HpvaB7ScXWJk+gsctqNjrYCmIPg +fmn8saGt3a8ffoiMW9AyJSKTT2JMpGI1NslhRSyxwqpbxCYK04Ub/F/I 35FlnffGWJZPpzvAmy/S6RUNB6vZXSetxthc29Ar8AmiWjHLCckQmiAGD oyZ10xM6qLGQRemkq5kOKzSRIfCB+Udmc/ivnpeLr7I+V19pYqc5WP0Pc BL8A1KU7y0gYl9m7M1aODXg5zlRkmu8hzIeDEmOeVeBKClc+jjaR8HlxR FrkOZjQAxES3vGnk7hn1KLN1T1+S4S6Fyf6FlQwapIQ0UPk3s5pZZCxMF A==; X-CSE-ConnectionGUID: 9uG+lN7bRLODWahnWE8a0g== X-CSE-MsgGUID: inVB4OkiSiWQ+zEmYwuLcA== X-IronPort-AV: E=McAfee;i="6600,9927,11030"; a="17691543" X-IronPort-AV: E=Sophos;i="6.07,171,1708416000"; d="scan'208";a="17691543" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2024 23:27:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,171,1708416000"; d="scan'208";a="17650268" Received: from xiaoyaol-hp-g830.ccr.corp.intel.com (HELO [10.124.224.7]) ([10.124.224.7]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2024 23:27:31 -0700 Message-ID: <005c16a4-b88c-4389-8834-a4fc98a8ba02@intel.com> Date: Mon, 1 Apr 2024 14:27:28 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 5/9] KVM: VMX: Track CPU's MSR_IA32_VMX_BASIC as a single 64-bit value To: Sean Christopherson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Paolo Bonzini , Andy Lutomirski , Peter Zijlstra Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Shan Kang , Kai Huang , Xin Li References: <20240309012725.1409949-1-seanjc@google.com> <20240309012725.1409949-6-seanjc@google.com> Content-Language: en-US From: Xiaoyao Li In-Reply-To: <20240309012725.1409949-6-seanjc@google.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 3/9/2024 9:27 AM, Sean Christopherson wrote: > Track the "basic" capabilities VMX MSR as a single u64 in vmcs_config > instead of splitting it across three fields, that obviously don't combine > into a single 64-bit value, so that KVM can use the macros that define MSR > bits using their absolute position. Replace all open coded shifts and > masks, many of which are relative to the "high" half, with the appropriate > macro. > > Opportunistically use VMX_BASIC_32BIT_PHYS_ADDR_ONLY instead of an open > coded equivalent, and clean up the related comment to not reference a > specific SDM section (to the surprise of no one, the comment is stale). > > No functional change intended (though obviously the code generation will > be quite different). > > Cc: Shan Kang > Cc: Kai Huang > Signed-off-by: Xin Li > [sean: split to separate patch, write changelog] The patch author doesn't match with the signed-off > Signed-off-by: Sean Christopherson > --- > arch/x86/include/asm/vmx.h | 5 +++++ > arch/x86/kvm/vmx/capabilities.h | 6 ++---- > arch/x86/kvm/vmx/vmx.c | 28 ++++++++++++++-------------- > 3 files changed, 21 insertions(+), 18 deletions(-) > > diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h > index c3a97dca4a33..ce6d166fc3c5 100644 > --- a/arch/x86/include/asm/vmx.h > +++ b/arch/x86/include/asm/vmx.h > @@ -150,6 +150,11 @@ static inline u32 vmx_basic_vmcs_size(u64 vmx_basic) > return (vmx_basic & GENMASK_ULL(44, 32)) >> 32; > } > > +static inline u32 vmx_basic_vmcs_mem_type(u64 vmx_basic) > +{ > + return (vmx_basic & GENMASK_ULL(53, 50)) >> 50; #define VMX_BASIC_MEM_TYPE_SHIFT 50 We have the shift defined in previous patch, we need to use it I think, Any maybe, we can define the MASK as well. Otherwise, this cleanup is good. Reviewed-by: Xiaoyao Li