Skip to content

Commit 4a1236b

Browse files
committed
Merge: x86/tsc: Trust initial offset in architectural TSC-adjust MSRs
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4187 JIRA: https://issues.redhat.com/browse/RHEL-29437 Upstream Status: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git commit 455f907 Author: Daniel J Blueman <daniel@quora.org> Date: Fri Apr 19 16:51:46 2024 +0800 x86/tsc: Trust initial offset in architectural TSC-adjust MSRs When the BIOS configures the architectural TSC-adjust MSRs on secondary sockets to correct a constant inter-chassis offset, after Linux brings the cores online, the TSC sync check later resets the core-local MSR to 0, triggering HPET fallback and leading to performance loss. Fix this by unconditionally using the initial adjust values read from the MSRs. Trusting the initial offsets in this architectural mechanism is a better approach than special-casing workarounds for specific platforms. Signed-off-by: Daniel J Blueman <daniel@quora.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Steffen Persvold <sp@numascale.com> Reviewed-by: James Cleverdon <james.cleverdon.external@eviden.com> Reviewed-by: Dimitri Sivanich <sivanich@hpe.com> Reviewed-by: Prarit Bhargava <prarit@redhat.com> Link: https://lore.kernel.org/r/20240419085146.175665-1-daniel@quora.org Omitted-fix: 7598293ab37c ("Merge branch into tip/master: 'x86/timers'") - only a mention of the commit being merged, not a bug or patch Signed-off-by: Prarit Bhargava <prarit@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: Lenny Szubowicz <lszubowi@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents e621d07 + 072b860 commit 4a1236b

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

arch/x86/kernel/tsc_sync.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,9 @@ bool tsc_store_and_check_tsc_adjust(bool bootcpu)
193193
cur->warned = false;
194194

195195
/*
196-
* If a non-zero TSC value for socket 0 may be valid then the default
197-
* adjusted value cannot assumed to be zero either.
196+
* The default adjust value cannot be assumed to be zero on any socket.
198197
*/
199-
if (tsc_async_resets)
200-
cur->adjusted = bootval;
198+
cur->adjusted = bootval;
201199

202200
/*
203201
* Check whether this CPU is the first in a package to come up. In

0 commit comments

Comments
 (0)