BKL pruning and serial bug fixing
Subsystems (4)
cover BKL pruning and serial bug fixing
BKL elemination using the existing locks
---
Alan Cox (11):
synclink: reworking locking a bit specialix; Kill the BKL
epca: Kill the big kernel lock
cyclades: Kill off BKL usage
synclink: kill the big kernel lock
rocket: kill BKL
isicom: kill off the BKL
riscom8: kill use of lock_kernel
istallion: use bit ops for the board flags
stallion: prune lock_kernel calls
tty: Fix the digi acceleport driver NULL checks
drivers/char/cyclades.c | 20 +++----- drivers/char/epca.c | 4 -- drivers/char/isicom.c | 13 ++--- drivers/char/istallion.c | 56 +++++++++++---------- drivers/char/riscom8.c | 14 +++-- drivers/char/rocket.c | 28 +++++++---- drivers/char/specialix.c | 11 ++-- drivers/char/stallion.c | 20 +++++--- drivers/char/synclink.c | 19 ++++--- drivers/char/synclink_gt.c | 90 +++++++++++++++++----------------- drivers/char/synclinkmp.c | 41 ++++++++------- drivers/usb/serial/digi_acceleport.c | 14 +++-- include/linux/istallion.h | 2 - 13 files changed, 174 insertions(+), 158 deletions(-)
Signature · 1 line
Signature
PATCH 1/11 tty: Fix the digi acceleport driver NULL checks
This now refcounts but doesn't actually check the reference was obtained in all the places it should.
---
drivers/usb/serial/digi_acceleport.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)
drivers/usb/serial/digi_acceleport.c +9 -5
@@ -609,8 +609,10 @@ static void digi_wakeup_write_lock(struct work_struct *work)static void digi_wakeup_write (struct usb_serial_port *port) {struct tty_struct *tty =tty_port_tty_get (&port->port); -tty_wakeup (tty); -tty_kref_put (tty); +if (tty) { +tty_wakeup (tty); +tty_kref_put (tty); + } }
@@ -1683,7 +1685,7 @@ static int digi_read_inb_callback(struct urb *urb) priv->dp_throttle_restart =1 ;/* receive data */ -if (opcode ==DIGI_CMD_RECEIVE_DATA ) { +if (tty && opcode ==DIGI_CMD_RECEIVE_DATA ) {/* get flag from port_status */ flag =0 ;
@@ -1764,10 +1766,12 @@ static int digi_read_oob_callback(struct urb *urb)return -1 ; tty =tty_port_tty_get (&port->port); + rts =0 ; - rts = tty->termios->c_cflag &CRTSCTS ; +if (tty) + rts = tty->termios->c_cflag &CRTSCTS ; -if (opcode ==DIGI_CMD_READ_INPUT_SIGNALS ) { +if (tty && opcode ==DIGI_CMD_READ_INPUT_SIGNALS ) {spin_lock (&priv->dp_port_lock);/* convert from digi flags to termiox flags */ if (val &DIGI_READ_INPUT_SIGNALS_CTS ) {
PATCH 2/11 stallion: prune lock_kernel calls
In reply to Alan CoxRemove unneeded tty layer lock kernel bits. Relock the needed bits using the port mutex. The istallion still has brd state races but those are not new or introduced by the removal of the lock_kernel logic.
---
drivers/char/istallion.c | 22 +++++++++++++--------- drivers/char/stallion.c | 20 ++++++++++++-------- 2 files changed, 25 insertions(+), 17 deletions(-)
drivers/char/istallion.c +13 -9
@@ -14,6 +14,7 @@* the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * +* FIXME: brdp->state needs proper locking. */ /*****************************************************************************/
@@ -4011,6 +4012,7 @@ static int stli_getbrdstats(combrd_t __user *bp)return -ENODEV ;memset (&stli_brdstats,0 ,sizeof (combrd_t)); + stli_brdstats.brd = brdp->brdnr; stli_brdstats.type = brdp->brdtype; stli_brdstats.hwid =0 ;
@@ -4076,10 +4078,13 @@ static int stli_portcmdstats(struct tty_struct *tty, struct stliport *portp)if (brdp ==NULL )return -ENODEV ; +mutex_lock (&portp->port.mutex);if (brdp->state &BST_STARTED ) {if ((rc =stli_cmdwait (brdp, portp,A_GETSTATS , - &stli_cdkstats,sizeof (asystats_t),1 )) <0 ) + &stli_cdkstats,sizeof (asystats_t),1 )) <0 ) { +mutex_unlock (&portp->port.mutex);return rc; + } }else {memset (&stli_cdkstats,0 ,sizeof (asystats_t)); }
@@ -4124,6 +4129,7 @@ static int stli_portcmdstats(struct tty_struct *tty, struct stliport *portp) stli_comstats.modem = stli_cdkstats.dcdcnt; stli_comstats.hwid = stli_cdkstats.hwid; stli_comstats.signals =stli_mktiocm (stli_cdkstats.signals); +mutex_unlock (&portp->port.mutex);return 0 ; }
@@ -4186,15 +4192,20 @@ static int stli_clrportstats(struct stliport *portp, comstats_t __user *cp)if (!brdp)return -ENODEV ; +mutex_lock (&portp->port.mutex); +if (brdp->state &BST_STARTED ) { -if ((rc =stli_cmdwait (brdp, portp,A_CLEARSTATS ,NULL ,0 ,0 )) <0 ) +if ((rc =stli_cmdwait (brdp, portp,A_CLEARSTATS ,NULL ,0 ,0 )) <0 ) { +mutex_unlock (&portp->port.mutex);return rc; + } }memset (&stli_comstats,0 ,sizeof (comstats_t)); stli_comstats.brd = portp->brdnr; stli_comstats.panel = portp->panelnr; stli_comstats.port = portp->portnr; +mutex_unlock (&portp->port.mutex);if (copy_to_user (cp, &stli_comstats,sizeof (comstats_t)))return -EFAULT ;
@@ -4266,8 +4277,6 @@ static long stli_memioctl(struct file *fp, unsigned int cmd, unsigned long arg) done =0 ; rc =0 ; -lock_kernel (); -switch (cmd) {case COM_GETPORTSTATS : rc =stli_getportstats (NULL ,NULL , argp);
@@ -4290,8 +4299,6 @@ static long stli_memioctl(struct file *fp, unsigned int cmd, unsigned long arg) done++;break ; } -unlock_kernel (); -if (done)return rc;
@@ -4308,8 +4315,6 @@ static long stli_memioctl(struct file *fp, unsigned int cmd, unsigned long arg)if (brdp->state ==0 )return -ENODEV ; -lock_kernel (); -switch (cmd) {case STL_BINTR :EBRDINTR (brdp);
@@ -4332,7 +4337,6 @@ static long stli_memioctl(struct file *fp, unsigned int cmd, unsigned long arg) rc = -ENOIOCTLCMD ;break ; } -unlock_kernel ();return rc; }
drivers/char/stallion.c +12 -8
@@ -807,7 +807,6 @@ static void stl_waituntilsent(struct tty_struct *tty, int timeout) timeout =HZ ; tend = jiffies + timeout; -lock_kernel ();while (stl_datastate (portp)) {if (signal_pending (current))break ;
@@ -815,7 +814,6 @@ static void stl_waituntilsent(struct tty_struct *tty, int timeout)if (time_after_eq (jiffies, tend))break ; } -unlock_kernel (); }/*****************************************************************************/
@@ -1029,6 +1027,8 @@ static int stl_getserial(struct stlport *portp, struct serial_struct __user *sp)pr_debug ("stl_getserial(portp=%p,sp=%p)\n" , portp, sp);memset (&sio,0 ,sizeof (struct serial_struct )); + +mutex_lock (&portp->port.mutex); sio.line = portp->portnr; sio.port = portp->ioaddr; sio.flags = portp->port.flags;
@@ -1048,6 +1048,7 @@ static int stl_getserial(struct stlport *portp, struct serial_struct __user *sp) brdp = stl_brds[portp->brdnr];if (brdp !=NULL ) sio.irq = brdp->irq; +mutex_unlock (&portp->port.mutex);return copy_to_user (sp, &sio,sizeof (struct serial_struct )) ? -EFAULT :0 ; }
@@ -1069,12 +1070,15 @@ static int stl_setserial(struct tty_struct *tty, struct serial_struct __user *spif (copy_from_user (&sio, sp,sizeof (struct serial_struct )))return -EFAULT ; +mutex_lock (&portp->port.mutex);if (!capable (CAP_SYS_ADMIN )) {if ((sio.baud_base != portp->baud_base) || (sio.close_delay != portp->close_delay) || ((sio.flags & ~ASYNC_USR_MASK ) != - (portp->port.flags & ~ASYNC_USR_MASK ))) + (portp->port.flags & ~ASYNC_USR_MASK ))) { +mutex_unlock (&portp->port.mutex);return -EPERM ; + } } portp->port.flags = (portp->port.flags & ~ASYNC_USR_MASK) |
@@ -1083,6 +1087,7 @@ static int stl_setserial(struct tty_struct *tty, struct serial_struct __user *sp portp->close_delay = sio.close_delay; portp->closing_wait = sio.closing_wait; portp->custom_divisor = sio.custom_divisor; +mutex_unlock (&portp->port.mutex);stl_setport (portp, tty->termios);return 0 ; }
@@ -1147,8 +1152,6 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd rc =0 ; -lock_kernel (); -switch (cmd) {case TIOCGSERIAL : rc =stl_getserial (portp, argp);
@@ -1173,7 +1176,6 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd rc = -ENOIOCTLCMD ;break ; } -unlock_kernel ();return rc; }
@@ -2327,6 +2329,7 @@ static int stl_getportstats(struct tty_struct *tty, struct stlport *portp, comstreturn -ENODEV ; } +mutex_lock (&portp->port.mutex); portp->stats.state = portp->istate; portp->stats.flags = portp->port.flags; portp->stats.hwid = portp->hwid;
@@ -2358,6 +2361,7 @@ static int stl_getportstats(struct tty_struct *tty, struct stlport *portp, comst (STL_TXBUFSIZE - (tail - head)); portp->stats.signals = (unsigned long )stl_getsignals (portp); +mutex_unlock (&portp->port.mutex);return copy_to_user (cp, &portp->stats,sizeof (comstats_t)) ? -EFAULT :0 ;
@@ -2382,10 +2386,12 @@ static int stl_clrportstats(struct stlport *portp, comstats_t __user *cp)return -ENODEV ; } +mutex_lock (&portp->port.mutex);memset (&portp->stats,0 ,sizeof (comstats_t)); portp->stats.brd = portp->brdnr; portp->stats.panel = portp->panelnr; portp->stats.port = portp->portnr; +mutex_unlock (&portp->port.mutex);return copy_to_user (cp, &portp->stats,sizeof (comstats_t)) ? -EFAULT :0 ; }
@@ -2451,7 +2457,6 @@ static long stl_memioctl(struct file *fp, unsigned int cmd, unsigned long arg)return -ENODEV ; rc =0 ; -lock_kernel ();switch (cmd) {case COM_GETPORTSTATS : rc =stl_getportstats (NULL ,NULL , argp);
@@ -2472,7 +2477,6 @@ static long stl_memioctl(struct file *fp, unsigned int cmd, unsigned long arg) rc = -ENOIOCTLCMD ;break ; } -unlock_kernel ();return rc; }
PATCH 3/11 istallion: use bit ops for the board flags
In reply to Alan CoxThis lets us avoid problems with races on the flag changes
---
drivers/char/istallion.c | 36 ++++++++++++++++++------------------ include/linux/istallion.h | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-)
drivers/char/istallion.c +18 -18
@@ -14,7 +14,6 @@* the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * -* FIXME: brdp->state needs proper locking. */ /*****************************************************************************/
@@ -204,9 +203,9 @@ static int stli_shared;* the board has been detected, and whether it is actually running a slave * or not. */ -#define BST_FOUND 0x1 -#define BST_STARTED 0x2 -#define BST_PROBED 0x4 +#define BST_FOUND 0 +#define BST_STARTED 1 +#define BST_PROBED 2/* * Define the set of port state flags. These are marked for internal
@@ -817,7 +816,7 @@ static int stli_open(struct tty_struct *tty, struct file *filp) brdp = stli_brds[brdnr];if (brdp ==NULL )return -ENODEV ; -if ((brdp->state &BST_STARTED ) ==0 ) +if (!test_bit (BST_STARTED , &brdp->state))return -ENODEV ; portnr =MINOR2PORT (minordev);if (portnr > brdp->nrports)
@@ -1847,7 +1846,7 @@ static void stli_portinfo(struct seq_file *m, struct stlibrd *brdp, struct stlip rc =stli_portcmdstats (NULL , portp); uart ="UNKNOWN" ; -if (brdp->state &BST_STARTED ) { +if (test_bit (BST_STARTED , &brdp->state)) {switch (stli_comstats.hwid) {case 0 : uart ="2681" ;break ;case 1 : uart ="SC26198" ;break ;
@@ -1856,7 +1855,7 @@ static void stli_portinfo(struct seq_file *m, struct stlibrd *brdp, struct stlip }seq_printf (m,"%d: uart:%s " , portnr, uart); -if ((brdp->state &BST_STARTED ) && (rc >=0 )) { +if (test_bit (BST_STARTED , &brdp->state) && rc >=0 ) {char sep; seq_printf(m, "tx:%d rx:%d", (int) stli_comstats.txtotal,
@@ -2356,7 +2355,7 @@ static void stli_poll(unsigned long arg) brdp = stli_brds[brdnr];if (brdp ==NULL )continue ; -if ((brdp->state &BST_STARTED ) ==0 ) +if (!test_bit (BST_STARTED , &brdp->state))continue ;spin_lock (&brd_lock);
@@ -3141,7 +3140,7 @@ static int stli_initecp(struct stlibrd *brdp) } - brdp->state |=BST_FOUND ; +set_bit (BST_FOUND , &brdp->state);return 0 ; err_unmap:iounmap (brdp->membase);
@@ -3298,7 +3297,7 @@ static int stli_initonb(struct stlibrd *brdp) brdp->panels[0 ] = brdp->nrports; - brdp->state |=BST_FOUND ; +set_bit (BST_FOUND , &brdp->state);return 0 ; err_unmap:iounmap (brdp->membase);
@@ -3408,7 +3407,7 @@ stli_donestartup:spin_unlock_irqrestore (&brd_lock, flags);if (rc ==0 ) - brdp->state |=BST_STARTED ; +set_bit (BST_STARTED , &brdp->state);if (! stli_timeron) { stli_timeron++;
@@ -3711,7 +3710,7 @@ static int __devinit stli_pciprobe(struct pci_dev *pdev,if (retval) goto err_null; - brdp->state |=BST_PROBED ; +set_bit (BST_PROBED , &brdp->state);pci_set_drvdata (pdev, brdp);EBRDENABLE (brdp);
@@ -3842,7 +3841,7 @@ static int __init stli_initbrds(void) brdp = stli_brds[i];if (brdp ==NULL )continue ; -if (brdp->state &BST_FOUND ) { +if (test_bit (BST_FOUND , &brdp->state)) {EBRDENABLE (brdp); brdp->enable =NULL ; brdp->disable =NULL ;
@@ -4079,7 +4078,7 @@ static int stli_portcmdstats(struct tty_struct *tty, struct stliport *portp)return -ENODEV ;mutex_lock (&portp->port.mutex); -if (brdp->state &BST_STARTED ) { +if (test_bit (BST_STARTED , &brdp->state)) {if ((rc =stli_cmdwait (brdp, portp,A_GETSTATS , &stli_cdkstats,sizeof (asystats_t),1 )) <0 ) {mutex_unlock (&portp->port.mutex);
@@ -4194,7 +4193,7 @@ static int stli_clrportstats(struct stliport *portp, comstats_t __user *cp)mutex_lock (&portp->port.mutex); -if (brdp->state &BST_STARTED ) { +if (test_bit (BST_STARTED , &brdp->state)) {if ((rc =stli_cmdwait (brdp, portp,A_CLEARSTATS ,NULL ,0 ,0 )) <0 ) {mutex_unlock (&portp->port.mutex);return rc;
@@ -4323,10 +4322,10 @@ static long stli_memioctl(struct file *fp, unsigned int cmd, unsigned long arg) rc =stli_startbrd (brdp);break ;case STL_BSTOP : - brdp->state &= ~BST_STARTED ; +clear_bit (BST_STARTED , &brdp->state);break ;case STL_BRESET : - brdp->state &= ~BST_STARTED ; +clear_bit (BST_STARTED , &brdp->state);EBRDRESET (brdp);if (stli_shared ==0 ) {if (brdp->reenable !=NULL )
@@ -4382,7 +4381,8 @@ static void istallion_cleanup_isa(void)unsigned int j;for (j =0 ; (j < stli_nrbrds); j++) { -if ((brdp = stli_brds[j]) ==NULL || (brdp->state &BST_PROBED )) +if ((brdp = stli_brds[j]) ==NULL || +test_bit (BST_PROBED , &brdp->state))continue ;stli_cleanup_ports (brdp);
include/linux/istallion.h +1 -1
@@ -86,7 +86,7 @@ struct stlibrd {unsigned long magic;unsigned int brdnr;unsigned int brdtype; -unsigned int state; +unsigned long state;unsigned int nrpanels;unsigned int nrports;unsigned int nrdevs;
PATCH 4/11 riscom8: kill use of lock_kernel
In reply to Alan CoxThe riscom8 board uses lock_kernel to protect bits of the port setting ioctl logic. We can use the port mutex for this as the logic is internal and will also lock set versus open (a locking property that has been lost somewhere along the way)
---
drivers/char/riscom8.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)
drivers/char/riscom8.c +8 -6
@@ -47,7 +47,6 @@#include <linux/init.h> #include <linux/delay.h> #include <linux/tty_flip.h> -#include <linux/smp_lock.h> #include <linux/spinlock.h> #include <linux/device.h>
@@ -1184,6 +1183,7 @@ static int rc_set_serial_info(struct tty_struct *tty, struct riscom_port *port,if (copy_from_user (&tmp, newinfo,sizeof (tmp)))return -EFAULT ; +mutex_lock (&port->port.mutex); change_speed = ((port->port.flags &ASYNC_SPD_MASK ) != (tmp.flags &ASYNC_SPD_MASK ));
@@ -1191,8 +1191,10 @@ static int rc_set_serial_info(struct tty_struct *tty, struct riscom_port *port,if ((tmp.close_delay != port->port.close_delay) || (tmp.closing_wait != port->port.closing_wait) || ((tmp.flags & ~ASYNC_USR_MASK ) != - (port->port.flags & ~ASYNC_USR_MASK ))) + (port->port.flags & ~ASYNC_USR_MASK ))) { +mutex_unlock (&port->port.mutex);return -EPERM ; + } port->port.flags = ((port->port.flags & ~ASYNC_USR_MASK ) | (tmp.flags &ASYNC_USR_MASK )); }else {
@@ -1208,6 +1210,7 @@ static int rc_set_serial_info(struct tty_struct *tty, struct riscom_port *port,rc_change_speed (tty, bp, port);spin_unlock_irqrestore (&riscom_lock, flags); } +mutex_unlock (&port->port.mutex);return 0 ; }
@@ -1220,12 +1223,15 @@ static int rc_get_serial_info(struct riscom_port *port,memset (&tmp,0 ,sizeof (tmp)); tmp.type =PORT_CIRRUS ; tmp.line = port - rc_port; + +mutex_lock (&port->port.mutex); tmp.port = bp->base; tmp.irq = bp->irq; tmp.flags = port->port.flags; tmp.baud_base = (RC_OSCFREQ +CD180_TPC /2 ) /CD180_TPC ; tmp.close_delay = port->port.close_delay *HZ /100 ; tmp.closing_wait = port->port.closing_wait *HZ /100 ; +mutex_unlock (&port->port.mutex); tmp.xmit_fifo_size =CD180_NFIFO ;return copy_to_user (retinfo, &tmp,sizeof (tmp)) ? -EFAULT :0 ; }
@@ -1242,14 +1248,10 @@ static int rc_ioctl(struct tty_struct *tty, struct file *filp,switch (cmd) {case TIOCGSERIAL : -lock_kernel (); retval =rc_get_serial_info (port, argp); -unlock_kernel ();break ;case TIOCSSERIAL : -lock_kernel (); retval =rc_set_serial_info (tty, port, argp); -unlock_kernel ();break ;default : retval = -ENOIOCTLCMD ;
PATCH 5/11 isicom: kill off the BKL
In reply to Alan CoxAs with the others we can use the port mutex to get the needed locking properties and fix the race with open.
---
drivers/char/isicom.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-)
drivers/char/isicom.c +5 -8
@@ -124,7 +124,6 @@#include <linux/fs.h> #include <linux/sched.h> #include <linux/serial.h> -#include <linux/smp_lock.h> #include <linux/mm.h> #include <linux/interrupt.h> #include <linux/timer.h>
@@ -872,7 +871,6 @@ static struct tty_port *isicom_find_port(struct tty_struct *tty)static int isicom_open (struct tty_struct *tty,struct file *filp) {struct isi_port *port; -struct isi_board *card;struct tty_port *tport; tport =isicom_find_port (tty);
@@ -1118,8 +1116,7 @@ static int isicom_set_serial_info(struct tty_struct *tty,if (copy_from_user (&newinfo, info,sizeof (newinfo)))return -EFAULT ; -lock_kernel (); - +mutex_lock (&port->port.mutex); reconfig_port = ((port->port.flags &ASYNC_SPD_MASK ) != (newinfo.flags &ASYNC_SPD_MASK ));
@@ -1128,7 +1125,7 @@ static int isicom_set_serial_info(struct tty_struct *tty, (newinfo.closing_wait != port->port.closing_wait) || ((newinfo.flags & ~ASYNC_USR_MASK) != (port->port.flags & ~ASYNC_USR_MASK))) { -unlock_kernel (); +mutex_unlock (&port->port.mutex);return -EPERM ; } port->port.flags = ((port->port.flags & ~ASYNC_USR_MASK) |
@@ -1145,7 +1142,7 @@ static int isicom_set_serial_info(struct tty_struct *tty,isicom_config_port (tty);spin_unlock_irqrestore (&port->card->card_lock, flags); } -unlock_kernel (); +mutex_unlock (&port->port.mutex);return 0 ; }
@@ -1154,7 +1151,7 @@ static int isicom_get_serial_info(struct isi_port *port, {struct serial_struct out_info; -lock_kernel (); +mutex_lock (&port->port.mutex);memset (&out_info,0 ,sizeof (out_info));/* out_info.type = ? */ out_info.line = port - isi_ports;
@@ -1164,7 +1161,7 @@ static int isicom_get_serial_info(struct isi_port *port,/* out_info.baud_base = ? */ out_info.close_delay = port->port.close_delay; out_info.closing_wait = port->port.closing_wait; -unlock_kernel (); +mutex_unlock (&port->port.mutex);if (copy_to_user (info, &out_info,sizeof (out_info)))return -EFAULT ;return 0 ;
PATCH 6/11 rocket: kill BKL
In reply to Alan CoxWe can use the port mutex for this and also for the hangup path so removing the problematic use of the hangup mutex in this driver. Fix up the locking on the various port flags while we are at it.
Ultimately this driver needs to be using tty_port_ helpers which would sort this out far better.
---
drivers/char/rocket.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-)
drivers/char/rocket.c +19 -9
@@ -73,7 +73,6 @@#include <linux/tty_driver.h> #include <linux/tty_flip.h> #include <linux/serial.h> -#include <linux/smp_lock.h> #include <linux/string.h> #include <linux/fcntl.h> #include <linux/ptrace.h>
@@ -1017,6 +1016,7 @@ static void rp_close(struct tty_struct *tty, struct file *filp)if (tty_port_close_start (port, tty, filp) ==0 )return ; +mutex_lock (&port->mutex); cp = &info->channel;/* * Before we drop DTR, make sure the UART transmitter
@@ -1060,9 +1060,13 @@ static void rp_close(struct tty_struct *tty, struct file *filp) info->xmit_buf =NULL ; } } +spin_lock_irq (&port->lock); info->port.flags &= ~(ASYNC_INITIALIZED |ASYNC_CLOSING |ASYNC_NORMAL_ACTIVE ); tty->closing =0 ; +spin_unlock_irq (&port->lock); +mutex_unlock (&port->mutex);tty_port_tty_set (port,NULL ); +wake_up_interruptible (&port->close_wait);complete_all (&info->close_wait);atomic_dec (&rp_num_ports_open);
@@ -1210,11 +1214,13 @@ static int get_config(struct r_port *info, struct rocket_config __user *retinfo)if (!retinfo)return -EFAULT ;memset (&tmp,0 ,sizeof (tmp)); +mutex_lock (&info->port.mutex); tmp.line = info->line; tmp.flags = info->flags; tmp.close_delay = info->port.close_delay; tmp.closing_wait = info->port.closing_wait; tmp.port = rcktpt_io_addr[(info->line >>5 ) &3 ]; +mutex_unlock (&info->port.mutex);if (copy_to_user (retinfo, &tmp,sizeof (*retinfo)))return -EFAULT ;
@@ -1229,10 +1235,13 @@ static int set_config(struct tty_struct *tty, struct r_port *info,if (copy_from_user (&new_serial, new_info,sizeof (new_serial)))return -EFAULT ; +mutex_lock (&info->port.mutex);if (!capable (CAP_SYS_ADMIN )) { -if ((new_serial.flags & ~ROCKET_USR_MASK ) != (info->flags & ~ROCKET_USR_MASK )) +if ((new_serial.flags & ~ROCKET_USR_MASK ) != (info->flags & ~ROCKET_USR_MASK )) { +mutex_unlock (&info->port.mutex);return -EPERM ; + } info->flags = ((info->flags & ~ROCKET_USR_MASK ) | (new_serial.flags &ROCKET_USR_MASK ));configure_r_port (tty, info,NULL );return 0 ;
@@ -1250,6 +1259,7 @@ static int set_config(struct tty_struct *tty, struct r_port *info, tty->alt_speed =230400 ;if ((info->flags &ROCKET_SPD_MASK ) ==ROCKET_SPD_WARP ) tty->alt_speed =460800 ; +mutex_unlock (&info->port.mutex);configure_r_port (tty, info,NULL );return 0 ;
@@ -1325,8 +1335,6 @@ static int rp_ioctl(struct tty_struct *tty, struct file *file,if (cmd !=RCKP_GET_PORTS &&rocket_paranoia_check (info,"rp_ioctl" ))return -ENXIO ; -lock_kernel (); -switch (cmd) {case RCKP_GET_STRUCT :if (copy_to_user (argp, info,sizeof (struct r_port )))
@@ -1350,7 +1358,6 @@ static int rp_ioctl(struct tty_struct *tty, struct file *file,default : ret = -ENOIOCTLCMD ; } -unlock_kernel ();return ret; }
@@ -1471,7 +1478,6 @@ static void rp_wait_until_sent(struct tty_struct *tty, int timeout) jiffies);printk (KERN_INFO "cps=%d...\n" , info->cps);#endif -lock_kernel ();while (1 ) { txcnt =sGetTxCnt (cp);if (!txcnt) {
@@ -1499,7 +1505,6 @@ static void rp_wait_until_sent(struct tty_struct *tty, int timeout)break ; }__set_current_state (TASK_RUNNING ); -unlock_kernel ();#ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT printk (KERN_INFO "txcnt = %d (jiff=%lu)...done\n" , txcnt, jiffies);#endif
@@ -1512,6 +1517,7 @@ static void rp_hangup(struct tty_struct *tty) {CHANNEL_t *cp;struct r_port *info = tty->driver_data; +unsigned long flags;if (rocket_paranoia_check (info,"rp_hangup" ))return ;
@@ -1520,11 +1526,15 @@ static void rp_hangup(struct tty_struct *tty)printk (KERN_INFO "rp_hangup of ttyR%d...\n" , info->line);#endif rp_flush_buffer (tty); -if (info->port.flags &ASYNC_CLOSING ) +spin_lock_irqsave (&info->port.lock, flags); +if (info->port.flags &ASYNC_CLOSING ) { +spin_unlock_irqrestore (&info->port.lock, flags);return ; + }if (info->port.count)atomic_dec (&rp_num_ports_open);clear_bit ((info->aiop *8 ) + info->chan, (void *) &xmit_flags[info->board]); +spin_unlock_irqrestore (&info->port.lock, flags);tty_port_hangup (&info->port);
@@ -1535,7 +1545,7 @@ static void rp_hangup(struct tty_struct *tty)sDisCTSFlowCtl (cp);sDisTxSoftFlowCtl (cp);sClrTxXOFF (cp); - info->port.flags &= ~ASYNC_INITIALIZED ; +clear_bit (ASYNCB_INITIALIZED , &info->port.flags);wake_up_interruptible (&info->port.open_wait); }
PATCH 7/11 synclink: kill the big kernel lock
In reply to Alan CoxWe don't need it while waiting and we can lock the ioctls using the port mutex. While at it eliminate use of the hangup mutex and switch to the port mutex.
---
drivers/char/synclink.c | 19 ++++++----- drivers/char/synclink_gt.c | 78 +++++++++++++++++++------------------------- drivers/char/synclinkmp.c | 32 +++++++----------- 3 files changed, 56 insertions(+), 73 deletions(-)
drivers/char/synclink.c +10 -9
@@ -81,7 +81,6 @@#include <linux/mm.h> #include <linux/seq_file.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/delay.h> #include <linux/netdevice.h> #include <linux/vmalloc.h>
@@ -2436,7 +2435,9 @@ static int mgsl_get_stats(struct mgsl_struct * info, struct mgsl_icount __user *if (!user_icount) {memset (&info->icount,0 ,sizeof (info->icount)); }else { +mutex_lock (&info->port.mutex);COPY_TO_USER (err, user_icount, &info->icount,sizeof (struct mgsl_icount )); +mutex_unlock (&info->port.mutex);if (err)return -EFAULT ; }
@@ -2461,7 +2462,9 @@ static int mgsl_get_params(struct mgsl_struct * info, MGSL_PARAMS __user *user_pprintk ("%s(%d):mgsl_get_params(%s)\n" , __FILE__,__LINE__, info->device_name); +mutex_lock (&info->port.mutex);COPY_TO_USER (err,user_params, &info->params,sizeof (MGSL_PARAMS )); +mutex_unlock (&info->port.mutex);if (err) {if ( debug_level >=DEBUG_LEVEL_INFO ) printk( "%s(%d):mgsl_get_params(%s) user buffer copy failed\n",
@@ -2501,11 +2504,13 @@ static int mgsl_set_params(struct mgsl_struct * info, MGSL_PARAMS __user *new_pareturn -EFAULT ; } +mutex_lock (&info->port.mutex);spin_lock_irqsave (&info->irq_spinlock,flags);memcpy (&info->params,&tmp_params,sizeof (MGSL_PARAMS ));spin_unlock_irqrestore (&info->irq_spinlock,flags);mgsl_change_params (info); +mutex_unlock (&info->port.mutex);return 0 ;
@@ -2935,7 +2940,6 @@ static int mgsl_ioctl(struct tty_struct *tty, struct file * file, unsigned int cmd, unsigned long arg) {struct mgsl_struct * info = tty->driver_data; -int ret;if (debug_level >=DEBUG_LEVEL_INFO ) printk("%s(%d):mgsl_ioctl %s cmd=%08X\n", __FILE__,__LINE__,
@@ -2950,10 +2954,7 @@ static int mgsl_ioctl(struct tty_struct *tty, struct file * file,return -EIO ; } -lock_kernel (); - ret =mgsl_ioctl_common (info, cmd, arg); -unlock_kernel (); -return ret; +return mgsl_ioctl_common (info, cmd, arg); }static int mgsl_ioctl_common (struct mgsl_struct *info,unsigned int cmd,unsigned long arg)
@@ -3109,12 +3110,14 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)if (tty_port_close_start (&info->port, tty, filp) ==0 ) goto cleanup; - + +mutex_lock (&info->port.mutex);if (info->port.flags &ASYNC_INITIALIZED )mgsl_wait_until_sent (tty, info->timeout);mgsl_flush_buffer (tty);tty_ldisc_flush (tty);shutdown (info); +mutex_unlock (&info->port.mutex);tty_port_close_end (&info->port, tty); info->port.tty =NULL ;
@@ -3162,7 +3165,6 @@ static void mgsl_wait_until_sent(struct tty_struct *tty, int timeout)* Note: use tight timings here to satisfy the NIST-PCTS. */ -lock_kernel ();if ( info->params.data_rate ) { char_time = info->timeout/(32 *5 );if (!char_time)
@@ -3192,7 +3194,6 @@ static void mgsl_wait_until_sent(struct tty_struct *tty, int timeout)break ; } } -unlock_kernel (); exit:if (debug_level >=DEBUG_LEVEL_INFO )
drivers/char/synclink_gt.c +34 -44
123 lines not on this page · raw message
drivers/char/synclinkmp.c +12 -20
@@ -52,7 +52,6 @@#include <linux/mm.h> #include <linux/seq_file.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/netdevice.h> #include <linux/vmalloc.h> #include <linux/init.h>
@@ -1062,9 +1061,7 @@ static void wait_until_sent(struct tty_struct *tty, int timeout)if (sanity_check (info, tty->name,"wait_until_sent" ))return ; -lock_kernel (); - -if (!(info->port.flags &ASYNC_INITIALIZED )) +if (!test_bit (ASYNCB_INITIALIZED , &info->port.flags)) goto exit; orig_jiffies = jiffies;
@@ -1094,8 +1091,10 @@ static void wait_until_sent(struct tty_struct *tty, int timeout)break ; } }else { -//TODO: determine if there is something similar to USC16C32 -// TXSTATUS_ALL_SENT status +/* +* TODO: determine if there is something similar to USC16C32 +* TXSTATUS_ALL_SENT status +*/ while ( info->tx_active && info->tx_enabled) {msleep_interruptible (jiffies_to_msecs (char_time));if (signal_pending (current))
@@ -1106,7 +1105,6 @@ static void wait_until_sent(struct tty_struct *tty, int timeout) } exit: -unlock_kernel ();if (debug_level >=DEBUG_LEVEL_INFO )printk ("%s(%d):%s wait_until_sent() exit\n" , __FILE__,__LINE__, info->device_name );
@@ -1122,7 +1120,6 @@ static int write_room(struct tty_struct *tty)if (sanity_check (info, tty->name,"write_room" ))return 0 ; -lock_kernel ();if (info->params.mode ==MGSL_MODE_HDLC ) { ret = (info->tx_active) ?0 :HDLC_MAX_FRAME_SIZE ; }else {
@@ -1130,7 +1127,6 @@ static int write_room(struct tty_struct *tty)if (ret <0 ) ret =0 ; } -unlock_kernel ();if (debug_level >=DEBUG_LEVEL_INFO ) printk("%s(%d):%s write_room()=%d\n",
@@ -1251,7 +1247,7 @@ static void tx_release(struct tty_struct *tty)* * Return Value: 0 if success, otherwise error code */ -static int do_ioctl (struct tty_struct *tty,struct file *file, +static int ioctl (struct tty_struct *tty,struct file *file,unsigned int cmd,unsigned long arg) {SLMP_INFO *info = tty->driver_data;
@@ -1341,16 +1337,6 @@ static int do_ioctl(struct tty_struct *tty, struct file *file,return 0 ; } -static int ioctl (struct tty_struct *tty,struct file *file, -unsigned int cmd,unsigned long arg) -{ -int ret; -lock_kernel (); - ret =do_ioctl (tty, file, cmd, arg); -unlock_kernel (); -return ret; -} -/* * /proc fs routines.... */
@@ -2883,7 +2869,9 @@ static int get_stats(SLMP_INFO * info, struct mgsl_icount __user *user_icount)if (!user_icount) {memset (&info->icount,0 ,sizeof (info->icount)); }else { +mutex_lock (&info->port.mutex);COPY_TO_USER (err, user_icount, &info->icount,sizeof (struct mgsl_icount )); +mutex_unlock (&info->port.mutex);if (err)return -EFAULT ; }
@@ -2898,7 +2886,9 @@ static int get_params(SLMP_INFO * info, MGSL_PARAMS __user *user_params)printk ("%s(%d):%s get_params()\n" , __FILE__,__LINE__, info->device_name); +mutex_lock (&info->port.mutex);COPY_TO_USER (err,user_params, &info->params,sizeof (MGSL_PARAMS )); +mutex_unlock (&info->port.mutex);if (err) {if ( debug_level >=DEBUG_LEVEL_INFO ) printk( "%s(%d):%s get_params() user buffer copy failed\n",
@@ -2926,11 +2916,13 @@ static int set_params(SLMP_INFO * info, MGSL_PARAMS __user *new_params)return -EFAULT ; } +mutex_lock (&info->port.mutex);spin_lock_irqsave (&info->lock,flags);memcpy (&info->params,&tmp_params,sizeof (MGSL_PARAMS ));spin_unlock_irqrestore (&info->lock,flags);change_params (info); +mutex_unlock (&info->port.mutex);return 0 ; }
PATCH 8/11 cyclades: Kill off BKL usage
In reply to Alan CoxUse the port mutext for config setting, the rest is locked sufficiently anyway that the BKL makes no odds.
---
drivers/char/cyclades.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-)
drivers/char/cyclades.c +9 -11
@@ -65,7 +65,6 @@#include <linux/tty.h> #include <linux/tty_flip.h> #include <linux/serial.h> -#include <linux/smp_lock.h> #include <linux/major.h> #include <linux/string.h> #include <linux/fcntl.h>
@@ -1655,7 +1654,6 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)return ;/* Just in case.... */ orig_jiffies = jiffies; -lock_kernel ();/* * Set the check interval to be 1/5 of the estimated time to * send a single character, and make it at least 1. The check
@@ -1702,7 +1700,6 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout) }/* Run one more char cycle */ msleep_interruptible (jiffies_to_msecs (char_time *5 )); -unlock_kernel ();#ifdef CY_DEBUG_WAIT_UNTIL_SENT printk (KERN_DEBUG "Clean (jiff=%lu)...done\n" , jiffies);#endif
@@ -1959,7 +1956,6 @@ static int cy_chars_in_buffer(struct tty_struct *tty)int char_count;__u32 tx_put, tx_get, tx_bufsize; -lock_kernel (); tx_get =readl (&buf_ctrl->tx_get); tx_put =readl (&buf_ctrl->tx_put); tx_bufsize =readl (&buf_ctrl->tx_bufsize);
@@ -1971,7 +1967,6 @@ static int cy_chars_in_buffer(struct tty_struct *tty)printk (KERN_DEBUG "cyc:cy_chars_in_buffer ttyC%d %d\n" , info->line, info->xmit_cnt + char_count);#endif -unlock_kernel (); return info->xmit_cnt + char_count; }#endif /* Z_EXT_CHARS_IN_BUFFER */
@@ -2359,17 +2354,22 @@ cy_set_serial_info(struct cyclades_port *info, struct tty_struct *tty, struct serial_struct __user *new_info) {struct serial_struct new_serial; +int ret;if (copy_from_user (&new_serial, new_info,sizeof (new_serial)))return -EFAULT ; +mutex_lock (&info->port.mutex);if (!capable (CAP_SYS_ADMIN )) {if (new_serial.close_delay != info->port.close_delay || new_serial.baud_base != info->baud || (new_serial.flags &ASYNC_FLAGS & ~ASYNC_USR_MASK ) != (info->port.flags &ASYNC_FLAGS & ~ASYNC_USR_MASK )) + { +mutex_unlock (&info->port.mutex);return -EPERM ; + } info->port.flags = (info->port.flags & ~ASYNC_USR_MASK ) | (new_serial.flags &ASYNC_USR_MASK ); info->baud = new_serial.baud_base;
@@ -2392,10 +2392,12 @@ cy_set_serial_info(struct cyclades_port *info, struct tty_struct *tty, check_and_exit:if (info->port.flags &ASYNC_INITIALIZED ) {cy_set_line_char (info, tty); -return 0 ; + ret =0 ; }else { -return cy_startup (info, tty); + ret =cy_startup (info, tty); } +mutex_unlock (&info->port.mutex); +return ret; }/* set_serial_info */ /*
@@ -2438,7 +2440,6 @@ static int cy_tiocmget(struct tty_struct *tty, struct file *file) card = info->card; -lock_kernel ();if (!cy_is_Z (card)) {unsigned long flags;int channel = info->line - card->first_line;
@@ -2478,7 +2479,6 @@ static int cy_tiocmget(struct tty_struct *tty, struct file *file) ((lstatus &C_RS_CTS ) ?TIOCM_CTS :0 ); } end: -unlock_kernel ();return result; }/* cy_tiomget */
@@ -2696,7 +2696,6 @@ cy_ioctl(struct tty_struct *tty, struct file *file,printk (KERN_DEBUG "cyc:cy_ioctl ttyC%d, cmd = %x arg = %lx\n" , info->line, cmd, arg);#endif -lock_kernel ();switch (cmd) {case CYGETMON :
@@ -2817,7 +2816,6 @@ cy_ioctl(struct tty_struct *tty, struct file *file,default : ret_val = -ENOIOCTLCMD ; } -unlock_kernel ();#ifdef CY_DEBUG_OTHER printk (KERN_DEBUG "cyc:cy_ioctl done\n" );
PATCH 9/11 epca: Kill the big kernel lock
In reply to Alan CoxThe lock is no longer needed for wait until sent paths so this can go
---
drivers/char/epca.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/char/epca.c +1 -3
@@ -36,7 +36,7 @@#include <linux/ctype.h> #include <linux/tty.h> #include <linux/tty_flip.h> -#include <linux/smp_lock.h> +#include <linux/slab.h> #include <linux/ioport.h> #include <linux/interrupt.h> #include <linux/uaccess.h>
@@ -2105,7 +2105,6 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file,break ;case DIGI_SETAW :case DIGI_SETAF : -lock_kernel ();if (cmd ==DIGI_SETAW ) {/* Setup an event to indicate when the transmit buffer empties */
@@ -2118,7 +2117,6 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file,if (tty->ldisc->ops->flush_buffer) tty->ldisc->ops->flush_buffer (tty); } -unlock_kernel ();/* Fall Thru */ case DIGI_SETA :if (copy_from_user (&ch->digiext, argp,sizeof (digi_t)))
PATCH 10/11 specialix; Kill the BKL
In reply to Alan CoxUse the port mutex instead
---
drivers/char/specialix.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-)
drivers/char/specialix.c +5 -6
@@ -1863,8 +1863,7 @@ static int sx_set_serial_info(struct specialix_port *port,return -EFAULT ; } -lock_kernel (); - +mutex_lock (&port->port.mutex); change_speed = ((port->port.flags &ASYNC_SPD_MASK ) != (tmp.flags &ASYNC_SPD_MASK )); change_speed |= (tmp.custom_divisor != port->custom_divisor);
@@ -1875,7 +1874,7 @@ static int sx_set_serial_info(struct specialix_port *port, ((tmp.flags & ~ASYNC_USR_MASK) != (port->port.flags & ~ASYNC_USR_MASK))) {func_exit (); -unlock_kernel (); +mutex_unlock (&port->port.mutex);return -EPERM ; } port->port.flags = ((port->port.flags & ~ASYNC_USR_MASK) |
@@ -1892,7 +1891,7 @@ static int sx_set_serial_info(struct specialix_port *port,sx_change_speed (bp, port);func_exit (); -unlock_kernel (); +mutex_unlock (&port->port.mutex);return 0 ; }
@@ -1906,7 +1905,7 @@ static int sx_get_serial_info(struct specialix_port *port,func_enter ();memset (&tmp,0 ,sizeof (tmp)); -lock_kernel (); +mutex_lock (&port->port.mutex); tmp.type =PORT_CIRRUS ; tmp.line = port - sx_port; tmp.port = bp->base;
@@ -1917,7 +1916,7 @@ static int sx_get_serial_info(struct specialix_port *port, tmp.closing_wait = port->port.closing_wait *HZ /100 ; tmp.custom_divisor = port->custom_divisor; tmp.xmit_fifo_size = CD186x_NFIFO; -unlock_kernel (); +mutex_unlock (&port->port.mutex);if (copy_to_user (retinfo, &tmp,sizeof (tmp))) {func_exit ();return -EFAULT ;
PATCH 11/11 synclink: reworking locking a bit
In reply to Alan CoxUse the port mutex and port lock to fix the various races. The locking still isn't totally consistent but its better than before. Wants switching to the port helpers.
---
drivers/char/synclink_gt.c | 12 +++++++++++- drivers/char/synclinkmp.c | 9 ++++++++- 2 files changed, 19 insertions(+), 2 deletions(-)
drivers/char/synclink_gt.c +11 -1
@@ -675,12 +675,14 @@ static int open(struct tty_struct *tty, struct file *filp) goto cleanup; } +mutex_lock (&info->port.mutex); info->port.tty->low_latency = (info->port.flags &ASYNC_LOW_LATENCY ) ?1 :0 ;spin_lock_irqsave (&info->netlock, flags);if (info->netcount) { retval = -EBUSY ;spin_unlock_irqrestore (&info->netlock, flags); +mutex_unlock (&info->port.mutex); goto cleanup; } info->port.count++;
@@ -692,7 +694,7 @@ static int open(struct tty_struct *tty, struct file *filp)if (retval <0 ) goto cleanup; } - +mutex_unlock (&info->port.mutex); retval =block_til_ready (tty, filp, info);if (retval) {DBGINFO (("%s block_til_ready rc=%d\n" , info->device_name, retval));
@@ -724,12 +726,14 @@ static void close(struct tty_struct *tty, struct file *filp)if (tty_port_close_start (&info->port, tty, filp) ==0 ) goto cleanup; +mutex_lock (&info->port.mutex);if (info->port.flags &ASYNC_INITIALIZED )wait_until_sent (tty, info->timeout);flush_buffer (tty);tty_ldisc_flush (tty);shutdown (info); +mutex_unlock (&info->port.mutex);tty_port_close_end (&info->port, tty); info->port.tty =NULL ;
@@ -740,17 +744,23 @@ cleanup:static void hangup (struct tty_struct *tty) {struct slgt_info *info = tty->driver_data; +unsigned long flags;if (sanity_check (info, tty->name,"hangup" ))return ;DBGINFO (("%s hangup\n" , info->device_name));flush_buffer (tty); + +mutex_lock (&info->port.mutex);shutdown (info); +spin_lock_irqsave (&info->port.lock, flags); info->port.count =0 ; info->port.flags &= ~ASYNC_NORMAL_ACTIVE ; info->port.tty =NULL ; +spin_unlock_irqrestore (&info->port.lock, flags); +mutex_unlock (&info->port.mutex);wake_up_interruptible (&info->port.open_wait); }
drivers/char/synclinkmp.c +8 -1
@@ -812,13 +812,15 @@ static void close(struct tty_struct *tty, struct file *filp)if (tty_port_close_start (&info->port, tty, filp) ==0 ) goto cleanup; - + +mutex_lock (&info->port.mutex);if (info->port.flags &ASYNC_INITIALIZED )wait_until_sent (tty, info->timeout);flush_buffer (tty);tty_ldisc_flush (tty);shutdown (info); +mutex_unlock (&info->port.mutex);tty_port_close_end (&info->port, tty); info->port.tty =NULL ;
@@ -834,6 +836,7 @@ cleanup:static void hangup (struct tty_struct *tty) {SLMP_INFO *info = tty->driver_data; +unsigned long flags;if (debug_level >=DEBUG_LEVEL_INFO ) printk("%s(%d):%s hangup()\n",
@@ -842,12 +845,16 @@ static void hangup(struct tty_struct *tty)if (sanity_check (info, tty->name,"hangup" ))return ; +mutex_lock (&info->port.mutex);flush_buffer (tty);shutdown (info); +spin_lock_irqsave (&info->port.lock, flags); info->port.count =0 ; info->port.flags &= ~ASYNC_NORMAL_ACTIVE ; info->port.tty =NULL ; +spin_unlock_irqrestore (&info->port.lock, flags); +mutex_unlock (&info->port.mutex);wake_up_interruptible (&info->port.open_wait); }
Quoted 1 line · Alan Cox
BKL elemination using the existing locks
Hm, have all of these patches been in -next before now? Do you think these are ready to go into .35?
thanks,
greg k-h
Quoted 5 lines · On Thu, 20 May 2010 10:56:36 -0700 Greg KH <[email protected]> wrote:
Quoted 1 line · Alan Cox
BKL elemination using the existing locks
Hm, have all of these patches been in -next before now? Do you think these are ready to go into .35?
Sorry - you asked for them to be re-sent with the BKL removal fixes from Arnd which is for .36. They aren't needed for .35 and don't really fix anything that would be worth backporting either.
Not .35 material.
Alan
Quoted 6 lines · Alan Cox
Quoted 3 lines · On Thu, 20 May 2010 10:56:36 -0700 Greg KH <[email protected]> wrote:
Quoted 1 line · Alan Cox
BKL elemination using the existing locks
Quoted 8 lines
Quoted 2 lines
Hm, have all of these patches been in -next before now? Do you think these are ready to go into .35?
Sorry - you asked for them to be re-sent with the BKL removal fixes from Arnd which is for .36. They aren't needed for .35 and don't really fix anything that would be worth backporting either.
Not .35 material.
Ah, good, I just didn't know where to apply them. I'll wait till .35-rc1 is out before queueing them up.
thanks,
greg k-h