From: Arnd Bergmann <arnd@arndb.de>
To: Greg KH <gregkh@suse.de>
Cc: linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Alan Cox <alan@lxorguk.ukuu.org.uk>,
Frederic Weisbecker <fweisbec@gmail.com>,
John Kacur <jkacur@redhat.com>
Subject: [PATCH 30/31] tty: release BTM while sleeping in block_til_ready
Date: Tue, 1 Jun 2010 22:53:10 +0200 [thread overview]
Message-ID: <1275425591-8803-31-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1275425591-8803-1-git-send-email-arnd@arndb.de>
Most tty drivers may block while opening a device.
Since this possibly depends on another thread
closing it first and both threads may need the BTM,
we need to release it here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/char/amiserial.c | 2 ++
drivers/char/ip2/ip2main.c | 4 ++++
drivers/char/serial167.c | 4 +++-
drivers/char/specialix.c | 2 ++
drivers/char/synclink.c | 2 ++
drivers/char/synclink_gt.c | 2 ++
drivers/char/synclinkmp.c | 2 ++
drivers/char/tty_port.c | 2 ++
drivers/serial/68328serial.c | 2 ++
drivers/serial/68360serial.c | 2 ++
drivers/serial/crisv10.c | 2 ++
11 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 8228e61..a11c8c9 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -1710,7 +1710,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
printk("block_til_ready blocking: ttys%d, count = %d\n",
info->line, state->count);
#endif
+ tty_unlock();
schedule();
+ tty_lock();
}
__set_current_state(TASK_RUNNING);
remove_wait_queue(&info->open_wait, &wait);
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 911e1da..07f3ea3 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -1486,7 +1486,9 @@ ip2_open( PTTY tty, struct file *pFile )
if ( tty_hung_up_p(pFile) || ( pCh->flags & ASYNC_CLOSING )) {
if ( pCh->flags & ASYNC_CLOSING ) {
+ tty_unlock();
schedule();
+ tty_lock();
}
if ( tty_hung_up_p(pFile) ) {
set_current_state( TASK_RUNNING );
@@ -1548,7 +1550,9 @@ ip2_open( PTTY tty, struct file *pFile )
rc = (( pCh->flags & ASYNC_HUP_NOTIFY ) ? -EAGAIN : -ERESTARTSYS);
break;
}
+ tty_unlock();
schedule();
+ tty_lock();
}
set_current_state( TASK_RUNNING );
remove_wait_queue(&pCh->open_wait, &wait);
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index 90b3ec0..f646725 100644
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -1786,7 +1786,9 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
tty->name, info->count);
/**/
#endif
- schedule();
+ tty_unlock();
+ schedule();
+ tty_lock();
}
__set_current_state(TASK_RUNNING);
remove_wait_queue(&info->open_wait, &wait);
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index 7be456f..9f8495b 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -1365,7 +1365,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
retval = -ERESTARTSYS;
break;
}
+ tty_unlock();
schedule();
+ tty_lock();
}
set_current_state(TASK_RUNNING);
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 4de1246..c1a004f 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -3349,7 +3349,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
printk("%s(%d):block_til_ready blocking on %s count=%d\n",
__FILE__,__LINE__, tty->driver->name, port->count );
+ tty_unlock();
schedule();
+ tty_lock();
}
set_current_state(TASK_RUNNING);
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index c56b70a..99fae38 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -3244,7 +3244,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
}
DBGINFO(("%s block_til_ready wait\n", tty->driver->name));
+ tty_unlock();
schedule();
+ tty_lock();
}
set_current_state(TASK_RUNNING);
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index cfa581e..eb58d5f 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -3365,7 +3365,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
printk("%s(%d):%s block_til_ready() count=%d\n",
__FILE__,__LINE__, tty->driver->name, port->count );
+ tty_unlock();
schedule();
+ tty_lock();
}
set_current_state(TASK_RUNNING);
diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c
index 35eb304..33d37d2 100644
--- a/drivers/char/tty_port.c
+++ b/drivers/char/tty_port.c
@@ -294,7 +294,9 @@ int tty_port_block_til_ready(struct tty_port *port,
retval = -ERESTARTSYS;
break;
}
+ tty_unlock();
schedule();
+ tty_lock();
}
finish_wait(&port->open_wait, &wait);
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index 3046386..0e91896 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -1243,7 +1243,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
retval = -ERESTARTSYS;
break;
}
+ tty_unlock();
schedule();
+ tty_lock();
}
current->state = TASK_RUNNING;
remove_wait_queue(&info->open_wait, &wait);
diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
index 5b7b801..8b8e4c3 100644
--- a/drivers/serial/68360serial.c
+++ b/drivers/serial/68360serial.c
@@ -1860,7 +1860,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
printk("block_til_ready blocking: ttys%d, count = %d\n",
info->line, state->count);
#endif
+ tty_unlock();
schedule();
+ tty_lock();
}
current->state = TASK_RUNNING;
remove_wait_queue(&info->open_wait, &wait);
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 0825d4a..ca47072 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -4055,7 +4055,9 @@ block_til_ready(struct tty_struct *tty, struct file * filp,
printk("block_til_ready blocking: ttyS%d, count = %d\n",
info->line, info->count);
#endif
+ tty_unlock();
schedule();
+ tty_lock();
}
set_current_state(TASK_RUNNING);
remove_wait_queue(&info->open_wait, &wait);
--
1.7.0.4
next prev parent reply other threads:[~2010-06-01 20:54 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-01 20:52 [PATCH 00/31] tty: BKL removal Arnd Bergmann
2010-06-01 20:52 ` [PATCH 01/31] stallion: prune lock_kernel calls Arnd Bergmann
2010-06-01 20:52 ` [PATCH 02/31] istallion: use bit ops for the board flags Arnd Bergmann
2010-06-01 20:52 ` [PATCH 03/31] riscom8: kill use of lock_kernel Arnd Bergmann
2010-06-01 20:52 ` [PATCH 04/31] isicom: kill off the BKL Arnd Bergmann
2010-06-01 20:52 ` [PATCH 05/31] rocket: kill BKL Arnd Bergmann
2010-06-01 20:52 ` [PATCH 06/31] synclink: kill the big kernel lock Arnd Bergmann
2010-06-01 20:52 ` [PATCH 07/31] cyclades: Kill off BKL usage Arnd Bergmann
2010-06-01 20:52 ` [PATCH 08/31] epca: Kill the big kernel lock Arnd Bergmann
2010-06-01 20:52 ` [PATCH 09/31] specialix; Kill the BKL Arnd Bergmann
2010-06-01 20:52 ` [PATCH 10/31] synclink: reworking locking a bit Arnd Bergmann
2010-06-01 20:52 ` [PATCH 11/31] tty: serial - fix various misuses/mishandlings of port->tty Arnd Bergmann
2010-06-01 20:52 ` [PATCH 12/31] tty: serial - fix tty back references in termios Arnd Bergmann
2010-06-17 18:50 ` Tony Luck
2010-06-17 20:21 ` Greg KH
2010-06-01 20:52 ` [PATCH 13/31] tty: serial - fix tty referencing in set_ldisc Arnd Bergmann
2010-06-01 20:52 ` [PATCH 14/31] vc: Locking clean up Arnd Bergmann
2010-06-01 20:52 ` [PATCH 15/31] tty: Make vt's have a tty_port Arnd Bergmann
2010-06-01 20:52 ` [PATCH 16/31] tty: Move the vt_tty field from the vc_data into the standard tty_port Arnd Bergmann
2010-06-01 20:52 ` [PATCH 17/31] serial: Change the wait for carrier locking Arnd Bergmann
2010-06-01 20:52 ` [PATCH 18/31] serial: add port helpers Arnd Bergmann
2010-06-01 20:52 ` [PATCH 19/31] serial: trim locking on the helpers Arnd Bergmann
2010-06-01 20:53 ` [PATCH 20/31] serial: Use block_til_ready helper Arnd Bergmann
2010-06-01 20:53 ` [PATCH 21/31] tty: replace BKL with a new tty_lock Arnd Bergmann
2010-06-01 20:53 ` [PATCH 22/31] tty: never hold BTM while getting tty_mutex Arnd Bergmann
2010-06-01 20:53 ` [PATCH 23/31] tty: fix console_sem lock order Arnd Bergmann
2010-06-01 20:53 ` [PATCH 24/31] cdc-acm: remove dead code Arnd Bergmann
2010-06-01 20:53 ` [PATCH 25/31] tty: introduce wait_event_interruptible_tty Arnd Bergmann
2010-06-01 20:53 ` [PATCH 26/31] tty: reorder ldisc locking Arnd Bergmann
2010-06-01 20:53 ` [PATCH 27/31] tty: untangle locking of wait_until_sent Arnd Bergmann
2010-06-01 20:53 ` [PATCH 28/31] tty: remove tty_lock_nested Arnd Bergmann
2010-06-01 20:53 ` [PATCH 29/31] tty: implement BTM as mutex instead of BKL Arnd Bergmann
2010-06-01 20:53 ` Arnd Bergmann [this message]
2010-06-01 20:53 ` [PATCH 31/31] 8250: fix set_ldisc operation Arnd Bergmann
2010-06-02 22:16 ` [PATCH 00/31] tty: BKL removal Arnd Bergmann
2010-06-02 23:10 ` Greg KH
2010-06-16 20:49 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1275425591-8803-31-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=fweisbec@gmail.com \
--cc=gregkh@suse.de \
--cc=jkacur@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®