|
Takashi Iwai |
ea6038 |
From c9ab053e56ce13a949977398c8edc12e6c02fc95 Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
ea6038 |
From: Fedor Pchelkin <pchelkin@ispras.ru>
|
|
Takashi Iwai |
ea6038 |
Date: Mon, 29 Aug 2022 16:16:39 +0300
|
|
Takashi Iwai |
ea6038 |
Subject: [PATCH] tty: n_gsm: replace kicktimer with delayed_work
|
|
Takashi Iwai |
ea6038 |
Git-commit: c9ab053e56ce13a949977398c8edc12e6c02fc95
|
|
Takashi Iwai |
ea6038 |
Patch-mainline: v6.0-rc4
|
|
Takashi Iwai |
ea6038 |
References: git-fixes
|
|
Takashi Iwai |
ea6038 |
|
|
Takashi Iwai |
ea6038 |
A kick_timer timer_list is replaced with kick_timeout delayed_work to be
|
|
Takashi Iwai |
ea6038 |
able to synchronize with mutexes as a prerequisite for the introduction
|
|
Takashi Iwai |
ea6038 |
of tx_mutex.
|
|
Takashi Iwai |
ea6038 |
|
|
Takashi Iwai |
ea6038 |
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
|
|
Takashi Iwai |
ea6038 |
|
|
Takashi Iwai |
ea6038 |
Fixes: c568f7086c6e ("tty: n_gsm: fix missing timer to handle stalled links")
|
|
Takashi Iwai |
ea6038 |
Cc: stable <stable@kernel.org>
|
|
Takashi Iwai |
ea6038 |
Reviewed-by: Jiri Slaby <jirislaby@kernel.org>
|
|
Takashi Iwai |
ea6038 |
Suggested-by: Hillf Danton <hdanton@sina.com>
|
|
Takashi Iwai |
ea6038 |
Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
|
|
Takashi Iwai |
ea6038 |
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
|
|
Takashi Iwai |
ea6038 |
Link: https://lore.kernel.org/r/20220829131640.69254-2-pchelkin@ispras.ru
|
|
Takashi Iwai |
ea6038 |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Takashi Iwai |
ea6038 |
Acked-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
ea6038 |
|
|
Takashi Iwai |
ea6038 |
---
|
|
Takashi Iwai |
ea6038 |
drivers/tty/n_gsm.c | 16 ++++++++--------
|
|
Takashi Iwai |
ea6038 |
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
Takashi Iwai |
ea6038 |
|
|
Takashi Iwai |
ea6038 |
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
|
|
Takashi Iwai |
ea6038 |
index d6598ca3640f..e23225aff5d9 100644
|
|
Takashi Iwai |
ea6038 |
--- a/drivers/tty/n_gsm.c
|
|
Takashi Iwai |
ea6038 |
+++ b/drivers/tty/n_gsm.c
|
|
Takashi Iwai |
ea6038 |
@@ -256,7 +256,7 @@ struct gsm_mux {
|
|
Takashi Iwai |
ea6038 |
struct list_head tx_data_list; /* Pending data packets */
|
|
Takashi Iwai |
ea6038 |
|
|
Takashi Iwai |
ea6038 |
/* Control messages */
|
|
Takashi Iwai |
ea6038 |
- struct timer_list kick_timer; /* Kick TX queuing on timeout */
|
|
Takashi Iwai |
ea6038 |
+ struct delayed_work kick_timeout; /* Kick TX queuing on timeout */
|
|
Takashi Iwai |
ea6038 |
struct timer_list t2_timer; /* Retransmit timer for commands */
|
|
Takashi Iwai |
ea6038 |
int cretries; /* Command retry counter */
|
|
Takashi Iwai |
ea6038 |
struct gsm_control *pending_cmd;/* Our current pending command */
|
|
Takashi Iwai |
ea6038 |
@@ -1009,7 +1009,7 @@ static void __gsm_data_queue(struct gsm_dlci *dlci, struct gsm_msg *msg)
|
|
Takashi Iwai |
ea6038 |
gsm->tx_bytes += msg->len;
|
|
Takashi Iwai |
ea6038 |
|
|
Takashi Iwai |
ea6038 |
gsmld_write_trigger(gsm);
|
|
Takashi Iwai |
ea6038 |
- mod_timer(&gsm->kick_timer, jiffies + 10 * gsm->t1 * HZ / 100);
|
|
Takashi Iwai |
ea6038 |
+ schedule_delayed_work(&gsm->kick_timeout, 10 * gsm->t1 * HZ / 100);
|
|
Takashi Iwai |
ea6038 |
}
|
|
Takashi Iwai |
ea6038 |
|
|
Takashi Iwai |
ea6038 |
/**
|
|
Takashi Iwai |
ea6038 |
@@ -1984,16 +1984,16 @@ static void gsm_dlci_command(struct gsm_dlci *dlci, const u8 *data, int len)
|
|
Takashi Iwai |
ea6038 |
}
|
|
Takashi Iwai |
ea6038 |
|
|
Takashi Iwai |
ea6038 |
/**
|
|
Takashi Iwai |
ea6038 |
- * gsm_kick_timer - transmit if possible
|
|
Takashi Iwai |
ea6038 |
- * @t: timer contained in our gsm object
|
|
Takashi Iwai |
ea6038 |
+ * gsm_kick_timeout - transmit if possible
|
|
Takashi Iwai |
ea6038 |
+ * @work: work contained in our gsm object
|
|
Takashi Iwai |
ea6038 |
*
|
|
Takashi Iwai |
ea6038 |
* Transmit data from DLCIs if the queue is empty. We can't rely on
|
|
Takashi Iwai |
ea6038 |
* a tty wakeup except when we filled the pipe so we need to fire off
|
|
Takashi Iwai |
ea6038 |
* new data ourselves in other cases.
|
|
Takashi Iwai |
ea6038 |
*/
|
|
Takashi Iwai |
ea6038 |
-static void gsm_kick_timer(struct timer_list *t)
|
|
Takashi Iwai |
ea6038 |
+static void gsm_kick_timeout(struct work_struct *work)
|
|
Takashi Iwai |
ea6038 |
{
|
|
Takashi Iwai |
ea6038 |
- struct gsm_mux *gsm = from_timer(gsm, t, kick_timer);
|
|
Takashi Iwai |
ea6038 |
+ struct gsm_mux *gsm = container_of(work, struct gsm_mux, kick_timeout.work);
|
|
Takashi Iwai |
ea6038 |
unsigned long flags;
|
|
Takashi Iwai |
ea6038 |
int sent = 0;
|
|
Takashi Iwai |
ea6038 |
|
|
Takashi Iwai |
ea6038 |
@@ -2458,7 +2458,7 @@ static void gsm_cleanup_mux(struct gsm_mux *gsm, bool disc)
|
|
Takashi Iwai |
ea6038 |
}
|
|
Takashi Iwai |
ea6038 |
|
|
Takashi Iwai |
ea6038 |
/* Finish outstanding timers, making sure they are done */
|
|
Takashi Iwai |
ea6038 |
- del_timer_sync(&gsm->kick_timer);
|
|
Takashi Iwai |
ea6038 |
+ cancel_delayed_work_sync(&gsm->kick_timeout);
|
|
Takashi Iwai |
ea6038 |
del_timer_sync(&gsm->t2_timer);
|
|
Takashi Iwai |
ea6038 |
|
|
Takashi Iwai |
ea6038 |
/* Finish writing to ldisc */
|
|
Takashi Iwai |
ea6038 |
@@ -2605,7 +2605,7 @@ static struct gsm_mux *gsm_alloc_mux(void)
|
|
Takashi Iwai |
ea6038 |
kref_init(&gsm->ref);
|
|
Takashi Iwai |
ea6038 |
INIT_LIST_HEAD(&gsm->tx_ctrl_list);
|
|
Takashi Iwai |
ea6038 |
INIT_LIST_HEAD(&gsm->tx_data_list);
|
|
Takashi Iwai |
ea6038 |
- timer_setup(&gsm->kick_timer, gsm_kick_timer, 0);
|
|
Takashi Iwai |
ea6038 |
+ INIT_DELAYED_WORK(&gsm->kick_timeout, gsm_kick_timeout);
|
|
Takashi Iwai |
ea6038 |
timer_setup(&gsm->t2_timer, gsm_control_retransmit, 0);
|
|
Takashi Iwai |
ea6038 |
INIT_WORK(&gsm->tx_work, gsmld_write_task);
|
|
Takashi Iwai |
ea6038 |
init_waitqueue_head(&gsm->event);
|
|
Takashi Iwai |
ea6038 |
--
|
|
Takashi Iwai |
ea6038 |
2.35.3
|
|
Takashi Iwai |
ea6038 |
|