From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: greg@kroah.com, linux-serial@vger.kernel.org
Subject: [PATCH 09/12] tty: tidy up the RESET_TERMIOS case
Date: Sat, 14 Jul 2012 15:34:04 +0100 [thread overview]
Message-ID: <20120714143356.26945.61497.stgit@localhost.localdomain> (raw)
In-Reply-To: <20120714142740.26945.98609.stgit@localhost.localdomain>
From: Alan Cox <alan@linux.intel.com>
If we are going to reset the termios then we don't need the driver side
buffers at all as we now have the tty allocation.
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
drivers/tty/tty_io.c | 45 +++++++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index cfd12da..d6feca1 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1249,16 +1249,20 @@ int tty_init_termios(struct tty_struct *tty)
struct ktermios *tp;
int idx = tty->index;
- tp = tty->driver->termios[idx];
- if (tp == NULL) {
- tp = kmalloc(sizeof(struct ktermios), GFP_KERNEL);
- if (tp == NULL)
- return -ENOMEM;
- *tp = tty->driver->init_termios;
- tty->driver->termios[idx] = tp;
- }
- tty->termios = *tp;
-
+ if (tty->driver->flags & TTY_DRIVER_RESET_TERMIOS)
+ tty->termios = tty->driver->init_termios;
+ else {
+ tp = tty->driver->termios[idx];
+ if (tp == NULL) {
+ tp = kzalloc(sizeof(struct ktermios[2]), GFP_KERNEL);
+ if (tp == NULL)
+ return -ENOMEM;
+ tp[0] = tty->driver->init_termios;
+ tty->driver->termios[idx] = tp;
+ }
+ tty->termios = tp[0];
+ tty->termios_locked = tp[1];
+ }
/* Compatibility until drivers always set this */
tty->termios.c_ispeed = tty_termios_input_baud_rate(&tty->termios);
tty->termios.c_ospeed = tty_termios_baud_rate(&tty->termios);
@@ -1435,16 +1439,9 @@ err_release_tty:
void tty_free_termios(struct tty_struct *tty)
{
- struct ktermios *tp;
int idx = tty->index;
/* Kill this flag and push into drivers for locking etc */
- if (tty->driver->flags & TTY_DRIVER_RESET_TERMIOS) {
- /* FIXME: Locking on ->termios array */
- tp = tty->driver->termios[idx];
- tty->driver->termios[idx] = NULL;
- kfree(tp);
- }
- else
+ if (!(tty->driver->flags & TTY_DRIVER_RESET_TERMIOS))
*tty->driver->termios[idx] = tty->termios;
}
EXPORT_SYMBOL(tty_free_termios);
@@ -3072,16 +3069,19 @@ static void destruct_tty_driver(struct kref *kref)
* drivers are removed from the kernel.
*/
for (i = 0; i < driver->num; i++) {
- tp = driver->termios[i];
- if (tp) {
- driver->termios[i] = NULL;
- kfree(tp);
+ if (!(driver->flags & TTY_DRIVER_RESET_TERMIOS)) {
+ tp = driver->termios[i];
+ if (tp) {
+ driver->termios[i] = NULL;
+ kfree(tp);
+ }
}
if (!(driver->flags & TTY_DRIVER_DYNAMIC_DEV))
tty_unregister_device(driver, i);
}
p = driver->ttys;
proc_tty_unregister_driver(driver);
+ /* FIXME: who frees driver->termios itself */
driver->ttys = NULL;
driver->termios = NULL;
kfree(p);
@@ -3121,6 +3121,7 @@ int tty_register_driver(struct tty_driver *driver)
void **p = NULL;
struct device *d;
+ /* FIXME: at this point we are overallocating for the RESET_TERMIOS case */
if (!(driver->flags & TTY_DRIVER_DEVPTS_MEM) && driver->num) {
p = kzalloc(driver->num * 2 * sizeof(void *), GFP_KERNEL);
if (!p)
next prev parent reply other threads:[~2012-07-14 14:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-14 14:30 [PATCH 00/12] tty: take 3 - termios, locking and 8250 bugs Alan Cox
2012-07-14 14:31 ` [PATCH 01/12] tty: revert incorrectly applied lock patch Alan Cox
2012-07-14 14:32 ` [PATCH 03/12] f81232: correct stubbed termios handler Alan Cox
2012-07-14 14:32 ` [PATCH 04/12] usb: fix sillies in the metro USB driver Alan Cox
2012-07-16 20:07 ` Greg KH
2012-07-14 14:32 ` [PATCH 05/12] usb, kobil: Sort out some bogus tty handling Alan Cox
2012-07-14 14:33 ` [PATCH 06/12] 8250: use the 8250 register interface not the legacy one Alan Cox
2012-07-16 20:09 ` Greg KH
2012-07-16 20:29 ` Alan Cox
2012-07-16 21:29 ` Greg KH
2012-07-14 14:33 ` [PATCH 07/12] 8250: propogate the bugs field Alan Cox
2012-07-14 14:33 ` [PATCH 08/12] 8250: add support for ASIX devices with a FIFO bug Alan Cox
2012-07-14 14:34 ` Alan Cox [this message]
2012-07-14 14:34 ` [PATCH 10/12] vt: fix the keyboard/led locking Alan Cox
2012-07-14 14:34 ` [PATCH 11/12] tty: Move the handling of the tty release logic Alan Cox
2012-07-14 14:34 ` [PATCH 12/12] tty: localise the lock Alan Cox
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=20120714143356.26945.61497.stgit@localhost.localdomain \
--to=alan@lxorguk.ukuu.org.uk \
--cc=greg@kroah.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.