From patchwork Wed Jan 24 14:46:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Wiesner X-Patchwork-Id: 191602 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1039130dyi; Wed, 24 Jan 2024 06:54:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IHK23IPPSTZekxNpjDT24hFvN3N0m70+oBEZPyMLUuN0+sSb0/Vvx/TcJesIFnnbS2iWRjw X-Received: by 2002:a17:906:3418:b0:a30:86ec:44dd with SMTP id c24-20020a170906341800b00a3086ec44ddmr723498ejb.67.1706108089271; Wed, 24 Jan 2024 06:54:49 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706108089; cv=pass; d=google.com; s=arc-20160816; b=CarqHR66buE3xTFPhFgTVRFjY5VIsT0zLr5A0SHoDWknRns+4VQWOOMwXsEfagbe92 bnUmunhKaWTX+E9977txEluaUkloSCHyNo1pgHaGssd76gQroGWLj84w7Mntuhpy9xlh NiLR2asxUueAJRo1YpkChDI9T9wbgRFTnJjNaZwUqHff+EaZe5tCy/THafQVszhhCoyc krdogZFhQuKfle8cXPftBL4Ub88re+sydWpB+EiZh9f+Dp2hnGC5VjiWcFTS8KzqiMI8 PGQ1DFFFr5YbPDpw/P6KaadITESBQl1dTEmgQS2lwjbGCvKIHHZxnVXf9SA7BqA3QjJy TsBQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:content-disposition:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:subject:cc:to:from :date:dkim-signature:dkim-signature:dkim-signature:dkim-signature; bh=5rkOT44PlHmm6TdsUOcAxZrzlfAOAubGywWPKAhas88=; fh=HyHrClrRhrWIQgDRpARPtB4IUkl3gRWML18qM/ZZUS8=; b=t1Qkw+0D1+zN/xaKn1UzFoyjixxWkm7b/SWXSI3ibTSgRhUjdeaodiILs0gh0jRkJF gzWBbthRIKfMCQX2sCesOPeObrDQ1lFM5QpxemztLQzYh/kvw3DYqV9vmxdAe/L8GTev +OsGDZ2V5MzOUq2HiE9dPoUwrY9pI+y9D2PPvUH9h5Dnv+i/jZuSn3lPbuB/yGmcywD3 +7Nt+Fr1uiIDVwMeoEILqV8U4YnPGA1XfqEdvwL2a8WaQB51tQ8kuYDPphXMOO1ogkqR RMJsjHKU6uZjITfvo4mkxEStIZedvhLruJMe2M6g9S9J/aMol2DWaX4QYr/dxiaqOE/n iYeA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=qhX3uEJK; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=qhX3uEJK; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; arc=pass (i=1 spf=pass spfdomain=suse.de dkim=pass dkdomain=suse.de dkim=pass dkdomain=suse.de dmarc=pass fromdomain=suse.de); spf=pass (google.com: domain of linux-kernel+bounces-37201-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37201-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id lb10-20020a170906adca00b00a2a2307cee2si13015541ejb.363.2024.01.24.06.54.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 06:54:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-37201-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=qhX3uEJK; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=qhX3uEJK; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; arc=pass (i=1 spf=pass spfdomain=suse.de dkim=pass dkdomain=suse.de dkim=pass dkdomain=suse.de dmarc=pass fromdomain=suse.de); spf=pass (google.com: domain of linux-kernel+bounces-37201-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37201-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id B695C1F21C08 for ; Wed, 24 Jan 2024 14:54:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5DF3F823AA; Wed, 24 Jan 2024 14:46:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="qhX3uEJK"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="NvH05ak7"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="qhX3uEJK"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="NvH05ak7" Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 6A3E27CF13 for ; Wed, 24 Jan 2024 14:46:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706107586; cv=none; b=gxCP5qyoFGdqU5T0UB/6KMzRPMWx1HJyOzd5otO41ewPfXZJLakMU4a+DrlYI1yxXqMcT41WNgIfP+IxAsbA7nh1xKLaRmqC8az2muw3dgC6X/MFX9PGTODpBir2qTH6KQXZo8OvKrzhFMy3UoNnBhAolURSgCPQ00UOPqdwNQY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706107586; c=relaxed/simple; bh=WCibBFfibzqFpDP9HZMzDddnPZYdR2zuHwq8uK6CkZ8=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=L1QVX00Yq8Lu7GnwdPF8/LsnDDqw8Pct6zknabqHbGiOtFHBgOzXqrwLyDZTxRGR+APJIVFv0/MK1m0HLV06JYfhm+JMKi1e+HmPrlRKZM9p3LeSL8zUCeOTPKZ7H74mv/kM1PYFhlVwNmV9VL9V1pfdZ7xTs6kuSqc9dNvp/go= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=qhX3uEJK; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=NvH05ak7; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=qhX3uEJK; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=NvH05ak7; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 51FB322308; Wed, 24 Jan 2024 14:46:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1706107582; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=5rkOT44PlHmm6TdsUOcAxZrzlfAOAubGywWPKAhas88=; b=qhX3uEJKZ8nEczU4Sd/b5z+8+hkJ+Np5seP4DpQezsGg+PH5R8t5htyaS77KjdnRFogopr ffztDrriBPm1AwUNhgeMJ8XHdc3i1qpVeeuI6IEA0cVdcPO6LScOND7greb8ZppjnQnTqz klcY02jK7Hb/kpXK7cRTWq0cS4SJvqI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1706107582; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=5rkOT44PlHmm6TdsUOcAxZrzlfAOAubGywWPKAhas88=; b=NvH05ak7ucZe67y6/s7Jds8w2fijukVfpdFEw52oZfrJFtpVm+W7kDcUJdgZW7mNhjuKmv jimV5HjumaKvPFCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1706107582; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=5rkOT44PlHmm6TdsUOcAxZrzlfAOAubGywWPKAhas88=; b=qhX3uEJKZ8nEczU4Sd/b5z+8+hkJ+Np5seP4DpQezsGg+PH5R8t5htyaS77KjdnRFogopr ffztDrriBPm1AwUNhgeMJ8XHdc3i1qpVeeuI6IEA0cVdcPO6LScOND7greb8ZppjnQnTqz klcY02jK7Hb/kpXK7cRTWq0cS4SJvqI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1706107582; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=5rkOT44PlHmm6TdsUOcAxZrzlfAOAubGywWPKAhas88=; b=NvH05ak7ucZe67y6/s7Jds8w2fijukVfpdFEw52oZfrJFtpVm+W7kDcUJdgZW7mNhjuKmv jimV5HjumaKvPFCQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 353391333E; Wed, 24 Jan 2024 14:46:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id OF7zDL4isWWnYQAAD6G6ig (envelope-from ); Wed, 24 Jan 2024 14:46:22 +0000 Received: by incl.suse.cz (Postfix, from userid 1000) id 5DF869C977; Wed, 24 Jan 2024 15:46:21 +0100 (CET) Date: Wed, 24 Jan 2024 15:46:21 +0100 From: Jiri Wiesner To: "Paul E. McKenney" Cc: Jonathan Corbet , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Daniel Lezcano , Feng Tang , Peter Zijlstra , linux-kernel@vger.kernel.org Subject: [PATCH v2] clocksource: disable watchdog checks on TSC when TSC is watchdog Message-ID: <20240124144621.GA5998@incl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Level: Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=qhX3uEJK; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=NvH05ak7 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-6.01 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DWL_DNSWL_MED(-2.00)[suse.de:dkim]; NEURAL_HAM_SHORT(-0.20)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; MX_GOOD(-0.01)[]; RCPT_COUNT_TWELVE(0.00)[12]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from] X-Spam-Score: -6.01 X-Rspamd-Queue-Id: 51FB322308 X-Spam-Flag: NO X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788983995639935066 X-GMAIL-MSGID: 1788983995639935066 Change the semantics of the tsc=watchdog option to always remove the CLOCK_SOURCE_MUST_VERIFY bit from the TSC clocksource so as to provide an alternative to the tsc=nowatchdog option, which is used routinely to prevent switches to the HPET clocksource on machines with hardware issues. Currently, the TSC does not get checked on machines with a stable TSC (4 NUMA nodes or less, CONSTANT_TSC, NONSTOP_TSC and TSC_ADJUST), and the tsc=watchdog option allows one to have the PMTMR (acpi_pm) checked instead. There are production machines that do not quality for having the clocksource watchdog disabled (usually on account of having more than 4 NUMA nodes) and that also may have a malfunctioning CPU that causes a watchdog check failure in a few days after a reboot resulting in the current clocksource being switched to the HPET. Solving a hardware issue or replacing the machine may take an inordinate amount of time, while the production machine is still needed to do its job. It is possible to pass tsc=nowatchdog to the kernel, which disables the clocksource watchdog on the TSC, effectively leaving the operator of the production machine blind to any clocksource malfunction. The sematics of the recently introduced tsc=watchdog option, 0051293c5330 ("clocksource: Enable TSC watchdog checking of HPET and PMTMR only when requested"), is changed by this patch so that the TSC does not get checked when tsc=watchdog is specified regardless of the TSC passing or not passing the criteria for being judged to be stable. This way, the TSC acts as a watchdog checking other clocksources (HPET, PMTMR) and a failed check does not result in the current clocksource (TSC) getting marked unstable. Passing tsc=watchdog has the advantange of the operator being informed that the machine may be experiencing clocksource issues. There is one side effect of the semantic change of tsc=watchdog - it fixes the HPET not having its CLOCK_SOURCE_MUST_VERIFY bit set as intended by efc8b329c7fd ("clocksource: Verify HPET and PMTMR when TSC unverified"). When the system is booting up, the HPET does not have its CLOCK_SOURCE_MUST_VERIFY bit set on account of the order in which clocksources are initialized in x86_late_time_init(). The HPET initialization and clocksource registration always comes before the TSC init function unsets the CLOCK_SOURCE_MUST_VERIFY bit. Fixes: efc8b329c7fd ("clocksource: Verify HPET and PMTMR when TSC unverified") Signed-off-by: Jiri Wiesner --- v2: the changelog was updated to improve intelligibility Documentation/admin-guide/kernel-parameters.txt | 9 +++++---- arch/x86/include/asm/time.h | 2 +- arch/x86/kernel/hpet.c | 2 +- arch/x86/kernel/tsc.c | 7 +++---- drivers/clocksource/acpi_pm.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 31b3a25680d0..860896571c04 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6722,10 +6722,11 @@ obtained from HW or FW using either an MSR or CPUID(0x15). Warn if the difference is more than 500 ppm. [x86] watchdog: Use TSC as the watchdog clocksource with - which to check other HW timers (HPET or PM timer), but - only on systems where TSC has been deemed trustworthy. - This will be suppressed by an earlier tsc=nowatchdog and - can be overridden by a later tsc=nowatchdog. A console + which to check other HW timers (HPET or PM timer). + TSC is not checked by the watchdog, even on systems + where TSC has not been deemed trustworthy. This will be + suppressed by an earlier tsc=nowatchdog and can be + overridden by a later tsc=nowatchdog. A console message will flag any such suppression or overriding. tsc_early_khz= [X86] Skip early TSC calibration and use the given diff --git a/arch/x86/include/asm/time.h b/arch/x86/include/asm/time.h index f360104ed172..c2364b74a318 100644 --- a/arch/x86/include/asm/time.h +++ b/arch/x86/include/asm/time.h @@ -7,7 +7,7 @@ extern void hpet_time_init(void); extern bool pit_timer_init(void); -extern bool tsc_clocksource_watchdog_disabled(void); +extern bool tsc_clocksource_as_watchdog(void); extern struct clock_event_device *global_clock_event; diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index a38d0c93a66e..46f2b4ffdba7 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -1091,7 +1091,7 @@ int __init hpet_enable(void) if (!hpet_counting()) goto out_nohpet; - if (tsc_clocksource_watchdog_disabled()) + if (tsc_clocksource_as_watchdog()) clocksource_hpet.flags |= CLOCK_SOURCE_MUST_VERIFY; clocksource_register_hz(&clocksource_hpet, (u32)hpet_freq); diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 15f97c0abc9d..ec1860178ea1 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -1221,10 +1221,9 @@ static void __init tsc_disable_clocksource_watchdog(void) clocksource_tsc.flags &= ~CLOCK_SOURCE_MUST_VERIFY; } -bool tsc_clocksource_watchdog_disabled(void) +bool tsc_clocksource_as_watchdog(void) { - return !(clocksource_tsc.flags & CLOCK_SOURCE_MUST_VERIFY) && - tsc_as_watchdog && !no_tsc_watchdog; + return tsc_as_watchdog && !no_tsc_watchdog; } static void __init check_system_tsc_reliable(void) @@ -1609,7 +1608,7 @@ void __init tsc_init(void) return; } - if (tsc_clocksource_reliable || no_tsc_watchdog) + if (tsc_clocksource_reliable || no_tsc_watchdog || tsc_as_watchdog) tsc_disable_clocksource_watchdog(); clocksource_register_khz(&clocksource_tsc_early, tsc_khz); diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index 82338773602c..9b5dad94713e 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c @@ -211,7 +211,7 @@ static int __init init_acpi_pm_clocksource(void) return -ENODEV; } - if (tsc_clocksource_watchdog_disabled()) + if (tsc_clocksource_as_watchdog()) clocksource_acpi_pm.flags |= CLOCK_SOURCE_MUST_VERIFY; return clocksource_register_hz(&clocksource_acpi_pm, PMTMR_TICKS_PER_SEC); }