Re: [PATCH 10/13] tty: untangle locking of wait_until_sent

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Arnd Bergmann
Date: Wednesday, May 5, 2010 - 2:31 pm

On Wednesday 05 May 2010 21:59:05 Alan Cox wrote:

Ok, that simplifies things, at least we can call
tty->ops->wait_until_sent(tty, timeout) while holding
the BTM then, even with the next patch that makes it
non-recursive.


These, and most of the others in this patch call tty_wait_until_sent()
from their close() function. That contains the lines

        if (wait_event_interruptible_timeout(tty->write_wait,
                        !tty_chars_in_buffer(tty), timeout) >= 0) {

Part of what my patch does is to give up the BTM when already
holding it, to mimic the BKL behavior.
If you can confirm that this wait_event never blocks indefinitely
or has to wait for the BTM from another function, that could just
be removed. Otherwise, it probably needs to become something ugly
like

	if (tty_chars_in_buffer(tty)) {
		if (tty_locked()) {
			tty_unlock();
			wait = wait_event_interruptible_timeout(tty->write_wait,
	                        !tty_chars_in_buffer(tty), timeout) >= 0);
			tty_lock();
		} else {
			wait = wait_event_interruptible_timeout(tty->write_wait,
	                        !tty_chars_in_buffer(tty), timeout) >= 0);
		}
		if (wait && tty->ops->wait_until_sent)
			tty->ops->wait_until_sent(tty, timeout);
	}

I already had to introduce a few of these constructs to make the BTM
non-recursive, but I'd prefer to keep the number as low as possible
for obvious reasons.



Fine with me.
While I technically own a 16-port specialix card somewhere in my
parents' basement, I'm not exactly interested in maintaining the
driver.

	Arnd
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH v2 00/13] BKL conversion in tty layer, Arnd Bergmann, (Tue May 4, 3:33 pm)
[PATCH 01/13] tty: replace BKL with a new tty_lock, Arnd Bergmann, (Tue May 4, 3:33 pm)
[PATCH 05/13] tty: make ldisc_mutex nest under tty_lock, Arnd Bergmann, (Tue May 4, 3:33 pm)
[PATCH 10/13] tty: untangle locking of wait_until_sent, Arnd Bergmann, (Tue May 4, 3:33 pm)
[PATCH 11/13] tty: remove tty_lock_nested, Arnd Bergmann, (Tue May 4, 3:33 pm)
Re: [PATCH v2 00/13] BKL conversion in tty layer, Alan Cox, (Wed May 5, 3:52 am)
Re: [PATCH v2 00/13] BKL conversion in tty layer, Arnd Bergmann, (Wed May 5, 5:24 am)
Re: [PATCH 10/13] tty: untangle locking of wait_until_sent, Arnd Bergmann, (Wed May 5, 2:31 pm)