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;
Date:   Mon, 17 Apr 2023 15:31:37 +0800
From:   Chao Gao <chao.gao@intel.com>
To:     Chenyi Qiang <chenyi.qiang@intel.com>
CC:     <kvm@vger.kernel.org>, Jiaan Lu <jiaan.lu@intel.com>,
        Zhang Chen <chen.zhang@intel.com>,
        Sean Christopherson <seanjc@google.com>,
        "Paolo Bonzini" <pbonzini@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        "Ingo Molnar" <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>, <x86@kernel.org>,
        "H. Peter Anvin" <hpa@zytor.com>, <linux-kernel@vger.kernel.org>
Subject: Re: [RFC PATCH v2 04/11] KVM: VMX: Add IA32_SPEC_CTRL virtualization
 support
Message-ID: <ZDz12ZlMb+iqJP9p@chao-env>
References: <20230414062545.270178-1-chao.gao@intel.com>
 <20230414062545.270178-5-chao.gao@intel.com>
 <c89c9d44-f9c4-2e48-ff0f-f0e070de6426@intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <c89c9d44-f9c4-2e48-ff0f-f0e070de6426@intel.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?irh4dUbg4rU10Ma9oYIzIM+euzQUrDMHZj1TdQnFaxQucMmuIC7KH+JTxxOo?=
 =?us-ascii?Q?JV23Ty9Okf7lKKGq33pwApFXcszJbIL0eKfmqyAAKTnApjjAH8jIaA8oAfah?=
 =?us-ascii?Q?BepvV/8viiC3/SbBxVLE83kAxYDJWCxUMaYV07J14rs2GM0db+WjbW0CZ4F/?=
 =?us-ascii?Q?uyFjf81X8OVjpfswponjlPQFU0zx5QbLMgRjxIbPLfBTEvmZKcFWCI92QMn6?=
 =?us-ascii?Q?iiUScqhdGAbM8WNmNUTxh8MABQ3qDG+rJ5h7cOHbjKjkvDHU3XI1gVoONFZw?=
 =?us-ascii?Q?xu1Mz2sbPgWXPIr6LfaI1JFHVrLqDzAoIvXs2IdjgXkm02zss57CU5cBfwAk?=
 =?us-ascii?Q?trt6a/VhVlpaCXtem9Gfs6N2Ie7ggRyv/LOItn+yGFkzUG9U9PQ1AIOzrtiy?=
 =?us-ascii?Q?I5v6wya/pjDxTsC8Wdyh+51Pu8Cg5ScHaeduE2LVRV+AufHkPRWwRPSjC94D?=
 =?us-ascii?Q?KsAzxPhdKzsT4EyUYX7LX9vZj7KWba+z8lDVa/uTR7MDfk8PrGc+7RZCD/Vm?=
 =?us-ascii?Q?9pmFnpQsz28dxeRmcz6DqJEV/2cdj34JLC9QaUBiuRXztowYRs3fDKKMdNKX?=
 =?us-ascii?Q?tckcL6LL4p4Lpsn72MkD1SDJrz2FYVG1MAbRVYpt5FwC7idvJ62Us9rOZp+L?=
 =?us-ascii?Q?VUAWI2LPBuJ05/SugkvC0aHUE/dasS2BatNU9fOswquKSYVKtHGbv0J7Q4sX?=
 =?us-ascii?Q?HFedhhe/Ikj6wyObXGPiz3YDELTrL/v2y+9NxsaXifi1NApGbCuTnS3K919u?=
 =?us-ascii?Q?N4Ch4AsKpNeBfahRfZx65I/mZpKES/FNpih8vJgFopPKonmqr87IxlV1DkWW?=
 =?us-ascii?Q?CwAdm4zUGVYJ0Lk/QfuGbXFCUowfD1bnEl5KzvFTn9GY6sMXKKkSNhPxbnLw?=
 =?us-ascii?Q?S/zRoBr4TyTZjcQDdNF8ixHffryGarLoWhp4fXUNrGXGwpPXF8t6f522ZpXB?=
 =?us-ascii?Q?In+u4q6XBtMd5vrZJnIIOHXC4Gfw/bCqjfwbj9HxMXJA3FQ+wr3FRGBDou8a?=
 =?us-ascii?Q?GfuooNzF0fv02wnljPP9kRF3XiUixxA6RMiRFUV+zOy43jjTavYE71HKwnBr?=
 =?us-ascii?Q?MJf7nwh75+2bh+HSqR0tbDtGn0/9A0cT3k0CevXZBtzwYur60ISuqseGKpAo?=
 =?us-ascii?Q?qQOLHHzqfHleEtpw4D7ov8DyBY7aV7bSMiivcRn9ZPNT5BQmw2jdlFfcvTYy?=
 =?us-ascii?Q?ZhpheKs2Vx4LHNfeQE6iprZGl2zgo56UW11vsgmI4rFkeVkj5+23rcSsGdqo?=
 =?us-ascii?Q?5vqR2oq/6omFMYKNBKi9DdOtPlwBsxWjP0BNCoy4sOY78QoCerCp5QR/PheX?=
 =?us-ascii?Q?D72sIToJsbN4G7cgmHJ9DE5BerUY7TBAtqs26xr0+I5xT3rvEPYhMYV5Haf0?=
 =?us-ascii?Q?Ap/sV/moIgTXP5mq4H7salYD+YbHAX70lyuqNAN5lrmb1AHBO8MGtYxhIEFl?=
 =?us-ascii?Q?yDv+sqlUClJ9ks3yny5db9v95Wu1Tr17Qs8rXBwFCfxUbFREV784FazbaOsz?=
 =?us-ascii?Q?Ddd+Av9fiNuwLtX3xZIJzAsz2hi4DdZzqVp1IpIT5T0kDaiwY5S8U0zxdIK3?=
 =?us-ascii?Q?9K/KHuqp8XMWbuRMOcn+z2IY3lC9YnE6xhwSEiqB?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 48d1f524-7784-47c9-4dde-08db3f15cd52
X-MS-Exchange-CrossTenant-AuthSource: PH8PR11MB6780.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2023 07:31:48.0133
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: zx/VvQ6kw+zWhUDKqJ/6AjfWY2feCUsTERWVQteIdyvHNjv+CZpXkjhQ+zIjDp54lQnPOD9Y4wkZBGf88C4GIA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB6997
X-OriginatorOrg: 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,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Apr 17, 2023 at 02:48:56PM +0800, Chenyi Qiang wrote:
>> Co-developed-by: Chao Gao <chao.gao@intel.com>
>> Signed-off-by: Chao Gao <chao.gao@intel.com>
>> Signed-off-by: Zhang Chen <chen.zhang@intel.com>
>> Signed-off-by: Chao Gao <chao.gao@intel.com>
>
>Duplicated SOB. Move the Co-developed-by down like other patches.
>

OK. Will do

>> Tested-by: Jiaan Lu <jiaan.lu@intel.com>
>> ---
>>  arch/x86/include/asm/vmx.h         |  5 ++++
>>  arch/x86/include/asm/vmxfeatures.h |  2 ++
>>  arch/x86/kvm/vmx/capabilities.h    |  5 ++++
>>  arch/x86/kvm/vmx/nested.c          | 13 ++++++++++
>>  arch/x86/kvm/vmx/vmcs.h            |  2 ++
>>  arch/x86/kvm/vmx/vmx.c             | 34 ++++++++++++++++++++-----
>>  arch/x86/kvm/vmx/vmx.h             | 40 +++++++++++++++++++++++++++++-
>>  7 files changed, 94 insertions(+), 7 deletions(-)
>> 
>> diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h
>> index 498dc600bd5c..b9f88ecf20c3 100644
>> --- a/arch/x86/include/asm/vmx.h
>> +++ b/arch/x86/include/asm/vmx.h
>> @@ -81,6 +81,7 @@
>>   * Definitions of Tertiary Processor-Based VM-Execution Controls.
>>   */
>>  #define TERTIARY_EXEC_IPI_VIRT			VMCS_CONTROL_BIT(IPI_VIRT)
>> +#define TERTIARY_EXEC_SPEC_CTRL_VIRT		VMCS_CONTROL_BIT(SPEC_CTRL_VIRT)
>>  
>>  #define PIN_BASED_EXT_INTR_MASK                 VMCS_CONTROL_BIT(INTR_EXITING)
>>  #define PIN_BASED_NMI_EXITING                   VMCS_CONTROL_BIT(NMI_EXITING)
>> @@ -233,6 +234,10 @@ enum vmcs_field {
>>  	TERTIARY_VM_EXEC_CONTROL_HIGH	= 0x00002035,
>>  	PID_POINTER_TABLE		= 0x00002042,
>>  	PID_POINTER_TABLE_HIGH		= 0x00002043,
>> +	IA32_SPEC_CTRL_MASK             = 0x0000204A,
>> +	IA32_SPEC_CTRL_MASK_HIGH        = 0x0000204B,
>> +	IA32_SPEC_CTRL_SHADOW           = 0x0000204C,
>> +	IA32_SPEC_CTRL_SHADOW_HIGH      = 0x0000204D,
>>  	GUEST_PHYSICAL_ADDRESS          = 0x00002400,
>>  	GUEST_PHYSICAL_ADDRESS_HIGH     = 0x00002401,
>>  	VMCS_LINK_POINTER               = 0x00002800,
>> diff --git a/arch/x86/include/asm/vmxfeatures.h b/arch/x86/include/asm/vmxfeatures.h
>> index c6a7eed03914..c70d0769b7d0 100644
>> --- a/arch/x86/include/asm/vmxfeatures.h
>> +++ b/arch/x86/include/asm/vmxfeatures.h
>> @@ -89,4 +89,6 @@
>>  
>>  /* Tertiary Processor-Based VM-Execution Controls, word 3 */
>>  #define VMX_FEATURE_IPI_VIRT		( 3*32+  4) /* Enable IPI virtualization */
>> +#define VMX_FEATURE_SPEC_CTRL_VIRT	( 3*32+  7) /* Enable IA32_SPEC_CTRL virtualization */
>> +
>>  #endif /* _ASM_X86_VMXFEATURES_H */
>> diff --git a/arch/x86/kvm/vmx/capabilities.h b/arch/x86/kvm/vmx/capabilities.h
>> index 45162c1bcd8f..a7ab70b55acf 100644
>> --- a/arch/x86/kvm/vmx/capabilities.h
>> +++ b/arch/x86/kvm/vmx/capabilities.h
>> @@ -138,6 +138,11 @@ static inline bool cpu_has_tertiary_exec_ctrls(void)
>>  		CPU_BASED_ACTIVATE_TERTIARY_CONTROLS;
>>  }
>>  
>> +static __always_inline bool cpu_has_spec_ctrl_virt(void)
>
>Do we need to use __always_inline to force generating inline code? or
>just align with other cpu_has_xxx() functions, use inline annotation.

__always_inline is needed because this function is called from 
vmx_spec_ctrl_restore_host() which is in .noinstr section. With just
__inline, the objtool may complain:

vmlinux.o: warning: objtool: vmx_spec_ctrl_restore_host+0xb3: call to cpu_has_spec_ctrl_virt() leaves .noinstr.text section

>
>> +{
>> +	return vmcs_config.cpu_based_3rd_exec_ctrl & TERTIARY_EXEC_SPEC_CTRL_VIRT;
>> +}
>> +
>>  static inline bool cpu_has_vmx_virtualize_apic_accesses(void)
>>  {
>>  	return vmcs_config.cpu_based_2nd_exec_ctrl &
>