tty: n_gsm: fix wrong T1 retry count handling
PATCH v2 1/4 tty: n_gsm: fix wrong T1 retry count handling
From: Daniel Starke <[email protected]>
n_gsm is based on the 3GPP 07.010 and its newer version is the 3GPP 27.010.
See https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1516
The changes from 07.010 to 27.010 are non-functional. Therefore, I refer to
the newer 27.010 here. Chapter 5.7.3 states that the valid range for the
maximum number of retransmissions (N2) is from 0 to 255 (both including).gsm_dlci_t1() handles this number incorrectly by performing N2 - 1
retransmission attempts. Setting N2 to zero results in more than 255
retransmission attempts.
Fix gsm_dlci_t1() to comply with 3GPP 27.010.
--- drivers/tty/n_gsm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
No changes have been applied compared to v1.
drivers/tty/n_gsm.c +2 -2
@@ -1805,8 +1805,8 @@ static void gsm_dlci_t1(struct timer_list *t)switch (dlci->state) {case DLCI_OPENING : - dlci->retries--;if (dlci->retries) { + dlci->retries--;gsm_command (dlci->gsm, dlci->addr,SABM |PF );mod_timer (&dlci->t1, jiffies + gsm->t1 *HZ /100 ); }else if (!dlci->addr && gsm->control == (DM |PF )) {
@@ -1821,8 +1821,8 @@ static void gsm_dlci_t1(struct timer_list *t)break ;case DLCI_CLOSING : - dlci->retries--;if (dlci->retries) { + dlci->retries--;gsm_command (dlci->gsm, dlci->addr,DISC |PF );mod_timer (&dlci->t1, jiffies + gsm->t1 *HZ /100 ); }else
Signature · 1 line
2.34.1
PATCH v2 2/4 tty: n_gsm: fix DM command
From: Daniel Starke <[email protected]>
n_gsm is based on the 3GPP 07.010 and its newer version is the 3GPP 27.010.
See https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1516
The changes from 07.010 to 27.010 are non-functional. Therefore, I refer to
the newer 27.010 here. Chapter 5.3.3 defines the DM response. There exists
no DM command. However, the current implementation incorrectly sends DM as
command in case of unexpected UIH frames in gsm_queue().
Correct this behavior by always sending DM as response.
--- drivers/tty/n_gsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
No changes have been applied compared to v1.
drivers/tty/n_gsm.c +1 -1
@@ -2207,7 +2207,7 @@ static void gsm_queue(struct gsm_mux *gsm)case UIH :case UIH |PF :if (dlci ==NULL || dlci->state !=DLCI_OPEN ) { -gsm_command (gsm, address,DM |PF ); +gsm_response (gsm, address,DM |PF );return ; } dlci->data (dlci, gsm->buf, gsm->len);
Signature · 1 line
2.34.1
PATCH v2 3/4 tty: n_gsm: fix flow control handling in tx path
In reply to D. StarkeFrom: Daniel Starke <[email protected]>
The current implementation constipates all transmission paths during flow control except for flow control frames. However, these may not be located at the beginning of the transmission queue of the control channel. Ensure that flow control frames in the transmission queue for the control channel are always handled even if constipated by skipping through other messages.
--- drivers/tty/n_gsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
No changes have been applied compared to v1.
drivers/tty/n_gsm.c +1 -1
@@ -891,7 +891,7 @@ static int gsm_data_kick(struct gsm_mux *gsm)/* Serialize control messages and control channel messages first */ list_for_each_entry_safe (msg, nmsg, &gsm->tx_ctrl_list, list) {if (gsm->constipated && !gsm_is_flow_ctrl_msg (msg)) -return -EAGAIN ; +continue ; ret =gsm_send_packet (gsm, msg);switch (ret) {case -ENOSPC :
Signature · 1 line
2.34.1
PATCH v2 4/4 tty: n_gsm: fix missing corner cases in gsmld_poll()
In reply to D. StarkeFrom: Daniel Starke <[email protected]>
gsmld_poll() currently fails to handle the following corner cases correctly:
- remote party closed the associated tty
Add the missing checks and map those to EPOLLHUP. Reorder the checks to group them by their reaction.
--- drivers/tty/n_gsm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Check for valid pointer in tty->disc_data has been removed compared to v1.
drivers/tty/n_gsm.c +5 -2
@@ -3053,12 +3053,15 @@ static __poll_t gsmld_poll(struct tty_struct *tty, struct file *file,poll_wait (file, &tty->read_wait, wait);poll_wait (file, &tty->write_wait, wait); + +if (gsm->dead) + mask |=EPOLLHUP ;if (tty_hung_up_p (file)) mask |=EPOLLHUP ; +if (test_bit (TTY_OTHER_CLOSED , &tty->flags)) + mask |=EPOLLHUP ;if (!tty_is_writelocked (tty) &&tty_write_room (tty) >0 ) mask |=EPOLLOUT |EPOLLWRNORM ; -if (gsm->dead) - mask |=EPOLLHUP ;return mask; }
Signature · 1 line
2.34.1