From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.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 C087D401495 for ; Fri, 29 May 2026 15:08:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780067306; cv=none; b=f0YF1ePCF2B0A5YJ4uhBJmh8S/6mGNKKEfqXeE2aqZSHKNCx7rETJu6KM4LBmbFmN6PEgWkUdmrruxRsSpKpc2HGVFrpEZ+cVwPVcJ7gnmk59Fp0oghyt9+ZOZMEDE6bRffweeMN1hIR++bFUexC5ajr/PfyX/Obo6UMIe9BRxg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780067306; c=relaxed/simple; bh=4VaqmgjNCHEhgXChxiXGwJR3wgEm9x1M9Rq4DUXzzAg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=cUPuXPRFRqe/NS7NWPWFJ7ExnDlBbtKr494lQ33wbdlVk+GQsY6YluA/abH82A4pMHwlK5Q7FutBEIBTBtT4tYgzILB6nljEqP4shKvSI8PPA1t9+vAXoqZrTqgjCqnfThiSnPmdLGJS/YbTQDT3UgEJbKrALTnovGRYuKvibGM= 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=FYCnz0vJ; arc=none smtp.client-ip=209.85.215.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="FYCnz0vJ" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c85807671b1so109363a12.2 for ; Fri, 29 May 2026 08:08:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780067304; x=1780672104; 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=Yfx7EXC5hiFOp82KCG+sZ/JXqzo7JAMVp+JZIeKJNyA=; b=FYCnz0vJX9i0zb3KVNtVvGyp2oQC09KFPMuh4DbD5MMH+TpS4z3Id4hnaEDrrvJUi1 4eBBybtSqY0wqY5NgglDLBp0D4Grss55nMkKx+ZdgRvSY4xUOfIV68s8Unf/uJ78dmPX rSoam/gs3jvndGRTNwg8NJiAjGHqcLQQPjOG0UwsZspz2m5xhz4/0QT/pv1ifyD4+jmo Y1u8faa747s3J9qlDxHKLX2Go++idjvIdeCDKl8QXEaBJVqSUixAvPrlEzNZPvHsDOtG tCu3RCls9S1k+UWgzYK1GGF0dVQ2Cv5R8q0SVCGlRZygJTZ4VAbxgyHVrLkBXj23Hr8e 2IqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780067304; x=1780672104; 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=Yfx7EXC5hiFOp82KCG+sZ/JXqzo7JAMVp+JZIeKJNyA=; b=O59XUELdSdKyJ4qEJRmmH49HE3yMnAWZ9PNVWTGV75/LCXb3U62p//gwIW+H9PvOm8 VNorNQDdGzmNnsbgStD/snVXFG167jQZWpB/ubg3WqJl44UkQJUuA6ieTHYiGrnIpUoE w5cIj10hkPF1qcXNcHSevMoPX9k9mJ8SFCaDGjsfP7wAcXX0Ll6go6PuTFftvpanWSVK jGUmghucc+Dkt6blB6yxuMZTnOqXxXPajJ7MYQmjvI242UglB7amE6a9z6lKazTwTmrY mF7QK1Q2t9NLEaV+T6vRinl2ZLU5PAPGKpSYbXO4Up08nS9TsHyHJLbjgBrTX01G4gsU /juA== X-Forwarded-Encrypted: i=1; AFNElJ8E3YLzRn18+BYtZLY+0m6f7X9WVxQvkJz5npR0/iMPIAmeXhC/YLhAG3t4NZ7cTrhgMNNdmwpxxEUj@lists.linux.dev X-Gm-Message-State: AOJu0YygVJzQYmZVFv0Bs6dtIQDLczMnUf1/34NmO6ECBdMFeeHeqIfl nc7LEvWvMiSoFRBdZz/lxHv8yw3a4Jdmg1LcpNHjBqwiaA49ip6jglWqmuerU3eRVa889kbnniH FpO1OFg== X-Received: from plai6.prod.google.com ([2002:a17:902:c946:b0:2bf:1ccd:c294]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e88c:b0:2bf:3074:34dc with SMTP id d9443c01a7336-2bf367c54demr2671615ad.14.1780067303834; Fri, 29 May 2026 08:08:23 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 29 May 2026 08:08:22 -0700 In-Reply-To: <20260529144435.704127-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: <20260529144435.704127-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.823.g6e5bcc1fc9-goog Message-ID: <20260529150822.714883-1-seanjc@google.com> Subject: [PATCH v4 42/47] x86/paravirt: Mark __paravirt_set_sched_clock() as __init From: Sean Christopherson To: Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Kiryl Shutsemau , 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: "H . Peter Anvin" , Rick Edgecombe , Vitaly Kuznetsov , Broadcom internal kernel review list , Boris Ostrovsky , Stephen Boyd , 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, David Woodhouse , Tom Lendacky , Nikunj A Dadhania , David Woodhouse , Michael Kelley , Thomas Gleixner Content-Type: text/plain; charset="UTF-8" Annotate __paravirt_set_sched_clock() as __init, and make its wrapper __always_inline to ensure sanitizers don't result in a non-inline version hanging around. All callers run during __init, and changing sched_clock after boot would be all kinds of crazy. No functional change intended. Reviewed-by: David Woodhouse Signed-off-by: Sean Christopherson --- arch/x86/include/asm/timer.h | 10 +++++----- arch/x86/kernel/tsc.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h index e97cd1ae03d1..96ae7feac47c 100644 --- a/arch/x86/include/asm/timer.h +++ b/arch/x86/include/asm/timer.h @@ -14,12 +14,12 @@ 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 (*save)(void), void (*restore)(void)); +void __init __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), - void (*save)(void), - void (*restore)(void)) +static __always_inline void paravirt_set_sched_clock(u64 (*func)(void), + void (*save)(void), + void (*restore)(void)) { __paravirt_set_sched_clock(func, true, save, restore); } diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 7fbcfc2efd1d..6da0a3ac05c2 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -280,8 +280,8 @@ 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 (*save)(void), void (*restore)(void)) +void __init __paravirt_set_sched_clock(u64 (*func)(void), bool stable, + void (*save)(void), void (*restore)(void)) { if (!stable) clear_sched_clock_stable(); -- 2.54.0.823.g6e5bcc1fc9-goog