Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp957369pxy; Wed, 28 Apr 2021 18:32:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0JUD4jCiDFg4q+uflwzrhd/u/7asESkQyNQaQ5gzZETz/rC4UH2N9Q8xX2OjddS2Pb35f X-Received: by 2002:a17:906:9a02:: with SMTP id ai2mr11110861ejc.279.1619659922813; Wed, 28 Apr 2021 18:32:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619659922; cv=none; d=google.com; s=arc-20160816; b=gtzUXfMIUKWSR6uEZQTdE5QInlHa7tlelrrRirbVuK+1yfgwQA39rp0TOf9UTdCLL6 OdYdjyqS/th8JAQ3kbNPZKR7Xe9nAzjcKj3xaWnqdRWTUEr1DBRD/DaqSf2XZyn5AZJF ju2FnNQsURNBK2/RaOl9d7GFkqZYKjTgLaj/vehzhO+MXUd0KLtM3uYupcAYOtQZntOJ fqhRQ+ULPVqkxo457Ap9wmgslKm5PrdNg0C56phPJYuWQ9F+pARRbqh/gkCHH2bbJhN6 KqqE4dV/m3ZApM5D3e9kP8wrAjbbtS1BI6ZU8Ff0EaUT+CbY+cpVdKj4BDszIvkpPesd uVlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4y+bDa3ln419bf6vktGuyOj25vVsbOG/RV+OgsIi62w=; b=c6jXlTxyer4tbZgs9nG8L6KubgOro8/i76BkMjQhDHp3ALNYpHFtdW/q5rLT/TwbGx o9mGgWuMOAGKmF7HgWYMb+BMdN3iSUOjDurECPbgGCpsQgvRj59CWUCBGHDJbpf1zMGI rdp/X6LpwglIMlpdJKtyd+2ELWXRAXg3tu9TN6Qv2fk5LPq0WdTvKaWM75eKo2NBASwv oZQzFHFF2YP0ksLyej2vQswUZEskb8sTK+Z0zHrP3V9evxdMg1RrH/uYr/oulrrc4VCF 7mnrky5Tt9yx8rBi1bNDY7fi1TnIqLB+zmgrzl/BrfowALy1AgvJ8Mg3U/CscANPOxoj WzJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="eq/uWYtN"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d5si1611552ejm.476.2021.04.28.18.31.39; Wed, 28 Apr 2021 18:32:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="eq/uWYtN"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235116AbhD2Bb0 (ORCPT + 99 others); Wed, 28 Apr 2021 21:31:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:33408 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230084AbhD2BbX (ORCPT ); Wed, 28 Apr 2021 21:31:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4275E61440; Thu, 29 Apr 2021 01:30:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619659838; bh=ysesX+RW8zVp2m4tJ1Vt5n3IPX9GL7H04/cOc1kBNAg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eq/uWYtNLbKhYfwLDyIk/0WvIc8j61HhRAUksqRCjVepwHGcbArxlt3TdJUzpqlO3 SEV3uQ0DJCRnOOGdA6PZZBcLGZQJ43zYQJJCv2AMaWl8R/7H7y0B2xqbJ7SnJoq81H 2q3DLlAK9axuy2LjxpZdYlBWLcqZKLR9/g7o/us5h1LxWtwKeN2yw9rgGBfz4voGXL dL7SRNQUvDczSs1wwxLDLPN23Qcafxa8YPGTjKSj22CR89Kc4ccxLgyF7ZCjWr+l41 ZYXe8JhavlrkNDv5aJsqzwuh+vETy+9GW9+02Eu1x9HHtHEyDnVEUNHAi+l0eLHn6E WfDD4d6iONdQw== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 14E205C0531; Wed, 28 Apr 2021 18:30:38 -0700 (PDT) From: "Paul E. McKenney" To: tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, john.stultz@linaro.org, sboyd@kernel.org, corbet@lwn.net, Mark.Rutland@arm.com, maz@kernel.org, kernel-team@fb.com, neeraju@codeaurora.org, ak@linux.intel.com, feng.tang@intel.com, zhengjun.xing@intel.com, "Paul E. McKenney" , Xing Zhengjun , Chris Mason Subject: [PATCH v11 clocksource 2/6] clocksource: Retry clock read if long delays detected Date: Wed, 28 Apr 2021 18:30:33 -0700 Message-Id: <20210429013037.3958717-2-paulmck@kernel.org> X-Mailer: git-send-email 2.31.1.189.g2e36527f23 In-Reply-To: <20210429012909.GA3958584@paulmck-ThinkPad-P17-Gen-1> References: <20210429012909.GA3958584@paulmck-ThinkPad-P17-Gen-1> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When the clocksource watchdog marks a clock as unstable, this might be due to that clock being unstable or it might be due to delays that happen to occur between the reads of the two clocks. Yes, interrupts are disabled across those two reads, but there are no shortage of things that can delay interrupts-disabled regions of code ranging from SMI handlers to vCPU preemption. It would be good to have some indication as to why the clock was marked unstable. Therefore, re-read the watchdog clock on either side of the read from the clock under test. If the watchdog clock shows an excessive time delta between its pair of reads, the reads are retried. The maximum number of retries is specified by a new kernel boot parameter clocksource.max_read_retries, which defaults to three, that is, up to four reads, one initial and up to three retries. If more than one retry was required, a message is printed on the console (the occasional single retry is expected behavior, especially in guest OSes). If the maximum number of retries is exceeded, the clock under test will be marked unstable. However, the probability of this happening due to various sorts of delays is quite small. In addition, the reason (clock-read delays) for the unstable marking will be apparent. Link: https://lore.kernel.org/lkml/20210425224540.GA1312438@paulmck-ThinkPad-P17-Gen-1/ Link: https://lore.kernel.org/lkml/20210420064934.GE31773@xsang-OptiPlex-9020/ Link: https://lore.kernel.org/lkml/20210106004013.GA11179@paulmck-ThinkPad-P72/ Link: https://lore.kernel.org/lkml/20210414043435.GA2812539@paulmck-ThinkPad-P17-Gen-1/ Link: https://lore.kernel.org/lkml/20210419045155.GA596058@paulmck-ThinkPad-P17-Gen-1/ Cc: John Stultz Cc: Thomas Gleixner Cc: Stephen Boyd Cc: Jonathan Corbet Cc: Mark Rutland Cc: Marc Zyngier Cc: Andi Kleen Cc: Xing Zhengjun Acked-by: Feng Tang Reported-by: Chris Mason [ paulmck: Per-clocksource retries per Neeraj Upadhyay feedback. ] [ paulmck: Don't reset injectfail per Neeraj Upadhyay feedback. ] [ paulmck: Apply Thomas Gleixner feedback. ] Signed-off-by: Paul E. McKenney --- .../admin-guide/kernel-parameters.txt | 6 +++ kernel/time/clocksource.c | 53 ++++++++++++++++--- 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index b68cb54bc872..eb40e5332236 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -604,6 +604,12 @@ from, and complained about, and to larger values to force the clock to be marked unstable. + clocksource.max_read_retries= [KNL] + Number of clocksource_watchdog() retries due to + external delays before the clock will be marked + unstable. Defaults to three retries, that is, + four attempts to read the clock under test. + clearcpuid=BITNUM[,BITNUM...] [X86] Disable CPUID feature X for the kernel. See arch/x86/include/asm/cpufeatures.h for the valid bit diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index f1e1e6e4b387..94bfdb53f2f4 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -125,6 +125,13 @@ static void __clocksource_change_rating(struct clocksource *cs, int rating); #define WATCHDOG_INTERVAL (HZ >> 1) #define WATCHDOG_THRESHOLD (NSEC_PER_SEC >> 4) +/* + * Maximum permissible delay between two readouts of the watchdog + * clocksource surrounding a read of the clocksource being validated. + * This delay could be due to SMIs, NMIs, or to VCPU preemptions. + */ +#define WATCHDOG_MAX_SKEW (100 * NSEC_PER_USEC) + static void clocksource_watchdog_work(struct work_struct *work) { /* @@ -189,6 +196,8 @@ static ulong inject_delay_period; module_param(inject_delay_period, ulong, 0644); static ulong inject_delay_repeat = 1; module_param(inject_delay_repeat, ulong, 0644); +static ulong max_read_retries = 3; +module_param(max_read_retries, ulong, 0644); static void clocksource_watchdog_inject_delay(void) { @@ -206,12 +215,42 @@ static void clocksource_watchdog_inject_delay(void) invocations++; } +static bool cs_watchdog_read(struct clocksource *cs, u64 *csnow, u64 *wdnow) +{ + unsigned int nretries; + u64 wd_end, wd_delta; + int64_t wd_delay; + + for (nretries = 0; nretries <= max_read_retries; nretries++) { + local_irq_disable(); + *wdnow = watchdog->read(watchdog); + clocksource_watchdog_inject_delay(); + *csnow = cs->read(cs); + wd_end = watchdog->read(watchdog); + local_irq_enable(); + + wd_delta = clocksource_delta(wd_end, *wdnow, watchdog->mask); + wd_delay = clocksource_cyc2ns(wd_delta, watchdog->mult, watchdog->shift); + if (wd_delay <= WATCHDOG_MAX_SKEW) { + if (nretries > 1 || nretries >= max_read_retries) { + pr_warn("timekeeping watchdog on CPU%d: %s retried %d times before success\n", + smp_processor_id(), watchdog->name, nretries); + } + return true; + } + } + + pr_warn("timekeeping watchdog on CPU%d: %s read-back delay of %lldns, attempt %d, marking unstable\n", + smp_processor_id(), watchdog->name, wd_delay, nretries); + return false; +} + static void clocksource_watchdog(struct timer_list *unused) { - struct clocksource *cs; u64 csnow, wdnow, cslast, wdlast, delta; - int64_t wd_nsec, cs_nsec; int next_cpu, reset_pending; + int64_t wd_nsec, cs_nsec; + struct clocksource *cs; spin_lock(&watchdog_lock); if (!watchdog_running) @@ -228,11 +267,11 @@ static void clocksource_watchdog(struct timer_list *unused) continue; } - local_irq_disable(); - csnow = cs->read(cs); - clocksource_watchdog_inject_delay(); - wdnow = watchdog->read(watchdog); - local_irq_enable(); + if (!cs_watchdog_read(cs, &csnow, &wdnow)) { + /* Clock readout unreliable, so give it up. */ + __clocksource_unstable(cs); + continue; + } /* Clocksource initialized ? */ if (!(cs->flags & CLOCK_SOURCE_WATCHDOG) || -- 2.31.1.189.g2e36527f23