From nobody Wed Dec 17 23:44:22 2025 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 2494AC83F16 for ; Sun, 27 Aug 2023 07:44:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230164AbjH0Hmx (ORCPT ); Sun, 27 Aug 2023 03:42:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229882AbjH0HmD (ORCPT ); Sun, 27 Aug 2023 03:42:03 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADB86FA; Sun, 27 Aug 2023 00:42:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4A3BB61CA0; Sun, 27 Aug 2023 07:42:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7803C433CA; Sun, 27 Aug 2023 07:41:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693122119; bh=/MCc3ST/bPhlU6uXJJVSsOAqk0QiSpDXWc16NEuKfBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j3uAvVdVaRPmK5VDbd4QaSZzwb834DMCl/TdtZSNE63xfrQW9ePVBUU2Ah4yHGXd6 xgXrxq6r7JEPNMPFrc3WLKB2uln4Pw/avGRtezkskHz/0w55l72coa035vig/mUQvo C98WfQ2ewY8fKFmdFMgVxONkd+9Q1X+u/rJ34apPum0v6NiU5GPGV0QoXYxFsgUWbt Jmnxk920Bmb6FE0nxCfN5eHddHMBXcm32NwY239QBM65+/lU2qU81MCgJMssxZe9FW zfFt+S5VJ6vD9184yzgeHPual/PvlGxyoMQRvclTJ9Vj6am6J/D5OeA5xXvqUPVqaF 8yxc3uZ5aryUg== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" Subject: [PATCH v2 06/14] tty: n_tty: use MASK() for masking out size bits Date: Sun, 27 Aug 2023 09:41:39 +0200 Message-ID: <20230827074147.2287-7-jirislaby@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230827074147.2287-1-jirislaby@kernel.org> References: <20230827074147.2287-1-jirislaby@kernel.org> 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" In n_tty, there is already a macro to mask out top bits from ring buffer counters. It is MASK() added some time ago. So use it more in the code to make it more readable. Signed-off-by: Jiri Slaby (SUSE) --- drivers/tty/n_tty.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index 7f8f6cfa8843..07b6a013b5ab 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c @@ -138,23 +138,23 @@ static inline size_t read_cnt(struct n_tty_data *ldat= a) =20 static inline unsigned char read_buf(struct n_tty_data *ldata, size_t i) { - return ldata->read_buf[i & (N_TTY_BUF_SIZE - 1)]; + return ldata->read_buf[MASK(i)]; } =20 static inline unsigned char *read_buf_addr(struct n_tty_data *ldata, size_= t i) { - return &ldata->read_buf[i & (N_TTY_BUF_SIZE - 1)]; + return &ldata->read_buf[MASK(i)]; } =20 static inline unsigned char echo_buf(struct n_tty_data *ldata, size_t i) { smp_rmb(); /* Matches smp_wmb() in add_echo_byte(). */ - return ldata->echo_buf[i & (N_TTY_BUF_SIZE - 1)]; + return ldata->echo_buf[MASK(i)]; } =20 static inline unsigned char *echo_buf_addr(struct n_tty_data *ldata, size_= t i) { - return &ldata->echo_buf[i & (N_TTY_BUF_SIZE - 1)]; + return &ldata->echo_buf[MASK(i)]; } =20 /* If we are not echoing the data, perhaps this is a secret so erase it */ @@ -1359,7 +1359,7 @@ static void n_tty_receive_char_special(struct tty_str= uct *tty, unsigned char c, put_tty_queue(c, ldata); =20 handle_newline: - set_bit(ldata->read_head & (N_TTY_BUF_SIZE - 1), ldata->read_flags); + set_bit(MASK(ldata->read_head), ldata->read_flags); put_tty_queue(c, ldata); smp_store_release(&ldata->canon_head, ldata->read_head); kill_fasync(&tty->fasync, SIGIO, POLL_IN); @@ -1505,14 +1505,14 @@ n_tty_receive_buf_real_raw(const struct tty_struct = *tty, const u8 *cp, struct n_tty_data *ldata =3D tty->disc_data; size_t n, head; =20 - head =3D ldata->read_head & (N_TTY_BUF_SIZE - 1); + head =3D MASK(ldata->read_head); n =3D min_t(size_t, count, N_TTY_BUF_SIZE - head); memcpy(read_buf_addr(ldata, head), cp, n); ldata->read_head +=3D n; cp +=3D n; count -=3D n; =20 - head =3D ldata->read_head & (N_TTY_BUF_SIZE - 1); + head =3D MASK(ldata->read_head); n =3D min_t(size_t, count, N_TTY_BUF_SIZE - head); memcpy(read_buf_addr(ldata, head), cp, n); ldata->read_head +=3D n; @@ -1779,8 +1779,7 @@ static void n_tty_set_termios(struct tty_struct *tty,= const struct ktermios *old ldata->canon_head =3D ldata->read_tail; ldata->push =3D 0; } else { - set_bit((ldata->read_head - 1) & (N_TTY_BUF_SIZE - 1), - ldata->read_flags); + set_bit(MASK(ldata->read_head - 1), ldata->read_flags); ldata->canon_head =3D ldata->read_head; ldata->push =3D 1; } @@ -1941,7 +1940,7 @@ static bool copy_from_read_buf(const struct tty_struc= t *tty, size_t n; bool is_eof; size_t head =3D smp_load_acquire(&ldata->commit_head); - size_t tail =3D ldata->read_tail & (N_TTY_BUF_SIZE - 1); + size_t tail =3D MASK(ldata->read_tail); =20 n =3D min(head - ldata->read_tail, N_TTY_BUF_SIZE - tail); n =3D min(*nr, n); @@ -2004,7 +2003,7 @@ static bool canon_copy_from_read_buf(const struct tty= _struct *tty, canon_head =3D smp_load_acquire(&ldata->canon_head); n =3D min(*nr, canon_head - ldata->read_tail); =20 - tail =3D ldata->read_tail & (N_TTY_BUF_SIZE - 1); + tail =3D MASK(ldata->read_tail); size =3D min_t(size_t, tail + n, N_TTY_BUF_SIZE); =20 n_tty_trace("%s: nr:%zu tail:%zu n:%zu size:%zu\n", @@ -2466,7 +2465,7 @@ static unsigned long inq_canon(struct n_tty_data *lda= ta) nr =3D head - tail; /* Skip EOF-chars.. */ while (MASK(head) !=3D MASK(tail)) { - if (test_bit(tail & (N_TTY_BUF_SIZE - 1), ldata->read_flags) && + if (test_bit(MASK(tail), ldata->read_flags) && read_buf(ldata, tail) =3D=3D __DISABLED_CHAR) nr--; tail++; --=20 2.42.0