Message-ID: <3b08788a-5f61-3846-19f4-63185d42ba80@intel.com>
Date:   Mon, 30 Jan 2023 20:37:15 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.1
Subject: Re: [PATCH v2 09/15] KVM: x86: Refine the matching and clearing logic
 for supported_xss
Content-Language: en-US
To:     Sean Christopherson <seanjc@google.com>
CC:     <pbonzini@redhat.com>, <jmattson@google.com>,
        <kvm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <like.xu.linux@gmail.com>, <kan.liang@linux.intel.com>,
        <wei.w.wang@intel.com>
References: <20221125040604.5051-1-weijiang.yang@intel.com>
 <20221125040604.5051-10-weijiang.yang@intel.com>
 <Y9RGHeXUVsQCpYBF@google.com>
From:   "Yang, Weijiang" <weijiang.yang@intel.com>
In-Reply-To: <Y9RGHeXUVsQCpYBF@google.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QmtESUQxTTluRUJDeDNGck8xd2tmK3dkZGZWT25wd1pNS2FjSDNyTFZTaldj?=
 =?utf-8?B?dEJ3UDVOakFKTDgvak5uSDVlU1ZrZXJrazIwRDI1RDVmUGJIOFVqdTlDSnpq?=
 =?utf-8?B?WWU0TVBNMjlXWUtOL2tBMU5OK3VFeTRhMi9RK0Ryc2ttTmxYMURVR0JseXkx?=
 =?utf-8?B?bEZ1eURDV1R5T0Z5bGFSR0YyZzFuNkprTG5YSk90dFdZQTBxSTZQYzRTdWRr?=
 =?utf-8?B?dFh3ZS9ZbkU4TXY2WHhSZjNZVzQ0SUpuaWdHNmJpWkxvR2k3WHNNRzdyc3NK?=
 =?utf-8?B?aTBNT0VjcXBwMVFtQXpvRzRFYnVwN1Y3VVlDMTg1WnpabzFMM3IxRWt2TlJZ?=
 =?utf-8?B?MjJWU0tJaEhYYVNCcHI3WXd0NlViUGxBRklJcnMxS3htRkpQZTNEU3A2L2tU?=
 =?utf-8?B?U280YnVQVkZuRnFNZWVFUEo5bFpBVmJVc2wzYWgxOUxIdi80MFNnMzRmNjVD?=
 =?utf-8?B?N1ZXZUgwK04rNitxOUNiS1NqdldaNU5lWUNpUFR4blF3TFRDb1JtUHp1SVQz?=
 =?utf-8?B?Q0xLbnBlYjFlOEdtanR1Yzl2Q2V3WnFLVE9QRnEvQ0ZBcFJRRW5MY1RBOWgr?=
 =?utf-8?B?U2hHdlh4NkhXQ2xnTGhFWEZvV2RYSmtCSEdRYjZEZGg3RVdYQTNJbVpnYTNr?=
 =?utf-8?B?VWR4alczOVJRZ09QZXUzbWI1MXgvanlETnA2ZVZuTlM0ZnFRRUM4eEJadDBm?=
 =?utf-8?B?K3liR0tGeWlGSkt2K1NyV3NmTGs4RGNUTFN0RHdIOUR1OWNoV1ZBaWFYRVky?=
 =?utf-8?B?aDUzR0JkZzBHcyt5TUl2a3IrckFnT2U1QlRtSFRnNzhRa043LzV2UDR3TnJT?=
 =?utf-8?B?T0pEWE11SXBUcS84b1JjTHN0QXZET2hWc0x2NU5sbEZKclBydUFSalF6b3lG?=
 =?utf-8?B?QjJDRXpvVDZVSSt4bDg3S2lSbWlEQW5hYTAxRTN4Ri9JNXU0aTNjbjZIM2h4?=
 =?utf-8?B?dkRMTGgrZk1tNUxOLy9uKzlrQ3YrU3MxRWxNYzk5VmloSThGSmc1RDNoTTRQ?=
 =?utf-8?B?S0o3WXY2SGZ4d01WdHhGWng0ZkJCY3FlT2dkYmFXTlRzamt6R1dPakV6YUkv?=
 =?utf-8?B?YmZmeUppWnVqSHdjeFlkbVlueVlxZEhoajV0c3pqcnNyUFErSkV2NTdRRmdl?=
 =?utf-8?B?UkR4WGtOK25LQVRrdEFZNnBzcGpCV0x1azFXTE9GM2RUQ1I3OExmZ09jOTZQ?=
 =?utf-8?B?OXNmYVducEZJNDRTZzU0UU1tWU04QlRqN0gwWE1FTEpKV0NidFFHb1NRMGdI?=
 =?utf-8?B?R2lTV0w1VEZWMXZnT1lJOXdsZU44MXFqUHZLbEFZbTdmU3VjWTBLR1Rzb3hL?=
 =?utf-8?B?SHFyMlRNcHJkU0FOMEJGWWZjQ1ZNQnkweGNJL1FDVVRZSDZHMVBqdWRDcEQ4?=
 =?utf-8?B?N28ycEZ1a0dmS3RZZjdaa0xCUGgzandKVnl4ZzFyNElFOUY4MWtWWitRQWRB?=
 =?utf-8?B?RTlZK3EyU2Fvb0JRYlpXMlI0aTlRSXVPRDVkOTBKQ1V3Qzg3ZDB1ZW4veXI0?=
 =?utf-8?B?bERORlVTLzdrMUIxUTZWNWtueVpYWlVURjlrUVBTQVdoQ2wycnVSQnF0U2dJ?=
 =?utf-8?B?TVNNUDJXU2pmU1ZFR2VoREVEYWRkdzhreXNmOGY2eTZwaStVNE9xS0ZDeGhU?=
 =?utf-8?B?Yzk3YWlFQjFGWHF4ZGdsOFE5ZHJYQWp6RXExYnQ1ZUw1M0dEeVlpVWJxdGZV?=
 =?utf-8?B?SkEvQ1h2dGlTVWdWNjhuOXZaK3E5NjhTeXFRTWVtQVVhaUl3WDhUTTc1U0lz?=
 =?utf-8?B?YW5hOU41TDVRL0prZi9IdnlPTGQ1bXJMb1hzdE56NWNaWnB4R2cvV1dURHo3?=
 =?utf-8?B?WktaOUsvMld5NW1waGpJcGFBSW8rTzJBQWZqTHdFVUFHZWZzVXMwYzlIbHl3?=
 =?utf-8?B?ZWtEc0VZanM3d0tKbTZGVldnNUxZMkV5RzNrMlREM2RaMThEMDVub2FHNnJ0?=
 =?utf-8?B?dFVZSE1DMnJRMFFxWlJaa2dWWklONGVvcWxCdUh4Yi9YdDNNcXhYMFVNQ1N0?=
 =?utf-8?B?T2p0cjVPSmY5MmFydDllbkUvLzJjb1lwaVJmenYzTFJNbFJmd21keDd4aDlC?=
 =?utf-8?B?SnNwbUxBSGEvQlc3clR6SjNsMFJIY01pTUhZVWJ2VXNPY3A1VVkrOGd5MW9I?=
 =?utf-8?B?TkJGOEdFRlhxSTFDd0dZQWxSaDREU2RrK1pEU0hMdVN1dys1VENDRjRGdWFk?=
 =?utf-8?B?SWc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 5f894d11-da9f-41d4-1eba-08db02bebe19
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB4965.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 12:37:26.2852
 (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: oJUVz5Xccui/wX4GTcidhJeAbpyqHV1YidsSqBliVokzLkOPCQGKnZsEsoqDJirQ1AAUsbqWQK/nRqXJXxG4qA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR11MB5460
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 1/28/2023 5:46 AM, Sean Christopherson wrote:
> On Thu, Nov 24, 2022, Yang Weijiang wrote:
>> From: Paolo Bonzini <pbonzini@redhat.com>
>>
>> Refine the code path of the existing clearing of supported_xss in this way:
>> initialize the supported_xss with the filter of KVM_SUPPORTED_XSS mask and
>> update its value in a bit clear manner (rather than bit setting).
>>
>> Suggested-by: Sean Christopherson <seanjc@google.com>
>> Signed-off-by: Like Xu <like.xu@linux.intel.com>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> Signed-off-by: Yang Weijiang <weijiang.yang@intel.com>
>> ---
>>   arch/x86/kvm/vmx/vmx.c | 5 +++--
>>   arch/x86/kvm/x86.c     | 6 +++++-
>>   2 files changed, 8 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
>> index 9bd52ad3bbf4..2ab4c33b5008 100644
>> --- a/arch/x86/kvm/vmx/vmx.c
>> +++ b/arch/x86/kvm/vmx/vmx.c
>> @@ -7738,9 +7738,10 @@ static __init void vmx_set_cpu_caps(void)
>>   		kvm_cpu_cap_set(X86_FEATURE_UMIP);
>>   
>>   	/* CPUID 0xD.1 */
>> -	kvm_caps.supported_xss = 0;
> This needs to stay until VMX actually supports something.

Will modify this patch.


>
>> -	if (!cpu_has_vmx_xsaves())
>> +	if (!cpu_has_vmx_xsaves()) {
>>   		kvm_cpu_cap_clear(X86_FEATURE_XSAVES);
>> +		kvm_caps.supported_xss = 0;
> This is already handled in common KVM.
>
>> +	}
>>   
>>   	/* CPUID 0x80000001 and 0x7 (RDPID) */
>>   	if (!cpu_has_vmx_rdtscp()) {
>> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
>> index 74c858eaa1ea..889be0c9176d 100644
>> --- a/arch/x86/kvm/x86.c
>> +++ b/arch/x86/kvm/x86.c
>> @@ -217,6 +217,8 @@ static struct kvm_user_return_msrs __percpu *user_return_msrs;
>>   				| XFEATURE_MASK_BNDCSR | XFEATURE_MASK_AVX512 \
>>   				| XFEATURE_MASK_PKRU | XFEATURE_MASK_XTILE)
>>   
>> +#define KVM_SUPPORTED_XSS     0
>> +
>>   u64 __read_mostly host_efer;
>>   EXPORT_SYMBOL_GPL(host_efer);
>>   
>> @@ -11999,8 +12001,10 @@ int kvm_arch_hardware_setup(void *opaque)
>>   
>>   	rdmsrl_safe(MSR_EFER, &host_efer);
>>   
>> -	if (boot_cpu_has(X86_FEATURE_XSAVES))
>> +	if (boot_cpu_has(X86_FEATURE_XSAVES)) {
>>   		rdmsrl(MSR_IA32_XSS, host_xss);
>> +		kvm_caps.supported_xss = host_xss & KVM_SUPPORTED_XSS;
>> +	}
>>   
>>   	kvm_init_pmu_capability();
>>   
>> -- 
>> 2.27.0
>>