Re: [PATCH v2 3/3] tty: n_gsm: add TIOCMIWAIT support

[Greg KH]

On Thu, Feb 02, 2023 at 03:59:34PM +0100, D. Starke wrote:
> From: Daniel Starke <daniel.starke@xxxxxxxxxxx>
> 
> Add support for the TIOCMIWAIT ioctl on the virtual ttys. This enables the
> user to wait for virtual modem signals like RING.
> 
> More work is needed to support also TIOCGICOUNT.
> 
> Signed-off-by: Daniel Starke <daniel.starke@xxxxxxxxxxx>
> ---
>  drivers/tty/n_gsm.c | 33 ++++++++++++++++++++++++++++++++-
>  1 file changed, 32 insertions(+), 1 deletion(-)
> 
> v1 -> v2:
> A remark regarding TIOCGICOUNT has been added to the commit message.
> Wake ups in gsm_dlci_close() and gsm_dlci_begin_close() have been added to
> cope with closed DLCI during TIOCMIWAIT.
> gsm_wait_modem_change() has been properly commented to highlight all use
> cases. Furthermore, the function has been simplified and a DLCI state
> condition added to the wait_event_interruptible() call to deal with DLCI
> termination during TIOCMIWAIT correctly.
> 
> Link: https://lore.kernel.org/all/Y9pgT4VcW3oGaSbY@xxxxxxxxx/
> 
> diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
> index cf1ab7d619d9..4f710a6309a7 100644
> --- a/drivers/tty/n_gsm.c
> +++ b/drivers/tty/n_gsm.c
> @@ -1542,6 +1542,7 @@ static void gsm_process_modem(struct tty_struct *tty, struct gsm_dlci *dlci,
>  	if (brk & 0x01)
>  		tty_insert_flip_char(&dlci->port, 0, TTY_BREAK);
>  	dlci->modem_rx = mlines;
> +	wake_up_interruptible(&dlci->gsm->event);
>  }
>  
>  /**
> @@ -2129,7 +2130,7 @@ static void gsm_dlci_close(struct gsm_dlci *dlci)
>  	/* A DLCI 0 close is a MUX termination so we need to kick that
>  	   back to userspace somehow */
>  	gsm_dlci_data_kick(dlci);
> -	wake_up(&dlci->gsm->event);
> +	wake_up_all(&dlci->gsm->event);
>  }
>  
>  /**
> @@ -2339,6 +2340,7 @@ static void gsm_dlci_begin_close(struct gsm_dlci *dlci)
>  	dlci->state = DLCI_CLOSING;
>  	gsm_command(dlci->gsm, dlci->addr, DISC|PF);
>  	mod_timer(&dlci->t1, jiffies + gsm->t1 * HZ / 100);
> +	wake_up_interruptible(&gsm->event);
>  }
>  
>  /**
> @@ -3877,6 +3879,33 @@ static int gsm_modem_update(struct gsm_dlci *dlci, u8 brk)
>  	return -EPROTONOSUPPORT;
>  }
>  
> +/**
> + * gsm_wait_modem_change - wait for modem status line change
> + * @dlci: channel
> + * @mask: modem status line bits
> + *
> + * The function returns if:
> + * - any given modem status line bit changed
> + * - the wait event function got interrupted (e.g. by a signal)
> + * - the underlying DLCI was closed
> + * - the underlying ldisc device was removed
> + */
> +static int gsm_wait_modem_change(struct gsm_dlci *dlci, u32 mask)

mask is u32, but:

> +{
> +	struct gsm_mux *gsm = dlci->gsm;
> +	u32 old = dlci->modem_rx;
> +	int ret;
> +
> +	ret = wait_event_interruptible(gsm->event, gsm->dead ||
> +				       dlci->state != DLCI_OPEN ||
> +				       (old ^ dlci->modem_rx) & mask);
> +	if (gsm->dead)
> +		return -ENODEV;
> +	if (dlci->state != DLCI_OPEN)
> +		return -EL2NSYNC;
> +	return ret;
> +}
> +
>  static bool gsm_carrier_raised(struct tty_port *port)
>  {
>  	struct gsm_dlci *dlci = container_of(port, struct gsm_dlci, port);
> @@ -4136,6 +4165,8 @@ static int gsmtty_ioctl(struct tty_struct *tty,
>  		gsm_destroy_network(dlci);
>  		mutex_unlock(&dlci->mutex);
>  		return 0;
> +	case TIOCMIWAIT:
> +		return gsm_wait_modem_change(dlci, arg);

Arg is a unsigned long.  Shouldn't you cast this?

thanks,

greg k-h