From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 752233932F0 for ; Fri, 15 May 2026 19:21:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778872865; cv=none; b=tW8lR45od2n89rzTJ/rBkZ43cyIb6Q8yxTbwX1yKhjMaQAj6nvepL2PNUpfC39fGXVa1KKNC3pa3KlbTuia63HpPQIPoHLjZKtcrOtcwu3uVCyVtFSIODiqHZWGV6JKWrUS1SWcJN3tcpY2Sa8wUhMr8Gf32Cf/wmms4conkmLQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778872865; c=relaxed/simple; bh=++iwLO4D9TJzPz8kuVQ32pM9hy17JXnAFhkjXdC7Tyo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=B9gvNmr5SBn717e5mA9r1bYA7rxTHl0X1fVuNTYukhZCsGCNIWjiVFzY2maDYjZFHlsHDPcDP+elL5omRg+CISM8IGmuWyV0VXwmIo0JhQQdHoSBV+oxBfjrd9r3p/XnJ4xyZym9we3tszgc34zALpu60D9x9WjHmsCKO1Ghw8E= 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=VsLUDJgl; arc=none smtp.client-ip=209.85.210.202 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="VsLUDJgl" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-837d0d71c61so80722b3a.1 for ; Fri, 15 May 2026 12:21:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778872863; x=1779477663; darn=lists.linux.dev; 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=cmCCoVXH/wzfqmDby7kD+g/lqwg2CVoD5UqPiffRRm8=; b=VsLUDJglH3NLxH+gtzaraEvmoaOIizk6/Ugysw5bhZVNavb6ezw3ItReNBxIt0Vr3K yTGHl2BIKDANMeaqOgTsXRZfTV4uNLdEthWn/MdVvfVmo5O+jrqERaWBAz7VG2QCR1gL trnm66x5Hik7B+16d9RAJlYxMOrGXXtVk7pf0Pcq9UPMFN6ELtHCLw5pVM91oi8+67Mh cqv9HPEheBUizRarJxpHu1T3eJw10dN5tmqxOmrZcY0auSUjoFZK/2Bnv6602wJyMpc0 JTaV3WBbHS9eP4166VfFo2lZU3ZzyHgLu02Y5xS97qTOU/ICzKUoVI3f5mHbQM2LoOYR Z0jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778872863; x=1779477663; 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=cmCCoVXH/wzfqmDby7kD+g/lqwg2CVoD5UqPiffRRm8=; b=B2vhKJWAOuEo+tqxA9ituPBNo9yeQs9c08qobKh7TUBpPCeIfeBo+L+1NKZAolYe7U IMVJJrTiG6nq5fAvc1tHAVZCN7SS0fWCe8cXqAJAjjQrXA2MeseqNBAgsFNHwY7bjBJS lGhyOkMpoR3SECilFwsZWcrCtmfnFk8L830fGjq6xcJ3NWEKGxzF/FJuERGIpZeMEWWl hqFRXltwledhbSylRnH1jgAEgY4ESEK4DlyPblAHsODO9HZBFEMQlJaDJyQ5hRRhkTyR tMT20mASFMn5ayK+g9zx3tjWmqbBZVghLqNROb2x6HcmtGi98X5Wccm5xUsT3jVNJIAv +DpQ== X-Forwarded-Encrypted: i=1; AFNElJ8lyh6c+1lEiKjOC2iZGb2b0td44SpRK6sq9gciUTYeW3INmeDusBhbvtlEbyCi5tBh+arm5jFC5sgW@lists.linux.dev X-Gm-Message-State: AOJu0Yz1oxzkW7aCskuuycuABFHug4mrJsJXvclyy40KXa8b6Kwb3/ev dsanFDxP5YsUhWWnIVxAj5SBqBglKGqjsw7tlYkRdD1oUA2pF5DdRikpOrFEgku+CgwUyCBiV02 6tIJ7rA== X-Received: from pfbeq3.prod.google.com ([2002:a05:6a00:37c3:b0:82f:ad57:40bb]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:44c3:b0:82c:6da7:2d3d with SMTP id d2e1a72fcca58-83f33c2a8fdmr5145208b3a.11.1778872862416; Fri, 15 May 2026 12:21:02 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 15 May 2026 12:19:26 -0700 In-Reply-To: <20260515191942.1892718-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515191942.1892718-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515191942.1892718-26-seanjc@google.com> Subject: [PATCH v3 25/41] x86/kvmclock: Hook clocksource.suspend/resume when kvmclock isn't sched_clock From: Sean Christopherson To: Kiryl Shutsemau , Paolo Bonzini , Sean Christopherson , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Ajay Kaher , Alexey Makhalov , Jan Kiszka , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Juergen Gross , Daniel Lezcano , Thomas Gleixner , John Stultz Cc: Rick Edgecombe , Vitaly Kuznetsov , Broadcom internal kernel review list , Boris Ostrovsky , Stephen Boyd , x86@kernel.org, linux-coco@lists.linux.dev, kvm@vger.kernel.org, linux-hyperv@vger.kernel.org, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, Michael Kelley , Tom Lendacky , Nikunj A Dadhania , Thomas Gleixner , David Woodhouse 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. 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 ccb2aff89b2f..655037949446 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -131,7 +131,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) @@ -202,6 +212,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) @@ -297,6 +309,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.54.0.563.g4f69b47b94-goog