Received-SPF: pass (google.com: domain of linux-kernel+bounces-209158-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Tue, 11 Jun 2024 09:40:59 +0800
From: Yan Zhao <yan.y.zhao@intel.com>
To: Sean Christopherson <seanjc@google.com>
CC: Paolo Bonzini <pbonzini@redhat.com>, <linux-kernel@vger.kernel.org>,
	Xiangfei Ma <xiangfeix.ma@intel.com>
Subject: Re: [PATCH 1/2] nVMX: Ensure host's PAT is loaded at the end of all
 VMX tests
Message-ID: <ZmerKzEHlIwne5ka@yzhao56-desk.sh.intel.com>
Reply-To: Yan Zhao <yan.y.zhao@intel.com>
References: <20240605224527.2907272-1-seanjc@google.com>
 <20240605224527.2907272-2-seanjc@google.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20240605224527.2907272-2-seanjc@google.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6+e+SRCHwBgTBtcZ45UsGYENApQROk5QqeRQqZh3EUdO0nNA5IXgMtAHhR5k?=
 =?us-ascii?Q?KclM4OnW0VpHCUeAYMFw8FFS9OJ0rbsl76Ywmue3M0dMs4WGVhahBYr2i/z8?=
 =?us-ascii?Q?RECQg8r04ahV2IPbo7PRPJ+Rc1dPbx7thdM/O38HBC7uxuLOvShXpgHo4FsG?=
 =?us-ascii?Q?5IkvQg+f6GI7qRTXfUdHi7kpmjA67Oiq+wMequ6HxqpBv8icCHWATysKnGBU?=
 =?us-ascii?Q?U7x1pFFx0EuHNr3FE2QkRuNOI4qMDZBZ8R0SUNa4EUvfo6ysl0E7/TT6D3ba?=
 =?us-ascii?Q?+fkw/egdrfgLOgk2wZNqCgZ9SAJSIpO2umkSqiDhH04rS6hiXxx8Iq/LwwM+?=
 =?us-ascii?Q?j3+Qvfam0az60elQ8GZzSFKq3yLsvuWMvvEthb52AqWdxNlAtZd2cIBtivzW?=
 =?us-ascii?Q?k7R/2KYDTfSV5EjuySo4sp7ldNDU81FHqv6hjQsoKeRuOwQY808hlyeQ/sBq?=
 =?us-ascii?Q?h+duQiS8ffwJms1wENtFFn0rbB1EqrxvC3pZejjVqvpRaIVceAQRZ7mMTJbp?=
 =?us-ascii?Q?+PrNvM4HcJuZEP9UElxNtmHzpGjiWZxUG/z4CbNBoabmKGB4Edwda6WMLO+4?=
 =?us-ascii?Q?OeQBePsDTGriYkwWDTOzVGnLa8oPt0Po3LbY8y2OQRNRP/hizZzRS+te4JvH?=
 =?us-ascii?Q?zKpF4d9Q9CZNiktRDqkjo9ha8B5liaR20pa/k044pmsw2ZKkQ878slMYaqm6?=
 =?us-ascii?Q?KqY0hZf9DJuKiiklQZ21MWm6N5b20frNbokgtYvaNvF+JEx3INAiz2DNVvWv?=
 =?us-ascii?Q?ZY6s/VTlCcO03e9iNTYZIw4XP8Ie/T3Cpk9jukYFX2t8LXMlRBdaUVY04Wp9?=
 =?us-ascii?Q?SNo0KYV+DhkOsktFveJSaBqDmnqzev9k3Ij2/83uPfyrGCyhHmjajuMx0Hf2?=
 =?us-ascii?Q?VO36YPMQT7aj8Cd8BjlPmPUl9tP8fOG+qnhiRjonba2LKq24lK/K2yc5HRj2?=
 =?us-ascii?Q?hQrZ7piyvQLXLYboFBNYlMTAAYQ0Wp3i/0g6PPpjvF3QSoqOK4uQlVBx8e1p?=
 =?us-ascii?Q?FgfZuvyit9VZAMMoeGccv/qQSJmMYCNCZPdQVRC+mPUiJOR0l1+TBzvqVDVB?=
 =?us-ascii?Q?2xAHmzi0+d8gldcoseA5676ektUuSAske9X/+KqYeMfL7rT+Kui4MysBZllF?=
 =?us-ascii?Q?P8YrW5SoVXXIyW1kyNSks+lYyNMIwkrujx3MfIGLdgWIQXUxuzGoxBofGY+C?=
 =?us-ascii?Q?3Ma2bzEibugrKN9TeFWddcPJqUFnBtg5JOVgqjFE4aWVCgkgFurY5hKtyuxT?=
 =?us-ascii?Q?0M6IiYjtBP/I4h88ubFEoj/ORySPAWWm7V2xgTIwGnsuN3hFLzSom3Lu2iY+?=
 =?us-ascii?Q?2bH2wQFKsxukUfeM/l9+ShTZ+4zMALR52SZee0pGyu7q8hyhp48rrSzXWT7k?=
 =?us-ascii?Q?8Yp7L8kHoXZ5IKnBClNO6Ge6BY42Ua+U79EGhzNY7TwkAddjVUoB5e3YKgul?=
 =?us-ascii?Q?zOCnRynUH2/2OHTdW1M2PttA8a9SiXNOmxAg9M8tvlpRGjpiJrQhj4Preden?=
 =?us-ascii?Q?onTj5D+yhdpOBWheiYkv0xgDA3dFP4WmHIZykKq7sKpr+XN/dhSwVb5hryXC?=
 =?us-ascii?Q?e6qkTL9IKX3u18107Cx5GOm3C+MBZvn5CXCR/P8C?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 9c783f71-be91-4d67-fc48-08dc89b7af08
X-MS-Exchange-CrossTenant-AuthSource: DS7PR11MB5966.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2024 01:41:59.0038
 (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: fIBOFHvKm+HPpBfoKHFqTvk3PFaGcTTXrtfXxnwtA/Kuf+67SfggJa59dDotRI0+U6AVnUTDs0WYzPN7PEhnFQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB7633
X-OriginatorOrg: intel.com

On Wed, Jun 05, 2024 at 03:45:26PM -0700, Sean Christopherson wrote:
> Load the host's original PAT on VM-Exit by default in all VMX tests, and
> manually write PAT with the original value in the test that verifies all
> legal PAT values can be loaded via HOST_PAT.  Failure to (re)load the
> correct host PAT results in all tests that run after test_load_host_pat()
> using UC memtype for all memory.
> 
> Opportunistically fix a message goof for the ENT_LOAD_PAT=0 case.
> 
> Reported-by: Xiangfei Ma <xiangfeix.ma@intel.com>
> Cc: Yan Zhao <yan.y.zhao@intel.com>
> Signed-off-by: Sean Christopherson <seanjc@google.com>
> ---
>  x86/vmx.c       | 4 +++-
>  x86/vmx_tests.c | 5 ++++-
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/x86/vmx.c b/x86/vmx.c
> index 9f08c096..c803eaa6 100644
> --- a/x86/vmx.c
> +++ b/x86/vmx.c
> @@ -1126,6 +1126,8 @@ static void init_vmcs_host(void)
>  	vmcs_write(HOST_CR4, read_cr4());
>  	vmcs_write(HOST_SYSENTER_EIP, (u64)(&entry_sysenter));
>  	vmcs_write(HOST_SYSENTER_CS,  KERNEL_CS);
> +	if (ctrl_exit_rev.clr & EXI_LOAD_PAT)
> +		vmcs_write(HOST_PAT, rdmsr(MSR_IA32_CR_PAT));
>  
>  	/* 26.2.3 */
>  	vmcs_write(HOST_SEL_CS, KERNEL_CS);
> @@ -1247,7 +1249,7 @@ int init_vmcs(struct vmcs **vmcs)
>  	/* All settings to pin/exit/enter/cpu
>  	   control fields should be placed here */
>  	ctrl_pin |= PIN_EXTINT | PIN_NMI | PIN_VIRT_NMI;
> -	ctrl_exit = EXI_LOAD_EFER | EXI_HOST_64;
> +	ctrl_exit = EXI_LOAD_EFER | EXI_HOST_64 | EXI_LOAD_PAT;
>  	ctrl_enter = (ENT_LOAD_EFER | ENT_GUEST_64);
>  	/* DIsable IO instruction VMEXIT now */
>  	ctrl_cpu[0] &= (~(CPU_IO | CPU_IO_BITMAP));
> diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c
> index 22e8812a..8a17dd90 100644
> --- a/x86/vmx_tests.c
> +++ b/x86/vmx_tests.c
> @@ -7233,6 +7233,7 @@ static void test_guest_efer(void)
>  static void test_pat(u32 field, const char * field_name, u32 ctrl_field,
>  		     u64 ctrl_bit)
>  {
> +	u64 pat_msr_saved = rdmsr(MSR_IA32_CR_PAT);
>  	u32 ctrl_saved = vmcs_read(ctrl_field);
>  	u64 pat_saved = vmcs_read(field);
>  	u64 i, val;
> @@ -7252,7 +7253,7 @@ static void test_pat(u32 field, const char * field_name, u32 ctrl_field,
>  				report_prefix_pop();
>  
>  			} else {	// GUEST_PAT
> -				test_guest_state("ENT_LOAD_PAT enabled", false,
> +				test_guest_state("ENT_LOAD_PAT disabled", false,
>  						 val, "GUEST_PAT");
>  			}
>  		}
> @@ -7274,6 +7275,8 @@ static void test_pat(u32 field, const char * field_name, u32 ctrl_field,
>  					error = 0;
>  
>  				test_vmx_vmlaunch(error);
> +				wrmsr(MSR_IA32_CR_PAT, pat_msr_saved);
> +
>  				report_prefix_pop();
>  
>  			} else {	// GUEST_PAT

Is it possible that ENT_LOAD_PAT of GUEST_PAT is tested when there's no support of
EXI_LOAD_PAT of HOST_PAT?
Then
	wrmsr(MSR_IA32_CR_PAT, pat_msr_saved);
is also required in this case?

> -- 
> 2.45.1.467.gbab1589fc0-goog
>