From nobody Wed Aug 26 17:02:31 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=1782934596; cv=none; d=zohomail.com; s=zohoarc; b=UGxwz9noPDx5VtESii4qm1XePMLwwrvNb9c30IJgTKKlBGUO1rt4BKdooAdzLSvvO61dg4QQWSdiB//0n5FFPf26K1lOPQrFT+wCQ1l+2cQSep7fY1AFMMl7W5HKZl+A3CcEe7YGH6KWZyHHMjHQYKiKfBdTl8rfrykvUETCqWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782934596; 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=p58sqQbLovUVGNo0nSS6BNMoKcJfer5lPY7RvPBWYyU=; b=gjAFkrsYs8+jRXl8zf/A6U2CeNRM5RSI5XcS7POczFS4Ik/oJBp+1xY+CJ7Zn1GFlp2acOK3jOOKs6UE/R7QTGAiEzHJS580JQNCN+GWxauqHF9H+j7GGq5fM1/iFzUe700DcP6XE1Y1JQnku87m7c0ZNJ3APDHgwJkALZXvpeo= 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 1782934596898206.670074741568; Wed, 1 Jul 2026 12:36:36 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1350741.1608258 (Exim 4.92) (envelope-from ) id 1wf0jD-0005Le-TS; Wed, 01 Jul 2026 19:36:11 +0000 Received: by outflank-mailman (output) from mailman id 1350741.1608258; Wed, 01 Jul 2026 19:36:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wf0jD-0005LU-Pq; Wed, 01 Jul 2026 19:36:11 +0000 Received: by outflank-mailman (input) for mailman id 1350741; Wed, 01 Jul 2026 19:36:09 +0000 Received: from mx.expurgate.net ([194.145.224.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from <3cmtFagYKCbcpbXkgZdlldib.Zljubk-absbiifpqp.ubkmolgbZq.lod@flex--seanjc.bounces.google.com>) id 1wf0jB-00056Q-ON for xen-devel@lists.xenproject.org; Wed, 01 Jul 2026 19:36:09 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wf0jB-00Bwg5-55 for xen-devel@lists.xenproject.org; Wed, 01 Jul 2026 21:36:09 +0200 Received: from [10.42.69.6] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from <3cmtFagYKCbcpbXkgZdlldib.Zljubk-absbiifpqp.ubkmolgbZq.lod@flex--seanjc.bounces.google.com>) id 6a456c00-5cb7-0a2a0a5109dd-0a2a4506ae74-46 for ; Wed, 01 Jul 2026 21:36:09 +0200 Received: from [209.85.216.73] (helo=mail-pj1-f73.google.com) by tlsNG-16d1c6.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from <3cmtFagYKCbcpbXkgZdlldib.Zljubk-absbiifpqp.ubkmolgbZq.lod@flex--seanjc.bounces.google.com>) id 6a456b73-08de-0a2a45060019-d155d849b446-3 for ; Wed, 01 Jul 2026 21:33:08 +0200 Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-37e17ec1940so1079273a91.0 for ; Wed, 01 Jul 2026 12:33:08 -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=1782934387; x=1783539187; 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=p58sqQbLovUVGNo0nSS6BNMoKcJfer5lPY7RvPBWYyU=; b=m7SSsnLTPrJAscY4pqjevoFfCkG+XkGqrfdH4EEeyG89fXJ4xxX0lArZTmkaZWrXIk CceEHqNV5rNv02FHxTS6FyVtiYny8dKN95OKZJ3JjcQhHz13NIjTBb0zuJpeKE+9O2Nf B7eM3nL4NQA9cUFYOjf769Zaeit+s/GciIJJFfvUc0yewjEdWwlMBs16xBf2PzE7xQ0L me4tvfvenUUIyMptj9ozuqEsomvcQeRZoJzjsJc8Q7pxjXOMN6G8wV+d+1HK0EN9NT4z Nv5MWuVIsNFnihDxH94OxTBG6VG+b081QpUVPnmYNG4hAUg7U5dZ7122U/RzF+BXWwpl o0wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782934387; x=1783539187; 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=p58sqQbLovUVGNo0nSS6BNMoKcJfer5lPY7RvPBWYyU=; b=ioiPhuWx4Y/xs95aa7GFaJpm0448Su7u0Eew3FsDscx3xcBT5ScFpPslKLgQqJ62S0 JHVtCTS8Oh93aghz1Kudk3v12QGQ3XtXm9oo1e4+W/s8o6sbl9gsKGC1kr0hLeKdXi6J 5CVVVQA11LnQrYxrQ9xl+2fmYnnm3RW/M1xMR5WjG0djYnqKqHWV5zvIVvPwJjVJ43ne J/fU8fvC1HEgQ4+jKR3MBbsg1EDLtIMjMVhPz0xjjq3xgZI93CL4sViwpv9uWWHibql6 U5w0PbtpflCFEGw6RLx6363T1AywWkOG1zbaB6OD6reSqJ1ing2IrtRltsRgYjKW3eQg kBRg== X-Forwarded-Encrypted: i=1; AHgh+RoVc8bTGChRrZIlltlGX3j9rv8SZZ+A9YuFBGfuIEsBtq9r116eRMlPG/ZjxqhlbgJBDORtV3B0c8U=@lists.xenproject.org X-Gm-Message-State: AOJu0YxvFDEP7M5W0bZK4WgCR2qb98/P2X6DXidhSZ69mci3qwJr/buv EcqJl48rkdpBX1YJhtbF9l7CX05861gGsChYV9WKW8xBgy3bp29jWPZ0xcsaibjca9d4UVuxJ8l gax467Q== X-Received: from pjbco22.prod.google.com ([2002:a17:90a:fe96:b0:36b:7f07:6fcd]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5823:b0:366:3517:1aa2 with SMTP id 98e67ed59e1d1-380a9e519bdmr3237404a91.0.1782934386500; Wed, 01 Jul 2026 12:33:06 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 1 Jul 2026 12:31:53 -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-33-seanjc@google.com> Subject: [PATCH v5 32/51] x86/kvmclock: Move sched_clock save/restore helpers up in kvmclock.c 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-16d1c6/1782934388-C5D3D68D-D4C08C89/13/0 X-purgate-type: clean X-purgate-size: 4424 X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1782934597546158500 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move kvmclock's sched_clock save/restore helper "up" so that they can (eventually) be referenced by kvm_sched_clock_init(). No functional change intended. Reviewed-by: David Woodhouse Signed-off-by: Sean Christopherson --- arch/x86/kernel/kvmclock.c | 108 ++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 4bc0495f1f9e..07e875738c39 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -71,6 +71,25 @@ static int kvm_set_wallclock(const struct timespec64 *no= w) return -ENODEV; } =20 +static void kvm_register_clock(char *txt) +{ + struct pvclock_vsyscall_time_info *src =3D this_cpu_hvclock(); + u64 pa; + + if (!src) + return; + + pa =3D slow_virt_to_phys(&src->pvti) | 0x01ULL; + wrmsrq(msr_kvm_system_time, pa); + pr_debug("kvm-clock: cpu %d, msr %llx, %s", smp_processor_id(), pa, txt); +} + +static void kvmclock_disable(void) +{ + if (msr_kvm_system_time) + native_write_msr(msr_kvm_system_time, 0); +} + static u64 kvm_clock_read(void) { u64 ret; @@ -112,6 +131,30 @@ static noinstr u64 kvm_sched_clock_read(void) return pvclock_clocksource_read_nowd(this_cpu_pvti()) - kvm_sched_clock_o= ffset; } =20 +static void kvm_save_sched_clock_state(void) +{ + /* + * Stop host writes to kvmclock immediately prior to suspend/hibernate. + * If the system is hibernating, then kvmclock will likely reside at a + * different physical address when the system awakens, and host writes + * to the old address prior to reconfiguring kvmclock would clobber + * random memory. + */ + kvmclock_disable(); +} + +#ifdef CONFIG_SMP +static void kvm_setup_secondary_clock(void) +{ + kvm_register_clock("secondary cpu clock"); +} +#endif + +static void kvm_restore_sched_clock_state(void) +{ + kvm_register_clock("primary cpu clock, resume"); +} + static inline void kvm_sched_clock_init(bool stable) { kvm_sched_clock_offset =3D kvm_clock_read(); @@ -124,6 +167,17 @@ static inline void kvm_sched_clock_init(bool stable) sizeof(((struct pvclock_vcpu_time_info *)NULL)->system_time)); } =20 +void kvmclock_cpu_action(enum kvm_guest_cpu_action action) +{ + /* + * Don't disable kvmclock on the BSP during suspend. If kvmclock is + * being used for sched_clock, then it needs to be kept alive until the + * last minute, and restored as quickly as possible after resume. + */ + if (action !=3D KVM_GUEST_BSP_SUSPEND) + kvmclock_disable(); +} + /* * If we don't do that, there is the possibility that the guest * will calibrate under heavy load - thus, getting a lower lpj - @@ -183,60 +237,6 @@ static struct clocksource kvm_clock =3D { .enable =3D kvm_cs_enable, }; =20 -static void kvm_register_clock(char *txt) -{ - struct pvclock_vsyscall_time_info *src =3D this_cpu_hvclock(); - u64 pa; - - if (!src) - return; - - pa =3D slow_virt_to_phys(&src->pvti) | 0x01ULL; - wrmsrq(msr_kvm_system_time, pa); - pr_debug("kvm-clock: cpu %d, msr %llx, %s", smp_processor_id(), pa, txt); -} - -static void kvmclock_disable(void) -{ - if (msr_kvm_system_time) - native_write_msr(msr_kvm_system_time, 0); -} - -static void kvm_save_sched_clock_state(void) -{ - /* - * Stop host writes to kvmclock immediately prior to suspend/hibernate. - * If the system is hibernating, then kvmclock will likely reside at a - * different physical address when the system awakens, and host writes - * to the old address prior to reconfiguring kvmclock would clobber - * random memory. - */ - kvmclock_disable(); -} - -static void kvm_restore_sched_clock_state(void) -{ - kvm_register_clock("primary cpu clock, resume"); -} - -void kvmclock_cpu_action(enum kvm_guest_cpu_action action) -{ - /* - * Don't disable kvmclock on the BSP during suspend. If kvmclock is - * being used for sched_clock, then it needs to be kept alive until the - * last minute, and restored as quickly as possible after resume. - */ - if (action !=3D KVM_GUEST_BSP_SUSPEND) - kvmclock_disable(); -} - -#ifdef CONFIG_SMP -static void kvm_setup_secondary_clock(void) -{ - kvm_register_clock("secondary cpu clock"); -} -#endif - static void __init kvmclock_init_mem(void) { unsigned long ncpus; --=20 2.55.0.rc0.799.gd6f94ed593-goog