Commit fe99d43f authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Yu Liao
Browse files

timers: Get rid of del_singleshot_timer_sync() 

mainline inclusion
from mainline-v6.2-rc1
commit 9a5a3056
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I7R8WG

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9a5a305686971f4be10c6d7251c8348d74b3e014



--------------------------------

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: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarAnna-Maria Behnsen <anna-maria@linutronix.de>
Link: https://lore.kernel.org/r/20221123201624.706987932@linutronix.de



 Conflicts:
	net/sunrpc/xprt.c
Signed-off-by: default avatarYu Liao <liaoyu15@huawei.com>
parent d0f4c739

drivers/char/tpm/tpm-dev-common.c

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,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);
@@ -263,7 +263,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;

drivers/misc/sgi-xp/xpc_partition.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ xpc_partition_disengaged(struct xpc_partition *part) 


		/* cancel the timer function, provided it's not us */

		if (!in_interrupt())

			del_singleshot_timer_sync(&part->disengage_timer);

			del_timer_sync(&part->disengage_timer);



		DBUG_ON(part->act_state != XPC_P_AS_DEACTIVATING &&

			part->act_state != XPC_P_AS_INACTIVE);

drivers/staging/wlan-ng/hfa384x_usb.c

+2 −2
Original line number Diff line number Diff line
@@ -1116,8 +1116,8 @@ static int hfa384x_usbctlx_complete_sync(struct hfa384x *hw, 
		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);

drivers/staging/wlan-ng/prism2usb.c

+3 −3
Original line number Diff line number Diff line
@@ -171,9 +171,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.

include/linux/timer.h

+0 −2
Original line number Diff line number Diff line
@@ -196,8 +196,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);

extern void run_local_timers(void);

struct hrtimer;