Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Message-ID: <cf92b26e-d940-4dc8-a339-56903952cee2@amd.com>
Date:   Thu, 2 Nov 2023 17:46:26 +0530
User-Agent: Mozilla Thunderbird
Reply-To: nikunj@amd.com
Subject: Re: [PATCH v5 13/14] x86/tsc: Mark Secure TSC as reliable clocksource
Content-Language: en-US
From:   "Nikunj A. Dadhania" <nikunj@amd.com>
To:     "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc:     Dave Hansen <dave.hansen@intel.com>, linux-kernel@vger.kernel.org,
        thomas.lendacky@amd.com, x86@kernel.org, kvm@vger.kernel.org,
        bp@alien8.de, mingo@redhat.com, tglx@linutronix.de,
        dave.hansen@linux.intel.com, dionnaglaze@google.com,
        pgonda@google.com, seanjc@google.com, pbonzini@redhat.com
References: <20231030063652.68675-1-nikunj@amd.com>
 <20231030063652.68675-14-nikunj@amd.com>
 <57d63309-51cd-4138-889d-43fbdf5ec790@intel.com>
 <ae267e31-5722-4784-9146-28bb13ca7cf5@amd.com>
 <20231102103306.v7ydmrobd5ibs4yn@box.shutemov.name>
 <5d8040b2-c761-4cea-a2ec-39319603e94a@amd.com>
In-Reply-To: <5d8040b2-c761-4cea-a2ec-39319603e94a@amd.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dDZwaTk5STRLdVFnM1BRUzFWWm5qamJ0ZmlTTWNySHNtRGJOdFp1alJmNzNl?=
 =?utf-8?B?K3hNTFZpOXNDdzloUFVBbTR0NWlvdXdMTGhLeU1SZnF2cGJvcllqczk0ajVJ?=
 =?utf-8?B?QzZ4c0svbVRseU1qN2Y0OEE0Y2F2TStOMmxEVVpsU2k0WFJvZVRBV1FBQmVU?=
 =?utf-8?B?OG5vUmdFVVZwTmtWb3BDMTM1MktrOFpiUndRb2Z3OVV2Z0dxMDE0NVFOZSs4?=
 =?utf-8?B?MFhUMWp5NnJtUmhrNzMzdWdsSG9jdi83UDJtalhrWUJrVDNDQ0NKSzd5YmdN?=
 =?utf-8?B?cG9DdUQ4WC81bnNGdFBRM09VTHpMVUNzUmF6R3lJdFRWbGhFZHdQNjQ4Mk9N?=
 =?utf-8?B?SGZLQ0NwZ3hwdWtFMjU4SllJRUMzZlVyOHNqYjc1Sm45NzdCV2YvQUl2eW50?=
 =?utf-8?B?QnQwcWp4Yk8wZXY1QkhETVg4czltWmlQcDh2Si9WMEJpNFZqNFdHc3Z0aFFz?=
 =?utf-8?B?bTJFMU1VL2t0c2kzZGNiVlFDK1ZOWXdIRnpYUFFpbTBlSUlTcDBNekVpTXJr?=
 =?utf-8?B?em9PSGlYekZDaXh4THhFRkU2TDJQVEh1WTU0UFlmRGoxNTVmelBWaDNFUHBY?=
 =?utf-8?B?WW1UUzE5dUhJekorMFZUYTU2T1B4R1lXYWZkMnRQUnNIS1dWUTV0VnlRTWNw?=
 =?utf-8?B?djNNRWxGMjdQY3hNQlRCZ1Q3VUJpOWYwRER5Q2tGWEpUZE9xMzN0eWNMWGVB?=
 =?utf-8?B?aGdyVlFJWVVXUzBqdElLZ0dRMWdsRkhTL3BZeHlUYjcrOS9qNUtnQ1pFVnVF?=
 =?utf-8?B?ZEZQSEFUcEFxNHR3WXhpYlZPSUR3UEFvMFNpM1ZHMkp3d0JiTU5oR2V0VDcr?=
 =?utf-8?B?aWF6YjE3UWNsOEk3bWJMSTA2dmlqeVRiL05qNFBCcGozaG9zNXBZWXRkT0xr?=
 =?utf-8?B?WFhsS0dNaFRxSDhnVDEzWWR3OVhFUzZidHpQWjZrOFY5cmNzMWZCbWp3WGNX?=
 =?utf-8?B?bXQxUXdmT1p6TVlhaWZCM0pOZmtyNHJPRkxJa0JORzdjR2loQTViaXRScjZu?=
 =?utf-8?B?VVBCSzk1a1hMVFNKaFFKTHF4cElPMW1Vek1pL3dIRUdlZUFETjFhdGM1blda?=
 =?utf-8?B?WHFDRFFlQUdBOXVlcXJCRjY5cTJQNk9Zb1BVVmcxS0FHUUFSbWhWODQyb3Rs?=
 =?utf-8?B?VnlvTnlFZkg4ZDZ1Z0t1b05uelY1UUliclRrU2VRaVFxUGozdzAxTUxGTXI3?=
 =?utf-8?B?ZW04UktXaHRXMVNab3dUdGFxMm9FQTFndlRJcUJ4UFRkVUIxR1BuNTFuajgx?=
 =?utf-8?B?MXA5V1NkMDdKeGhPRGZRMWd2L3dSK09Ua21KbDhsYVQ2UmFDUjd3cGdOcnJG?=
 =?utf-8?B?elJ3aGNXRHdPRllRaXJlNFplZFVROURHYWZhS3RpQU5BOEhmWCtYeDBSaVBJ?=
 =?utf-8?B?dTFpbXJKM2pib0FYZnFzRUVTU0MwQ0lGUnFKUkplWVJhZnhDZ1lXWGJHd1hV?=
 =?utf-8?B?UUx6SFhwZ25xY3RyejMvSFRrUlRrUTVYRWZjblYyYThxSC9LR0dTSk9XYS9i?=
 =?utf-8?B?cFBCTVJmVVB1OTFpZ3Jod2ZlWDRqSHpQTElLMXIxekhrMFZWbDVsVkZCL3Vs?=
 =?utf-8?B?TFR0OGdBS0JoTUY4RXFxUncrWmJqUC9YaGZFZW0rYXAyOTF3MFVxcnBPb0pB?=
 =?utf-8?B?N3plR3JlajcrRlpjdG9sNnMyNE9adW9mT0Rzc2dKN2g3a3RIUDhwWGkzZHpt?=
 =?utf-8?B?NEI1c1VXQ0p3U3JEWlErckp4c2IvNW9kZEJNZ21sOTVTWHlXQWpVd1RpM1pK?=
 =?utf-8?B?ZHNEVmtnRUIvYit5ZGEzR3doMTVKQmE1RG4zaWptM1BFa29iclp0bWloY0Ux?=
 =?utf-8?B?dmtIVnNQSFQyVGZEMHFaREtBTWdDRnBIVEkvUjViQ0ZPNGV0Y3pyamhGTnZU?=
 =?utf-8?B?VEJmRW1reVptTW9iODdCUmhJMEJRUlF2Z1ErR3V0alAzV0tvczFTcEpuZllj?=
 =?utf-8?B?SU9LdkVyMFhsbEhNaC9pSHk5WVhmcEVKZExjbjhxQ2RoVnZZNEtIRHowbEEz?=
 =?utf-8?B?Z3hObG4vS3FhZ2Q4T1Jpdi9DSjh2a1h6ZG1aTS96bVdjaHFVYXpubGtQM2tH?=
 =?utf-8?B?aDByQXQ2S29vSVdNNzAyRWNWSGtRbGZLd0ZTdXF3bmhydHVvSGNURGFKNm5k?=
 =?utf-8?Q?bUecwIfshZrMRCJASCZHrv6JV?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 075d2db2-888a-44cb-66f1-08dbdb9d90a0
X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB6309.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2023 12:16:38.9529
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: fYRQl6oP0TdhY31qoG6zLB2KCT5oxsrg9v+9zY+l4wzyZi4SaUtC/flbSy6TOYO46tDWdXy43kd2oTWXx2r5tQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8349
X-Spam-Status: No, score=-1.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,
	URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 02 Nov 2023 05:17:37 -0700 (PDT)

On 11/2/2023 5:37 PM, Nikunj A. Dadhania wrote:
> On 11/2/2023 4:03 PM, Kirill A. Shutemov wrote:
>> On Thu, Nov 02, 2023 at 11:23:34AM +0530, Nikunj A. Dadhania wrote:
>>> On 10/30/2023 10:48 PM, Dave Hansen wrote:
>>>> On 10/29/23 23:36, Nikunj A Dadhania wrote:
>>>> ...
>>>>> diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
>>>>> index 15f97c0abc9d..b0a8546d3703 100644
>>>>> --- a/arch/x86/kernel/tsc.c
>>>>> +++ b/arch/x86/kernel/tsc.c
>>>>> @@ -1241,7 +1241,7 @@ static void __init check_system_tsc_reliable(void)
>>>>>  			tsc_clocksource_reliable = 1;
>>>>>  	}
>>>>>  #endif
>>>>> -	if (boot_cpu_has(X86_FEATURE_TSC_RELIABLE))
>>>>> +	if (boot_cpu_has(X86_FEATURE_TSC_RELIABLE) || cc_platform_has(CC_ATTR_GUEST_SECURE_TSC))
>>>>>  		tsc_clocksource_reliable = 1;
>>>>
>>>> Why can't you just set X86_FEATURE_TSC_RELIABLE?
>>>
>>> Last time when I tried, I had removed my kvmclock changes and I had set
>>> the X86_FEATURE_TSC_RELIABLE similar to Kirill's patch[1], this did not
>>> select the SecureTSC.
>>>
>>> Let me try setting X86_FEATURE_TSC_RELIABLE and retaining my patch for
>>> skipping kvmclock.
>>
>> kvmclock lowers its rating if TSC is good enough:
>>
>> 	if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC) &&
>> 	    boot_cpu_has(X86_FEATURE_NONSTOP_TSC) &&
>> 	    !check_tsc_unstable())
>> 		kvm_clock.rating = 299;
>>
>> Does your TSC meet the requirements?
> 
> I have set TscInvariant (bit 8) in CPUID_8000_0007_edx and TSC is set as reliable.
> 
> With this I see kvm_clock rating being lowered, but kvm-clock is still being picked as clock-source.

Ah.. at later point TSC is picked up, is this expected ?

[    2.564052] clocksource: Switched to clocksource kvm-clock
[    2.678136] clocksource: Switched to clocksource tsc

Regards
Nikunj