Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TTY: um/line, use tty from tty_port

Browse Source 
This means switching to the tty refcounted model so that we will not
race with interrupts.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: user-mode-linux-devel@lists.sourceforge.net
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Jiri Slaby 2012-06-04 13:35:27 +02:00 committed by Richard Weinberger
parent 060ed31dd9
commit 6fc58845ad
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/um/drivers/chan_kern.c
View File

@ -150,9 +150,11 @@ void chan_enable_winch(struct chan *chan, struct tty_struct *tty)
static void line_timer_cb(struct work_struct *work) static void line_timer_cb(struct work_struct *work)
{ {
struct line *line = container_of(work, struct line, task.work); struct line *line = container_of(work, struct line, task.work);
struct tty_struct *tty = tty_port_tty_get(&line->port);
if (!line->throttled) if (!line->throttled)
chan_interrupt(line, line->tty, line->driver->read_irq); chan_interrupt(line, tty, line->driver->read_irq);
tty_kref_put(tty);
} }
int enable_chan(struct line *line) int enable_chan(struct line *line)

25
arch/um/drivers/line.c
View File

@ -19,9 +19,11 @@ static irqreturn_t line_interrupt(int irq, void *data)
{ {
struct chan *chan = data; struct chan *chan = data;
struct line *line = chan->line; struct line *line = chan->line;
struct tty_struct *tty = tty_port_tty_get(&line->port);
if (line) if (line)
chan_interrupt(line, line->tty, irq); chan_interrupt(line, tty, irq);
tty_kref_put(tty);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -333,7 +335,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
{ {
struct chan *chan = data; struct chan *chan = data;
struct line *line = chan->line; struct line *line = chan->line;
struct tty_struct *tty = line->tty; struct tty_struct *tty;
int err; int err;
/* /*
@ -352,10 +354,13 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
} }
spin_unlock(&line->lock); spin_unlock(&line->lock);
tty = tty_port_tty_get(&line->port);
if (tty == NULL) if (tty == NULL)
return IRQ_NONE; return IRQ_NONE;
tty_wakeup(tty); tty_wakeup(tty);
tty_kref_put(tty);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -409,7 +414,7 @@ int line_open(struct line *lines, struct tty_struct *tty)
BUG_ON(tty->driver_data); BUG_ON(tty->driver_data);
tty->driver_data = line; tty->driver_data = line;
line->tty = tty; tty_port_tty_set(&line->port, tty);
err = enable_chan(line); err = enable_chan(line);
if (err) /* line_close() will be called by our caller */ if (err) /* line_close() will be called by our caller */
@ -449,7 +454,7 @@ void line_close(struct tty_struct *tty, struct file * filp)
if (--line->port.count) if (--line->port.count)
goto out_unlock; goto out_unlock;
line->tty = NULL; tty_port_tty_set(&line->port, NULL);
tty->driver_data = NULL; tty->driver_data = NULL;
if (line->sigio) { if (line->sigio) {
@ -610,9 +615,15 @@ int line_get_config(char *name, struct line *lines, unsigned int num, char *str,
mutex_lock(&line->count_lock); mutex_lock(&line->count_lock);
if (!line->valid) if (!line->valid)
CONFIG_CHUNK(str, size, n, "none", 1); CONFIG_CHUNK(str, size, n, "none", 1);
else if (line->tty == NULL) else {
CONFIG_CHUNK(str, size, n, line->init_str, 1); struct tty_struct *tty = tty_port_tty_get(&line->port);
else n = chan_config_string(line, str, size, error_out); if (tty == NULL) {
CONFIG_CHUNK(str, size, n, line->init_str, 1);
} else {
n = chan_config_string(line, str, size, error_out);
tty_kref_put(tty);
}
}
mutex_unlock(&line->count_lock); mutex_unlock(&line->count_lock);
return n; return n;

1
arch/um/drivers/line.h
View File

@ -33,7 +33,6 @@ struct line_driver {
struct line { struct line {
struct tty_port port; struct tty_port port;
struct tty_struct *tty;
struct mutex count_lock; struct mutex count_lock;
int valid; int valid;