From nobody Mon Aug 24 21:36:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1782934377; cv=none; d=zohomail.com; s=zohoarc; b=Z8tA3zPtCNQ93zCzacr9Wf/bSmuVm5rgnf8hqxWZOCx57ihU/PtcB97qn1Y+4zWJs1Gg3i3BfdSUDDVuAAjzdj3NSmaD0E/czrT4VKv7sLmq24CKc0+RzAhg8SOJ7hYAZGPzHXDz5BED1zIi1Vuk7bsUkG2UoppYdHFUHRZAThI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782934377; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=esF5eJj/7ACJs9NShhG3o0+XzSBpzRsvPz4C7FhhKMM=; b=dGn2XF5twtz/Vu6YExetXiICXuK2SvTa3DzzCpL5iMCd22DNdlAe+oPfVZXXZv+YkmgcR5C6eUl1ZPlwHPgCgZlZIpT5xxAeRq5d8x7hxob8XI9dpJkgx/iCfeWbTxPdSPFscrpfZ2L2f9fMGnh8N9LCzLtj2NLZ42YyEptJZk4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1782934377278840.7978122653582; Wed, 1 Jul 2026 12:32:57 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1350364.1607817 (Exim 4.92) (envelope-from ) id 1wf0fd-0007mb-Tw; Wed, 01 Jul 2026 19:32:29 +0000 Received: by outflank-mailman (output) from mailman id 1350364.1607817; Wed, 01 Jul 2026 19:32:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wf0fd-0007mU-Qo; Wed, 01 Jul 2026 19:32:29 +0000 Received: by outflank-mailman (input) for mailman id 1350364; Wed, 01 Jul 2026 19:32:29 +0000 Received: from mx.expurgate.net ([194.145.224.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from <3SWtFagYKCY4Aws51uy66y3w.u64Fw5-vwDw330ABA.Fw57961wuB.69y@flex--seanjc.bounces.google.com>) id 1wf0fc-0007Zv-SD for xen-devel@lists.xenproject.org; Wed, 01 Jul 2026 19:32:28 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wf0fc-00Bw10-95 for xen-devel@lists.xenproject.org; Wed, 01 Jul 2026 21:32:28 +0200 Received: from [10.42.69.10] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from <3SWtFagYKCY4Aws51uy66y3w.u64Fw5-vwDw330ABA.Fw57961wuB.69y@flex--seanjc.bounces.google.com>) id 6a456b35-bab6-0a2a0a5309dd-0a2a450a9d4e-16 for ; Wed, 01 Jul 2026 21:32:28 +0200 Received: from [209.85.214.202] (helo=mail-pl1-f202.google.com) by tlsNG-4011c0.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from <3SWtFagYKCY4Aws51uy66y3w.u64Fw5-vwDw330ABA.Fw57961wuB.69y@flex--seanjc.bounces.google.com>) id 6a456b4a-e40e-0a2a450a0019-d155d6cac001-3 for ; Wed, 01 Jul 2026 21:32:28 +0200 Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2c80f89b64bso15742295ad.2 for ; Wed, 01 Jul 2026 12:32:27 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=20251104 header.d=google.com header.i="@google.com" header.h="Cc:To:From:Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782934346; x=1783539146; darn=lists.xenproject.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=esF5eJj/7ACJs9NShhG3o0+XzSBpzRsvPz4C7FhhKMM=; b=gbdGjLPvfSHGpnVGpCwK7ucojnV45lSdH+Lk6BO1No0nRwZavh8NOnaS9xwxrVSUXE UKdqxnMsYhWoqj/nIUbM9LSUjZ0iXgvN6d/qN0MkU6plvKrkwJ4wp3nao5phv+y9Gtsn cG8Z10qjKoBfQ+9fgdAD5mE9NsvU2uDW0eLnKvprKI6k7XSaw663hdOJgSZnKS2LddGx 7kvQJGJN9QsIeMcKg67ceih1NTnAdBvpkmPscJlI6AAI5l+XDXtdZgUjyhBAsp8pN1cQ 2h7fCh6OGZbg5aYcJLv1Ddeal1uJkTMMo4wLZx1fkyv8t9wPDl8kq2pWG8Y2JFthJQat /W0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782934346; x=1783539146; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=esF5eJj/7ACJs9NShhG3o0+XzSBpzRsvPz4C7FhhKMM=; b=VXCxBsF8BhG427lMR8CuLR+esaGE2ZK+mJWQGnU8g5jrR23Xr80zf23ZH8Oh/4sXjv Jx0f/2pNMnrCn66oxcarM5g50p2ZfoFdXgmH5z5Bm33yiEHPdStbGdnhJJ66W/t45aRE bbvqdNPagI9VeufmOWxHlvJ0ImoVawJ39yRaDBajGPvvqR2GdpuE8pyoCEyQaLAfcCXq Wy6nZZJvL0ZN8DmcnsvJN93uc9YNMcD2EVPcX3xwy4Au2QrS3ZCYNY1HzcsUAcOqig1S VBP3/DNfun1TlPJYjoyOluR2lzjXKG4ByOfdPeY4e23DWdmCbMYzHD8qRddJ0nAxWmxS ymhA== X-Forwarded-Encrypted: i=1; AHgh+RpgXwACTmF8tJwt8dHwWZiyay5TdhXGy38D3TjidMjVh32Bua/YRlxakYOI8rjbvV1eCp1s2K7LZeM=@lists.xenproject.org X-Gm-Message-State: AOJu0YzVZd4amDY+iqn7uZFCZiGjL09wCReGjZI6Y6fa5bV+vaaQd7jk 8w0jKmHVT47MqgmQc5gwnjOcaf7tdP2AJinoLnhJsAFhKaGgiZuqrIjJMZj/tRiaQbvTntYIU21 Iev8rEg== X-Received: from plfz4.prod.google.com ([2002:a17:902:d544:b0:2c7:f3dc:ae29]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e811:b0:2c9:f73d:4b38 with SMTP id d9443c01a7336-2ca7e6db91bmr32521425ad.19.1782934345724; Wed, 01 Jul 2026 12:32:25 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 1 Jul 2026 12:31:22 -0700 In-Reply-To: <20260701193212.749551-1-seanjc@google.com> Mime-Version: 1.0 References: <20260701193212.749551-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260701193212.749551-2-seanjc@google.com> Subject: [PATCH v5 01/51] x86/apic: Provide helpers to set local APIC timer period in hz and khz From: Sean Christopherson To: Jonathan Corbet , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Kiryl Shutsemau , Rick Edgecombe , Sean Christopherson , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Ajay Kaher , Alexey Makhalov , Jan Kiszka , Andy Lutomirski , Peter Zijlstra , Juergen Gross , Daniel Lezcano , John Stultz Cc: Shuah Khan , "H. Peter Anvin" , Vitaly Kuznetsov , Broadcom internal kernel review list , Boris Ostrovsky , Stephen Boyd , linux-doc@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, linux-hyperv@vger.kernel.org, virtualization@lists.linux.dev, xen-devel@lists.xenproject.org, Tom Lendacky , Nikunj A Dadhania , David Woodhouse , David Woodhouse , Michael Kelley , Thomas Gleixner X-purgate-ID: tlsNG-4011c0/1782934348-D7935DDE-2F08127A/0/0 X-purgate-type: clean X-purgate-size: 5605 X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1782934378229158500 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add and use APIs to set the local APIC timer period instead of open coding the subtle HZ math in a all external callers, and make lapic_timer_period local to apic.c. Provide APIs to specify the frequency in both hertz and kilohertz so that Hyper-V and VMware code aren't forced to lose precision. Opportunistically use mul_u64_u32_div() to harden against the possibility that the period in Khz is greater than 4294967, i.e. if the APIC timer runs at ~4.29 GHz. As pointed out by Sashiko, 4294968 * 1000 =3D=3D 0x1_000002c= 0, and thus a Khz period of 4294968 would silently overflow the 32-bit unsigned integer used by most callers. Signed-off-by: Sean Christopherson --- arch/x86/include/asm/apic.h | 3 ++- arch/x86/kernel/apic/apic.c | 12 +++++++++++- arch/x86/kernel/cpu/mshyperv.c | 5 +---- arch/x86/kernel/cpu/vmware.c | 4 +--- arch/x86/kernel/jailhouse.c | 2 +- arch/x86/kernel/tsc.c | 2 +- arch/x86/kernel/tsc_msr.c | 2 +- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 9cd493d467d4..cd84a94688a2 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -63,7 +63,6 @@ extern int apic_verbosity; extern int local_apic_timer_c2_ok; =20 extern bool apic_is_disabled; -extern unsigned int lapic_timer_period; =20 extern enum apic_intr_mode_id apic_intr_mode; enum apic_intr_mode_id { @@ -138,6 +137,8 @@ void register_lapic_address(unsigned long address); extern void setup_boot_APIC_clock(void); extern void setup_secondary_APIC_clock(void); extern void lapic_update_tsc_freq(void); +extern void apic_set_timer_period_hz(u64 period_hz, const char *source); +extern void apic_set_timer_period_khz(u64 period_khz, const char *source); =20 #ifdef CONFIG_X86_64 static inline bool apic_force_enable(unsigned long addr) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index aa1e19979aa8..8d3d930576fd 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -176,7 +176,7 @@ static struct resource lapic_resource =3D { }; =20 /* Measured in ticks per HZ. */ -unsigned int lapic_timer_period =3D 0; +static unsigned int lapic_timer_period; =20 static void apic_pm_activate(void); =20 @@ -796,6 +796,16 @@ bool __init apic_needs_pit(void) return lapic_timer_period =3D=3D 0; } =20 +void apic_set_timer_period_khz(u64 period_khz, const char *source) +{ + lapic_timer_period =3D mul_u64_u32_div(period_khz, 1000, HZ); +} + +void apic_set_timer_period_hz(u64 period_hz, const char *source) +{ + lapic_timer_period =3D div_u64(period_hz, HZ); +} + static int __init calibrate_APIC_clock(void) { struct clock_event_device *levt =3D this_cpu_ptr(&lapic_events); diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c index 185d4f677ec0..87beecec76f0 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -646,10 +646,7 @@ static void __init ms_hyperv_init_platform(void) u64 hv_lapic_frequency; =20 rdmsrq(HV_X64_MSR_APIC_FREQUENCY, hv_lapic_frequency); - hv_lapic_frequency =3D div_u64(hv_lapic_frequency, HZ); - lapic_timer_period =3D hv_lapic_frequency; - pr_info("Hyper-V: LAPIC Timer Frequency: %#x\n", - lapic_timer_period); + apic_set_timer_period_hz(hv_lapic_frequency, "Hyper-V hypervisor"); } =20 register_nmi_handler(NMI_UNKNOWN, hv_nmi_unknown, NMI_FLAG_FIRST, diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index 34b73573b108..36f779dd311d 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -424,9 +424,7 @@ static void __init vmware_platform_setup(void) =20 #ifdef CONFIG_X86_LOCAL_APIC /* Skip lapic calibration since we know the bus frequency. */ - lapic_timer_period =3D ecx / HZ; - pr_info("Host bus clock speed read from hypervisor : %u Hz\n", - ecx); + apic_set_timer_period_hz(ecx, "VMware hypervisor"); #endif } else { pr_warn("Failed to get TSC freq from the hypervisor\n"); diff --git a/arch/x86/kernel/jailhouse.c b/arch/x86/kernel/jailhouse.c index f58ce9220e0f..f2d4ef89c085 100644 --- a/arch/x86/kernel/jailhouse.c +++ b/arch/x86/kernel/jailhouse.c @@ -65,7 +65,7 @@ static void jailhouse_get_wallclock(struct timespec64 *no= w) =20 static void __init jailhouse_timer_init(void) { - lapic_timer_period =3D setup_data.v1.apic_khz * (1000 / HZ); + apic_set_timer_period_khz(setup_data.v1.apic_khz, "Jailhouse hypervisor"); } =20 static unsigned long jailhouse_get_tsc(void) diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index ce10ae4b298b..f9ecc9256863 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -717,7 +717,7 @@ unsigned long native_calibrate_tsc(void) * lapic_timer_period here to avoid having to calibrate the APIC * timer later. */ - lapic_timer_period =3D crystal_khz * 1000 / HZ; + apic_set_timer_period_khz(crystal_khz, "CPUID 0x15/0x16"); #endif =20 return crystal_khz * ebx_numerator / eax_denominator; diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c index 48e6cc1cb017..7e990871e041 100644 --- a/arch/x86/kernel/tsc_msr.c +++ b/arch/x86/kernel/tsc_msr.c @@ -211,7 +211,7 @@ unsigned long cpu_khz_from_msr(void) pr_err("Error MSR_FSB_FREQ index %d is unknown\n", index); =20 #ifdef CONFIG_X86_LOCAL_APIC - lapic_timer_period =3D (freq * 1000) / HZ; + apic_set_timer_period_khz(freq, "MSR_FSB_FREQ"); #endif =20 /* --=20 2.55.0.rc0.799.gd6f94ed593-goog