Received-SPF: pass (google.com: domain of linux-kernel+bounces-73069-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <119db925-4472-4070-adb3-767f2bd00726@intel.com>
Date: Tue, 20 Feb 2024 21:23:01 +0800
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v10 10/27] KVM: x86: Refine xsave-managed guest
 register/MSR reset handling
To: Chao Gao <chao.gao@intel.com>
CC: <seanjc@google.com>, <pbonzini@redhat.com>, <dave.hansen@intel.com>,
	<x86@kernel.org>, <kvm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<peterz@infradead.org>, <rick.p.edgecombe@intel.com>, <mlevitsk@redhat.com>,
	<john.allen@amd.com>
References: <20240219074733.122080-1-weijiang.yang@intel.com>
 <20240219074733.122080-11-weijiang.yang@intel.com>
 <ZdQWu3D3Jku1iAvd@chao-email>
Content-Language: en-US
From: "Yang, Weijiang" <weijiang.yang@intel.com>
In-Reply-To: <ZdQWu3D3Jku1iAvd@chao-email>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QjFtVllyZDFubzQ4N3QvMmtCVHd6TnFBWnhpenZYbmIrTEc3SFIxcmk4Qzl6?=
 =?utf-8?B?RTVmOWFKNXRIbmlWRWtvN0YyZ3NodFQ4RXBuYU5rVXlGckh0UkpGekVIWlJ5?=
 =?utf-8?B?Z3NCUndQMUJDZ0dPTW9ZSVVScjFJdlVkTDRSaHQ5THBFaW5oV2Q2VmZaNEJS?=
 =?utf-8?B?Vko3TGcwVENUekRXRU1KZ3hGZ0RWam5BOW44c3h1Tm5JamtrYWwvdmRWMFJl?=
 =?utf-8?B?YklJRWxNTVNBOXVjTGJqTjgwUDI1YmcwczZWemxKUTZVdFFsR2tTaDJUTEdq?=
 =?utf-8?B?WjVGZGFZS20vY0ZuZWp1YTVIZUdUTzBJWTFVOVR6L1JtYkpaUGtKK3k4VkUv?=
 =?utf-8?B?Y1QyZ3l2YlJNVXdGelZSbTZNNTlnWk1RQmVrbnlNQ2EveUpjZ3QrS3ZGOHdD?=
 =?utf-8?B?MGd5S2JHWEsyZHRtZnVTNUYyVytZRURWU2d6OWFvd3BtL3V2eGV6d3FMei8y?=
 =?utf-8?B?NjF0QXFqQ3UwYy9RbS9udEMvQzVXOGlFYzBOc1AxNy9ZNmExcjZXRFp3ektF?=
 =?utf-8?B?MWJIMnJ6eWcwQkdQelN3YkZETjBObFVBV3FxWkx3QmJ3bEhQcmY4ZDJmRnEx?=
 =?utf-8?B?eU5nNmhHd0ozcTdaRUxWSkdSQ3p4K28ybmZKMkZEQWVNcDdwVFo4em9YVk1m?=
 =?utf-8?B?bW1tOFJyQzBsczByOVlzdDJpTVY3Mi83NkRKOU5XeXV5YVZ5TGFRZkVIbFo1?=
 =?utf-8?B?VnZWeTkrS1hoUEMyUkRTMmcrZHZybWFjNGY3L0t2cXRrb205VVIwNUpzM20y?=
 =?utf-8?B?UjRjS1IvOExBUWVIMXdlelRBUGJQQmVOSVpZbjgyUmlvZVNhL25QOXNLVWcv?=
 =?utf-8?B?RTlZenFnc2FEc3ZkaTZWd2xwcVZPTzNBZEM0YWZ4akFWR1NqdHd0QklYTUJX?=
 =?utf-8?B?WThheUJjS2F2YTR1R2ZvcDdOaGMxSnJ1SzcvNG9OdTNFTTl4dXY5c1pXemZI?=
 =?utf-8?B?SUpxY1lmcDRkQW5FNW9UT2FjZ0tZZzA5UkdFUmxyY3prRjQ1NmFxNncxY2V1?=
 =?utf-8?B?VWZIdmpTVFpXWDBjK1BwT0RobkZzYnZXWTRCS2hvZDJNRW5QSlhJdmoyL1Nl?=
 =?utf-8?B?dkVTMlI2Nlk0ZXJSdTlTK3dsQXpjQjVmZ2crSWd0VWdDaVphV2VPTUJZakgr?=
 =?utf-8?B?bERvRC9GS3JuNnZsUmwvbVhVYjRBcWdJQnNpbjFpNkNCRGlkK1Y4M2tRcnlK?=
 =?utf-8?B?bFlpOTczTTVHWXpwR3JUMVJNNjlCVEtzazNiRHhlZy8wWVFZNHgraVFOcHl4?=
 =?utf-8?B?U3FHZ1dGeWQxMnV3emg2cDN0dURPVVp1SkVMZFdYeDNhWThDQVpLNjZnaE9Z?=
 =?utf-8?B?MlR5UEx3cDMxWDN5MkNzKzZpYTVBVjhzZUxjV3BROEZ4V1pKN2VYUFpRbXZS?=
 =?utf-8?B?OERlUGZHeHFZRGw3S3cySzI1RG8yam4wWTNmWS9jN1VOdkxTclNjSVBiWXA2?=
 =?utf-8?B?MEhOemw4UnFoVFZjZHJOWHkxTnZ3WTl2VU5YaEowaDNhODlDMkpoS0dGcjNO?=
 =?utf-8?B?YUZFSkJheHNrU3djc3dUWW40b0IxN2xkSVUrTXlGZDZlQUg3bEY3dzIwYkdX?=
 =?utf-8?B?azlKSS9nUTF6VWk0cFpUNDl2U0pzSXU1YW1vdUtPZEF6aHJ5SVdReU4zWno3?=
 =?utf-8?B?Qm9XcWYzRHBMOFJNNjFUekdlU0dQTUxsRUZyTEs1S1lZa21aZ0lDZ1JJM09r?=
 =?utf-8?B?emM0RzFBSDhJYkgwemkvL2hBM1JIM0ZQOEZzTFUxZVgwYk4xUTljYVhTcDl1?=
 =?utf-8?B?ekpTUzdIMXRKWGc3MEgxeVlPb3FTSkxZWmhHb2NyRVVxbXljSFlBY2p1MENQ?=
 =?utf-8?B?WWpGN1RaOW9UL3h0WU9HTGY3VTh4ZXFadFRpUWhXTGtIM285cXNpS3AvcFFY?=
 =?utf-8?B?WDdlN1Rsc3l6RXpoakkzWU45OWlvTUhMNVFuWE0yY0hRbU9DL3RrdGlybGpo?=
 =?utf-8?B?Q0tmS3UzV1AydGxnY2pWaHRtWk5uMWhrdHJRV3gyNHFnOW1WNW1YUkFoSDZE?=
 =?utf-8?B?WEtnclphS1M5N1JTc1VmeUZ2bDNhS3B0bVNDL2crTUxmbTZlSVZncGs1MVhI?=
 =?utf-8?B?U1N5NzJTcHdCL3FDbTRDWUdkeDN3Q0gyUzgvcFFLQy9MN1g4OU42c2dhMGZR?=
 =?utf-8?B?MHcwNHdsSm1jYTlMQmRmVEQ5Rkw2NE96OTNJU09YaGxGaWh3eThPU1U2NDRj?=
 =?utf-8?B?ZEE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 31b65aa5-ef86-4a60-0ab8-08dc321718b0
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB4965.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2024 13:23:16.1016
 (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: bYKvXN4GVGErljlw4zcQvyu/kY43bXt5EFao7Kn35WdIuOXtBIzJxIwRkSLcRf+jm9NLG9XzFYo3mXrqwSiZcQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR11MB5227
X-OriginatorOrg: intel.com

On 2/20/2024 11:04 AM, Chao Gao wrote:
> On Sun, Feb 18, 2024 at 11:47:16PM -0800, Yang Weijiang wrote:
>> Tweak the code a bit to facilitate resetting more xstate components in
>> the future, e.g., CET's xstate-managed MSRs.
>>
>> No functional change intended.
> Strictly speaking, there is a functional change. in the previous logic, if
> either of BNDCSR or BNDREGS state is not supported (kvm_mpx_supported() will
> return false), KVM won't reset either of them.
> Since this gets changed, I vote
> to drop 'No functional change ..'

Yes, I'll remove it since existing logic is slightly changed.

>> Suggested-by: Chao Gao <chao.gao@intel.com>
>> Signed-off-by: Yang Weijiang <weijiang.yang@intel.com>
>> ---
>> arch/x86/kvm/x86.c | 30 +++++++++++++++++++++++++++---
>> 1 file changed, 27 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
>> index 10847e1cc413..5a9c07751c0e 100644
>> --- a/arch/x86/kvm/x86.c
>> +++ b/arch/x86/kvm/x86.c
>> @@ -12217,11 +12217,27 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
>> 		static_branch_dec(&kvm_has_noapic_vcpu);
>> }
>>
>> +#define XSTATE_NEED_RESET_MASK	(XFEATURE_MASK_BNDREGS | \
>> +				 XFEATURE_MASK_BNDCSR)
>> +
>> +static bool kvm_vcpu_has_xstate(unsigned long xfeature)
> kvm_vcpu_has_xstate is a misnomer because it doesn't take a vCPU.

True, I'll change it, thanks!

>> +{
>> +	switch (xfeature) {
>> +	case XFEATURE_MASK_BNDREGS:
>> +	case XFEATURE_MASK_BNDCSR:
>> +		return kvm_cpu_cap_has(X86_FEATURE_MPX);
>> +	default:
>> +		return false;
>> +	}
>> +}
>> +
>> void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
>> {
>> 	struct kvm_cpuid_entry2 *cpuid_0x1;
>> 	unsigned long old_cr0 = kvm_read_cr0(vcpu);
>> +	DECLARE_BITMAP(reset_mask, 64);
>> 	unsigned long new_cr0;
>> +	unsigned int i;
>>
>> 	/*
>> 	 * Several of the "set" flows, e.g. ->set_cr0(), read other registers
>> @@ -12274,7 +12290,12 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
>> 	kvm_async_pf_hash_reset(vcpu);
>> 	vcpu->arch.apf.halted = false;
>>
>> -	if (vcpu->arch.guest_fpu.fpstate && kvm_mpx_supported()) {
>> +	bitmap_from_u64(reset_mask, (kvm_caps.supported_xcr0 |
>> +				     kvm_caps.supported_xss) &
>> +				    XSTATE_NEED_RESET_MASK);
>> +
>> +	if (vcpu->arch.guest_fpu.fpstate &&
>> +	    !bitmap_empty(reset_mask, XFEATURE_MAX)) {
>> 		struct fpstate *fpstate = vcpu->arch.guest_fpu.fpstate;
>>
>> 		/*
>> @@ -12284,8 +12305,11 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
>> 		if (init_event)
>> 			kvm_put_guest_fpu(vcpu);
>>
>> -		fpstate_clear_xstate_component(fpstate, XFEATURE_BNDREGS);
>> -		fpstate_clear_xstate_component(fpstate, XFEATURE_BNDCSR);
>> +		for_each_set_bit(i, reset_mask, XFEATURE_MAX) {
>> +			if (!kvm_vcpu_has_xstate(i))
>> +				continue;
> The kvm_vcpu_has_xstate() check is superfluous because @i is derived from
> kvm_caps.supported_xcr0/xss, which already guarantees that all unsupported
> xfeatures are filtered out.

Yeah, at least currently I can skip the check for CET/MPX feaures, will remove it, thanks!

>
> I recommend dropping this check. w/ this change,
>
> Reviewed-by: Chao Gao <chao.gao@intel.com>
>
>> +			fpstate_clear_xstate_component(fpstate, i);
>> +		}
>>
>> 		if (init_event)
>> 			kvm_load_guest_fpu(vcpu);
>> -- 
>> 2.43.0
>>