From patchwork Mon Jun 5 15:08:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 103321 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2753139vqr; Mon, 5 Jun 2023 08:09:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4oWd9mC5eqHBWZJMxzlo4j/lGa2UsM90CMbRN1ighZjSoJ8RWJcchVmiQd2cfnXxUUJuQ1 X-Received: by 2002:a05:6a00:b91:b0:65b:cc73:1074 with SMTP id g17-20020a056a000b9100b0065bcc731074mr1432799pfj.23.1685977793745; Mon, 05 Jun 2023 08:09:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685977793; cv=none; d=google.com; s=arc-20160816; b=v5aG4f3f5qXGADtpko3/jXRkLTO56qeyf6g5ZrvBETJBcuwE6QVwTcLHkZYKxeUEbD 7Fz7vwm9DbGL2EmiWhQGuIdtx4zegrsq+X9npVNaQQTZ9FJ+b9JiyLNNjeuTaY2eq6Hi TgfP/XzAGlo77dEHajxwvwuVGmU34gxYa0XzF3cQD1zLWt5jmMvfKNKeQg5RBpmZA73O cWkdtQwHocC4XOaAPqNQwMKksWLPQLG6XvbXJFHr8hqJwYXWmCOsSr1dM0dEILBEvRXU E23Eil+dkYHTaohWsXMOcOI+vClL1a3ia6+6jf3i8Cx1tT3cLa3zK0xumi7wx/P+RpTq B8Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=PAplYoHSmngzRsFNWrHFnD3XVwaxz1tiQGVB5+wXWZI=; b=lAG3Lp9onrzqEbXfduQMNaI+RvjhxNt7Lpti0DXyEqrfiKAz5AbZEySxaM7LK56qei aXE8VfmCiCI7EHwiNA7Sh6BSg61vBap1BpDTosuV+kpmx9KLw14BorZa2AbaZV07dtWr 7O0jA864K08+WmtCF2+EE76N1r8DUrr19NjLEtR3lfpOdup+jnUVfOQ4gLQDN3jb75Tf NrELwd3O9n8jMKEaVY1RCj/nTBXAVwp1vw8EGkYEecrOxg87f9lvO+dOME/MoKozp5gB H1wnugQuywyHeYCuX/LDD/Q4tlKsiMaqToWDMM1zkhdm+GmM+Q/Aia0Xcn3h7KxH1dgf K/OQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=p6VBCA1d; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q7-20020a632a07000000b00534769ac7acsi5525359pgq.879.2023.06.05.08.09.41; Mon, 05 Jun 2023 08:09:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=p6VBCA1d; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234383AbjFEPIt (ORCPT + 99 others); Mon, 5 Jun 2023 11:08:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233794AbjFEPI3 (ORCPT ); Mon, 5 Jun 2023 11:08:29 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA7ECD2; Mon, 5 Jun 2023 08:08:27 -0700 (PDT) Date: Mon, 05 Jun 2023 15:08:25 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1685977706; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PAplYoHSmngzRsFNWrHFnD3XVwaxz1tiQGVB5+wXWZI=; b=p6VBCA1dJJfgCghJt0XubE3YK1ZNh+9VCT26rtWlD7uOgbSBuy4XSVNZsM5zPH+RADE+Cd 9Q3Uynb5kL/XT95EM88JDAY1MEsVQlR7VZRcsocflFJi+hV+PVOmG5hvnvBaMy8LniGWfl 9fieJ3BoLk2q3upLZ+ss0rKKq4TeXG2eXqYITudIYoxQ7bUaksHSrrIoi+HNgbzzO6vnqe 3FIS3Bnu5qVv87WWYt4S7WNJTEaDsATlIE3zG+UIgGHTk57XcRawscpL+N0ddamwk2LBku isxv+ATLw8YXlnYgsRyRrFZhgsrD1vINwHR3rqQG43IqRaAFXO9Enqm5ZyqQ1Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1685977706; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PAplYoHSmngzRsFNWrHFnD3XVwaxz1tiQGVB5+wXWZI=; b=dZghajwuc2DSTridLx2UGjYivki09QXrVUKPyOcjexsZM4RYI6EcGFMBL6CRKpaSp/647T Tv0kfc8hNs/UfcBQ== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] posix-timers: Clarify posix_timer_fn() comments Cc: Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <874jnrdmrq.ffs@tglx> References: <874jnrdmrq.ffs@tglx> MIME-Version: 1.0 Message-ID: <168597770582.404.11174447408587272957.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764176999689763952?= X-GMAIL-MSGID: =?utf-8?q?1767875851355628241?= The following commit has been merged into the timers/core branch of tip: Commit-ID: 63dede13d09850a8ace210f8e4227ac5a6b309ae Gitweb: https://git.kernel.org/tip/63dede13d09850a8ace210f8e4227ac5a6b309ae Author: Thomas Gleixner AuthorDate: Thu, 01 Jun 2023 21:07:37 +02:00 Committer: Thomas Gleixner CommitterDate: Mon, 05 Jun 2023 17:03:38 +02:00 posix-timers: Clarify posix_timer_fn() comments Make the issues vs. SIG_IGN understandable and remove the 15 years old promise that a proper solution is already on the horizon. Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/874jnrdmrq.ffs@tglx --- kernel/time/posix-timers.c | 62 +++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index f1a7c62..a22c183 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -326,11 +326,11 @@ int posix_timer_event(struct k_itimer *timr, int si_private) } /* - * This function gets called when a POSIX.1b interval timer expires. It - * is used as a callback from the kernel internal timer. The - * run_timer_list code ALWAYS calls with interrupts on. - - * This code is for CLOCK_REALTIME* and CLOCK_MONOTONIC* timers. + * This function gets called when a POSIX.1b interval timer expires from + * the HRTIMER interrupt (soft interrupt on RT kernels). + * + * Handles CLOCK_REALTIME, CLOCK_MONOTONIC, CLOCK_BOOTTIME and CLOCK_TAI + * based timers. */ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer) { @@ -348,9 +348,10 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer) if (posix_timer_event(timr, si_private)) { /* - * signal was not sent because of sig_ignor - * we will not get a call back to restart it AND - * it should be restarted. + * The signal was not queued due to SIG_IGN. As a + * consequence the timer is not going to be rearmed from + * the signal delivery path. But as a real signal handler + * can be installed later the timer must be rearmed here. */ if (timr->it_interval != 0) { ktime_t now = hrtimer_cb_get_time(timer); @@ -359,34 +360,35 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer) * FIXME: What we really want, is to stop this * timer completely and restart it in case the * SIG_IGN is removed. This is a non trivial - * change which involves sighand locking - * (sigh !), which we don't want to do late in - * the release cycle. + * change to the signal handling code. + * + * For now let timers with an interval less than a + * jiffie expire every jiffie and recheck for a + * valid signal handler. + * + * This avoids interrupt starvation in case of a + * very small interval, which would expire the + * timer immediately again. * - * For now we just let timers with an interval - * less than a jiffie expire every jiffie to - * avoid softirq starvation in case of SIG_IGN - * and a very small interval, which would put - * the timer right back on the softirq pending - * list. By moving now ahead of time we trick - * hrtimer_forward() to expire the timer - * later, while we still maintain the overrun - * accuracy, but have some inconsistency in - * the timer_gettime() case. This is at least - * better than a starved softirq. A more - * complex fix which solves also another related - * inconsistency is already in the pipeline. + * Moving now ahead of time by one jiffie tricks + * hrtimer_forward() to expire the timer later, + * while it still maintains the overrun accuracy + * for the price of a slight inconsistency in the + * timer_gettime() case. This is at least better + * than a timer storm. + * + * Only required when high resolution timers are + * enabled as the periodic tick based timers are + * automatically aligned to the next tick. */ -#ifdef CONFIG_HIGH_RES_TIMERS - { - ktime_t kj = NSEC_PER_SEC / HZ; + if (IS_ENABLED(CONFIG_HIGHRES_TIMERS)) { + ktime_t kj = TICK_NSECS; if (timr->it_interval < kj) now = ktime_add(now, kj); } -#endif - timr->it_overrun += hrtimer_forward(timer, now, - timr->it_interval); + + timr->it_overrun += hrtimer_forward(timer, now, timr->it_interval); ret = HRTIMER_RESTART; ++timr->it_requeue_pending; timr->it_active = 1;