Skip to contentSkip to conversation

A little console mystery...

RFC In review Alan Cox 3 participants 6 messages Feb 17, 2010

Subsystems (2)
lore
Share & tools
lore

Alan Cox

author
#0 lore raw

cover A little console mystery...

Anyone feeling inspired. These three patches move the console to use the tty_port interface and refcounting. The first two work perfectly, the third which we really need works beautifully except that it breaks mingetty/login stuff.

[So not for the main kernel if you like using text consoles]

I have been staring at this problem for ages and I'm clearly missing something silly because I've still not pinned down why mingetty etc break with the third patch applied.

---

Alan Cox (3):
vt: Fix refcounting use
tty: Move the vt_tty field from the vc_data into the standard tty_port
tty: Make vt's have a tty_port

author
#1 lore raw

PATCH 1/3 tty: Make vt's have a tty_port

The vt layer isn't safely handling reference counts to tty object on the input side. Add a tty port structure to the vt layer in order to implement this using the standard helpers.

---

 drivers/char/vt.c              |    2 ++
 include/linux/console_struct.h |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)
drivers/char/vt.c +2 -0
index bd1d116..8e2cb28 100644
@@ -768,6 +768,7 @@ int vc_allocate(unsigned int currcons)	/* return 0 on success */
 	    if (!vc)
 		return -ENOMEM;
 	    vc_cons[currcons].d = vc;
+	    tty_port_init(&vc->port);
 	    INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK);
 	    visual_init(vc, currcons, 1);
 	    if (!*vc->vc_uni_pagedir_loc)
@@ -2908,6 +2909,7 @@ static int __init con_init(void)
 	for (currcons = 0; currcons < MIN_NR_CONSOLES; currcons++) {
 		vc_cons[currcons].d = vc = kzalloc(sizeof(struct vc_data), GFP_NOWAIT);
 		INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK);
+		tty_port_init(&vc->port);
 		visual_init(vc, currcons, 1);
 		vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size, GFP_NOWAIT);
 		vc_init(vc, vc->vc_rows, vc->vc_cols,
include/linux/console_struct.h +2 -0
index 38fe59d..57e83f1 100644
@@ -21,6 +21,8 @@ struct vt_struct;
 #define NPAR 16
 
 struct vc_data {
+	struct tty_port port;			/* Upper level data */
+
 	unsigned short	vc_num;			/* Console number */
 	unsigned int	vc_cols;		/* [#] Console size */
 	unsigned int	vc_rows;
author
#2 lore raw

PATCH 2/3 tty: Move the vt_tty field from the vc_data into the standard tty_port

In reply to Alan Cox

This takes all the tty references through the expected interface points so we can refcount them.

---

 drivers/char/keyboard.c        |   10 +++++-----
 drivers/char/vt.c              |   10 +++++-----
 drivers/char/vt_ioctl.c        |    2 +-
 include/linux/console_struct.h |    1 -
 4 files changed, 11 insertions(+), 12 deletions(-)
drivers/char/keyboard.c +5 -5
index 11491a3..cd440f8 100644
@@ -315,7 +315,7 @@ int kbd_rate(struct kbd_repeat *rep)
  */
 static void put_queue(struct vc_data *vc, int ch)
 {
-	struct tty_struct *tty = vc->vc_tty;
+	struct tty_struct *tty = vc->port.tty;
 
 	if (tty) {
 		tty_insert_flip_char(tty, ch, 0);
@@ -325,7 +325,7 @@ static void put_queue(struct vc_data *vc, int ch)
 
 static void puts_queue(struct vc_data *vc, char *cp)
 {
-	struct tty_struct *tty = vc->vc_tty;
+	struct tty_struct *tty = vc->port.tty;
 
 	if (!tty)
 		return;
@@ -497,7 +497,7 @@ static void fn_show_ptregs(struct vc_data *vc)
 
 static void fn_hold(struct vc_data *vc)
 {
-	struct tty_struct *tty = vc->vc_tty;
+	struct tty_struct *tty = vc->port.tty;
 
 	if (rep || !tty)
 		return;
@@ -575,7 +575,7 @@ static void fn_inc_console(struct vc_data *vc)
 
 static void fn_send_intr(struct vc_data *vc)
 {
-	struct tty_struct *tty = vc->vc_tty;
+	struct tty_struct *tty = vc->port.tty;
 
 	if (!tty)
 		return;
@@ -1167,7 +1167,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
 	int shift_final;
 	struct keyboard_notifier_param param = { .vc = vc, .value = keycode, .down = down };
 
-	tty = vc->vc_tty;
+	tty = vc->port.tty;
 
 	if (tty && (!tty->driver_data)) {
 		/* No driver data? Strange. Okay we fix it then. */
drivers/char/vt.c +5 -5
index 8e2cb28..9821628 100644
@@ -957,12 +957,12 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
  *	Resize a virtual console as seen from the console end of things. We
  *	use the common vc_do_resize methods to update the structures. The
  *	caller must hold the console sem to protect console internals and
- *	vc->vc_tty
+ *	vc->port.tty
  */
 
 int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int rows)
 {
-	return vc_do_resize(vc->vc_tty, vc, cols, rows);
+	return vc_do_resize(vc->port.tty, vc, cols, rows);
 }
 
 /**
@@ -2794,12 +2794,12 @@ static int con_open(struct tty_struct *tty, struct file *filp)
 			struct vc_data *vc = vc_cons[currcons].d;
 
 			/* Still being freed */
-			if (vc->vc_tty) {
+			if (vc->port.tty) {
 				release_console_sem();
 				return -ERESTARTSYS;
 			}
 			tty->driver_data = vc;
-			vc->vc_tty = tty;
+			vc->port.tty = tty;
 
 			if (!tty->winsize.ws_row && !tty->winsize.ws_col) {
 				tty->winsize.ws_row = vc_cons[currcons].d->vc_rows;
@@ -2827,7 +2827,7 @@ static void con_shutdown(struct tty_struct *tty)
 	struct vc_data *vc = tty->driver_data;
 	BUG_ON(vc == NULL);
 	acquire_console_sem();
-	vc->vc_tty = NULL;
+	vc->port.tty = NULL;
 	release_console_sem();
 	tty_shutdown(tty);
 }
drivers/char/vt_ioctl.c +1 -1
index 6aa1028..625f77d 100644
@@ -1367,7 +1367,7 @@ void vc_SAK(struct work_struct *work)
 	acquire_console_sem();
 	vc = vc_con->d;
 	if (vc) {
-		tty = vc->vc_tty;
+		tty = vc->port.tty;
 		/*
 		 * SAK should also work in all raw modes and reset
 		 * them properly.
include/linux/console_struct.h +0 -1
index 57e83f1..3364898 100644
@@ -58,7 +58,6 @@ struct vc_data {
 	/* VT terminal data */
 	unsigned int	vc_state;		/* Escape sequence parser state */
 	unsigned int	vc_npar,vc_par[NPAR];	/* Parameters of current escape sequence */
-	struct tty_struct *vc_tty;		/* TTY we are attached to */
 	/* data for manual vt switching */
 	struct vt_mode	vt_mode;
 	struct pid 	*vt_pid;
author
#3 lore raw

PATCH 3/3 vt: Fix refcounting use

In reply to Alan Cox

We want to properly refcount the vc tty because of the cases where a vc is disassociated from a tty (eg destroyed). At the moment the code isn't safe and in fact input even tries to patch up broken pointers as a result!

---

 drivers/char/keyboard.c |   47 +++++++++++-------
 drivers/char/vt.c       |  126 ++++++++++++++++++++++++++++++++---------------
 drivers/char/vt_ioctl.c |    6 +-
 3 files changed, 119 insertions(+), 60 deletions(-)
drivers/char/keyboard.c +29 -18
index cd440f8..46d0b1a 100644
@@ -315,17 +315,18 @@ int kbd_rate(struct kbd_repeat *rep)
  */
 static void put_queue(struct vc_data *vc, int ch)
 {
-	struct tty_struct *tty = vc->port.tty;
+	struct tty_struct *tty = tty_port_tty_get(&vc->port);
 
 	if (tty) {
 		tty_insert_flip_char(tty, ch, 0);
 		con_schedule_flip(tty);
+		tty_kref_put(tty);
 	}
 }
 
 static void puts_queue(struct vc_data *vc, char *cp)
 {
-	struct tty_struct *tty = vc->port.tty;
+	struct tty_struct *tty = tty_port_tty_get(&vc->port);
 
 	if (!tty)
 		return;
@@ -335,6 +336,7 @@ static void puts_queue(struct vc_data *vc, char *cp)
 		cp++;
 	}
 	con_schedule_flip(tty);
+	tty_kref_put(tty);
 }
 
 static void applkey(struct vc_data *vc, int key, char mode)
@@ -497,10 +499,12 @@ static void fn_show_ptregs(struct vc_data *vc)
 
 static void fn_hold(struct vc_data *vc)
 {
-	struct tty_struct *tty = vc->port.tty;
+	struct tty_struct *tty = tty_port_tty_get(&vc->port);
 
-	if (rep || !tty)
+	if (rep || !tty) {
+	        tty_kref_put(tty);
 		return;
+        }
 
 	/*
 	 * Note: SCROLLOCK will be set (cleared) by stop_tty (start_tty);
@@ -511,6 +515,7 @@ static void fn_hold(struct vc_data *vc)
 		start_tty(tty);
 	else
 		stop_tty(tty);
+        tty_kref_put(tty);
 }
 
 static void fn_num(struct vc_data *vc)
@@ -575,12 +580,13 @@ static void fn_inc_console(struct vc_data *vc)
 
 static void fn_send_intr(struct vc_data *vc)
 {
-	struct tty_struct *tty = vc->port.tty;
+	struct tty_struct *tty = tty_port_tty_get(&vc->port);
 
 	if (!tty)
 		return;
 	tty_insert_flip_char(tty, 0, TTY_BREAK);
 	con_schedule_flip(tty);
+	tty_kref_put(tty);
 }
 
 static void fn_scroll_forw(struct vc_data *vc)
@@ -1167,11 +1173,14 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
 	int shift_final;
 	struct keyboard_notifier_param param = { .vc = vc, .value = keycode, .down = down };
 
-	tty = vc->port.tty;
+	tty = tty_port_tty_get(&vc->port);
 
-	if (tty && (!tty->driver_data)) {
-		/* No driver data? Strange. Okay we fix it then. */
-		tty->driver_data = vc;
+	if (tty && !tty->driver_data) {
+		/* No driver data? - can't continue */
+		WARN_ON(1);
+		/* If this race still exists we want to know */
+		tty_kref_put(tty);
+		return;
 	}
 
 	kbd = kbd_table + vc->vc_num;
@@ -1201,13 +1210,13 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
 			sysrq_down = down;
 			sysrq_alt_use = sysrq_alt;
 		}
-		return;
+		goto put;
 	}
 	if (sysrq_down && !down && keycode == sysrq_alt_use)
 		sysrq_down = 0;
 	if (sysrq_down && down && !rep) {
 		handle_sysrq(kbd_sysrq_xlate[keycode], tty);
-		return;
+		goto put;
 	}
 #endif
 #ifdef CONFIG_SPARC
@@ -1245,7 +1254,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
 		 * characters get aren't echoed locally. This makes key repeat
 		 * usable with slow applications and under heavy loads.
 		 */
-		return;
+		goto put;
 	}
 
 	param.shift = shift_final = (shift_state | kbd->slockstate) ^ kbd->lockstate;
@@ -1256,14 +1265,14 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
 		atomic_notifier_call_chain(&keyboard_notifier_list, KBD_UNBOUND_KEYCODE, &param);
 		compute_shiftstate();
 		kbd->slockstate = 0;
-		return;
+		goto put;
 	}
 
 	if (keycode >= NR_KEYS)
 		if (keycode >= KEY_BRL_DOT1 && keycode <= KEY_BRL_DOT8)
 			keysym = U(K(KT_BRL, keycode - KEY_BRL_DOT1 + 1));
 		else
-			return;
+			goto put;
 	else
 		keysym = key_map[keycode];
 
@@ -1272,10 +1281,10 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
 	if (type < 0xf0) {
 		param.value = keysym;
 		if (atomic_notifier_call_chain(&keyboard_notifier_list, KBD_UNICODE, &param) == NOTIFY_STOP)
-			return;
+			goto put;
 		if (down && !raw_mode)
 			to_utf8(vc, keysym);
-		return;
+		goto put;
 	}
 
 	type -= 0xf0;
@@ -1291,10 +1300,10 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
 	param.value = keysym;
 
 	if (atomic_notifier_call_chain(&keyboard_notifier_list, KBD_KEYSYM, &param) == NOTIFY_STOP)
-		return;
+		goto put;
 
 	if (raw_mode && type != KT_SPEC && type != KT_SHIFT)
-		return;
+		goto put;
 
 	(*k_handler[type])(vc, keysym & 0xff, !down);
 
@@ -1303,6 +1312,8 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
 
 	if (type != KT_SLOCK)
 		kbd->slockstate = 0;
+put:
+        tty_kref_put(tty);
 }
 
 static void kbd_event(struct input_handle *handle, unsigned int event_type,
drivers/char/vt.c +86 -40

198 lines not on this page · raw message

drivers/char/vt_ioctl.c +4 -2
index 625f77d..8540604 100644
@@ -1367,13 +1367,15 @@ void vc_SAK(struct work_struct *work)
 	acquire_console_sem();
 	vc = vc_con->d;
 	if (vc) {
-		tty = vc->port.tty;
+		tty = tty_port_tty_get(&vc->port);
 		/*
 		 * SAK should also work in all raw modes and reset
 		 * them properly.
 		 */
-		if (tty)
+		if (tty) {
 			__do_SAK(tty);
+			tty_kref_put(tty);
+		}
 		reset_vc(vc);
 	}
 	release_console_sem();
#4 lore raw

Re: [PATCH 3/3] vt: Fix refcounting use

Quoted 8 lines · Alan Cox

We want to properly refcount the vc tty because of the cases where a vc is disassociated from a tty (eg destroyed). At the moment the code isn't safe and in fact input even tries to patch up broken pointers as a result!

static void applkey(struct vc_data *vc, int key, char mode)

drivers/char/keyboard.c +0 -0
@@ -497,10 +499,12 @@ static void fn_show_ptregs(struct vc_data *vc)
 
  static void fn_hold(struct vc_data *vc)

drivers/char/keyboard.c static void fn_show_ptregs(struct vc_data *vc) · line 508

Quoted 10 lines
drivers/char/keyboard.c +4 -2
  {
-	struct tty_struct *tty = vc->port.tty;
+	struct tty_struct *tty = tty_port_tty_get(&vc->port);
 
-	if (rep || !tty)
+	if (rep || !tty) {
+	        tty_kref_put(tty);
  		return;
+        }
 

This is the only bit that immediately stands out.. maybe?

	if (rep || !tty) {
		if (tty)
			tty_kref_put(tty);
		return;
	}

regards
Richard

#5 lore raw

Re: [PATCH 3/3] vt: Fix refcounting use

Quoted 7 lines

This is the only bit that immediately stands out.. maybe?

	if (rep || !tty) {
		if (tty)
			tty_kref_put(tty);
		return;
	}

tty_kref_put(NULL) is valid - otherwise a lot of other code (and programmers) would go nuts..

Alan