From patchwork Tue Nov 15 20:28:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 20548 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2931343wru; Tue, 15 Nov 2022 12:40:25 -0800 (PST) X-Google-Smtp-Source: AA0mqf4+KMYMAGLUaApKYW5vdRgoYQ/q0CgQNvTKaSnlopadGasKN0rKWYdemkUUBSLresgBxlIA X-Received: by 2002:a17:907:9546:b0:7ac:d0ae:feba with SMTP id ex6-20020a170907954600b007acd0aefebamr15465089ejc.646.1668544825261; Tue, 15 Nov 2022 12:40:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668544825; cv=none; d=google.com; s=arc-20160816; b=ajONfTxn5/d9Kquy6ns3EdL4NG6vZVmPdNfjV2FBadzr5MDkvLiUzvyAu0X0PI6Msk SH1zoZ11zUCQEQFXAVXS+uHfrto9L5yFVR2Gmt785zFq13YUgF6jAQoRk8hDRFpZoqe7 NlkVD0gesIC49MTx3F8z2CviriFTlo68rjESjUjx1OqipugbYrkpAQgxeUdFE9AwHTTA PTl6uI2L2adC4sBCNwjGAa2lBPsJQeQn58EeSvyw2iFHJBISa6SmDSlcXep41Hbis2Dj IcReBBlspKhcvZ6war9a8eVA/GsVsi6iMZge7IgF97ePbUejDTJV33anTcAxoXPyRUc4 K/Iw== 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=lhI4vWrTLS0UmEPOy+yLY9a4+uY4zqdwPZIU3WEgia8=; b=BR2S36pm9ylPCfeD5LUKsSGjhgIW4YsX05s/8TEgGGi2J8t9HrnU3YgSyrEMmGI1su gk5HkyjB1O71cv/AeOJ5ZaWfma4p3vY76CY4Fm1BAJATBG5fOMbHRkM53IBN4rMV/yzu dCkklQnf4jXM9goUXqsQlGyzgg+h1IzTyA9ij7MqybK5YmihmC5PRzkaFueipYPjw2m2 9aUdeizsnMjt7KBYCMPnBEuc3JGP0ImDRjgbEmgUXoBj/yqMNC0XPGNTgBXufED/OpW0 RfsQNQVwAS66a4cH1zmn7leTtg3Vrrvv3u0mFvBGkKlNTy8zWUNoXJoddXfSPb0MkXIV +EHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=0L0jDWVh; dkim=neutral (no key) header.i=@linutronix.de; 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 i20-20020a50fc14000000b00461f7a83e58si11581252edr.46.2022.11.15.12.40.01; Tue, 15 Nov 2022 12:40:25 -0800 (PST) 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=0L0jDWVh; dkim=neutral (no key) header.i=@linutronix.de; 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 S238283AbiKOU36 (ORCPT + 99 others); Tue, 15 Nov 2022 15:29:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232569AbiKOU3R (ORCPT ); Tue, 15 Nov 2022 15:29:17 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74C891659D; Tue, 15 Nov 2022 12:28:48 -0800 (PST) Message-ID: <20221115202117.438013991@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1668544127; 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=lhI4vWrTLS0UmEPOy+yLY9a4+uY4zqdwPZIU3WEgia8=; b=0L0jDWVheTH+lUpVH8Cme4AHvqhxzhwFM5thzlZjbYNCixajpNtYarLKjs5JhMfYmXdt0I Boa11in0Rf90i9OJfB1ECG5n5eslv3vZJLD97TtXc+3yK4auw1H+l4olFGw3CRtqzTWRga AE+8PxmgCmfYpQ+xCpe0K2ii+psAf3J/LbXfKnAggA+wCOQRnz/kjnmlQ5TrwyB92YnrO1 UkouQQOg9ZjS0qTBWbPDP/bvHeGril3j/gLwombTEPBzWYWRg1R/n3wHRkol9pwuWPesUO 7SO4O3jnZisJbfNS29Divd52EwkD5WH5btGRnO2574O8jPE+Z2zjzZW9bgZNwQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1668544127; 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=lhI4vWrTLS0UmEPOy+yLY9a4+uY4zqdwPZIU3WEgia8=; b=xyGRlNWi/OwMd0LPS63ukFn7w/SoiFAGTc11LkVlCjaQiuLBDCvZc0dfsQP/9bI2lq+drz qk+HLo8SCblDu7DA== From: Thomas Gleixner To: LKML Cc: Linus Torvalds , Steven Rostedt , Anna-Maria Behnsen , Peter Zijlstra , Stephen Boyd , Guenter Roeck , Andrew Morton , Julia Lawall , Arnd Bergmann , Viresh Kumar , Marc Zyngier , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , linux-bluetooth@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org Subject: [patch 08/15] timers: Rename del_timer_sync() to timer_delete_sync() References: <20221115195802.415956561@linutronix.de> MIME-Version: 1.0 Date: Tue, 15 Nov 2022 21:28:46 +0100 (CET) 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 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?1749596058519608280?= X-GMAIL-MSGID: =?utf-8?q?1749596058519608280?= The timer related functions do not have a strict timer_ prefixed namespace which is really annoying. Rename del_timer_sync() to timer_delete_sync() and provide del_timer_sync() as a wrapper. Document that del_timer_sync() is not for new code. Signed-off-by: Thomas Gleixner Reviewed-by: Steven Rostedt (Google) --- include/linux/timer.h | 15 ++++++++++++++- kernel/time/timer.c | 18 +++++++++--------- 2 files changed, 23 insertions(+), 10 deletions(-) --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -183,7 +183,20 @@ extern int timer_reduce(struct timer_lis extern void add_timer(struct timer_list *timer); extern int try_to_del_timer_sync(struct timer_list *timer); -extern int del_timer_sync(struct timer_list *timer); +extern int timer_delete_sync(struct timer_list *timer); + +/** + * del_timer_sync - Delete a pending timer and wait for a running callback + * @timer: The timer to be deleted + * + * See timer_delete_sync() for detailed explanation. + * + * Do not use in new code. Use timer_delete_sync() instead. + */ +static inline int del_timer_sync(struct timer_list *timer) +{ + return timer_delete_sync(timer); +} extern void init_timers(void); struct hrtimer; --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1083,7 +1083,7 @@ static inline int /* * We are trying to schedule the timer on the new base. * However we can't change timer's base while it is running, - * otherwise del_timer_sync() can't detect that the timer's + * otherwise timer_delete_sync() can't detect that the timer's * handler yet has not finished. This also guarantees that the * timer is serialized wrt itself. */ @@ -1255,7 +1255,7 @@ EXPORT_SYMBOL_GPL(add_timer_on); * del_timer - Deactivate a timer. * @timer: The timer to be deactivated * - * Contrary to del_timer_sync() this function does not wait for an + * Contrary to timer_delete_sync() this function does not wait for an * eventually running timer callback on a different CPU and it neither * prevents rearming of the timer. If @timer can be rearmed concurrently * then the return value of this function is meaningless. @@ -1388,7 +1388,7 @@ static inline void del_timer_wait_runnin #endif /** - * del_timer_sync - Deactivate a timer and wait for the handler to finish. + * timer_delete_sync - Deactivate a timer and wait for the handler to finish. * @timer: The timer to be deactivated * * Synchronization rules: Callers must prevent restarting of the timer, @@ -1410,10 +1410,10 @@ static inline void del_timer_wait_runnin * spin_lock_irq(somelock); * * spin_lock(somelock); - * del_timer_sync(mytimer); + * timer_delete_sync(mytimer); * while (base->running_timer == mytimer); * - * Now del_timer_sync() will never return and never release somelock. + * Now timer_delete_sync() will never return and never release somelock. * The interrupt on the other CPU is waiting to grab somelock but it has * interrupted the softirq that CPU0 is waiting to finish. * @@ -1426,7 +1426,7 @@ static inline void del_timer_wait_runnin * * %0 - The timer was not pending * * %1 - The timer was pending and deactivated */ -int del_timer_sync(struct timer_list *timer) +int timer_delete_sync(struct timer_list *timer) { int ret; @@ -1466,7 +1466,7 @@ int del_timer_sync(struct timer_list *ti return ret; } -EXPORT_SYMBOL(del_timer_sync); +EXPORT_SYMBOL(timer_delete_sync); static void call_timer_fn(struct timer_list *timer, void (*fn)(struct timer_list *), @@ -1488,8 +1488,8 @@ static void call_timer_fn(struct timer_l #endif /* * Couple the lock chain with the lock chain at - * del_timer_sync() by acquiring the lock_map around the fn() - * call here and in del_timer_sync(). + * timer_delete_sync() by acquiring the lock_map around the fn() + * call here and in timer_delete_sync(). */ lock_map_acquire(&lockdep_map);