From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (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 CF4ED3D4130 for ; Tue, 28 Jul 2026 23:04:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785279856; cv=none; b=qh2Dr6IvuUWXtWjXgWff3lDcSnmZO0sdiOM52G7c0KvivfAvqgzCwlBGJfvyIXAcYlVoHJjoi7BuIvHZZdzGHtmpwM0+ipMkgQfe7oGcy5egoB676/gqtxFmysiFjskr/QAxVwP4O3rd2/oCBUK0zVaPuMz3kfBcwl3ZE/AOMU0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785279856; c=relaxed/simple; bh=gHXZcf7IOMhEOJ4FGfr7TBj1sqZnBOL1N553RhUOdqg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=RdomWe1JZhtnQ0hPi9ql4NK0/wq9vep5vVfr5tKCrEIrJTgUYNwvGkjGY0gJpC2fUroc1Cwjh8fUYBAdizGaps/c5qiZ83chpsFvR7vkRzxYY+PkdYKVy03FAGBSZrqHzBqGK3ydjqfubKRtgfvwpp2BP0KK9Up9wdikAgKPGUo= 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=heZFKCD+; arc=none smtp.client-ip=209.85.214.199 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="heZFKCD+" Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2ccd1958e8fso5377395ad.2 for ; Tue, 28 Jul 2026 16:04:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785279854; x=1785884654; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=1l81sd+1Dt+3WFLZZe7rfpxDHFJTbu6GbcdYA+gInbc=; b=heZFKCD+UpC5cJDMlKsyfS9fO5rMQFmCMbMkPFIxMODXmNfk+Vf1n7alfZ+shsoVpu nnRdDRybxGWfkx8naPex6HHKVQnZc74i3fhZh2tyLjcZSJdgb12tWNISLDgzhxQigC15 9qZUBS865xSuneihcIMKYrx/SkMf1nHCKXlgCSzhYofdZfZPukJmrFoAyWKsWhxy9dVe BS9E+S/cmosTJCR9csEVyaq5ZD5ScyPEH1ksak5KSgu45yABQHRh9GugkTqxYEB7RysJ IL6EvtNoTCLwLjtuf0lf641LxTw6Pn6HWsLsuEXLATtoY4OS5Y2bFwrxafehhad8RQ2P 2hyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785279854; x=1785884654; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=1l81sd+1Dt+3WFLZZe7rfpxDHFJTbu6GbcdYA+gInbc=; b=dBKMoQktnxWFZ8evyolrFtxfH7kthqLCp4I5QKItRfGuF0RiysprzCZb5H/S11DoZE sUXbjPlkw1FnbngLjFK1Kd5xzAs4KbTU3/3cZZZ/wJKQm4RSu39Xr/FA4bPJKxh3zzF5 g2cerwnukSTgq8UnXiFvcAtTwG7YKQHvC53Ug5GVtThNDAltJa312kkSRIMcfALIPgZJ ZR7mjboF629croPUL3RH7haEU3p1AIQlVArNq+LowYdr1lOIBQEHsvp8w6TZuGJngNkB /b6aUVc4DQNtF5HUnWfBR1cdU5MUwvN18m1lU7rUchNi0v4mt1T9Q2jYme1NBFEnYn7y RSqA== X-Forwarded-Encrypted: i=1; AHgh+RpIWemMi6Q5KUFQAPOqo6QgyQxZ2uNYAKMnnOMaeh/sxLe2Nut1M6pcQbKiFVxZheEGawOf2O1HG/g=@vger.kernel.org X-Gm-Message-State: AOJu0Yytg/TOm/FeelJLvJYStSH5DwOC6fJehN1+pvew4jiRt0R0SqFz ZD2naxDpeE4Abyc2hUTkP6NhUkya7M1uAfDgS2KwbMOTfC99Jc3rsGbA8Oww/khHpl5GDnuOLgO UT1qPzw== X-Received: from plkz12.prod.google.com ([2002:a17:902:708c:b0:2ce:d2e2:393]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ef07:b0:2cb:2b84:f431 with SMTP id d9443c01a7336-2d015d607d0mr51470645ad.47.1785279853901; Tue, 28 Jul 2026 16:04:13 -0700 (PDT) Date: Tue, 28 Jul 2026 16:04:13 -0700 In-Reply-To: <20260728144954.355376-8-dwmw2@infradead.org> Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260728144954.355376-1-dwmw2@infradead.org> <20260728144954.355376-8-dwmw2@infradead.org> Message-ID: Subject: Re: [PATCH v7 07/36] KVM: x86: Restructure get_kvmclock() From: Sean Christopherson To: David Woodhouse Cc: Paolo Bonzini , Jonathan Corbet , Shuah Khan , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Vitaly Kuznetsov , Juergen Gross , Boris Ostrovsky , Paul Durrant , Jonathan Cameron , Sascha Bischoff , Marc Zyngier , Joey Gouly , Jack Allister , Dongli Zhang , joe.jin@oracle.com, kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, linux-kselftest@vger.kernel.org Content-Type: text/plain; charset="us-ascii" On Tue, Jul 28, 2026, David Woodhouse wrote: > When the clock read fails (e.g. clocksource transitioning away from TSC), > fall back to that path rather than proceeding with uninitialised data or > spinning in the seqcount loop. This is not restructuring, it is a logical change. It's a good logical change, but it needs to be isolated. This is what I have locally (spoiler alert; I'm working backwards a bit): From: David Woodhouse Date: Tue, 28 Jul 2026 15:26:35 -0700 Subject: [PATCH] KVM: x86: Fall back to non-master-clock if clockread fails in get_kvmclock() When computing kvmclock and the it's currently in master-clock mode, fall back to the non-master-clock path if the clock read fils, e.g. if the kernel's clocksource transitioning away from TSC but ka->use_master_clock hasn't been udated yet. The rdtsc() fall back was added (well, kept) in commit c68dc1b577ea ("KVM: x86: Report host tsc and realtime values in KVM_GET_CLOCK") purely to avoid uninitialized variables and compilation problems on 32-bit kernels (already addressed). In hindsight, keeping the rdtsc() was a hack and a mistake. Link: https://lore.kernel.org/all/CAOQ_QsgVqS_PuJo8F10Gg5Xw+tKt+5gDx+kJf1j3CiPO4MAOqg@mail.gmail.com Signed-off-by: David Woodhouse [sean: isolate from refactoring changes, write changelog] Signed-off-by: Sean Christopherson --- arch/x86/kvm/x86.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a0ed0969fcb3..895d3cf7bfcf 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1657,14 +1657,13 @@ static bool __get_kvmclock_master_clock(struct kvm *kvm, if (!tsc_hz) return false; - if (kvm_get_walltime_and_clockread(&ts, &data->host_tsc)) { - data->realtime = ts.tv_nsec + NSEC_PER_SEC * ts.tv_sec; - data->flags |= KVM_CLOCK_REALTIME | KVM_CLOCK_HOST_TSC; - } else { - data->host_tsc = rdtsc(); - } + if (!kvm_get_walltime_and_clockread(&ts, &data->host_tsc)) + return false; + + data->realtime = ts.tv_nsec + NSEC_PER_SEC * ts.tv_sec; + data->flags |= KVM_CLOCK_REALTIME | KVM_CLOCK_HOST_TSC | + KVM_CLOCK_TSC_STABLE; - data->flags |= KVM_CLOCK_TSC_STABLE; hv_clock.tsc_timestamp = ka->master_cycle_now; hv_clock.system_time = ka->master_kernel_ns + ka->kvmclock_offset; kvm_get_time_scale(NSEC_PER_SEC, tsc_hz, base-commit: f8c5e70f5ed58dc9d39db90ecaba0ce76ac52189 --