From patchwork Tue Jun 6 14:38:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 103888 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3451612vqr; Tue, 6 Jun 2023 07:52:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ZI0+ZW6xjk7jU4VsQXo2bM9bL+0exgJoL3y07+U1LjMEFQAuLV+LurA5gBA8EvXD+tFWf X-Received: by 2002:a05:6214:629:b0:5c5:1a25:edf0 with SMTP id a9-20020a056214062900b005c51a25edf0mr2397560qvx.26.1686063125300; Tue, 06 Jun 2023 07:52:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686063125; cv=none; d=google.com; s=arc-20160816; b=n4Cw+f5zl4HUXIkvy27XbIbAev7UaRS3Cf+kgv1iMyTYMe3AFKDpKaK6emtAXrELwy pr6uyfkvU5QUOyRo1E8fR+60sLq8FlNatDoHvGesA3NmeoUU02fe8EGGsCO17lfM5mQH kVBzmgCAf+kwxHCxI/86DrQv/ly8U9vM8TVUPOx9ujUi/wpWsvYjCDGAV29J/4Y5SJkg +Z2kBFYmxnGnHwCHB3ifypHBl0PfDdA/vmeLuvfDfFEpJ4dqQkOT8+/Yv8T0m3/QRRbi U6Xcpnb/11QwZYsgNkVqp+a1cxVm6Q84YneTMvD2F5sLdmPAq/XzmGDArdxK0ThCKQCo qG+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=CLYMwgJmr5FlvwjCFRZh30bCjVfx+q+Z6l1NHlqA5Kg=; b=ggL6ao8TS2/pvzR40NbGYBAVlQj7jXTroPFO031jd2jDUEuERYsQ/BnfnVmVpU64Oh ad+MkgyMU7LZ8BlU7J82y3Ww6tM8JzuBM1Va0+qYSIHumVqJzc1o5lZImoIpESuyipL9 IDUs4XMvtczs6KnuhpIsEqwrUVoccogsIthY+Zzz3R6ZPr7TZf+gQNh7WqO90u1tOn8a T29Lupt8M91w9O8S86eiK3WLKAUFYjWVMihXrGKPRfGkMOKKYq8l2nD51scalgIsUGsl ZL5NiDcujewS1Y8lfkhaOhSRxMYjf222FnZPPcuzo3gad2WhKgAHnHhlQ+eMNpr3hzdN ZyVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=SBEkWjjK; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=kCwRxsDU; 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 jp11-20020ad45f8b000000b0062b5c0de74esi1300067qvb.592.2023.06.06.07.51.51; Tue, 06 Jun 2023 07:52:05 -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=SBEkWjjK; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=kCwRxsDU; 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 S238167AbjFFOkW (ORCPT + 99 others); Tue, 6 Jun 2023 10:40:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238266AbjFFOjH (ORCPT ); Tue, 6 Jun 2023 10:39:07 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FCB1171D for ; Tue, 6 Jun 2023 07:38:14 -0700 (PDT) Message-ID: <20230606142032.655376396@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686062285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=CLYMwgJmr5FlvwjCFRZh30bCjVfx+q+Z6l1NHlqA5Kg=; b=SBEkWjjKOPc5r+5qv1tF0CLdempgLMDgk3cqd3AUuEo9hq8jZKn6O3sLLj0nysbfM68AYn VikIQ8Zln3DJFEQyrO8rAU45wcbGPtUUHnJDPSTrsLR/EHe/Q+FByVe3EfMAO4ntt05wBz IMPaxCElQF7f3rpKXvZLfYJZwvTcIjsl3nIGGxvbPOnexQCQu+XuRrreGtQYgQ8iDSMOFJ XkB4GmB6/R4Qj3LdbTQYkT557pSh2o3wqC1padUFRnRJsbGMdq2ZR7RbVGwWdm0IyyfB0Y SJfuSEVhr7SUTgvVfJbOTwNF8qzx3PDPf6chFeCTao3G1pVQpnn/gVH7QN0jyg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686062285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=CLYMwgJmr5FlvwjCFRZh30bCjVfx+q+Z6l1NHlqA5Kg=; b=kCwRxsDUwnRH9F3ouDI9aLA4jIZh6Raet5hysFRmvvgVfj9nsm6Vn789ZsSIWMFM5RAHaA P1eLYe5cCVClT/Cg== From: Thomas Gleixner To: LKML Cc: Frederic Weisbecker , Anna-Maria Behnsen , John Stultz , Peter Zijlstra , Ingo Molnar , Stephen Boyd , Eric Biederman , Oleg Nesterov Subject: [patch 29/45] posix-timers: Make signal overrun accounting sensible References: <20230606132949.068951363@linutronix.de> MIME-Version: 1.0 Date: Tue, 6 Jun 2023 16:38:04 +0200 (CEST) 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,URIBL_BLOCKED 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?1767965327560542280?= X-GMAIL-MSGID: =?utf-8?q?1767965327560542280?= The handling of the timer overrun in the signal code is inconsistent as it takes previous overruns into account. This is just wrong as after the reprogramming of a timer the overrun count starts over from a clean state, i.e. 0. Make the accounting in send_sigqueue() consistent with that. Signed-off-by: Thomas Gleixner --- kernel/signal.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1957,6 +1957,34 @@ int send_sigqueue(struct sigqueue *q, st */ q->info.si_sys_private = si_private; + /* + * Set the overrun count to zero unconditionally. The posix timer + * code does not self rearm periodic timers. They are rearmed from + * dequeue_signal(). + * + * But there is a situation where @q is already enqueued: + * + * 1) timer_settime() + * arm_timer() + * 2) timer_expires() + * send_sigqueue(@q) + * enqueue(@q) + * 3) timer_settime() + * arm_timer() + * 4) timer_expires() + * send_sigqueue(@q) <- Observes @q already queued + * + * In this case incrementing si_overrun does not make sense because + * there is no relationship between timer_settime() #1 and #2. + * + * The POSIX specification is useful as always: "The effect of + * disarming or resetting a timer with pending expiration + * notifications is unspecified." + * + * Just do the sensible thing and reset the overrun. + */ + q->info.si_overrun = 0; + ret = 1; /* the signal is ignored */ result = TRACE_SIGNAL_IGNORED; if (!prepare_signal(sig, t, false)) @@ -1964,15 +1992,9 @@ int send_sigqueue(struct sigqueue *q, st ret = 0; if (unlikely(!list_empty(&q->list))) { - /* - * If an SI_TIMER entry is already queue just increment - * the overrun count. - */ - q->info.si_overrun++; result = TRACE_SIGNAL_ALREADY_PENDING; goto out; } - q->info.si_overrun = 0; signalfd_notify(t, sig); pending = (type != PIDTYPE_PID) ? &t->signal->shared_pending : &t->pending;