linux-serial.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Hurley <peter@hurleysoftware.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>,
	One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>,
	linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org,
	Peter Hurley <peter@hurleysoftware.com>
Subject: [PATCH -next v2 10/26] tty: Don't take tty_mutex for tty count changes
Date: Wed,  5 Nov 2014 12:12:53 -0500	[thread overview]
Message-ID: <1415207589-15967-11-git-send-email-peter@hurleysoftware.com> (raw)
In-Reply-To: <1415207589-15967-1-git-send-email-peter@hurleysoftware.com>

Holding tty_mutex is no longer required to serialize changes to
the tty_count or to prevent concurrent opens of closing ttys;
tty_lock() is sufficient.

Reviewed-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
 drivers/tty/tty_io.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 49167ed..f1c4b07 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1806,10 +1806,6 @@ int tty_release(struct inode *inode, struct file *filp)
 	 * each iteration we avoid any problems.
 	 */
 	while (1) {
-		/* Guard against races with tty->count changes elsewhere and
-		   opens on /dev/tty */
-
-		mutex_lock(&tty_mutex);
 		tty_lock_pair(tty, o_tty);
 		tty_closing = tty->count <= 1;
 		o_tty_closing = o_tty &&
@@ -1845,7 +1841,6 @@ int tty_release(struct inode *inode, struct file *filp)
 			       __func__, tty_name(tty, buf));
 		}
 		tty_unlock_pair(tty, o_tty);
-		mutex_unlock(&tty_mutex);
 		schedule_timeout_killable(timeout);
 		if (timeout < 120 * HZ)
 			timeout = 2 * timeout + 1;
@@ -1900,7 +1895,6 @@ int tty_release(struct inode *inode, struct file *filp)
 		read_unlock(&tasklist_lock);
 	}
 
-	mutex_unlock(&tty_mutex);
 	tty_unlock_pair(tty, o_tty);
 	/* At this point, the tty->count == 0 should ensure a dead tty
 	   cannot be re-opened by a racing opener */
-- 
2.1.3


  parent reply	other threads:[~2014-11-05 17:49 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-16 20:24 [PATCH -next 00/27] tty locking changes Peter Hurley
2014-10-16 20:24 ` [PATCH -next 01/27] tty: Don't hold tty_lock for ldisc release Peter Hurley
2014-10-16 20:25 ` [PATCH -next 02/27] tty: Invert tty_lock/ldisc_sem lock order Peter Hurley
2014-10-16 20:25 ` [PATCH -next 03/27] tty: Remove TTY_HUPPING Peter Hurley
2014-10-16 20:25 ` [PATCH -next 04/27] tty: Clarify re-open behavior of master ptys Peter Hurley
2014-10-16 20:25 ` [PATCH -next 05/27] tty: Check tty->count instead of TTY_CLOSING in tty_reopen() Peter Hurley
2014-10-16 20:25 ` [PATCH -next 06/27] pty: Always return -EIO if slave BSD pty opened first Peter Hurley
2014-10-16 20:25 ` [PATCH -next 07/27] tty: Re-open /dev/tty without tty_mutex Peter Hurley
2014-10-16 20:25 ` [PATCH -next 08/27] tty: Drop tty_mutex before tty reopen Peter Hurley
2014-10-16 20:25 ` [PATCH -next 09/27] tty: Remove TTY_CLOSING Peter Hurley
2014-10-16 20:25 ` [PATCH -next 10/27] tty: Don't take tty_mutex for tty count changes Peter Hurley
2014-10-16 20:25 ` [PATCH -next 11/27] tty: Don't release tty locks for wait queue sanity check Peter Hurley
2014-10-22 15:29   ` One Thousand Gnomes
2014-10-22 17:34     ` Peter Hurley
2014-10-23 11:30       ` One Thousand Gnomes
2014-10-16 20:25 ` [PATCH -next 12/27] tty: Document check_tty_count() requires tty_lock held Peter Hurley
2014-10-16 20:25 ` [PATCH -next 13/27] tty: Simplify pty pair teardown logic Peter Hurley
2014-10-16 20:25 ` [PATCH -next 14/27] tty: Fold pty pair handling into tty_flush_works() Peter Hurley
2014-10-16 20:25 ` [PATCH -next 15/27] tty: Simplify tty_ldisc_release() interface Peter Hurley
2014-10-16 20:25 ` [PATCH -next 16/27] tty: Simplify tty_release_checks() interface Peter Hurley
2014-10-16 20:25 ` [PATCH -next 17/27] tty: Simplify tty_release() state checks Peter Hurley
2014-10-16 20:25 ` [PATCH -next 18/27] tty: Change tty lock order to master->slave Peter Hurley
2014-10-16 20:25 ` [PATCH -next 19/27] tty: Remove tty_unhangup() declaration Peter Hurley
2014-10-16 20:25 ` [PATCH -next 20/27] tty: Refactor __tty_hangup to enable lockdep annotation Peter Hurley
2014-10-27 22:13   ` Peter Hurley
2014-10-16 20:25 ` [PATCH -next 21/27] pty: Don't drop pty master tty lock to hangup slave Peter Hurley
2014-10-16 20:25 ` [PATCH -next 22/27] tty: Document hangup call tree Peter Hurley
2014-10-16 20:25 ` [PATCH -next 23/27] pty, n_tty: Simplify input processing on final close Peter Hurley
2014-10-16 20:25 ` [PATCH -next 24/27] tty: Prefix tty_ldisc_{lock,lock_nested,unlock} functions Peter Hurley
2014-10-16 20:25 ` [PATCH -next 25/27] tty: Fix hung task on pty hangup Peter Hurley
2014-10-16 20:25 ` [PATCH -next 26/27] tty: Fix timeout on pty set ldisc Peter Hurley
2014-10-16 20:25 ` [PATCH -next 27/27] tty: Flush ldisc buffer atomically with tty flip buffers Peter Hurley
2014-10-22 15:31 ` [PATCH -next 00/27] tty locking changes One Thousand Gnomes
2014-11-05 17:12 ` [PATCH -next v2 00/26] " Peter Hurley
2014-11-05 17:12   ` [PATCH -next v2 01/26] tty: Don't hold tty_lock for ldisc release Peter Hurley
2014-11-05 17:12   ` [PATCH -next v2 02/26] tty: Invert tty_lock/ldisc_sem lock order Peter Hurley
2014-11-05 17:12   ` [PATCH -next v2 03/26] tty: Remove TTY_HUPPING Peter Hurley
2014-11-05 17:12   ` [PATCH -next v2 04/26] tty: Clarify re-open behavior of master ptys Peter Hurley
2014-11-05 17:12   ` [PATCH -next v2 05/26] tty: Check tty->count instead of TTY_CLOSING in tty_reopen() Peter Hurley
2014-11-05 17:12   ` [PATCH -next v2 06/26] pty: Always return -EIO if slave BSD pty opened first Peter Hurley
2014-11-05 17:12   ` [PATCH -next v2 07/26] tty: Re-open /dev/tty without tty_mutex Peter Hurley
2014-11-05 17:12   ` [PATCH -next v2 08/26] tty: Drop tty_mutex before tty reopen Peter Hurley
2014-11-05 17:12   ` [PATCH -next v2 09/26] tty: Remove TTY_CLOSING Peter Hurley
2014-11-05 17:12   ` Peter Hurley [this message]
2014-11-06  2:33     ` [PATCH -next v2 10/26] tty: Don't take tty_mutex for tty count changes Greg Kroah-Hartman
2014-11-06  2:39       ` Peter Hurley
2014-11-06  2:50         ` Peter Hurley
2014-11-06  3:46           ` Greg Kroah-Hartman
2014-11-05 17:12   ` [PATCH -next v2 11/26] tty: Don't release tty locks for wait queue sanity check Peter Hurley
2014-11-06  2:40     ` Greg Kroah-Hartman
2014-11-05 17:12   ` [PATCH -next v2 12/26] tty: Document check_tty_count() requires tty_lock held Peter Hurley
2014-11-05 17:12   ` [PATCH -next v2 13/26] tty: Simplify pty pair teardown logic Peter Hurley
2014-11-05 17:12   ` [PATCH -next v2 14/26] tty: Fold pty pair handling into tty_flush_works() Peter Hurley
2014-11-05 17:12   ` [PATCH -next v2 15/26] tty: Simplify tty_ldisc_release() interface Peter Hurley
2014-11-05 17:12   ` [PATCH -next v2 16/26] tty: Simplify tty_release_checks() interface Peter Hurley
2014-11-05 17:13   ` [PATCH -next v2 17/26] tty: Simplify tty_release() state checks Peter Hurley
2014-11-05 17:13   ` [PATCH -next v2 18/26] tty: Change tty lock order to master->slave Peter Hurley
2014-11-05 17:13   ` [PATCH -next v2 19/26] tty: Preset lock subclass for nested tty locks Peter Hurley
2014-11-05 17:13   ` [PATCH -next v2 20/26] tty: Remove tty_unhangup() declaration Peter Hurley
2014-11-05 17:13   ` [PATCH -next v2 21/26] pty: Don't drop pty master tty lock to hangup slave Peter Hurley
2014-11-11 15:49     ` One Thousand Gnomes
2014-11-05 17:13   ` [PATCH -next v2 22/26] pty, n_tty: Simplify input processing on final close Peter Hurley
2014-11-05 17:13   ` [PATCH -next v2 23/26] tty: Prefix tty_ldisc_{lock,lock_nested,unlock} functions Peter Hurley
2014-11-05 17:13   ` [PATCH -next v2 24/26] tty: Fix hung task on pty hangup Peter Hurley
2014-11-05 17:13   ` [PATCH -next v2 25/26] tty: Fix timeout on pty set ldisc Peter Hurley
2014-11-05 17:13   ` [PATCH -next v2 26/26] tty: Flush ldisc buffer atomically with tty flip buffers Peter Hurley

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=1415207589-15967-11-git-send-email-peter@hurleysoftware.com \
    --to=peter@hurleysoftware.com \
    --cc=gnomes@lxorguk.ukuu.org.uk \
    --cc=gregkh@linuxfoundation.org \
    --cc=jslaby@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@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;
as well as URLs for NNTP newsgroup(s).