From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 981A939DBC0 for ; Fri, 15 May 2026 19:21:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778872869; cv=none; b=nSpq9OIuPmA6ObJYmJd5gfwcBSE4F/0LjkrkvZbDDriRM/L1/4eoiDWWn8qLPD5dasfSQ6isGBuW5Mhn8bD60znlI7d6xh+CdlapJGrxH3F/E2s5tyVV9hng8bU/AY8vCoxK8vfK2rdrs0BEcGE4BGEflU66JdrB2GYd70qaRlc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778872869; c=relaxed/simple; bh=dMZi/ynefGqL3V/hiHHk2W0j93MqJm0B6kXxK/NMi+E=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WPVT0aykh4b/k6Z5oqSXbqP7eggfsrXfivvMrpiG1uAhRDJ7EkbQxZnGRdF5Jaml1e3Wphmyp3tYVNN6BM8Cl285IsfhWA0oHqG7icTKdgAy3BDrc5cCTAF9cIDOjT+ifqDvc7d4Fn24rFqiaFyKO1EQgPFXY8EYY4LGZ/AAde4= 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=vln0evpJ; arc=none smtp.client-ip=209.85.216.73 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="vln0evpJ" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-36781927b4dso293415a91.0 for ; Fri, 15 May 2026 12:21:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778872867; x=1779477667; darn=vger.kernel.org; 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=czryuinsQM/bDv8Ei5QNsAEKCG27pLCUAiJBy5nMgao=; b=vln0evpJjZCLQm4W9wGjjm1WrHcySGyzcgPoYi71uio/EQ82k1Jxte/hG4jFU161yH +6lhqX3ZkNCJY0Jl41wthOia5vZeRbm+Gl46Yljg1rqfXFe+Cmn3xPbgX4k67i6xnfcg 4dgXfAzGvkn+92OMReJZIzRp2O5+6U77GkfgxwF+8sgzmNvznuDbrLtF3Gyi6ufIIzKU HoZOGpZNAXuc+zCLUtzEyCvA7N+kBjVXIFxkkPKnJeRdZPwveIPkcm85nD/W3krjrt/+ exb13ZQ0xoQ84gAl0buyjrXrdLq6Cl+S+B7j960mUP7nZq383Q5/Qw4q5urX8QmFjdO+ d3IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778872867; x=1779477667; 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=czryuinsQM/bDv8Ei5QNsAEKCG27pLCUAiJBy5nMgao=; b=ATtUlEZGYjGJnRCUa0SqRgQ1yvfbJOjKG68Mx2zJsn3I6TDgz41gB9oKTYHp/LVrL2 jCjjBesXdyzOnHXcZEwBOzbGd4CidhqcTnTG+NnOvyRroEjuBc4LPCwh1SrEzBE6ZV7/ M3j2beACwDUwz/1kEInjZltWq2vrvun63K5i4V02yVhwXGmtWJE08aIxNLEhF+JgtALI ySfKEaogQzQC25yauMqQWqAy/eRZMsdifFZ3InCKFVIRwCEBxUOdOb0jAC02xmZAxX3f Ar/pjgt8yldLykUPGIZfr2IC0zAbkbGEkMcRKD8lsY0JaC384NCF8dA96SWcqr28D1MA lbBA== X-Forwarded-Encrypted: i=1; AFNElJ9JkmZZznnxcE6yM72J/jfBOk49YeNMA7SAsg4HY3zitMT9RCoWSkqG+ExKx4QoZ1Kd3Rs=@vger.kernel.org X-Gm-Message-State: AOJu0YxZN2MfHjtNWM5aFf9WTXc4GyrWmaMv40ZINrVDOW8QCJS8X3mt vcAKuZz8b5zR7tL7KmmqSB9hD1iufvfm8dcx/dogy2hOWEabak0YGJ6T8VEmQHe+mlDmiZ11CLg EOwn6GQ== X-Received: from pjbiw14.prod.google.com ([2002:a17:90b:420e:b0:365:df9b:ae96]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:4ca4:b0:369:69f8:ad6b with SMTP id 98e67ed59e1d1-36969f8b046mr1344290a91.0.1778872866654; Fri, 15 May 2026 12:21:06 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 15 May 2026 12:19:29 -0700 In-Reply-To: <20260515191942.1892718-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org 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-29-seanjc@google.com> Subject: [PATCH v3 28/41] x86/paravirt: Mark __paravirt_set_sched_clock() as __init 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" 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. 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 0114c63dfdd9..4a48b8ba5bea 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.563.g4f69b47b94-goog