From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 D53123E3143 for ; Fri, 15 May 2026 19:20:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778872855; cv=none; b=qqW2W787ZKRqa3PdL+GxnqmzuLIV79NG+kAjXHoVz2ERER8HH3z8V4ws0ABMOQMBT8rzZQ6nVCZrvnUtlhXfDuq2BcaaJRJllLce6gXHV2JCeGOEEaxQj8lTYWja1TP45vEa0e3rj0WO1sQYQPzVybGeBCW8vNFj9Q7bcAJZiS8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778872855; c=relaxed/simple; bh=F9WUpGZj1miTCwUFuamAuxgNbr/h7T971FWwjKtok0w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WeplmI/tbLOihuYdgGfn4OayLRtbtjKxMS/yDNFH6Un9aoQtL2JQZ7DTFWj/GmbQ32ENtUKj5HrlnJ3OMk+LD7+o6dqVOmR52xoW/Gq1Dg/jR4EzevB0KeibqKXtcvZyQxrLJF+q+1DkJWUg6sEw4Q0/L2r8ZP/RqXtdDNGrDQI= 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=Xdm4+80b; arc=none smtp.client-ip=209.85.214.201 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="Xdm4+80b" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2bd15c00a1fso15033935ad.1 for ; Fri, 15 May 2026 12:20:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778872852; x=1779477652; 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=HxeaHaxP6KnUzzL58lskoB535u+ahD+SqcMQMaRjbjY=; b=Xdm4+80bMWeRQwC3FPW+FrarvrDnN0VsSSfmLRmXlxpLvIwamJ0G8TBIYLOhYdd6c2 aumb5n6JVtBMEJgEU+Oi6RkQo8mTTWhpmOhZYDbIYK47ZLN1fWS3EoFn8ab9DWw5iUDC sZs3bb2isabxzY2DL/ifKwOvarRzn7it0xXsqojuhRQDmD8AWqOIw7tWAmKzMuKgwz6T /JB4wp6Tn/yrtLwiV+z+5tGH3CRopnelVzKC1CKB5T9UBf1eUyToST8g8Xv9ek70j6R8 mU+0qZ//xr4aDbGOYEfpX4ZkGX9XGNC497RJXwgQmvvxgMbzg+jarsZsEL/B+zAPpe4a pN0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778872852; x=1779477652; 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=HxeaHaxP6KnUzzL58lskoB535u+ahD+SqcMQMaRjbjY=; b=CneB7DeO8jfMrD+ITqEC5VGkoTm2XYBpPq3lpOGvvCNEmkC+1oMUQ2F0gKl8zyh443 TSWX2wHwZo5VJoU9OxkXiHRPQfCDfRpiq7blyXTLkaMakBMdWuBS7Og7J8itu294/zHD KwXRPF3EyluzCMpCk9W6o9WFzJ4+ZwhQ952Wmh8gHeLm1+EPVcSPxRygzkOUiIJCQDM6 qbDGBV8c7VdFgpglRZ9/wr59/nIboNmbZCiN5RmtFugpo37Mx/i87HvBr8BL0cn68zJ6 D45e6y5C2sNCye4O3at7rImgcv6gmqqWjL2AtjbWMscNm9TJyG4Cq4zuE1J0eutvVcGT NQig== X-Forwarded-Encrypted: i=1; AFNElJ8kJJktpJUMVp8CUmNvxa7PKsGRS/R0VjkCqnfrDzCkClQpGF1ockiWtwNCeyXbhyC8C8OkkfjwbqGgwcW2qw==@lists.linux.dev X-Gm-Message-State: AOJu0YyksbkP7oxj85sAwFBKxDp1RIWsXqidPbXSAilSclSgWKoouaVt KqWvvdOUSIHe5gTu/Fd+l3S9fIvs+w8RDcVE1OXtEsBK56XUjQuvmEV5fm2HM36Hdoeaz7hHTE0 1Ya1dug== X-Received: from plhl17.prod.google.com ([2002:a17:903:1211:b0:2ba:73fd:6d36]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:943:b0:2ba:5e99:93e8 with SMTP id d9443c01a7336-2bd52b6d778mr87428535ad.29.1778872850277; Fri, 15 May 2026 12:20:50 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 15 May 2026 12:19:19 -0700 In-Reply-To: <20260515191942.1892718-1-seanjc@google.com> Precedence: bulk X-Mailing-List: virtualization@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-19-seanjc@google.com> Subject: [PATCH v3 18/41] x86/paravirt: Pass sched_clock save/restore helpers during registration 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" Pass in a PV clock's save/restore helpers when configuring sched_clock instead of relying on each PV clock to manually set the save/restore hooks. In addition to bringing sanity to the code, this will allow gracefully "rejecting" a PV sched_clock, e.g. when running as a CoCo guest that has access to a "secure" TSC. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/include/asm/timer.h | 9 ++++++--- arch/x86/kernel/cpu/vmware.c | 7 ++----- arch/x86/kernel/kvmclock.c | 6 +++--- arch/x86/kernel/tsc.c | 5 ++++- arch/x86/xen/time.c | 5 ++--- drivers/clocksource/hyperv_timer.c | 6 ++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h index fe41d40a9ae6..e97cd1ae03d1 100644 --- a/arch/x86/include/asm/timer.h +++ b/arch/x86/include/asm/timer.h @@ -14,11 +14,14 @@ extern int no_timer_check; extern bool using_native_sched_clock(void); #ifdef CONFIG_PARAVIRT -void __paravirt_set_sched_clock(u64 (*func)(void), bool stable); +void __paravirt_set_sched_clock(u64 (*func)(void), bool stable, + void (*save)(void), void (*restore)(void)); -static inline void paravirt_set_sched_clock(u64 (*func)(void)) +static inline void paravirt_set_sched_clock(u64 (*func)(void), + void (*save)(void), + void (*restore)(void)) { - __paravirt_set_sched_clock(func, true); + __paravirt_set_sched_clock(func, true, save, restore); } #endif diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index b5cb66ca022b..968de002975f 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -347,11 +347,8 @@ static void __init vmware_paravirt_ops_setup(void) vmware_cyc2ns_setup(); - if (vmw_sched_clock) { - paravirt_set_sched_clock(vmware_sched_clock); - x86_platform.save_sched_clock_state = NULL; - x86_platform.restore_sched_clock_state = NULL; - } + if (vmw_sched_clock) + paravirt_set_sched_clock(vmware_sched_clock, NULL, NULL); if (vmware_is_stealclock_available()) { has_steal_clock = true; diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 800c3d65f0af..962b6fcb5c60 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -137,7 +137,9 @@ static void kvm_restore_sched_clock_state(void) static inline void kvm_sched_clock_init(bool stable) { kvm_sched_clock_offset = kvm_clock_read(); - __paravirt_set_sched_clock(kvm_sched_clock_read, stable); + __paravirt_set_sched_clock(kvm_sched_clock_read, stable, + kvm_save_sched_clock_state, + kvm_restore_sched_clock_state); pr_info("kvm-clock: using sched offset of %llu cycles", kvm_sched_clock_offset); @@ -344,8 +346,6 @@ void __init kvmclock_init(void) #ifdef CONFIG_SMP x86_cpuinit.early_percpu_clock_init = kvm_setup_secondary_clock; #endif - x86_platform.save_sched_clock_state = kvm_save_sched_clock_state; - x86_platform.restore_sched_clock_state = kvm_restore_sched_clock_state; kvm_get_preset_lpj(); /* diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index b14c4ada89a3..0114c63dfdd9 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -280,12 +280,15 @@ bool using_native_sched_clock(void) return static_call_query(pv_sched_clock) == native_sched_clock; } -void __paravirt_set_sched_clock(u64 (*func)(void), bool stable) +void __paravirt_set_sched_clock(u64 (*func)(void), bool stable, + void (*save)(void), void (*restore)(void)) { if (!stable) clear_sched_clock_stable(); static_call_update(pv_sched_clock, func); + x86_platform.save_sched_clock_state = save; + x86_platform.restore_sched_clock_state = restore; } #else u64 sched_clock_noinstr(void) __attribute__((alias("native_sched_clock"))); diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 21d366d01985..ee7095febfd1 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -567,13 +567,12 @@ static void __init xen_init_time_common(void) { xen_sched_clock_offset = xen_clocksource_read(); static_call_update(pv_steal_clock, xen_steal_clock); - paravirt_set_sched_clock(xen_sched_clock); + /* * Xen has paravirtualized suspend/resume and so doesn't use the common * x86 sched_clock save/restore hooks. */ - x86_platform.save_sched_clock_state = NULL; - x86_platform.restore_sched_clock_state = NULL; + paravirt_set_sched_clock(xen_sched_clock, NULL, NULL); tsc_register_calibration_routines(xen_tsc_khz, NULL); x86_platform.get_wallclock = xen_get_wallclock; diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyperv_timer.c index ac1d9f9c381c..dee59ce61c29 100644 --- a/drivers/clocksource/hyperv_timer.c +++ b/drivers/clocksource/hyperv_timer.c @@ -553,10 +553,8 @@ static void hv_restore_sched_clock_state(void) static __always_inline void hv_setup_sched_clock(void *sched_clock) { /* We're on x86/x64 *and* using PV ops */ - paravirt_set_sched_clock(sched_clock); - - x86_platform.save_sched_clock_state = hv_save_sched_clock_state; - x86_platform.restore_sched_clock_state = hv_restore_sched_clock_state; + paravirt_set_sched_clock(sched_clock, hv_save_sched_clock_state, + hv_restore_sched_clock_state); } #else /* !CONFIG_GENERIC_SCHED_CLOCK && !CONFIG_PARAVIRT */ static __always_inline void hv_setup_sched_clock(void *sched_clock) {} -- 2.54.0.563.g4f69b47b94-goog