PATCH: tty locking for 2.6.9rc2
Subsystems (6)
This updates the ldisc locking patch for the 2.6.9rc2 changes.
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/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/rocket.c +31 -12
89 lines not on this page · raw message
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 +407 -81
769 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/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 +21 -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,13 @@ 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 ); +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 1 line · Alan Cox
This updates the ldisc locking patch for the 2.6.9rc2 changes.
I tried this patch and can't change line disciplines. The user program waits forever on ioctl(TIOCSETD). I am going to add printk statements to
find out more.
Looking at your patch I have a question:
Each line discipline has a refcount.
This single refcount is modified by all entities using that line discipline.
tty_set_ldisc() in tty_io.c waits until the old ldisc refcount goes to zero before setting the new ldisc. This seems to cause a problem in the following situation:
1. two tty instances start with the same ldisc
2. first tty instance holds reference to ldisc
3. second tty instance tries to change ldisc
The second tty instance must wait for the first tty instance to drop the ldisc reference before it can change to a new ldisc.
Each tty instance should be able to change line discipline independant of other tty instances.
Or am I not understanding this correctly?
--
Paul Fulghum
[email protected]
Quoted 3 lines · Paul Fulghum
I tried this patch and can't change line disciplines. The user program waits forever on ioctl(TIOCSETD). I am going to add printk statements to
Is the tty currently in use - that implies maybe an ldisc leak
Quoted 3 lines
Each line discipline has a refcount.
This single refcount is modified by all
entities using that line discipline.
Nope. tty->ldisc is a -copy- of the ldisc structure rather than a pointer. It has always been that way
struct tty_struct {
int magic;
struct tty_driver *driver;
int index;
struct tty_ldisc ldisc;...
Quoted 5 lines · Alan Cox
Quoted 3 lines · Paul Fulghum
I tried this patch and can't change line disciplines. The user program waits forever on ioctl(TIOCSETD). I am going to add printk statements to
Quoted 8 lines
Is the tty currently in use - that implies maybe an ldisc leak
Quoted 3 lines
Each line discipline has a refcount.
This single refcount is modified by all
entities using that line discipline.Nope.
tty->ldiscis a -copy- of the ldisc structure rather than a pointer. It has always been that way
Got it.
Global ldisc array refcount is used to know
when an ldisc module can be unloaded.
Per tty ldisc refcount is used to know
when an ldisc can be switched.
The problem is that the per tty ldisc structure is being initialized with the global ldisc array entry including the global refcount.
So the per tty refcount starts non zero and
never goes to zero and can't be changed.
The per tty ldisc refcount must be initialized to zero after copying the global ldisc structure.
There are 6 places where this needs to be done:
3 in tty_set_ldisc
2 in release_dev
1 in initialize_tty_struct
Also:
Switching back to N_TTY ldisc in release_dev() of tty_io.c takes a global ldisc reference (tty_ldisc_get) but then frees the tty structure. This causes a reference leak (global ldisc refcount) on N_TTY because there is no corresponding tty_ldisc_put.
--
Paul Fulghum
[email protected]
Quoted 4 lines · Paul Fulghum
There are 6 places where this needs to be done:
3 intty_set_ldisc
2 inrelease_dev
1 ininitialize_tty_struct
Argh I thought I'd fixed that after I turned it into one refcount field from two.
Quoted 5 lines
Switching back to
N_TTYldisc inrelease_dev()oftty_io.ctakes a global ldisc reference (tty_ldisc_get) but then frees the tty structure. This causes a reference leak (global ldisc refcount) onN_TTYbecause there is no correspondingtty_ldisc_put.
Thanks will look
Alan:
Here is a patch against your last patch that clears up both the per tty refcount initialization and the remove_dev() global refcount leak.
I've tested it and it seems to work.
The patch is not meant to be applied and
is just for your information in deciding how you want the final code to look.
drivers/char/tty_io.c +9 -3
@@ -288,6 +288,7 @@ }else ld =NULL ; +if (ld)printk ("tty_ldisc_get ld=%p refcount=%d\n" , ld, ld->refcount);spin_unlock_irqrestore (&tty_ldisc_lock, flags);return ld; }
@@ -307,6 +308,7 @@if (ld->refcount ==0 )BUG (); ld->refcount --; +printk ("tty_ldisc_put ld=%p refcount=%d\n" , ld, ld->refcount);module_put (ld->owner);spin_unlock_irqrestore (&tty_ldisc_lock, flags); }
@@ -497,6 +499,7 @@/* Now set up the new line discipline. */ tty->ldisc = *ld; + tty->ldisc.refcount =0 ; tty->termios->c_line = ldisc;if (tty->ldisc.open) retval = (tty->ldisc.open)(tty);
@@ -504,11 +507,13 @@tty_ldisc_put (ldisc);/* There is an outstanding reference here so this is safe */ tty->ldisc = *tty_ldisc_get (o_ldisc.num); + tty->ldisc.refcount =0 ; tty->termios->c_line = tty->ldisc.num;if (tty->ldisc.open && (tty->ldisc.open (tty) <0 )) {tty_ldisc_put (o_ldisc.num);/* This driver is always present */ tty->ldisc = *tty_ldisc_get (N_TTY ); + tty->ldisc.refcount =0 ; tty->termios->c_line =N_TTY ;if (tty->ldisc.open) {int r = tty->ldisc.open (tty);
@@ -1567,15 +1572,15 @@/* * Switch the line discipline back */ - tty->ldisc = *tty_ldisc_get (N_TTY ); - tty->termios->c_line =N_TTY ; +// tty->ldisc = *tty_ldisc_get(N_TTY); +// tty->termios->c_line = N_TTY; if (o_tty) {/* FIXME: could o_tty be in setldisc here ? */ clear_bit (TTY_LDISC , &o_tty->flags);if (o_tty->ldisc.close) (o_tty->ldisc.close)(o_tty);tty_ldisc_put (o_tty->ldisc.num); - o_tty->ldisc = *tty_ldisc_get (N_TTY ); +// o_tty->ldisc = *tty_ldisc_get(N_TTY); }/*
@@ -2466,6 +2471,7 @@memset (tty,0 ,sizeof (struct tty_struct )); tty->magic =TTY_MAGIC ; tty->ldisc = *tty_ldisc_get (N_TTY ); + tty->ldisc.refcount =0 ; tty->pgrp =-1 ; tty->flip.char_buf_ptr = tty->flip.char_buf; tty->flip.flag_buf_ptr = tty->flip.flag_buf;
Thanks,
Paul
--
Paul Fulghum
[email protected]
Quoted 3 lines · Paul Fulghum
Here is a patch against your last patch that clears up both the per tty refcount initialization and the
remove_dev()global refcount leak.
Thanks
drivers/char/tty_io.c line 502
Quoted 3 lines
drivers/char/tty_io.c +1
-0/* Now set up the new line discipline. */ tty->ldisc = *ld; + tty->ldisc.refcount =0 ;
What do you think about
tty_ldisc_get(tty, ldisc_num)
That seems to remove the whole mess ?
Quoted 5 lines · Alan Cox
What do you think about
tty_ldisc_get(tty, ldisc_num)That seems to remove the whole mess ?
Seems reasonable.
It's more compact and less error prone.
It will require some reordering/reworking
of tty_set_ldisc().
--
Paul Fulghum
[email protected]