From patchwork Tue Jun 6 14:38:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 103878 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3449043vqr; Tue, 6 Jun 2023 07:47:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7QPqdyMndXyBMKlL+z0xC+nflR/JhyrBau4lo8o/O14gZk11zZUQAWktPonYJ7eN3AoBFi X-Received: by 2002:a05:6a21:3803:b0:111:3c41:2068 with SMTP id yi3-20020a056a21380300b001113c412068mr1356519pzb.28.1686062853000; Tue, 06 Jun 2023 07:47:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686062852; cv=none; d=google.com; s=arc-20160816; b=ZszHBuMI0n3kifNzHk5Vuvatv5beIhaLdkfdOfJxlyV5q3xuKxXa3KjlJqa/DcdSyb Lj3H2glIRoS+DT9ZCYbU2czYdR7gInKrUoxw8L2KhQaqZrbZ1v8P+I70M+uekkHS7BpU aRBauOOKIkzpyXSkQLe3bQqVKRwdL+pEL5qKFIuUlWnP3p6JZsnIlbOctRC/jVJITysh vtxisjtotlzPql5n7azBHughINEh6u53A3D9DLeNHYVS1shXNCSDG+9W49FtQwvYhBJv tjJDuCsli0kUBnlr/8lbU2vCkI4HNLcap2CFv5TRKZ80aMin7Y8SXZnHbXFknPH5x4wX RidQ== 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=9SYjUCAe0AgsqCGuTWf7t+WUqVVywcl4/ZGVc9cUSlA=; b=cFktCSkcRoKmHqgsOy9fpmMUTcwFtpDmqy3GFAB4r5/yGfujQCL50j3Ie1mFC9piRL U4Hljz8JMuto0BYmA+vQF8LBU25xyOLCDiRTqMxRmiAwTlES1ZxAqTstCepbSF1O59Zf CGS5bHg0etBlWgMLvX7KlO63K0Jc0EODMiVF17YHuRMR7P3J7jHpjeHEjqO7r3rwQMgS D9QN96d7n9EDitkfwenxC24WrH3sWTpev4LN1waK1ehJXAJEEPf5hi5XuQwjGDCVl3hw mRsVRT+TDguyLXpQCB3Q3ke2aMsvc4ok44sflCx1wjhlMLheS0XJyv1c1YanaFBMyM0t tsVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=qxu1lZ93; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="x/Zj3IWC"; 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 i73-20020a636d4c000000b0053b9ebed2adsi7317456pgc.190.2023.06.06.07.47.20; Tue, 06 Jun 2023 07:47:32 -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=qxu1lZ93; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="x/Zj3IWC"; 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 S238301AbjFFOje (ORCPT + 99 others); Tue, 6 Jun 2023 10:39:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238107AbjFFOjE (ORCPT ); Tue, 6 Jun 2023 10:39:04 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8DEA1BF2 for ; Tue, 6 Jun 2023 07:38:05 -0700 (PDT) Message-ID: <20230606142032.489307214@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686062280; 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=9SYjUCAe0AgsqCGuTWf7t+WUqVVywcl4/ZGVc9cUSlA=; b=qxu1lZ9377m1VdXrFDK7hm0MCDbgZuf1oa7cKHpXv9jMupkRKDli7MoIf4AeWKjuPEuWPd 9HjzVBhABZ+JqAiOrNP7c4ViUqE7MgiHSt4LSAEqRJoyVpyjYcXTiMlqLzYMoxsMl6iVVz WSyKN2iWFFR1oGgYONZoIe1/lzhxvYf5mut4FHNSrJVnq9nzukQjRELWq3P3wXp7rK6fNr 9a+0J0Dkm87qeVVlj2N5iTSDvUKu3SmZ1s+ao3oU3A14aOQ/ZWwHyUa6yNsb3u4kzqHvV7 FrGeZZVjmyaHIGITJnuuI/KCbN/iwsBRzA0NEksuMBlXWXrcwhxvBthG1AERGQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686062280; 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=9SYjUCAe0AgsqCGuTWf7t+WUqVVywcl4/ZGVc9cUSlA=; b=x/Zj3IWC//rixGZDrq+hF1gwDYu/SR5Sf3JVr45VCeoe7YU3bpROw7BBg8TGKJa7FweLbz PO9GHG/GXN45WWAQ== 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 26/45] posix-timers: Rename k_itimer::it_requeue_pending References: <20230606132949.068951363@linutronix.de> MIME-Version: 1.0 Date: Tue, 6 Jun 2023 16:38:00 +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?1767965041748347070?= X-GMAIL-MSGID: =?utf-8?q?1767965041748347070?= Prepare for using this struct member to do a proper reprogramming and deletion accounting so that stale signals can be dropped. No functional change. Signed-off-by: Thomas Gleixner --- include/linux/posix-timers.h | 5 ++--- kernel/time/alarmtimer.c | 2 +- kernel/time/posix-cpu-timers.c | 2 +- kernel/time/posix-timers.c | 12 ++++++------ 4 files changed, 10 insertions(+), 11 deletions(-) --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h @@ -213,8 +213,7 @@ static inline void posix_cputimers_init_ * @it_active: Marker that timer is active * @it_overrun: The overrun counter for pending signals * @it_overrun_last: The overrun at the time of the last delivered signal - * @it_requeue_pending: Indicator that timer waits for being requeued on - * signal delivery + * @it_signal_seq: Sequence count to control signal delivery * @it_sigev_notify: The notify word of sigevent struct for signal delivery * @it_interval: The interval for periodic timers * @it_signal: Pointer to the creators signal struct @@ -235,7 +234,7 @@ struct k_itimer { int it_active; s64 it_overrun; s64 it_overrun_last; - int it_requeue_pending; + unsigned int it_signal_seq; int it_sigev_notify; ktime_t it_interval; struct signal_struct *it_signal; --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -573,7 +573,7 @@ static enum alarmtimer_restart alarm_han * small intervals cannot starve the system. */ ptr->it_overrun += __alarm_forward_now(alarm, ptr->it_interval, true); - ++ptr->it_requeue_pending; + ++ptr->it_signal_seq; ptr->it_active = 1; result = ALARMTIMER_RESTART; } --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c @@ -607,7 +607,7 @@ static void cpu_timer_fire(struct k_itim * ticking in case the signal is deliverable next time. */ posix_cpu_timer_rearm(timer); - ++timer->it_requeue_pending; + ++timer->it_signal_seq; } } --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -269,13 +269,13 @@ bool posixtimer_deliver_signal(struct ke if (!timr) goto out; - if (timr->it_interval && timr->it_requeue_pending == info->si_sys_private) { + if (timr->it_interval && timr->it_signal_seq == info->si_sys_private) { timr->kclock->timer_rearm(timr); timr->it_active = 1; timr->it_overrun_last = timr->it_overrun; timr->it_overrun = -1LL; - ++timr->it_requeue_pending; + ++timr->it_signal_seq; info->si_overrun = timer_overrun_to_int(timr, info->si_overrun); } @@ -299,7 +299,7 @@ int posix_timer_queue_signal(struct k_it timr->it_active = 0; if (timr->it_interval) - si_private = ++timr->it_requeue_pending; + si_private = ++timr->it_signal_seq; type = !(timr->it_sigev_notify & SIGEV_THREAD_ID) ? PIDTYPE_TGID : PIDTYPE_PID; ret = send_sigqueue(timr->sigq, timr->it_pid, type, si_private); @@ -366,7 +366,7 @@ static enum hrtimer_restart posix_timer_ timr->it_overrun += hrtimer_forward(timer, now, timr->it_interval); ret = HRTIMER_RESTART; - ++timr->it_requeue_pending; + ++timr->it_signal_seq; timr->it_active = 1; } } @@ -662,7 +662,7 @@ void common_timer_get(struct k_itimer *t * is a SIGEV_NONE timer move the expiry time forward by intervals, * so expiry is > now. */ - if (iv && (timr->it_requeue_pending & REQUEUE_PENDING || sig_none)) + if (iv && (timr->it_signal_seq & REQUEUE_PENDING || sig_none)) timr->it_overrun += kc->timer_forward(timr, now); remaining = kc->timer_remaining(timr, now); @@ -863,7 +863,7 @@ void posix_timer_set_common(struct k_iti timer->it_interval = timespec64_to_ktime(new_setting->it_interval); /* Prevent reloading in case there is a signal pending */ - timer->it_requeue_pending = (timer->it_requeue_pending + 2) & ~REQUEUE_PENDING; + timer->it_signal_seq = (timer->it_signal_seq + 2) & ~REQUEUE_PENDING; /* Reset overrun accounting */ timer->it_overrun_last = 0; timer->it_overrun = -1LL;