From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D4E642A794 for ; Wed, 1 Jul 2026 19:33:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782934404; cv=none; b=TqVRM0IJ4QGGnxTddBRu4OkovWEs6FQjbNQwxWx9trr+1yoUn0adwLentKnMELzQwzpeQoq8r8DEDWFUvHaEUOwD7R+/LS0OG01waV9DiUsPAJrUTK+S1BGJabYRjwPu1euD9YesDVXn61AmfOFCtd8yIicwNnbZiCbVwnPHDiA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782934404; c=relaxed/simple; bh=5RmHG8jQeFaxWLyXRFh1e6DyJpHBisQQEigG7SgzsNI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=sFIrv2noPzKINMX6luR4Nlex5fqp6NZPDVZjRCqzDdFpUMbdoNhTPCLdNnZeZWxQVPTh5DqBgPWceSN6fpmEwOmBqUyZ7lmtKnytuZv6WZ3jsGw8+EmN2OQOWHVLcXkfZY4Edu/5aQUmgonSArk3Oy/an1HsTjwfi0DAV6b+zgY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=J2W5DPwy; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="J2W5DPwy" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-37e16f658abso813952a91.1 for ; Wed, 01 Jul 2026 12:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782934400; x=1783539200; darn=lists.linux.dev; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:reply-to:from:to:cc:subject:date:message-id :reply-to:content-type; bh=VKCobU9qtcP/hN9BlhIiU1X9DFbnjtpoNJAd58RipCc=; b=J2W5DPwyAPl90p8wOKOa6ymV8wz65mAlRuck8n91gsHDe/N4zButTg/7kWsBGQuddz qokU5PNItiM9u1tmVuytTSMkHU1NIwkVK7CZ6AX6SOIkwo50ub0TnT5J8HG3SqM1gngN XIGl72CVxm2EAirMRlLIwOCfIb4VQmN2AXgOzzGR3wGPrZQqkArDPz2eK5J+oNuH0dvH veis07E3Npw13CgXS5pV+tF3QZ1UFrUwpjtJveOaQPPbk16z98EnMTDP2XamGKAjKPbq aF4HARHE0xd4G2JFjn3mhhMaxzfmnPB00so37Eg8YYSKH1zMGCvBUd173hiaLrwEHC0+ NCXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782934400; x=1783539200; h=content-type: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:content-type; bh=VKCobU9qtcP/hN9BlhIiU1X9DFbnjtpoNJAd58RipCc=; b=RTVeObhvxDaIBvresWgkhcRPm/yK/FudGpYWQjfT7bciGoJ1OpXym76zI75IfgrBdE cm1h4OvOA1fITQ6l7kyTA2hNtGItTUXvYbiMxYLKOVSV5xnwUT6QmhUygbV0/MXtFYyH PC36sZvHGS8l3Xm7wxg2Cl74qiVoH3VLKC8uvy6IZlsVOof84z9l6tRnmtYr3cwJdTtY sO7AO+R1i4Wepp8jhb0Zg6+L39nVFlc5Mhzu2u0ZFb/dZWOzqZ+PV4hMHb4Ghw4Lq6Mi vQ3JV2FuTfUaK02srWpDXH3eAvTY1LTaSbj2Dud2ERREnaik55V5fbhrOqJv5fxurHVl jiOQ== X-Forwarded-Encrypted: i=1; AHgh+RpEcn+p4GPSIxNFNnBS7l6zoPHbCWq3PNvGawkPh9BMT0hiB6nSk8R+9voeztsmNMn5HNmkubsfLm1Uu0+ETg==@lists.linux.dev X-Gm-Message-State: AOJu0Yw/6LQTuo7xaGGyy6gw5bi29GqFa3i93T4y/71xujSWeMkzQ28c yBLYqXJFC6a2GGu1GvdRrct1aRCwlqGsPZxyloRA22ZVWTSjey0MLunHPvBMlWujCYAU0tE0gVx 2NEGjEw== X-Received: from pjqu11.prod.google.com ([2002:a17:90a:ae8b:b0:37d:8595:7a08]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:180e:b0:37f:ff9d:ad69 with SMTP id 98e67ed59e1d1-380ba80c706mr2175388a91.7.1782934399271; Wed, 01 Jul 2026 12:33:19 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 1 Jul 2026 12:32:04 -0700 In-Reply-To: <20260701193212.749551-1-seanjc@google.com> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: 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-44-seanjc@google.com> Subject: [PATCH v5 43/51] x86/kvmclock: Hook clocksource.suspend/resume when kvmclock isn't sched_clock 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 Content-Type: text/plain; charset="UTF-8" Save/restore kvmclock across suspend/resume via clocksource hooks when kvmclock isn't being used for sched_clock. This will allow using kvmclock as a clocksource (or for wallclock!) without also using it for sched_clock. Reviewed-by: David Woodhouse Signed-off-by: Sean Christopherson --- arch/x86/kernel/kvmclock.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 61d4d943fe74..41aff709b90a 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -152,7 +152,17 @@ static void kvm_setup_secondary_clock(void) static void kvm_restore_sched_clock_state(void) { - kvm_register_clock("primary cpu clock, resume"); + kvm_register_clock("primary cpu, sched_clock resume"); +} + +static void kvmclock_suspend(struct clocksource *cs) +{ + kvmclock_disable(); +} + +static void kvmclock_resume(struct clocksource *cs) +{ + kvm_register_clock("primary cpu, clocksource resume"); } void kvmclock_cpu_action(enum kvm_guest_cpu_action action) @@ -223,6 +233,8 @@ static struct clocksource kvm_clock = { .flags = CLOCK_SOURCE_IS_CONTINUOUS, .id = CSID_X86_KVM_CLK, .enable = kvm_cs_enable, + .suspend = kvmclock_suspend, + .resume = kvmclock_resume, }; static void __init kvmclock_init_mem(void) @@ -318,6 +330,15 @@ static __init void kvm_sched_clock_init(bool stable) kvm_save_sched_clock_state, kvm_restore_sched_clock_state); + /* + * The BSP's clock is managed via dedicated sched_clock save/restore + * hooks when kvmclock is used as sched_clock, as sched_clock needs to + * be kept alive until the very end of suspend entry, and restored as + * quickly as possible after resume. + */ + kvm_clock.suspend = NULL; + kvm_clock.resume = NULL; + pr_info("kvm-clock: using sched offset of %llu cycles", kvm_sched_clock_offset); -- 2.55.0.rc0.799.gd6f94ed593-goog