From patchwork Thu Nov 24 14:16:14 2022 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: 25575 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3426502wrr; Thu, 24 Nov 2022 06:22:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf5R9Dl+wz0g/5eb0MUv+vxkgr6iYWm1RKP1cXrQbc/g+G8ySUwqJrytQdVt4/2gSRI3reyh X-Received: by 2002:a05:6a00:4287:b0:56c:1251:8718 with SMTP id bx7-20020a056a00428700b0056c12518718mr14585942pfb.62.1669299736881; Thu, 24 Nov 2022 06:22:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669299736; cv=none; d=google.com; s=arc-20160816; b=MZcSXTiUUji46Iq/SYte38AhtH2KkjevKtc6POUBoMGdrQaiAS+sg+FVmdlYoe8ZFo wSQW9CGTxHBs5Q2qwBm5C/lYMeGYoNK1t2jwk4tB0+Mdc1zY6OdXW+Gsgue7D4yn/sVw foWUXdElDJSCvny2j9b4z7Pe+vjltNopSMGQH6Jk47CYi61Xksk9f1fd7KVV8PAlAEkM LBWw+gV/uEEC8jmvgVe0yQ7eTl5GMtZPHD8FCjVWioOtQr6HN5UXY+X3UbH9WVtOyy/L sx/na3qLSuSsTN3wLKE7wBNoNXu5xjM01LGTw/tKWHI5tWQo/Xhyw9Rpx/IrLLENzXxl HKew== 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=Ndr8k76BBWZN12WNY79X+vYDbodvKnLFM9WsKDTl5Ic=; b=pAGkuEaPISdckbrUJlNN99w5UPD/E1wMxU77dh8E8yBMowe1NRgtOsvjwOTSwipPUu IhD7Bx3EmAENNVd498uIm/o4oJRaDSadABxXtrrtvBT/L5QTkF13/S8I2wac33ZmEwX/ Y4k8ai334VdtsTAClaWdJhhJpd3Q7r32kdX+Egu0bfadEtAmqdk/dhWosztWUsIjatkH Zh5Ga1QsPckd7T57rFG0amF8odQwD3RrzJo6WHDQjE/MCa2D4AvrEGexEuq4Jn733/r+ tL3dHMAT/t8HhoyJ+6dG4ybFWPzYGiw5rUXOM+V3X3ptoNaHTUEQnplATwCN8yJAQqPj j4qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=GRGMWliK; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=WTCAfedX; 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 d1-20020a170903230100b001884ba979e7si1284651plh.194.2022.11.24.06.22.03; Thu, 24 Nov 2022 06:22:16 -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=GRGMWliK; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=WTCAfedX; 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 S230359AbiKXOQ6 (ORCPT + 99 others); Thu, 24 Nov 2022 09:16:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230169AbiKXOQS (ORCPT ); Thu, 24 Nov 2022 09:16:18 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7A59F3922; Thu, 24 Nov 2022 06:16:16 -0800 (PST) Date: Thu, 24 Nov 2022 14:16:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1669299375; 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=Ndr8k76BBWZN12WNY79X+vYDbodvKnLFM9WsKDTl5Ic=; b=GRGMWliKYJz/hBi7iyZYUXswIQ42Zyxf1VkkIKFqvoTHWoLPUfVWAk73zVZbEa/511XjNf 4pD/IFKgvfgH7bzWbciJk+zHnteu1vbDKNepGdDlBNQTL8vEeEx/GE7r2u1juSauiMvV9l VjhOL2YVEZueBJ0gaSWQsEPA9rG4h12azyV2JEQbuGS2sf6xmQgwo7q7wyTsdmMNvlhjnp tBwtUkZg/Uoram/dYJ4Wu7n1w5vishMOB1DWUlnkAsuO1KPmI389wvV7/Ylg1yrxQChKnf 1rPbJLiHj72c5+T5lPDJstzb+uv/7RzK9S8ulZs08Xd84rIlg2NRmEQOk5LdPg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1669299375; 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=Ndr8k76BBWZN12WNY79X+vYDbodvKnLFM9WsKDTl5Ic=; b=WTCAfedX0mjhk9PP4zQ9LTW8cH/4ubeuqMqUfDJUZNBuSwNP9NQN1oj8jvVqu/O6XxxqYX iL8Xmm59Whcy9KCQ== 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] timers: Get rid of del_singleshot_timer_sync() Cc: Thomas Gleixner , Guenter Roeck , Jacob Keller , "Anna-Maria Behnsen" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221123201624.706987932@linutronix.de> References: <20221123201624.706987932@linutronix.de> MIME-Version: 1.0 Message-ID: <166929937412.4906.17418722479650107453.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 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?1750319681394285930?= X-GMAIL-MSGID: =?utf-8?q?1750387640739481878?= The following commit has been merged into the timers/core branch of tip: Commit-ID: 9a5a305686971f4be10c6d7251c8348d74b3e014 Gitweb: https://git.kernel.org/tip/9a5a305686971f4be10c6d7251c8348d74b3e014 Author: Thomas Gleixner AuthorDate: Wed, 23 Nov 2022 21:18:37 +01:00 Committer: Thomas Gleixner CommitterDate: Thu, 24 Nov 2022 15:09:10 +01:00 timers: Get rid of del_singleshot_timer_sync() 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 Tested-by: Guenter Roeck Reviewed-by: Jacob Keller Reviewed-by: Anna-Maria Behnsen Link: https://lore.kernel.org/r/20221123201624.706987932@linutronix.de --- 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(-) diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c index dc4c0a0..30b4c28 100644 --- 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 *file, char __user *buf, 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 @@ __poll_t tpm_common_poll(struct file *file, poll_table *wait) 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; diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c index 02fdef7..c7cd541 100644 --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/drivers/staging/wlan-ng/hfa384x_usb.c @@ -1116,8 +1116,8 @@ cleanup: 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); diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c index e13da7f..c13f169 100644 --- a/drivers/staging/wlan-ng/prism2usb.c +++ b/drivers/staging/wlan-ng/prism2usb.c @@ -170,9 +170,9 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface) */ 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. diff --git a/include/linux/timer.h b/include/linux/timer.h index 648f001..ea35d00 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -190,8 +190,6 @@ extern int try_to_del_timer_sync(struct timer_list *timer); # 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 *); diff --git a/kernel/time/timer.c b/kernel/time/timer.c index f40c88c..190e069 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1933,7 +1933,7 @@ signed long __sched schedule_timeout(signed long timeout) 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); diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 656cec2..ab453ed 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -1164,7 +1164,7 @@ xprt_request_enqueue_receive(struct rpc_task *task) spin_unlock(&xprt->queue_lock); /* Turn off autodisconnect */ - del_singleshot_timer_sync(&xprt->timer); + del_timer_sync(&xprt->timer); return 0; }