]> www.infradead.org Git - linux.git/commitdiff
tty: n_tty: use time_is_before_jiffies() in n_tty_receive_overrun()
authorJiri Slaby (SUSE) <jirislaby@kernel.org>
Sun, 27 Aug 2023 07:41:37 +0000 (09:41 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 27 Aug 2023 09:46:52 +0000 (11:46 +0200)
The jiffies tests in n_tty_receive_overrun() are simplified ratelimiting
(without locking). We could use struct ratelimit_state and the helpers,
but to me, it occurs to be too complex for this use case.

But the code currently tests both if the time passed (the first
time_after()) and if jiffies wrapped around (the second time_after()).
time_is_before_jiffies() takes care of both, provided overrun_time is
initialized at the allocation time.

So switch to time_is_before_jiffies(), the same what ratelimiting does.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230827074147.2287-5-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/n_tty.c

index 7f9fee4cf7cff93c6f136473276894fb45d61c6d..c0b23e975877b78df1bb9c44b50e7b0325aa0100 100644 (file)
@@ -1173,8 +1173,7 @@ static void n_tty_receive_overrun(const struct tty_struct *tty)
        struct n_tty_data *ldata = tty->disc_data;
 
        ldata->num_overrun++;
-       if (time_after(jiffies, ldata->overrun_time + HZ) ||
-           time_after(ldata->overrun_time, jiffies)) {
+       if (time_is_before_jiffies(ldata->overrun_time + HZ)) {
                tty_warn(tty, "%d input overrun(s)\n", ldata->num_overrun);
                ldata->overrun_time = jiffies;
                ldata->num_overrun = 0;