From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: greg@kroah.com, linux-kernel@vger.kernel.org,
linux-serial@vger.kernel.org
Subject: [PATCH 10/12] tty: tidy up the RESET_TERMIOS case
Date: Fri, 22 Jun 2012 16:46:14 +0100 [thread overview]
Message-ID: <20120622154510.1405.45258.stgit@localhost.localdomain> (raw)
In-Reply-To: <20120622153600.1405.15575.stgit@localhost.localdomain>
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 f5c8d4f..14db2a8 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);
@@ -1432,16 +1436,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);
@@ -3069,16 +3066,18 @@ 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);
driver->ttys = NULL;
driver->termios = NULL;
kfree(p);
@@ -3117,6 +3117,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-06-22 15:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-22 15:36 [PATCH 01/12] f81232: correct stubbed termios handler Alan Cox
2012-06-22 15:38 ` [PATCH 02/12] usb: fix sillies in the metro USB driver Alan Cox
2012-06-24 21:49 ` Jiri Slaby
2012-07-23 16:32 ` Alan Cox
2012-06-22 15:40 ` [PATCH 03/12] tty: note race we need to fix Alan Cox
2012-06-22 15:42 ` [PATCH 04/12] gpio-sch: Fix resource leak Alan Cox
2012-06-27 2:25 ` Greg KH
2012-06-22 15:43 ` [PATCH 05/12] kobil_sct: Fix some bogus tty handling Alan Cox
2012-06-27 2:24 ` Greg KH
2012-06-22 15:43 ` [PATCH 06/12] 8250: use the 8250 register interface not the legacy one Alan Cox
2012-06-27 2:30 ` Greg KH
2012-06-22 15:44 ` [PATCH 07/12] 8250: propogate the bugs field Alan Cox
2012-06-22 15:44 ` [PATCH 08/12] 8250: add support for ASIX devices with a FIFO bug Alan Cox
2012-06-22 15:44 ` [PATCH 09/12] commit 22126843cb3c2a782c2d52614486115f3e9db478 Alan Cox
2012-06-22 15:36 ` Greg KH
2012-06-22 17:04 ` Alan Cox
2012-08-01 0:51 ` Yinghai Lu
2012-06-22 15:46 ` Alan Cox [this message]
2012-06-22 15:46 ` [PATCH 11/12] vt: fix the keyboard/led locking Alan Cox
2012-06-22 15:47 ` [PATCH 12/12] tty: move the handling of the tty release logic Alan Cox
2012-08-01 0:47 ` Yinghai Lu
2012-06-27 2:22 ` [PATCH 01/12] f81232: correct stubbed termios handler 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=20120622154510.1405.45258.stgit@localhost.localdomain \
--to=alan@lxorguk.ukuu.org.uk \
--cc=greg@kroah.com \
--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).