From patchwork Sun Jun 18 20:50:03 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: 109673 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2636507vqr; Sun, 18 Jun 2023 13:58:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6+ZN0F7LzoNs3EtHV0XmlakfZot7055UjtbjlrkjctQUcMS/z0XiYCdprfYuoE918zDD/R X-Received: by 2002:aa7:8894:0:b0:663:78e6:6d0a with SMTP id z20-20020aa78894000000b0066378e66d0amr11596866pfe.7.1687121914179; Sun, 18 Jun 2023 13:58:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687121914; cv=none; d=google.com; s=arc-20160816; b=kEOSn6XUQtoa70D2orXd7VvdmhLhgqHf1N24wa+rH0OyQCrjBJfkp8LOrGR2USeuqW +WwUDjra/VwLx9SRFHwtfyJ1UXpADMpi0/gK1yhdEDENn1/WJW3pSwRxtVsQIElilOv/ IL+rA444SfvXqV7KzX4zevHowzbbyePZmNs4SOhMKiRIlDOhm8oK58zm3rVVqY5FzK6d ThoNRpdHDMcfApk8CMon+kmPe1IK2hobuNyk7Or6wfhqqKPJbgF4bcjepCOiIsQJLDm2 gG+EyNw4NwMl2epEbfh46+DJ6F+O4hmA+JVlzL6sKaedbAJecgMPcybYZ8+3qWNwxAz8 6sEQ== 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=tE0PPSvgiBV5Ta1Wh/yehUxuOW1BM6BMnXtjBzy/htw=; b=UPq9DRer/oxkO0EXCl/N44wqNWxpgCvm1i5+GAeZcNRSdhYPF9IgTK2kOV1jSCANfr XlwHa1YOu3bjY5q2hQsrkagQ/B1WKD6q5RDv9PPr1i6JM7tJeR6+oI9lySqzlqvyZD4b nNEKwh7dfBeihF+Ib2cHmLY9zT4PTM7eGyUcPvJn8sv2PzwxP1/ZLIEEhsc1PjccEpWt 6ljSmWw3D/nD6UyCIqIuNTZyi/ZfDjTzZCdfhUvQLannxJ0gVuqCkWEExKd5Ek+c9n0u 9cu8fEFpOBVqNGCciLRXpulSHFj07pRc2dgfusvoBPJkULluJdQYf/bLI1EQzvLPNxAz cQPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=YXig6ezM; dkim=neutral (no key) header.i=@linutronix.de header.b=fmRgRd0f; 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 d199-20020a621dd0000000b00667593df948si3785712pfd.375.2023.06.18.13.58.22; Sun, 18 Jun 2023 13:58:34 -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=YXig6ezM; dkim=neutral (no key) header.i=@linutronix.de header.b=fmRgRd0f; 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 S229808AbjFRUu4 (ORCPT + 99 others); Sun, 18 Jun 2023 16:50:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229612AbjFRUuG (ORCPT ); Sun, 18 Jun 2023 16:50:06 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A6D1E56; Sun, 18 Jun 2023 13:50:05 -0700 (PDT) Date: Sun, 18 Jun 2023 20:50:03 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1687121404; 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=tE0PPSvgiBV5Ta1Wh/yehUxuOW1BM6BMnXtjBzy/htw=; b=YXig6ezMJyRfFkCpfFbX6sh4o8D7NyqqJqmbpSNVHpYy45kWDo454iLrYpIWbARmxs4h2W YUHMnbrCAvM1PEl9otel1Hems4kXriO+NjJUvHGKkXalI4CZ0jn597RZDmHC5L0TaHpz1F dTAxqAvXa9vN+OzgNsZp/V1FYP4tbn84YLgiphwnGJByvu156l5mP8VkFosJM4EbAhXEYT Oh10pSUT12qqsiREGfi0/v3pRafRpEHHD7fYPT/QSm0OmW4GjNnVG+3+R8DJgPUfHUVK89 Wnd7OuGj36Tz/zcluRyuNp6ap8pcsygXiAp0MjvXld0jE82F1Y/45pHTij3DTg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1687121404; 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=tE0PPSvgiBV5Ta1Wh/yehUxuOW1BM6BMnXtjBzy/htw=; b=fmRgRd0fiNph0n3x+a2Zg2UAvRhX4KHr6kwajorvsh1CbTBCIeB+stKJT7vIlJzlrA9DbV Ab0b+jvRepTiUDCw== 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: Split release_posix_timers() Cc: Thomas Gleixner , Frederic Weisbecker , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230425183313.301432503@linutronix.de> References: <20230425183313.301432503@linutronix.de> MIME-Version: 1.0 Message-ID: <168712140351.404.14009303465424230043.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?1764175797086414200?= X-GMAIL-MSGID: =?utf-8?q?1769075548097495603?= The following commit has been merged into the timers/core branch of tip: Commit-ID: 8cc96ca2c75f6da59de41321797c87562703c9e1 Gitweb: https://git.kernel.org/tip/8cc96ca2c75f6da59de41321797c87562703c9e1 Author: Thomas Gleixner AuthorDate: Tue, 25 Apr 2023 20:49:09 +02:00 Committer: Thomas Gleixner CommitterDate: Sun, 18 Jun 2023 22:41:50 +02:00 posix-timers: Split release_posix_timers() release_posix_timers() is called for cleaning up both hashed and unhashed timers. The cases are differentiated by an argument and the usage is hideous. Seperate the actual free path out and use it for unhashed timers. Provide a function for hashed timers. No functional change. Signed-off-by: Thomas Gleixner Reviewed-by: Frederic Weisbecker Link: https://lore.kernel.org/r/20230425183313.301432503@linutronix.de --- kernel/time/posix-timers.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index ed7d260..6ac6933 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -466,20 +466,21 @@ static void k_itimer_rcu_free(struct rcu_head *head) kmem_cache_free(posix_timers_cache, tmr); } -#define IT_ID_SET 1 -#define IT_ID_NOT_SET 0 -static void release_posix_timer(struct k_itimer *tmr, int it_id_set) -{ - if (it_id_set) { - spin_lock(&hash_lock, flags); - hlist_del_rcu(&tmr->t_hash); - spin_unlock(&hash_lock, flags); - } +static void posix_timer_free(struct k_itimer *tmr) +{ put_pid(tmr->it_pid); sigqueue_free(tmr->sigq); call_rcu(&tmr->rcu, k_itimer_rcu_free); } +static void posix_timer_unhash_and_free(struct k_itimer *tmr) +{ + spin_lock(&hash_lock); + hlist_del_rcu(&tmr->t_hash); + spin_unlock(&hash_lock); + posix_timer_free(tmr); +} + static int common_timer_create(struct k_itimer *new_timer) { hrtimer_init(&new_timer->it.real.timer, new_timer->it_clock, 0); @@ -493,7 +494,6 @@ static int do_timer_create(clockid_t which_clock, struct sigevent *event, const struct k_clock *kc = clockid_to_kclock(which_clock); struct k_itimer *new_timer; int error, new_timer_id; - int it_id_set = IT_ID_NOT_SET; if (!kc) return -EINVAL; @@ -513,11 +513,10 @@ static int do_timer_create(clockid_t which_clock, struct sigevent *event, */ new_timer_id = posix_timer_add(new_timer); if (new_timer_id < 0) { - error = new_timer_id; - goto out; + posix_timer_free(new_timer); + return new_timer_id; } - it_id_set = IT_ID_SET; new_timer->it_id = (timer_t) new_timer_id; new_timer->it_clock = which_clock; new_timer->kclock = kc; @@ -569,7 +568,7 @@ static int do_timer_create(clockid_t which_clock, struct sigevent *event, * new_timer after the unlock call. */ out: - release_posix_timer(new_timer, it_id_set); + posix_timer_unhash_and_free(new_timer); return error; } @@ -1057,7 +1056,7 @@ retry_delete: WRITE_ONCE(timer->it_signal, NULL); unlock_timer(timer, flags); - release_posix_timer(timer, IT_ID_SET); + posix_timer_unhash_and_free(timer); return 0; } @@ -1109,7 +1108,7 @@ retry_delete: WRITE_ONCE(timer->it_signal, NULL); spin_unlock_irqrestore(&timer->it_lock, flags); - release_posix_timer(timer, IT_ID_SET); + posix_timer_unhash_and_free(timer); } /*