Received-SPF: pass (google.com: domain of linux-kernel+bounces-207086-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <87f4123a-d640-4283-ac3b-f3410aefa8f4@intel.com>
Date: Sat, 8 Jun 2024 08:12:36 -0700
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH V7 1/2] KVM: selftests: Add x86_64 guest udelay() utility
To: <isaku.yamahata@intel.com>, <pbonzini@redhat.com>,
	<erdemaktas@google.com>, <vkuznets@redhat.com>, <seanjc@google.com>,
	<vannapurve@google.com>, <jmattson@google.com>, <mlevitsk@redhat.com>,
	<xiaoyao.li@intel.com>, <chao.gao@intel.com>, <rick.p.edgecombe@intel.com>,
	<yuan.yao@intel.com>
CC: <kvm@vger.kernel.org>, <linux-kernel@vger.kernel.org>
References: <cover.1717695426.git.reinette.chatre@intel.com>
 <6cd5b8bba5905813dacf71249865b316146dd1d2.1717695426.git.reinette.chatre@intel.com>
From: Reinette Chatre <reinette.chatre@intel.com>
Content-Language: en-US
In-Reply-To: <6cd5b8bba5905813dacf71249865b316146dd1d2.1717695426.git.reinette.chatre@intel.com>
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?MTczUlB3VURaZzVYWWMzZGN4UCs3ZW5hdlo1blc1L3NNRnpLZnVoSTV0cUJS?=
 =?utf-8?B?Rmc4em92TjFTYjBJZjFudWxZeWhJTk1YQVZpVUFrVUtOeWRUeG5NNXdValBs?=
 =?utf-8?B?NWY4SFowMGlmeGVzc2s2YlZUVmI2L2toaWFzS1pwZDZNcXh0Nnd0d3BYZzNr?=
 =?utf-8?B?bmxXMkJUSGFNaVUvZDhtZXhBOHl5bGNuNlQrSWZ5ditFajhLVjVmWEM5U0pB?=
 =?utf-8?B?em9XbWcySDFlZEd0QjJUaDd6dmZnMTdKMWhtNXJzamthTU9obGl6ckpvT2dr?=
 =?utf-8?B?aUVpWVFqM2MrSDV1SE1TM01Sa281V0lwV3hPQnBrM3pUUWJOQXczNlZadVls?=
 =?utf-8?B?R3o2UVFkVXBhQmhuQTdNQmk1Y0RYc0dENWhxTmZZVDVEcUNqa0NlVUNUSzRY?=
 =?utf-8?B?RWNjOWRhenFQTjNSMkFmb2J2bSttN2gyUjdyZmZTMm90cjNMc0R6bUk4RU5t?=
 =?utf-8?B?MW9XalJmaHJNbk5tckprbER1SmY3VmlzNGtOU2pGUHM3NGV6dktLeHdkVEY4?=
 =?utf-8?B?UmVMbTA4RStoUzhwSzBYZGpNT21UWGZnVDc1RzU3Sm5naHlISWc2TGNxY3h6?=
 =?utf-8?B?Qk9ObFRYNUp0Y051RWVFaiszTm1nS0U4SytEUkMzOXdYaXZmWEp6MlQ3L2Zs?=
 =?utf-8?B?M1JuU2hWTUtXNlhFRlhIeEp2Y2lQZXZDVmJITXN6aVVoRzRMRDFjdnlsL08y?=
 =?utf-8?B?YTRvM2VVNndtemNxaXZUTVZSUGlrNWRLeGJFNHV0WlBWYXlTLy8wenROWG9M?=
 =?utf-8?B?WjIrME1CbTFjZWtKMEErcmpDY2x1M1BqK2lHQThpRGR5RVJYWE5xbis5aTE4?=
 =?utf-8?B?a2xDOVRpTDBjTFl1MlgxWGIwSmRva1l1bFk3Y3B5cFlYaU81TVE5bTFtVmRp?=
 =?utf-8?B?MTFrdDg4L1phMEFlQmgzZkl4TU93ZERYUGpLWlFRL0tCVmhMMi81Rmp1NVU4?=
 =?utf-8?B?eC9DKy9tOTV0ekVBZWFtL0tnVjQ5U045bFZqZ2ZhcFI2TXhQZDAzUkg3SXJQ?=
 =?utf-8?B?WEFNelBWSmdpTDNmcjVyUHB2ZzZ1d1ppVGdMdGdJUkZQNWZjbzFGOEtTZFVw?=
 =?utf-8?B?bmdyVGk3eDR2UEduYWJqMG1NZSs1Ni8ycGE1ZXhOUERSQUtTWXllT1BZUjdR?=
 =?utf-8?B?eStmYkFMVjZKRXVpdG54dnd1bzUwVFIxQ1hKNU04RlZTSVBCTng3OVp3YVlW?=
 =?utf-8?B?RE5OQ0lQNExvUXVSYzE2UC8zdHFaTjRleXlZVDJuT0NpcUlxUnhuaStuRFRL?=
 =?utf-8?B?YUY4UXJRbGV2NWNtQlZYOEdRekZoZEVydlZDYlpnUHdBeUJWd0RaWHVzSTJK?=
 =?utf-8?B?UzUzV2lsVmRzVWV3ZHg5K2tpMnhpSGE3eDJvVWpjdmNBV09rY2NnbXhMWTFI?=
 =?utf-8?B?RnJCUFp5MytML0ZMWGphUW5UaThoMmFRb0F1WEJ5b2JrVkU5OTZDczROdUNv?=
 =?utf-8?B?QlBhUzFuakJKR01UcVcxQldMRjZZVWZXdlFHMzlSVnM0cy8rdk1CNCtraWt1?=
 =?utf-8?B?NTRSQlBOOTBCSUxjK0ZmZjlYMk1zMDFqbmppQ0l6MktXZEN5SmhWeXdXdXNm?=
 =?utf-8?B?SWNTN2FNM1QwNlJVYUF1a21PWVQxZUZmRHZMLzR5WmwwM0lSZ1cwTjVCTzFa?=
 =?utf-8?B?cnNrNTl1ZkU3M295TEpoT0J5MnlEcWlMa0w5akdGRW0rSVpIREtLMnlqLy9D?=
 =?utf-8?B?M3p5NS9Reml5R1luQllWdGxoSzY3NFpZVUo5WWYxY3ArZ21KUkkxcEJGYVB2?=
 =?utf-8?B?RFFGeFpFcmpJZ3ptSlVsSm5aRTgybjJZS0tKZk0zM1N0ajlrenI4aFM4UTJl?=
 =?utf-8?B?VU1YN1UwZkRyUlRlMFpadjZ1TUpuckcyOFdibjRjVVBlQTJWVmIrVDI2SjFP?=
 =?utf-8?B?UVZnVm9pNVVnVHU5eCtxaE5XbVU1M1YxbkdCZEtNUTZYdi95TmFTZmRQZ0oy?=
 =?utf-8?B?SjR0V050UUlJQTVPWGpCUmNZYUhkb1hQWjI4ekV3OEVjSUYrcVdhT3c4K1Uy?=
 =?utf-8?B?eFAybisvUCtCaGNrM0h4ZlFpbEZ6NGNrLzdhUmVSOVB5eTd6SnNNK3ZFbVpE?=
 =?utf-8?B?QUgyR05Za2cvK2VyYW9hQXo1cXBKVVlZVndqWG9nbjJ4S0Y1Wlc4SjRHTmh6?=
 =?utf-8?B?UXVCSkRPUTN1TklZcUZyTTNtcy84cmZwclhKZWpEZitHOERlMjJDenRIZTY1?=
 =?utf-8?B?d2c9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 5a0a67d5-a277-48fa-aef2-08dc87cd6fe8
X-MS-Exchange-CrossTenant-AuthSource: SJ2PR11MB7573.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2024 15:12:39.7010
 (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: hApcvT9SxxNv1+ezxvh65+r/bundsMF4QM4qhh4/YhHO0deibSjeAR82dptsyUev5DGLRC0NKgcgr2tI/lP4R+hRxngVpZ7KC1JEDsMxKy8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7052
X-OriginatorOrg: intel.com


On 6/6/24 10:42 AM, Reinette Chatre wrote:
> Create udelay() utility for x86_64 tests to match
> udelay() available to ARM and RISC-V tests.
> 
> Calibrate guest frequency using the KVM_GET_TSC_KHZ ioctl()
> and share it between host and guest with the new
> tsc_khz global variable.
> 
> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
> ---
>   .../selftests/kvm/include/x86_64/processor.h      | 15 +++++++++++++++
>   .../testing/selftests/kvm/lib/x86_64/processor.c  |  8 ++++++++
>   2 files changed, 23 insertions(+)
> 
> diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h
> index 8eb57de0b587..f3a5881dd821 100644
> --- a/tools/testing/selftests/kvm/include/x86_64/processor.h
> +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h
> @@ -23,6 +23,7 @@
>   
>   extern bool host_cpu_is_intel;
>   extern bool host_cpu_is_amd;
> +extern unsigned long tsc_khz;
>   
>   /* Forced emulation prefix, used to invoke the emulator unconditionally. */
>   #define KVM_FEP "ud2; .byte 'k', 'v', 'm';"
> @@ -815,6 +816,20 @@ static inline void cpu_relax(void)
>   	asm volatile("rep; nop" ::: "memory");
>   }
>   
> +static inline void udelay(unsigned long usec)
> +{
> +	unsigned long cycles = tsc_khz / 1000 * usec;
> +	uint64_t start, now;
> +
> +	start = rdtsc();
> +	for (;;) {
> +		now = rdtsc();
> +		if (now - start >= cycles)
> +			break;
> +		cpu_relax();
> +	}
> +}
> +
>   #define ud2()			\
>   	__asm__ __volatile__(	\
>   		"ud2\n"	\
> diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/testing/selftests/kvm/lib/x86_64/processor.c
> index c664e446136b..6558fece8a36 100644
> --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c
> +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c
> @@ -25,6 +25,7 @@ vm_vaddr_t exception_handlers;
>   bool host_cpu_is_amd;
>   bool host_cpu_is_intel;
>   bool is_forced_emulation_enabled;
> +unsigned long tsc_khz;
>   
>   static void regs_dump(FILE *stream, struct kvm_regs *regs, uint8_t indent)
>   {
> @@ -628,6 +629,13 @@ void kvm_arch_vm_post_create(struct kvm_vm *vm)
>   
>   		vm_sev_ioctl(vm, KVM_SEV_INIT2, &init);
>   	}
> +
> +	if (kvm_has_cap(KVM_CAP_GET_TSC_KHZ)) {
> +		tsc_khz = __vm_ioctl(vm, KVM_GET_TSC_KHZ, NULL);
> +		if (tsc_khz < 0)

This incorrect type usage will be fixed in next version that I plan
to send on Monday.

> +			tsc_khz = 0;
> +		sync_global_to_guest(vm, tsc_khz);
> +	}
>   }
>   
>   void vcpu_arch_set_entry_point(struct kvm_vcpu *vcpu, void *guest_code)

Reinette