From nobody Wed Apr 8 14:10:30 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 560A2C433FE for ; Sat, 8 Oct 2022 11:02:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229686AbiJHLCv (ORCPT ); Sat, 8 Oct 2022 07:02:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229650AbiJHLCs (ORCPT ); Sat, 8 Oct 2022 07:02:48 -0400 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 326BD46DB7 for ; Sat, 8 Oct 2022 04:02:47 -0700 (PDT) Received: from localhost.localdomain (unknown [46.242.14.200]) by mail.ispras.ru (Postfix) with ESMTPSA id 1741E40A312E; Sat, 8 Oct 2022 11:02:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 1741E40A312E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1665226965; bh=1rs5pf/LUt3IgOmfzALZpQhjLw/lUwYJJzYZNLHM6nQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ESzqjJJvvDbEap9VzRlMY0mSOfBJ4FXNSclIkfEzC8DDfXNXmMDQFq5VmF7D/j9yS aBazWKo5OHl2SJ4tPyJrjCoMmXhX4LHaohBCd6+76UvbulI0j/V21V80LHFQKieZ5e 7pe9go8rkpFs7QYQrJJEIZlpUC4Vsy19WYLhMK0s= From: Fedor Pchelkin To: Daniel Starke Cc: Fedor Pchelkin , Jiri Slaby , lvc-project@linuxtesting.org, Alexey Khoroshilov , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Pavel Machek Subject: [PATCH 2/2] Revert "tty: n_gsm: replace kicktimer with delayed_work" Date: Sat, 8 Oct 2022 14:02:21 +0300 Message-Id: <20221008110221.13645-3-pchelkin@ispras.ru> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221008110221.13645-1-pchelkin@ispras.ru> References: <20221008110221.13645-1-pchelkin@ispras.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This reverts commit c9ab053e56ce13a949977398c8edc12e6c02fc95. The above commit is reverted as it was a prerequisite for tx_mutex introduction and tx_mutex has been removed as it does not correctly work in order to protect tx data. Signed-off-by: Fedor Pchelkin Signed-off-by: Alexey Khoroshilov Reviewed-by: Daniel Starke --- drivers/tty/n_gsm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index e23225aff5d9..d6598ca3640f 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -256,7 +256,7 @@ struct gsm_mux { struct list_head tx_data_list; /* Pending data packets */ =20 /* Control messages */ - struct delayed_work kick_timeout; /* Kick TX queuing on timeout */ + struct timer_list kick_timer; /* Kick TX queuing on timeout */ struct timer_list t2_timer; /* Retransmit timer for commands */ int cretries; /* Command retry counter */ struct gsm_control *pending_cmd;/* Our current pending command */ @@ -1009,7 +1009,7 @@ static void __gsm_data_queue(struct gsm_dlci *dlci, s= truct gsm_msg *msg) gsm->tx_bytes +=3D msg->len; =20 gsmld_write_trigger(gsm); - schedule_delayed_work(&gsm->kick_timeout, 10 * gsm->t1 * HZ / 100); + mod_timer(&gsm->kick_timer, jiffies + 10 * gsm->t1 * HZ / 100); } =20 /** @@ -1984,16 +1984,16 @@ static void gsm_dlci_command(struct gsm_dlci *dlci,= const u8 *data, int len) } =20 /** - * gsm_kick_timeout - transmit if possible - * @work: work contained in our gsm object + * gsm_kick_timer - transmit if possible + * @t: timer contained in our gsm object * * Transmit data from DLCIs if the queue is empty. We can't rely on * a tty wakeup except when we filled the pipe so we need to fire off * new data ourselves in other cases. */ -static void gsm_kick_timeout(struct work_struct *work) +static void gsm_kick_timer(struct timer_list *t) { - struct gsm_mux *gsm =3D container_of(work, struct gsm_mux, kick_timeout.w= ork); + struct gsm_mux *gsm =3D from_timer(gsm, t, kick_timer); unsigned long flags; int sent =3D 0; =20 @@ -2458,7 +2458,7 @@ static void gsm_cleanup_mux(struct gsm_mux *gsm, bool= disc) } =20 /* Finish outstanding timers, making sure they are done */ - cancel_delayed_work_sync(&gsm->kick_timeout); + del_timer_sync(&gsm->kick_timer); del_timer_sync(&gsm->t2_timer); =20 /* Finish writing to ldisc */ @@ -2605,7 +2605,7 @@ static struct gsm_mux *gsm_alloc_mux(void) kref_init(&gsm->ref); INIT_LIST_HEAD(&gsm->tx_ctrl_list); INIT_LIST_HEAD(&gsm->tx_data_list); - INIT_DELAYED_WORK(&gsm->kick_timeout, gsm_kick_timeout); + timer_setup(&gsm->kick_timer, gsm_kick_timer, 0); timer_setup(&gsm->t2_timer, gsm_control_retransmit, 0); INIT_WORK(&gsm->tx_work, gsmld_write_task); init_waitqueue_head(&gsm->event); --=20 2.25.1