PATCH: tty drivers take two
Subsystems (7)
- Merge AKPM's capi fix
- Review/comment ppp_async
- Review/comment ppp_synctty
- Add tty_wakeup helper
- Fix incorrect double ldisc flush call (found by Paul Fulghum)
- Do cyclades.c
- Switch rocket to tty_wakeup()
- Switch mxser to ldisc/tty_wakeup()
- Review/comment slip
- Fix isicom
- Fix moxa to ldisc/tty_wakeup()
- Fix riscom8 to ldisc/tty_wakeup
- Amiserial to ldisc/tty_wakeup
- Fix 68328/68360 tty/ldisc
- Fix mcfserial tty/ldisc
- Fix epca for tty/ldisc
- Fix generic_serial for tty/ldisc
- Fix refcount init bug found by Paul Fulghum
(should fix pppd)
Documentation/tty.txt +192 -0
@@ -0,0 +1,192 @@ + + The Lockronomicon + +Your guide to the ancient and twisted locking policies of the tty layer and +the warped logic behind them. Beware all ye who read on. + +FIXME: still need to work out the full set of BKL assumptions and document +them so they can eventually be killed off. + + +Line Discipline +--------------- + +Line disciplines are registered with tty_register_ldisc() passing the +discipline number and the ldisc structure. At the point of registration the +discipline must be ready to use and it is possible it will get used before +the call returns success. If the call returns an error then it won't get +called. Do not re-use ldisc numbers as they are part of the userspace ABI +and writing over an existing ldisc will cause demons to eat your computer. +After the return the ldisc data has been copied so you may free your own +copy of the structure. You must not re-register over the top of the line +discipline even with the same data or your computer again will be eaten by +demons. + +In order to remove a line discipline call tty_register_ldisc passing NULL. +In ancient times this always worked. In modern times the function will +return -EBUSY if the ldisc is currently in use. Since the ldisc referencing +code manages the module counts this should not usually be a concern. + +Heed this warning: the reference count field of the registered copies of the +tty_ldisc structure in the ldisc table counts the number of lines using this +discipline. The reference count of the tty_ldisc structure within a tty +counts the number of active users of the ldisc at this instant. In effect it +counts the number of threads of execution within an ldisc method (plus those +about to enter and exit although this detail matters not). + +Line Discipline Methods +----------------------- + +TTY side interfaces: + +close() - This is called on a terminal when the line + discipline is being unplugged. At the point of + execution no further users will enter the + ldisc code for this tty. Can sleep. + +open() - Called when the line discipline is attached to + the terminal. No other call into the line + discipline for this tty will occur until it + completes successfully. Can sleep. + +write() - A process is writing data from user space + through the line discipline. Multiple write calls + are serialized by the tty layer for the ldisc. May + sleep. + +flush_buffer() - May be called at any point between open and close. + +chars_in_buffer() - Report the number of bytes in the buffer. + +set_termios() - Called on termios structure changes. Semantics + deeply mysterious right now. + +read() - Move data from the line discipline to the user. + Multiple read calls may occur in parallel and the + ldisc must deal with serialization issues. May + sleep. + +poll() - Check the status for the poll/select calls. Multiple + poll calls may occur in parallel. May sleep. + +ioctl() - Called when an ioctl is handed to the tty layer + that might be for the ldisc. Multiple ioctl calls + may occur in parallel. May sleep. + +Driver Side Interfaces: + +receive_buf() - Hand buffers of bytes from the driver to the ldisc + for processing. Semantics currently rather + mysterious 8( + +receive_room() - Can be called by the driver layer at any time when + the ldisc is opened. The ldisc must be able to + handle the reported amount of data at that instant. + Synchronization between active receive_buf and + receive_room calls is down to the driver not the + ldisc. Must not sleep. + +write_wakeup() - May be called at any point between open and close. + The TTY_DO_WRITE_WAKEUP flag indicates if a call + is needed but always races versus calls. Thus the + ldisc must be careful about setting order and to + handle unexpected calls. Must not sleep. + + +Locking + +Callers to the line discipline functions from the tty layer are required to +take line discipline locks. The same is true of calls from the driver side +but not yet enforced. + +Three calls are now provided + + ldisc = tty_ldisc_ref(tty); + +takes a handle to the line discipline in the tty and returns it. If no ldisc +is currently attached or the ldisc is being closed and re-opened at this +point then NULL is returned. While this handle is held the ldisc will not +change or go away. + + tty_ldisc_deref(ldisc) + +Returns the ldisc reference and allows the ldisc to be closed. Returning the +reference takes away your right to call the ldisc functions until you take +a new reference. + + ldisc = tty_ldisc_ref_wait(tty); + +Performs the same function as tty_ldisc_ref except that it will wait for an +ldisc change to complete and then return a reference to the new ldisc. + +While these functions are slightly slower than the old code they should have +minimal impact as most receive logic uses the flip buffers and they only +need to take a reference when they push bits up through the driver. + +A caution: The ldisc->open(), ldisc->close() and driver->set_ldisc +functions are called with the ldisc unavailable. Thus tty_ldisc_ref will +fail in this situation if used within these functions. Ldisc and driver +code calling its own functions must be careful in this case. + + +Driver Interface +---------------- + +open() - Called when a device is opened. May sleep + +close() - Called when a device is closed. At the point of + return from this call the driver must make no + further ldisc calls of any kind. May sleep + +write() - Called to write bytes to the device. May not + sleep. May occur in parallel in special cases. + Because this includes panic paths drivers generally + shouldn't try and do clever locking here. + +put_char() - Stuff a single character onto the queue. The + driver is guaranteed following up calls to + flush_chars. + +flush_chars() - Ask the kernel to write put_char queue + +write_room() - Return the number of characters tht can be stuffed + into the port buffers without overflow (or less). + The ldisc is responsible for being intelligent + about multi-threading of write_room/write calls + +ioctl() - Called when an ioctl may be for the driver + +set_termios() - Called on termios change, may get parallel calls, + may block for now (may change that) + +set_ldisc() - Notifier for discipline change. At the point this + is done the discipline is not yet usable. Can now + sleep (I think) + +throttle() - Called by the ldisc to ask the driver to do flow + control. Serialization including with unthrottle + is the job of the ldisc layer. + +unthrottle() - Called by the ldisc to ask the driver to stop flow + control. + +stop() - Ldisc notifier to the driver to stop output. As with + throttle the serializations with start() are down + to the ldisc layer. + +start() - Ldisc notifier to the driver to start output. + +hangup() - Ask the tty driver to cause a hangup initiated + from the host side. [Can sleep ??] + +break_ctl() - Send RS232 break. Can sleep. Can get called in + parallel, driver must serialize (for now), and + with write calls. + +wait_until_sent() - Wait for characters to exit the hardware queue + of the driver. Can sleep + +send_xchar() - Send XON/XOFF and if possible jump the queue with + it in order to get fast flow control responses. + Cannot sleep ?? +
drivers/bluetooth/hci_ldisc.c +9 -3
@@ -180,6 +180,7 @@ static int hci_uart_flush(struct hci_dev {struct hci_uart *hu = (struct hci_uart *) hdev->driver_data;struct tty_struct *tty = hu->tty; +struct tty_ldisc *ld =tty_ldisc_ref (tty);BT_DBG ("hdev %p tty %p" , hdev, tty);
@@ -188,8 +189,11 @@ static int hci_uart_flush(struct hci_dev }/* Flush any pending characters in the driver and discipline. */ -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); +if (ld) { +if (ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + }if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty);
@@ -280,7 +284,9 @@ static int hci_uart_tty_open(struct tty_spin_lock_init (&hu->rx_lock); -/* Flush any pending characters in the driver and line discipline */ +/* Flush any pending characters in the driver and line discipline. */ +/* FIXME: why is this needed. Note don't use ldisc_ref here as the +open path is before the ldisc is referencable */ if (tty->ldisc.flush_buffer) tty->ldisc.flush_buffer (tty);
drivers/char/amiserial.c +10 -8
@@ -553,9 +553,7 @@ static void do_softint(unsigned long prireturn ;if (test_and_clear_bit (RS_EVENT_WRITE_WAKEUP , &info->event)) { -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait); } }
@@ -1019,9 +1017,7 @@ static void rs_flush_buffer(struct tty_s info->xmit.head = info->xmit.tail =0 ;local_irq_restore (flags);wake_up_interruptible (&tty->write_wait); -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty); }/*
@@ -1488,6 +1484,7 @@ static void rs_close(struct tty_struct *struct async_struct * info = (struct async_struct *)tty->driver_data;struct serial_state *state;unsigned long flags; +struct tty_ldisc *ld;if (!info ||serial_paranoia_check (info, tty->name,"rs_close" ))return ;
@@ -1560,8 +1557,13 @@ static void rs_close(struct tty_struct *shutdown (info);if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + + ld =tty_ldisc_ref (tty); +if (ld !=NULL ) { +if (ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + } tty->closing =0 ; info->event =0 ; info->tty =0 ;
drivers/char/cyclades.c +10 -9
@@ -970,10 +970,7 @@ do_softint(void *private_)wake_up_interruptible (&info->delta_msr_wait); }if (test_and_clear_bit (Cy_EVENT_WRITE_WAKEUP, &info->event)) { -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) - && tty->ldisc.write_wakeup){ - (tty->ldisc.write_wakeup)(tty); - } +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait); }#ifdef Z_WAKE
@@ -2743,6 +2740,7 @@ static void cy_close(struct tty_struct *tty, struct file *filp) { struct cyclades_port *info = (struct cyclades_port *)tty->driver_data; +struct tty_ldisc *ld;unsigned long flags;#ifdef CY_DEBUG_OTHER
@@ -2850,8 +2848,13 @@ cy_close(struct tty_struct *tty, structshutdown (info);if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + + ld =tty_ldisc_ref (tty); +if (ld) { +if (ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + }CY_LOCK (info, flags); tty->closing =0 ;
@@ -4554,10 +4557,8 @@ cy_flush_buffer(struct tty_struct *tty) }CY_UNLOCK (info, flags); } +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait); -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) - && tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); }/* cy_flush_buffer */
drivers/char/epca.c +18 -12
@@ -500,6 +500,7 @@ static void pc_close(struct tty_struct *if ((ch =verifyChannel (tty)) !=NULL ) {/* Begin if ch != NULL */ +struct tty_ldisc *ld;save_flags (flags);cli ();
@@ -550,8 +551,12 @@ static void pc_close(struct tty_struct *if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + ld =tty_ldisc_ref (tty); +if (ld !=NULL ) { +if (ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + }shutdown (ch); tty->closing =0 ;
@@ -651,14 +656,19 @@ static void pc_hangup(struct tty_struct {/* Begin if ch != NULL */ unsigned long flags; +struct tty_ldisc *ld;save_flags (flags);cli ();if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + ld =tty_ldisc_ref (tty); +if (ld !=NULL ) { +if (ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + }shutdown (ch);
@@ -1119,8 +1129,7 @@ static void pc_flush_buffer(struct tty_srestore_flags (flags);wake_up_interruptible (&tty->write_wait); -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty); }/* End pc_flush_buffer */
@@ -2261,9 +2270,7 @@ static void doevent(int crd) {/* Begin if LOWWAIT */ ch->statusflags &= ~LOWWAIT ; -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait); }/* End if LOWWAIT */
@@ -2280,9 +2287,7 @@ static void doevent(int crd) {/* Begin if EMPTYWAIT */ ch->statusflags &= ~EMPTYWAIT ; -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait);
@@ -3135,6 +3140,7 @@ static int pc_ioctl(struct tty_struct *t }else { +/* ldisc lock already held in ioctl */ if (tty->ldisc.flush_buffer) tty->ldisc.flush_buffer (tty); }
drivers/char/generic_serial.c +12 -10
@@ -436,9 +436,7 @@ void gs_flush_buffer(struct tty_struct *restore_flags (flags);wake_up_interruptible (&tty->write_wait); -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty);func_exit (); }
@@ -578,9 +576,7 @@ void gs_do_softint(void *private_)if (!tty)return ;if (test_and_clear_bit (RS_EVENT_WRITE_WAKEUP , &port->event)) { -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait); }func_exit ();
@@ -694,8 +690,9 @@ void gs_close(struct tty_struct * tty, s {unsigned long flags;struct gs_port *port; - -func_enter (); +struct tty_ldisc *ld; + + func_enter ()if (!tty)return ;
@@ -760,8 +757,13 @@ void gs_close(struct tty_struct * tty, sif (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + + ld =tty_ldisc_ref (tty); +if (ld !=NULL ) { + ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + } tty->closing =0 ; port->event =0 ;
drivers/char/isicom.c +11 -9
@@ -485,10 +485,8 @@ static void isicom_bottomhalf(void * datif (!tty)return ; - -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); + +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait); }
@@ -1074,6 +1072,7 @@ static void isicom_close(struct tty_strustruct isi_port * port = (struct isi_port *) tty->driver_data;struct isi_board * card = port->card;unsigned long flags; +struct tty_ldisc *ld;if (!port)return ;
@@ -1120,8 +1119,13 @@ static void isicom_close(struct tty_struisicom_shutdown_port (port);if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + + ld =tty_ldisc_ref (tty); +if (ld !=NULL ) { +if (ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + } tty->closing =0 ; port->tty =NULL ;if (port->blocked_open) {
@@ -1564,9 +1568,7 @@ static void isicom_flush_buffer(struct trestore_flags (flags);wake_up_interruptible (&tty->write_wait); -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty); }
drivers/char/moxa.c +11 -11
@@ -571,6 +571,7 @@ static void moxa_close(struct tty_struct {struct moxa_str *ch;int port; +struct tty_ldisc *ld; port =PORTNO (tty);if (port ==MAX_PORTS ) {
@@ -618,8 +619,13 @@ static void moxa_close(struct tty_structif (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + + ld =tty_ldisc_ref (tty); +if (ld !=NULL ) { +if (ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + } tty->closing =0 ; ch->event =0 ; ch->tty =NULL ;
@@ -693,9 +699,7 @@ static void moxa_flush_buffer(struct ttyif (ch ==NULL )return ;MoxaPortFlushData (ch->port,1 ); -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup) (tty); +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait); }
@@ -954,9 +958,7 @@ static void moxa_poll(unsigned long ignoif (MoxaPortTxQueue (ch->port) <=WAKEUP_CHARS ) {if (!tp->stopped) { ch->statusflags &= ~LOWWAIT ; -if ((tp->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tp->ldisc.write_wakeup) - (tp->ldisc.write_wakeup) (tp); +tty_wakeup (tty);wake_up_interruptible (&tp->write_wait); } }
@@ -1123,9 +1125,7 @@ static void check_xmit_empty(unsigned loif (ch->tty && (ch->statusflags &EMPTYWAIT )) {if (MoxaPortTxQueue (ch->port) ==0 ) { ch->statusflags &= ~EMPTYWAIT ; -if ((ch->tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - ch->tty->ldisc.write_wakeup) - (ch->tty->ldisc.write_wakeup) (ch->tty); +tty_wakeup (tty);wake_up_interruptible (&ch->tty->write_wait);return ; }
drivers/char/mxser.c +9 -8
@@ -674,9 +674,7 @@ static void mxser_do_softint(void *priva tty = info->tty;if (tty) {if (test_and_clear_bit (MXSER_EVENT_TXLOW , &info->event)) { -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup) (tty); +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait); }if (test_and_clear_bit (MXSER_EVENT_HANGUP , &info->event)) {
@@ -813,8 +811,13 @@ static void mxser_close(struct tty_strucmxser_shutdown (info);if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + + ld =tty_ldisc_ref (tty); +if (ld) { +if (ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + } tty->closing =0 ; info->event =0 ; info->tty =NULL ;
@@ -972,9 +975,7 @@ static void mxser_flush_buffer(struct tt info->xmit_cnt = info->xmit_head = info->xmit_tail =0 ;restore_flags (flags);wake_up_interruptible (&tty->write_wait); -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup) (tty); +tty_wakeup (tty); } static int mxser_ioctl(struct tty_struct *tty, struct file *file,
drivers/char/pty.c +4 -0
@@ -101,6 +101,10 @@ static void pty_unthrottle(struct tty_st* (2) avoid redundant copying for cases where count >> receive_room * N.B. Calls from user space may now return an error code instead of * a count. +* +* FIXME: Our pty_write method is called with our ldisc lock held but +* not our partners. We can't just take the other one blindly without +* risking deadlocks. There is also the small matter of TTY_DONT_FLIP */ static int pty_write (struct tty_struct * tty,int from_user,const unsigned char *buf,int count)
drivers/char/riscom8.c +10 -8
@@ -1064,6 +1064,7 @@ static void rc_close(struct tty_struct *struct riscom_board *bp;unsigned long flags;unsigned long timeout; +struct tty_ldisc *ld;if (!port ||rc_paranoia_check (port, tty->name,"close" ))return ;
@@ -1123,8 +1124,13 @@ static void rc_close(struct tty_struct *rc_shutdown_port (bp, port);if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + + ld =tty_ldisc_ref (tty); +if (ld !=NULL ) { +if (ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + } tty->closing =0 ; port->event =0 ; port->tty =NULL ;
@@ -1297,9 +1303,7 @@ static void rc_flush_buffer(struct tty_srestore_flags (flags);wake_up_interruptible (&tty->write_wait); -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty); }static int rc_tiocmget (struct tty_struct *tty,struct file *file)
@@ -1640,9 +1644,7 @@ static void do_softint(void *private_)return ;if (test_and_clear_bit (RS_EVENT_WRITE_WAKEUP , &port->event)) { -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait); } }
drivers/char/rocket.c +20 -12
@@ -250,12 +250,16 @@ static void rp_do_receive(struct r_port CHANNEL_t * cp, unsigned int ChanStatus) { unsigned int CharNStat; -int ToRecv, wRecv, space, count; +int ToRecv, wRecv, space =0 , count;unsigned char *cbuf;char *fbuf; +struct tty_ldisc *ld; + + ld =tty_ldisc_ref (tty); ToRecv =sGetRxCnt (cp); - space = tty->ldisc.receive_room (tty); +if (ld) + space = tty->ldisc.receive_room (tty);if (space >2 *TTY_FLIPBUF_SIZE ) space =2 *TTY_FLIPBUF_SIZE ; cbuf = tty->flip.char_buf;
@@ -354,7 +358,8 @@ static void rp_do_receive(struct r_port count += ToRecv; }/* Push the data up to the tty layer */ - tty->ldisc.receive_buf (tty, tty->flip.char_buf, tty->flip.flag_buf, count); + ld->receive_buf (tty, tty->flip.char_buf, tty->flip.flag_buf, count); +tty_ldisc_deref (ld); }/*
@@ -408,8 +413,7 @@ static void rp_do_transmit(struct r_portclear_bit ((info->aiop *8 ) + info->chan, (void *) &xmit_flags[info->board]);if (info->xmit_cnt <WAKEUP_CHARS ) { -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup) (tty); +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait);#ifdef ROCKETPORT_HAVE_POLL_WAIT wake_up_interruptible (&tty->poll_wait);
@@ -1022,7 +1026,8 @@ static void rp_close(struct tty_struct *unsigned long flags;int timeout;CHANNEL_t *cp; - +struct tty_ldisc *ld; +if (rocket_paranoia_check (info,"rp_close" ))return ;
@@ -1101,8 +1106,13 @@ static void rp_close(struct tty_struct *if (TTY_DRIVER_FLUSH_BUFFER_EXISTS (tty))TTY_DRIVER_FLUSH_BUFFER (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + + ld =tty_ldisc_ref (tty); +if (ld) { +if (ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + }clear_bit ((info->aiop *8 ) + info->chan, (void *) &xmit_flags[info->board]);
@@ -1727,8 +1737,7 @@ end_intr: end:if (info->xmit_cnt <WAKEUP_CHARS ) { -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup) (tty); +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait);#ifdef ROCKETPORT_HAVE_POLL_WAIT wake_up_interruptible (&tty->poll_wait);
@@ -1802,8 +1811,7 @@ static void rp_flush_buffer(struct tty_s#ifdef ROCKETPORT_HAVE_POLL_WAIT wake_up_interruptible (&tty->poll_wait);#endif -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup) (tty); +tty_wakeup (tty); cp = &info->channel;sFlushTxFIFO (cp);
drivers/char/selection.c +5 -0
@@ -277,12 +277,15 @@ int paste_selection(struct tty_struct *t {struct vt_struct *vt = (struct vt_struct *) tty->driver_data;int pasted =0 , count; +struct tty_ldisc *ld;DECLARE_WAITQUEUE (wait, current);acquire_console_sem ();poke_blanked_console ();release_console_sem (); + ld =tty_ldisc_ref_wait (tty); +add_wait_queue (&vt->paste_wait, &wait);while (sel_buffer && sel_buffer_lth > pasted) {set_current_state (TASK_INTERRUPTIBLE );
@@ -297,6 +300,8 @@ int paste_selection(struct tty_struct *t }remove_wait_queue (&vt->paste_wait, &wait); current->state =TASK_RUNNING ; + +tty_ldisc_deref (ld);return 0 ; }
drivers/char/tty_io.c +432 -79
800 lines not on this page · raw message
drivers/char/tty_ioctl.c +23 -9
@@ -98,6 +98,7 @@ static void change_termios(struct tty_st {int canon_change;struct termios old_termios = *tty->termios; +struct tty_ldisc *ld;local_irq_disable ();// FIXME: is this safe? *tty->termios = *new_termios;
@@ -136,13 +137,16 @@ static void change_termios(struct tty_stif (tty->driver->set_termios) (*tty->driver->set_termios)(tty, &old_termios); -if (tty->ldisc.set_termios) - (*tty->ldisc.set_termios)(tty, &old_termios); + ld =tty_ldisc_ref (tty); +if (ld->set_termios) + (ld->set_termios)(tty, &old_termios); +tty_ldisc_deref (ld); }static int set_termios (struct tty_struct * tty,void __user *arg,int opt) {struct termios tmp_termios; +struct tty_ldisc *ld;int retval =tty_check_change (tty);if (retval)
@@ -159,9 +163,14 @@ static int set_termios(struct tty_structreturn -EFAULT ; } -if ((opt &TERMIOS_FLUSH ) && tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); - + ld =tty_ldisc_ref (tty); + +if (ld !=NULL ) { +if ((opt &TERMIOS_FLUSH ) && ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + } +if (opt &TERMIOS_WAIT ) {tty_wait_until_sent (tty,0 );if (signal_pending (current))
@@ -365,6 +374,7 @@ int n_tty_ioctl(struct tty_struct * tty,struct tty_struct * real_tty;void __user *p = (void __user *)arg;int retval; +struct tty_ldisc *ld;if (tty->driver->type ==TTY_DRIVER_TYPE_PTY && tty->driver->subtype ==PTY_TYPE_MASTER )
@@ -443,22 +453,26 @@ int n_tty_ioctl(struct tty_struct * tty, retval =tty_check_change (tty);if (retval)return retval; + + ld =tty_ldisc_ref (tty);switch (arg) {case TCIFLUSH : -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); +if (ld->flush_buffer) + ld->flush_buffer (tty);break ;case TCIOFLUSH : -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); +if (ld->flush_buffer) + ld->flush_buffer (tty);/* fall through */ case TCOFLUSH :if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty);break ;default : +tty_ldisc_deref (ld);return -EINVAL ; } +tty_ldisc_deref (ld);return 0 ;case TIOCOUTQ : return put_user(tty->driver->chars_in_buffer ?
drivers/char/viocons.c +7 -3
@@ -422,9 +422,13 @@ static void send_buffers(struct port_inf pi->overflowMessage =0 ;if (pi->tty) { -if ((pi->tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - (pi->tty->ldisc.write_wakeup)) - (pi->tty->ldisc.write_wakeup)(pi->tty); +struct tty_ldisc *ld =tty_ldisc_ref (tty); +if (ld) { +if ((pi->tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && + (ld->write_wakeup)) + (ld->write_wakeup)(pi->tty); +tty_ldisc_deref (ld); + }wake_up_interruptible (&pi->tty->write_wait); } }
drivers/char/vt_ioctl.c +7 -2
@@ -373,6 +373,7 @@ int vt_ioctl(struct tty_struct *tty, strunsigned char ucval;void __user *up = (void __user *)arg;int i, perm; +struct tty_ldisc *ld; console = vt->vc_num;
@@ -536,8 +537,12 @@ int vt_ioctl(struct tty_struct *tty, strdefault :return -EINVAL ; } -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + ld =tty_ldisc_ref (tty); +if (ld) { +if (ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + }return 0 ;case KDGKBMODE :
drivers/isdn/capi/capi.c +54 -38
119 lines not on this page · raw message
drivers/isdn/i4l/isdn_tty.c +23 -7
@@ -293,12 +293,16 @@ isdn_tty_tint(modem_info * info)if ((slen =isdn_writebuf_skb_stub (info->isdn_driver, info->isdn_channel,1 , skb)) == len) {struct tty_struct *tty = info->tty; +struct tty_ldisc *ld =tty_ldisc_ref (tty); info->send_outstanding++; info->msr &= ~UART_MSR_CTS ; info->lsr &= ~UART_LSR_TEMT ; -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup) (tty); +if (ld !=NULL ) { +if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && + ld->write_wakeup) + ld->write_wakeup (tty); +tty_ldisc_deref (ld); + }wake_up_interruptible (&tty->write_wait);return ; }
@@ -1681,6 +1685,7 @@ isdn_tty_close(struct tty_struct *tty, s {modem_info *info = (modem_info *) tty->driver_data;ulong timeout; +struct tty_ldisc *ld;if (!info ||isdn_tty_paranoia_check (info, tty->name,"isdn_tty_close" ))return ;
@@ -1747,10 +1752,16 @@ isdn_tty_close(struct tty_struct *tty, s } dev->modempoll--;isdn_tty_shutdown (info); +if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + + ld =tty_ldisc_ref (tty); +if (ld) { +if (ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + } info->tty =NULL ; info->ncarrier =0 ; tty->closing =0 ;
@@ -2678,11 +2689,16 @@ isdn_tty_modem_result(int code, modem_in } }if (code ==RESULT_NO_CARRIER ) { +struct tty_ldisc *ld;if ((info->flags &ISDN_ASYNC_CLOSING ) || (!info->tty)) {return ; } -if (info->tty->ldisc.flush_buffer) - info->tty->ldisc.flush_buffer (info->tty); + ld =tty_ldisc_ref (info->tty); +if (ld) { +if (ld->flush_buffer) + ld->flush_buffer (info->tty); +tty_ldisc_deref (ld); + }if ((info->flags &ISDN_ASYNC_CHECK_CD ) && (!((info->flags &ISDN_ASYNC_CALLOUT_ACTIVE ) && (info->flags &ISDN_ASYNC_CALLOUT_NOHUP )))) {
drivers/net/hamradio/mkiss.c +2 -2
@@ -602,8 +602,8 @@ static int ax25_open(struct tty_struct *if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); +/* FIXME - not needed - check if (tty->ldisc.flush_buffer) +tty->ldisc.flush_buffer(tty); */ /* Restore default settings */ ax->dev->type =ARPHRD_AX25 ;
drivers/net/ppp_async.c +15 -3
@@ -122,6 +122,9 @@ static struct ppp_channel_ops async_ops* frees the memory that ppp_asynctty_receive is using. The best * way to fix this is to use a rwlock in the tty struct, but for now * we use a single global rwlock for all ttys in ppp line discipline. +* +* FIXME: this is no longer true. The _close path for the ldisc is +* now guaranteed to be sane. */ static rwlock_t disc_data_lock =RW_LOCK_UNLOCKED ;
@@ -144,7 +147,8 @@ static void ap_put(struct asyncppp *ap) }/* -* Called when a tty is put into PPP line discipline. +* Called when a tty is put into PPP line discipline. Called in process +* context. */ static int ppp_asynctty_open (struct tty_struct *tty)
@@ -255,6 +259,11 @@ ppp_asynctty_write(struct tty_struct *ttreturn -EAGAIN ; } +/* +* Called in process context only. May be re-entered by multiple +* ioctl calling threads. +*/ +static int ppp_asynctty_ioctl (struct tty_struct *tty,struct file *file,unsigned int cmd,unsigned long arg)
@@ -716,7 +725,8 @@ flush:/* * Flush output from our internal buffers. -* Called for the TCFLSH ioctl. +* Called for the TCFLSH ioctl. Can be entered in parallel +* but this is covered by the xmit_lock. */ static void ppp_async_flush_output (struct asyncppp *ap)
@@ -816,7 +826,9 @@ process_input_packet(struct asyncppp *apskb_trim (skb,0 ); } -/* called when the tty driver has data for us. */ +/* Called when the tty driver has data for us. Runs parallel with the +other ldisc functions but will not be re-entered */ +static void ppp_async_input (struct asyncppp *ap,const unsigned char *buf,char *flags,int count)
drivers/net/ppp_synctty.c +2 -0
@@ -175,6 +175,8 @@ ppp_print_buffer (const char *name, cons* frees the memory that ppp_synctty_receive is using. The best * way to fix this is to use a rwlock in the tty struct, but for now * we use a single global rwlock for all ttys in ppp line discipline. +* +* FIXME: Fixed in tty_io nowdays. */ static rwlock_t disc_data_lock =RW_LOCK_UNLOCKED ;
drivers/net/slip.c +17 -7
@@ -672,7 +672,9 @@ static int slip_receive_room(struct tty_* Handle the 'receiver data ready' interrupt. * This function is called by the 'tty_io' module in the kernel when * a block of SLIP data has been received, which can now be decapsulated -* and sent on to some IP layer for further processing. +* and sent on to some IP layer for further processing. This will not +* be re-entered while running but other ldisc functions may be called +* in parallel */ static void slip_receive_buf (struct tty_struct *tty,const unsigned char *cp,char *fp,int count)
@@ -841,9 +843,11 @@ sl_alloc(dev_t line)* SLIP line discipline is called for. Because we are * sure the tty line exists, we only have to link it to * a free SLIP channel... +* +* Called in process context serialized from other ldisc calls. */ -static int -slip_open (struct tty_struct *tty) + +static int slip_open (struct tty_struct *tty) {struct slip *sl;int err;
@@ -876,10 +880,14 @@ slip_open(struct tty_struct *tty) tty->disc_data = sl; sl->line =tty_devnum (tty); sl->pid = current->pid; + +/* FIXME: already done before we were called - seems this can go */ if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); + +/* FIXME: DOES NOTHING AT THIS POINT : IS IT NEEDED if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); +tty->ldisc.flush_buffer(tty); */ if (!test_bit (SLF_INUSE , &sl->flags)) {/* Perform the low-level SLIP initialization. */
@@ -923,6 +931,9 @@ err_exit: }/* + +FIXME: 1,2 are fixed 3 was never true anyway. +Let me to blame a bit. 1. TTY module calls this funstion on soft interrupt. 2. TTY module calls this function WITH MASKED INTERRUPTS!
@@ -941,9 +952,8 @@ err_exit:/* * Close down a SLIP channel. -* This means flushing out any pending queues, and then restoring the -* TTY line discipline to what it was before it got hooked to SLIP -* (which usually is TTY again). +* This means flushing out any pending queues, and then returning. This +* call is serialized against other ldisc functions. */ static void slip_close (struct tty_struct *tty)
drivers/serial/68328serial.c +12 -8
@@ -435,9 +435,7 @@ static void do_softint(void *private)return ;#if 0 if (clear_bit (RS_EVENT_WRITE_WAKEUP , &info->event)) { -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait); }#endif
@@ -859,9 +857,7 @@ static void rs_flush_buffer(struct tty_s info->xmit_cnt = info->xmit_head = info->xmit_tail =0 ;sti ();wake_up_interruptible (&tty->write_wait); -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty); }/*
@@ -1185,11 +1181,18 @@ static void rs_close(struct tty_struct *shutdown (info);if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + + ld =tty_ldisc_ref (tty); +if (ld !=NULL ) { +if (ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + } tty->closing =0 ; info->event =0 ; info->tty =0 ; +#warning "This is not and has never been valid so fix it" +#if 0 if (tty->ldisc.num != ldiscs[N_TTY ].num) {if (tty->ldisc.close) (tty->ldisc.close)(tty);
@@ -1198,6 +1201,7 @@ static void rs_close(struct tty_struct *if (tty->ldisc.open) (tty->ldisc.open)(tty); } +#endif if (info->blocked_open) {if (info->close_delay) { current->state =TASK_INTERRUPTIBLE ;
drivers/serial/68360serial.c +10 -8
@@ -701,9 +701,7 @@ static void do_softint(void *private_)return ;if (test_and_clear_bit (RS_EVENT_WRITE_WAKEUP , &info->event)) { -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait); } }
@@ -1153,9 +1151,7 @@ static void rs_360_flush_buffer(struct t* is on its way out. */ wake_up_interruptible (&tty->write_wait); -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty); info->flags &= ~TX_WAKEUP ; }
@@ -1634,6 +1630,7 @@ static void rs_360_set_termios(struct ttstatic void rs_360_close (struct tty_struct *tty,struct file * filp) {ser_info_t *info = (ser_info_t *)tty->driver_data; +struct tty_ldisc *ld;/* struct async_state *state; */ struct serial_state *state;unsigned long flags;
@@ -1716,8 +1713,13 @@ static void rs_360_close(struct tty_strushutdown (info);if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + + ld =tty_ldisc_ref (tty); +if (ld !=NULL ) { +if (ldisc->flush_buffer) + ldis->flush_buffer (tty); +tty_ldisc_deref (ld); + } tty->closing =0 ; info->event =0 ; info->tty =0 ;
drivers/serial/mcfserial.c +12 -8
@@ -425,9 +425,7 @@ static void mcfrs_offintr(void *private)if (!tty)return ; -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty);wake_up_interruptible (&tty->write_wait); }
@@ -836,9 +834,7 @@ static void mcfrs_flush_buffer(struct ttlocal_irq_restore (flags);wake_up_interruptible (&tty->write_wait); -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); +tty_wakeup (tty); }/*
@@ -1168,6 +1164,7 @@ static void mcfrs_close(struct tty_strucvolatile unsigned char *uartp;struct mcf_serial *info = (struct mcf_serial *)tty->driver_data;unsigned long flags; +struct tty_ldisc *ld;if (!info ||serial_paranoia_check (info, tty->name,"mcfrs_close" ))return ;
@@ -1232,8 +1229,15 @@ static void mcfrs_close(struct tty_strucshutdown (info);if (tty->driver->flush_buffer) tty->driver->flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + + ld =tty_ldisc_ref (tty); +if (ld !=NULL ) + { +if (ld->flush_buffer) + ld->flush_buffer (tty); +tty_ldisc_deref (ld); + } + tty->closing =0 ; info->event =0 ; info->tty =0 ;
drivers/serial/serial_core.c +26 -9
@@ -111,9 +111,13 @@ static void uart_tasklet_action(unsigned tty = state->info->tty;if (tty) { -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - tty->ldisc.write_wakeup (tty); +struct tty_ldisc *ldisc =tty_ldisc_ref (tty); +if (ldisc) { +if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && + ldisc->write_wakeup) + ldisc->write_wakeup (tty); +tty_ldisc_deref (ldisc); + }wake_up_interruptible (&tty->write_wait); } }
@@ -575,6 +579,7 @@ static void uart_flush_buffer(struct ttystruct uart_state *state = tty->driver_data;struct uart_port *port = state->port;unsigned long flags; +struct tty_ldisc *ldisc;DPRINTK ("uart_flush_buffer(%d) called\n" , tty->index);
@@ -582,9 +587,13 @@ static void uart_flush_buffer(struct ttyuart_circ_clear (&state->info->xmit);spin_unlock_irqrestore (&port->lock, flags);wake_up_interruptible (&tty->write_wait); -if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); + ldisc =tty_ldisc_ref (tty); +if (ldisc) { +if ((tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && + ldisc->write_wakeup) + (ldisc->write_wakeup)(tty); +tty_ldisc_deref (ldisc); + } }/*
@@ -1216,7 +1225,8 @@ static void uart_close(struct tty_struct {struct uart_state *state = tty->driver_data;struct uart_port *port; - +struct tty_ldisc *ldisc; +BUG_ON (!kernel_locked ());if (!state || !state->port)
@@ -1280,8 +1290,15 @@ static void uart_close(struct tty_structuart_shutdown (state);uart_flush_buffer (tty); -if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer (tty); + + ldisc =tty_ldisc_ref (tty); +if (ldisc) + { +if (ldisc->flush_buffer) + ldisc->flush_buffer (tty); +tty_ldisc_deref (ldisc); + } + tty->closing =0 ; state->info->tty =NULL ;
fs/proc/proc_tty.c +6 -6
@@ -15,9 +15,6 @@#include <linux/seq_file.h> #include <asm/bitops.h> -extern struct tty_ldisc ldiscs[]; - -static int tty_ldiscs_read_proc (char *page,char **start,off_t off,int count,int *eof,void *data);
@@ -159,12 +156,15 @@ static int tty_ldiscs_read_proc(char *paint i;int len =0 ;off_t begin =0 ; - +struct tty_ldisc *ld; +for (i=0 ; i <NR_LDISCS ; i++) { -if (!(ldiscs[i].flags &LDISC_FLAG_DEFINED )) + ld =tty_ldisc_get (i); +if (ld ==NULL )continue ; len +=sprintf (page+len,"%-10s %2d\n" , - ldiscs[i].name ? ldiscs[i].name :"???" , i); + ld->name ? ld->name :"???" , i); +tty_ldisc_put (i);if (len+begin > off+count)break ;if (len+begin < off) {
include/linux/tty.h +23 -13
@@ -306,19 +306,20 @@ struct tty_struct {* tty->write. Thus, you must use the inline functions set_bit() and * clear_bit() to make things atomic. */ -#define TTY_THROTTLED 0 -#define TTY_IO_ERROR 1 -#define TTY_OTHER_CLOSED 2 -#define TTY_EXCLUSIVE 3 -#define TTY_DEBUG 4 -#define TTY_DO_WRITE_WAKEUP 5 -#define TTY_PUSH 6 -#define TTY_CLOSING 7 -#define TTY_DONT_FLIP 8 -#define TTY_HW_COOK_OUT 14 -#define TTY_HW_COOK_IN 15 -#define TTY_PTY_LOCK 16 -#define TTY_NO_WRITE_SPLIT 17 +#define TTY_THROTTLED 0/* Call unthrottle() at threshold min */ +#define TTY_IO_ERROR 1/* Canse an I/O error (may be no ldisc too) */ +#define TTY_OTHER_CLOSED 2/* Other side (if any) has closed */ +#define TTY_EXCLUSIVE 3/* Exclusive open mode */ +#define TTY_DEBUG 4/* Debugging */ +#define TTY_DO_WRITE_WAKEUP 5/* Call write_wakeup after queuing new */ +#define TTY_PUSH 6/* n_tty private */ +#define TTY_CLOSING 7/* ->close() in progress */ +#define TTY_DONT_FLIP 8/* Defer buffer flip */ +#define TTY_LDISC 9/* Line discipline attached */ +#define TTY_HW_COOK_OUT 14/* Hardware can do output cooking */ +#define TTY_HW_COOK_IN 15/* Hardware can do input cooking */ +#define TTY_PTY_LOCK 16/* pty private */ +#define TTY_NO_WRITE_SPLIT 17/* Preserve write boundaries to driver */ #define TTY_WRITE_FLUSH (tty) tty_write_flush((tty))
@@ -362,6 +363,15 @@ extern void tty_flip_buffer_push(structextern int tty_get_baud_rate (struct tty_struct *tty);extern int tty_termios_baud_rate (struct termios *termios); +extern struct tty_ldisc *tty_ldisc_ref (struct tty_struct *); +extern void tty_ldisc_deref (struct tty_ldisc *); +extern struct tty_ldisc *tty_ldisc_ref_wait (struct tty_struct *); + +extern struct tty_ldisc *tty_ldisc_get (int ); +extern void tty_ldisc_put (int ); + +extern void tty_wakeup (struct tty_struct *tty); +struct semaphore ;extern struct semaphore tty_sem;
include/linux/tty_ldisc.h +2 -0
@@ -132,6 +132,8 @@ struct tty_ldisc {void (*write_wakeup)(struct tty_struct *);struct module *owner; + +int refcount; };#define TTY_LDISC_MAGIC 0x5403
Quoted 5 lines · Alan Cox
- Switch rocket to
tty_wakeup()
- Switch mxser to ldisc/tty_wakeup()
- Fix moxa to ldisc/tty_wakeup()
- Fix riscom8 to ldisc/tty_wakeup
- Amiserial to ldisc/tty_wakeup
Alan:
I was applying the ldisc changes
to the synclink drivers and had a question regarding the tty_wakeup() helper.
Quoted 1 line
From what I see, all drivers who call
tty_wakeup()
also do wake_up_interruptible(&tty->write_wait); at the same time.
Would it be reasonable to add that to the helper and remove it from the individual drivers.
In my first pass on the synclink drivers (before I saw the new tty_wakeup helper), I created a write_wakeup wrapper that does the same thing as tty_wakeup but also moved wake_up_interruptible(&tty->write_wait); into the wrapper. This works for me.
Signature · 2 lines
Paul Fulghum [email protected]
Quoted 2 lines · El Thu, 16 Sep 2004 10:30:57 -0400 Alan Cox <[email protected]> escribió:
- Fix refcount init bug found by Paul Fulghum
(should fix pppd)
I can confirm it fixes the problem I reported for -rc2-mm1.
Quoted 2 lines · Paul Fulghum
Would it be reasonable to add that to the
helper and remove it from the individual drivers.
I was looking at that but some of them do the wakeup before and some after and I've not had time to figure out if the order ever matters
Quoted 3 lines · Alan Cox
I was looking at that but some of them do the wakeup before and some after and I've not had time to figure out if the order ever matters
I don't see the order mattering as far as breaking things, but might matter a little for performance. (depending on the particular ldisc implementation)
wake_up_interruptible(&tty->write_wait) should come after the ldisc write_wakeup (as is done in tty_io.c) so that send data buffered by the ldisc
can be sent to the driver before trying to process more send data from a sleeping user context.
The various serial drivers make the two calls for the same reason: the driver has become capable of accepting more data. That the drivers make the calls in different order points back to the order not mattering for strictly functional purposes.
*BUT*
You made a statement about reworking tty locking one step at a time, and concentrating on the ldisc locking first.
In that light, it might be better to factor out the wake_up_interruptible(&tty->write_wait) calls after the ldisc locking is complete and integrated.
Signature · 2 lines
Paul Fulghum [email protected]
Alan:
The N_TTY ldisc global reference leak is still in tty_io.c release_dev().
This does not currently cause a problem because N_TTY is never deregistered. It seems
a little ugly to have the N_TTY reference invalid when all other ldisc references are maintained. I could see this subtle difference biting someone in the future when working with this.
The lines that cause the leak serve no purpose. There is no reason to assign N_TTY ldisc to a tty instance that
is then immediately thrown away. The lines that drop the reference to the current ldisc are, of course, still needed.
Signature · 2 lines
Paul Fulghum [email protected]
Quoted 5 lines · Paul Fulghum
purpose. There is no reason to assign
N_TTYldisc to a tty instance that
is then immediately thrown away. The lines that drop the reference to the current ldisc are, of course, still needed.
Yep. Your previous fixes there are on my todo list