Skip to contentSkip to conversation

viocons: BKL locking

PATCH In review Alan Cox 3 participants 4 messages Feb 20, 2008 – Feb 21, 2008 Char and misc drivers

lore
Share & tools
lore

Alan Cox

author
#0 lore raw

PATCH 1/1 viocons: BKL locking

For some weird reason I can't ascertain (translation "I think its broken") the viocons driver calls directly into the n_tty ldisc code even if another ldisc is in use. It'll probably break if you do that but I'm just fixing the locking and adding a comment that its horked.

drivers/char/viocons.c +5 -2
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc2-mm1/drivers/char/viocons.c linux-2.6.25-rc2-mm1/drivers/char/viocons.c
@@ -704,8 +704,11 @@
 	case KDSKBLED:
 		return 0;
 	}
-
-	return n_tty_ioctl(tty, file, cmd, arg);
+	/* FIXME: WTF is this being called for ??? */
+	lock_kernel();
+	ret =  n_tty_ioctl(tty, file, cmd, arg);
+	unlock_kernel();
+	return ret;
 }
 
 /*
#1 lore raw
Quoted 4 lines · Alan Cox

For some weird reason I can't ascertain (translation "I think its broken") the viocons driver calls directly into the n_tty ldisc code even if another ldisc is in use. It'll probably break if you do that but I'm just fixing the locking and adding a comment that its horked.

Looks to me like it (viotty_ioctl) should return -ENOIOCTLCMD instead of calling n_tty_ioctl -- do you agree?

Paul.

author
#2 lore raw
Quoted 9 lines · On Thu, 21 Feb 2008 14:58:29 +1100 Paul Mackerras <[email protected]> wrote:
Quoted 4 lines · Alan Cox

For some weird reason I can't ascertain (translation "I think its broken") the viocons driver calls directly into the n_tty ldisc code even if another ldisc is in use. It'll probably break if you do that but I'm just fixing the locking and adding a comment that its horked.

Looks to me like it (viotty_ioctl) should return -ENOIOCTLCMD instead of calling n_tty_ioctl -- do you agree?

I think that is probably what is intended. That would then bounce back throuh the tty layer to the right places.

Alan

#3 lore raw

Hi Alan,

Quoted 11 lines · On Thu, 21 Feb 2008 10:50:56 +0000 Alan Cox <[email protected]> wrote:
Quoted 7 lines · On Thu, 21 Feb 2008 14:58:29 +1100 Paul Mackerras <[email protected]> wrote:
Quoted 4 lines · Alan Cox

For some weird reason I can't ascertain (translation "I think its broken") the viocons driver calls directly into the n_tty ldisc code even if another ldisc is in use. It'll probably break if you do that but I'm just fixing the locking and adding a comment that its horked.

Quoted 5 lines
Quoted 2 lines

Looks to me like it (viotty_ioctl) should return -ENOIOCTLCMD instead of calling n_tty_ioctl -- do you agree?

I think that is probably what is intended. That would then bounce back throuh the tty layer to the right places.

The other thing to note is that viocons is deprecated (we wrote another backend to hvc as an alternative console for legacy iSeries) and will hopefully be removed sometime soon so don't spend any time on it.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/