From patchwork Tue Nov 15 20:28:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 20542 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2927516wru; Tue, 15 Nov 2022 12:29:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf5PG+FZd4ld2mLNMre6j/YmFzmmKmdTtKClWkT4UQNHE/KsEDTLwYtlBvepp7gxKvdxlRuY X-Received: by 2002:a17:902:b48d:b0:188:b8cf:85b with SMTP id y13-20020a170902b48d00b00188b8cf085bmr5500854plr.126.1668544182489; Tue, 15 Nov 2022 12:29:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668544182; cv=none; d=google.com; s=arc-20160816; b=Dl4Ag5nFxUpSCu0s4JvNCfgk4cmetMAfmfoAU07kDKSoq5hekQTy+HyEH4rQb2IgC9 tHrjAbmOSokTEM92rYpbPbcHvEojx5WIMP55mF+lf8ho+dX2vKBFCNN8IFtMTY0yvd8n bk9fZ6mW3rZk+89qOJarRlchQOMa66vMKRupPPZN3jzEr53Db/vs8DFTHHH1SbGAhObA jfCyxlaU6WWAu0C59bKqIC0GSpa/X884LvBDRRgmodWPDVOVYxRr3KZdPObsl9Ty8rk7 NJ5zG0uiMC8h6WWUwaEHBUN28KQk19Uijzil87cZYapPFzlzsOJWDe19X6ZLo0McAqju Z3OA== 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=3TBA6m8Bui7HopFhQ4Bz43kzwszNO0sb5x3eSnipnV0=; b=dvSJPMdB2/W7+6ezfLeSCbgIY8Rgi+uy+Hcqbe/qOXX+D8ec48xhZDd4HjssEvEl/4 fsD/MWXfG3vH0BgHVkow6aDRCwWjOViQGKcnppRackekDjDE2PPKDAbwlqsAntLTits5 BhyrvMR4sPZEOJtYx+qeOIWnal52kVEwQxOVz/8fC3mi8EDYLOco7nJNuPZLpc2ivqQq Pa84uOyEg7uCBL4shuaz16/XiZW2GbnG5LIgWmulq4w0Gijep9bElwLwwEBBYBOQkmXO hGRsR1Smlx9TE1FFNHa8x1FG/tcLvwcPoMD8WLRfK9thc7bjFNxx1J91LGjjvIpDSsPG XQmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=CnGelLBE; 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 a13-20020a655c8d000000b00439dcdd3cfdsi13507866pgt.825.2022.11.15.12.29.28; Tue, 15 Nov 2022 12:29:42 -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=CnGelLBE; 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 S229562AbiKOU3D (ORCPT + 99 others); Tue, 15 Nov 2022 15:29:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231640AbiKOU2m (ORCPT ); Tue, 15 Nov 2022 15:28:42 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1952BDE93; Tue, 15 Nov 2022 12:28:41 -0800 (PST) Message-ID: <20221115202117.212339280@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1668544119; 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=3TBA6m8Bui7HopFhQ4Bz43kzwszNO0sb5x3eSnipnV0=; b=CnGelLBE0Fa85YjIR35gJaKjBm/eUBT0c7RRftGo7CvC9/gQL8eQiSl9bpw8uXwvYVj+5X YcgEmxPqRUsd/YsKCIV8sGkFHINcPbcrZn3Vftp4oPrdmAChvCzJRrsK446Iisg2irt67i UqyUYuZXLEKS3ms2Z5WSLe8nmYdFYXQW6qjVg90q4SXQOSRC+Y9Aqu5BwUBdnCOSykPlDy z0g9P2ZBAmmxbohG/ZSF4jpAhx3gGkubIHsCFOQEFCvSF7xIcyNXdJh7VtaAoTXHPl70Ih 7RjR05xoWFmNlKbGpDJg7876fzQuCCtnG83wUr88KKOq4I3yflOJ2mUS0C06Sg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1668544119; 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=3TBA6m8Bui7HopFhQ4Bz43kzwszNO0sb5x3eSnipnV0=; b=RLinhQXJtS9wYfu34J619sF3m7jtZSMxOgQg18D6H7+Pz454qb6YYMDZ+510IR8kUAC3Ze Q2q1BB+iVBJasIAw== 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 04/15] timers: Get rid of del_singleshot_timer_sync() References: <20221115195802.415956561@linutronix.de> MIME-Version: 1.0 Date: Tue, 15 Nov 2022 21:28:39 +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?1749595384895953286?= X-GMAIL-MSGID: =?utf-8?q?1749595384895953286?= del_singleshot_timer_sync() used to be an optimization for deleting timers which are not rearmed from the timer callback function. This optimization turned out to be broken and got mapped to del_timer_sync() about 17 years ago. Get rid of the undocumented indirection and use del_timer_sync() directly. No functional change. Signed-off-by: Thomas Gleixner Reviewed-by: Steven Rostedt (Google) --- drivers/char/tpm/tpm-dev-common.c | 4 ++-- drivers/staging/wlan-ng/hfa384x_usb.c | 4 ++-- drivers/staging/wlan-ng/prism2usb.c | 6 +++--- include/linux/timer.h | 2 -- kernel/time/timer.c | 2 +- net/sunrpc/xprt.c | 2 +- 6 files changed, 9 insertions(+), 11 deletions(-) --- a/drivers/char/tpm/tpm-dev-common.c +++ b/drivers/char/tpm/tpm-dev-common.c @@ -155,7 +155,7 @@ ssize_t tpm_common_read(struct file *fil out: if (!priv->response_length) { *off = 0; - del_singleshot_timer_sync(&priv->user_read_timer); + del_timer_sync(&priv->user_read_timer); flush_work(&priv->timeout_work); } mutex_unlock(&priv->buffer_mutex); @@ -262,7 +262,7 @@ ssize_t tpm_common_write(struct file *fi void tpm_common_release(struct file *file, struct file_priv *priv) { flush_work(&priv->async_work); - del_singleshot_timer_sync(&priv->user_read_timer); + del_timer_sync(&priv->user_read_timer); flush_work(&priv->timeout_work); file->private_data = NULL; priv->response_length = 0; --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/drivers/staging/wlan-ng/hfa384x_usb.c @@ -1116,8 +1116,8 @@ static int hfa384x_usbctlx_complete_sync if (ctlx == get_active_ctlx(hw)) { spin_unlock_irqrestore(&hw->ctlxq.lock, flags); - del_singleshot_timer_sync(&hw->reqtimer); - del_singleshot_timer_sync(&hw->resptimer); + del_timer_sync(&hw->reqtimer); + del_timer_sync(&hw->resptimer); hw->req_timer_done = 1; hw->resp_timer_done = 1; usb_kill_urb(&hw->ctlx_urb); --- a/drivers/staging/wlan-ng/prism2usb.c +++ b/drivers/staging/wlan-ng/prism2usb.c @@ -170,9 +170,9 @@ static void prism2sta_disconnect_usb(str */ prism2sta_ifstate(wlandev, P80211ENUM_ifstate_disable); - del_singleshot_timer_sync(&hw->throttle); - del_singleshot_timer_sync(&hw->reqtimer); - del_singleshot_timer_sync(&hw->resptimer); + del_timer_sync(&hw->throttle); + del_timer_sync(&hw->reqtimer); + del_timer_sync(&hw->resptimer); /* Unlink all the URBs. This "removes the wheels" * from the entire CTLX handling mechanism. --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -190,8 +190,6 @@ extern int try_to_del_timer_sync(struct # define del_timer_sync(t) del_timer(t) #endif -#define del_singleshot_timer_sync(t) del_timer_sync(t) - extern void init_timers(void); struct hrtimer; extern enum hrtimer_restart it_real_fn(struct hrtimer *); --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1933,7 +1933,7 @@ signed long __sched schedule_timeout(sig timer_setup_on_stack(&timer.timer, process_timeout, 0); __mod_timer(&timer.timer, expire, MOD_TIMER_NOTPENDING); schedule(); - del_singleshot_timer_sync(&timer.timer); + del_timer_sync(&timer.timer); /* Remove the timer from the object tracker */ destroy_timer_on_stack(&timer.timer); --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -1164,7 +1164,7 @@ xprt_request_enqueue_receive(struct rpc_ spin_unlock(&xprt->queue_lock); /* Turn off autodisconnect */ - del_singleshot_timer_sync(&xprt->timer); + del_timer_sync(&xprt->timer); return 0; }