Skip to contentSkip to conversation

Add get- ioctls to fetch some bits from tty/pty status

PATCH In review Cyrill Gorcunov 3 participants 12 messages Sep 27, 2012

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover Add get- ioctls to fetch some bits from tty/pty status

For c/r we need some additional bits to fetch from terminal connection status to be able to recreate it on restore. This series adds appropriate ioctls. Please review, i've tested them locally but still.

Cyrill

#1 lore raw

PATCH 1/2 tty: pty - Move TIOCPKT handling into pty.c

Since this ioctl is for pty devices only move it to pty.c.

CC "H. Peter Anvin" <[email protected]>
CC Greg Kroah-Hartman <[email protected]>
CC Pavel Emelyanov <[email protected]>
CC Jiri Slaby <[email protected]>
---
 drivers/tty/pty.c       |   29 +++++++++++++++++++++++++++++
 drivers/tty/tty_ioctl.c |   20 --------------------
 2 files changed, 29 insertions(+), 20 deletions(-)
drivers/tty/pty.c +29 -0
Index: tty.git/drivers/tty/pty.c
===================================================================
@@ -174,6 +174,31 @@ static int pty_set_lock(struct tty_struc
 	return 0;
 }
 
+/* Set the packet mode on a pty */
+static int pty_set_pktmode(struct tty_struct *tty, int __user *arg)
+{
+	unsigned long flags;
+	int pktmode;
+
+	if (tty->driver->subtype != PTY_TYPE_MASTER)
+		return -ENOTTY;
+
+	if (get_user(pktmode, arg))
+		return -EFAULT;
+
+	spin_lock_irqsave(&tty->ctrl_lock, flags);
+	if (pktmode) {
+		if (!tty->packet) {
+			tty->packet = 1;
+			tty->link->ctrl_status = 0;
+		}
+	} else
+		tty->packet = 0;
+	spin_unlock_irqrestore(&tty->ctrl_lock, flags);
+
+	return 0;
+}
+
 /* Send a signal to the slave */
 static int pty_signal(struct tty_struct *tty, int sig)
 {
@@ -393,6 +418,8 @@ static int pty_bsd_ioctl(struct tty_stru
 	switch (cmd) {
 	case TIOCSPTLCK: /* Set PT Lock (disallow slave open) */
 		return pty_set_lock(tty, (int __user *) arg);
+	case TIOCPKT: /* Set PT packet mode */
+		return pty_set_pktmode(tty, (int __user *)arg);
 	case TIOCSIG:    /* Send signal to other side of pty */
 		return pty_signal(tty, (int) arg);
 	}
@@ -507,6 +534,8 @@ static int pty_unix98_ioctl(struct tty_s
 	switch (cmd) {
 	case TIOCSPTLCK: /* Set PT Lock (disallow slave open) */
 		return pty_set_lock(tty, (int __user *)arg);
+	case TIOCPKT: /* Set PT packet mode */
+		return pty_set_pktmode(tty, (int __user *)arg);
 	case TIOCGPTN: /* Get PT Number */
 		return put_user(tty->index, (unsigned int __user *)arg);
 	case TIOCSIG:    /* Send signal to other side of pty */
drivers/tty/tty_ioctl.c +0 -20
Index: tty.git/drivers/tty/tty_ioctl.c
===================================================================
@@ -1153,26 +1153,6 @@ int n_tty_ioctl_helper(struct tty_struct
 		return 0;
 	case TCFLSH:
 		return tty_perform_flush(tty, arg);
-	case TIOCPKT:
-	{
-		int pktmode;
-
-		if (tty->driver->type != TTY_DRIVER_TYPE_PTY ||
-		    tty->driver->subtype != PTY_TYPE_MASTER)
-			return -ENOTTY;
-		if (get_user(pktmode, (int __user *) arg))
-			return -EFAULT;
-		spin_lock_irqsave(&tty->ctrl_lock, flags);
-		if (pktmode) {
-			if (!tty->packet) {
-				tty->packet = 1;
-				tty->link->ctrl_status = 0;
-			}
-		} else
-			tty->packet = 0;
-		spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-		return 0;
-	}
 	default:
 		/* Try the mode commands */
 		return tty_mode_ioctl(tty, file, cmd, arg);
#2 lore raw

Re: [patch 1/2] tty: pty - Move TIOCPKT handling into pty.c

Quoted 4 lines · Cyrill Gorcunov
drivers/tty/pty.c +0 -0
@@ -174,6 +174,31 @@ static int pty_set_lock(struct tty_struc
 	return 0;

drivers/tty/pty.c static int pty_set_lock(struct tty_struc · line 184

Quoted 10 lines
drivers/tty/pty.c +8 -0
 }
 
+/* Set the packet mode on a pty */
+static int pty_set_pktmode(struct tty_struct *tty, int __user *arg)
+{
+	unsigned long flags;
+	int pktmode;
+
+	if (tty->driver->subtype != PTY_TYPE_MASTER)
+		return -ENOTTY;

Hi!

This check is not needed as the ioctls are master-only.

Signature · 2 lines
js
suse labs
#3 lore raw

Re: [patch 1/2] tty: pty - Move TIOCPKT handling into pty.c

Quoted 4 lines · Jiri Slaby

Hi!

This check is not needed as the ioctls are master-only.

Hi, thanks, Jiri, i'll update (was hurry to provide patches so missed this ;)

Cyrill

maintainer
#4 lore raw

Re: [patch 1/2] tty: pty - Move TIOCPKT handling into pty.c

Quoted 8 lines · Cyrill Gorcunov
Quoted 4 lines · Jiri Slaby

Hi!

This check is not needed as the ioctls are master-only.

Hi, thanks, Jiri, i'll update (was hurry to provide patches so missed this ;)

Don't rush, anything you do here will be for 3.8, not 3.7, it's too late for that, the tty tree already has lots of changes for 3.7.

So take your time please.

greg k-h

#5 lore raw

Re: [patch 1/2] tty: pty - Move TIOCPKT handling into pty.c

Quoted 7 lines · Greg KH
Quoted 6 lines · Cyrill Gorcunov
Quoted 4 lines · Jiri Slaby

Hi!

This check is not needed as the ioctls are master-only.

Quoted 7 lines
Quoted 2 lines

Hi, thanks, Jiri, i'll update (was hurry to provide patches so missed this ;)

Don't rush, anything you do here will be for 3.8, not 3.7, it's too late for that, the tty tree already has lots of changes for 3.7.

So take your time please.

Sure, patching other archs ioctls is not as simple as I thought, need to recheck everything and I think better to do all this in 3 patches

- move ptkmode setting into pty
- introduce new ioctl codes (including patching other archs)
- add real handlers for this new ioctl codes

this will help for bisection.

Cyrill

#6 lore raw

Re: [patch 1/2] tty: pty - Move TIOCPKT handling into pty.c

In reply to Jiri Slaby
Quoted 7 lines · Jiri Slaby

Review

Quoted 3 lines
(quoted diff) +3 -0
+
+	if (tty->driver->subtype != PTY_TYPE_MASTER)
+		return -ENOTTY;

Hi!

This check is not needed as the ioctls are master-only.

Here is updated version, thanks!
---
From: Cyrill Gorcunov <[email protected]>
Subject: tty: pty - Move TIOCPKT handling into pty.c

Since this ioctl is for pty devices only move it to pty.c.

v2:
- drop PTY_TYPE_MASTER test since it's master peer ioctl anyway (by jslaby@)

CC "H. Peter Anvin" <[email protected]>
CC Greg Kroah-Hartman <[email protected]>
CC Pavel Emelyanov <[email protected]>
CC Jiri Slaby <[email protected]>
---
 drivers/tty/pty.c       |   26 ++++++++++++++++++++++++++
 drivers/tty/tty_ioctl.c |   20 --------------------
 2 files changed, 26 insertions(+), 20 deletions(-)
drivers/tty/pty.c +26 -0
Index: tty.git/drivers/tty/pty.c
===================================================================
@@ -174,6 +174,28 @@ static int pty_set_lock(struct tty_struc
 	return 0;
 }
 
+/* Set the packet mode on a pty */
+static int pty_set_pktmode(struct tty_struct *tty, int __user *arg)
+{
+	unsigned long flags;
+	int pktmode;
+
+	if (get_user(pktmode, arg))
+		return -EFAULT;
+
+	spin_lock_irqsave(&tty->ctrl_lock, flags);
+	if (pktmode) {
+		if (!tty->packet) {
+			tty->packet = 1;
+			tty->link->ctrl_status = 0;
+		}
+	} else
+		tty->packet = 0;
+	spin_unlock_irqrestore(&tty->ctrl_lock, flags);
+
+	return 0;
+}
+
 /* Send a signal to the slave */
 static int pty_signal(struct tty_struct *tty, int sig)
 {
@@ -393,6 +415,8 @@ static int pty_bsd_ioctl(struct tty_stru
 	switch (cmd) {
 	case TIOCSPTLCK: /* Set PT Lock (disallow slave open) */
 		return pty_set_lock(tty, (int __user *) arg);
+	case TIOCPKT: /* Set PT packet mode */
+		return pty_set_pktmode(tty, (int __user *)arg);
 	case TIOCSIG:    /* Send signal to other side of pty */
 		return pty_signal(tty, (int) arg);
 	}
@@ -507,6 +531,8 @@ static int pty_unix98_ioctl(struct tty_s
 	switch (cmd) {
 	case TIOCSPTLCK: /* Set PT Lock (disallow slave open) */
 		return pty_set_lock(tty, (int __user *)arg);
+	case TIOCPKT: /* Set PT packet mode */
+		return pty_set_pktmode(tty, (int __user *)arg);
 	case TIOCGPTN: /* Get PT Number */
 		return put_user(tty->index, (unsigned int __user *)arg);
 	case TIOCSIG:    /* Send signal to other side of pty */
drivers/tty/tty_ioctl.c +0 -20
Index: tty.git/drivers/tty/tty_ioctl.c
===================================================================
@@ -1153,26 +1153,6 @@ int n_tty_ioctl_helper(struct tty_struct
 		return 0;
 	case TCFLSH:
 		return tty_perform_flush(tty, arg);
-	case TIOCPKT:
-	{
-		int pktmode;
-
-		if (tty->driver->type != TTY_DRIVER_TYPE_PTY ||
-		    tty->driver->subtype != PTY_TYPE_MASTER)
-			return -ENOTTY;
-		if (get_user(pktmode, (int __user *) arg))
-			return -EFAULT;
-		spin_lock_irqsave(&tty->ctrl_lock, flags);
-		if (pktmode) {
-			if (!tty->packet) {
-				tty->packet = 1;
-				tty->link->ctrl_status = 0;
-			}
-		} else
-			tty->packet = 0;
-		spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-		return 0;
-	}
 	default:
 		/* Try the mode commands */
 		return tty_mode_ioctl(tty, file, cmd, arg);
#7 lore raw

PATCH 2/2 tty: Add get- ioctls to fetch tty status v2

In reply to Cyrill Gorcunov

For checkpoint/restore we need to know if tty has exclusive or packet mode set, as well as if pty is currently locked. Just to be able to restore this characteristics.

For this sake the following ioctl codes are introduced

- TIOCGPKT to get packet mode state
- TIOCGPTLCK to get Pty locked state
- TIOCGEXCL to get Exclusive mode state

Note this ioctls are a bit unsafe in terms of data obtained consistency. The tty characteristics might be changed right after ioctl complete. Keep it in mind and use this ioctl carefully.

v2:
- Use TIOC prefix for ioctl codes (by jslaby@)

CC Alan Cox <[email protected]>
CC "H. Peter Anvin" <[email protected]>
CC Greg Kroah-Hartman <[email protected]>
CC Pavel Emelyanov <[email protected]>
CC Jiri Slaby <[email protected]>
---
 drivers/tty/pty.c            |   35 +++++++++++++++++++++++++++++++++++
 drivers/tty/tty_io.c         |    7 +++++++
 fs/compat_ioctl.c            |    3 +++
 include/asm-generic/ioctls.h |    3 +++
 4 files changed, 48 insertions(+)
drivers/tty/pty.c +35 -0
Index: tty.git/drivers/tty/pty.c
===================================================================
@@ -174,6 +174,14 @@ static int pty_set_lock(struct tty_struc
 	return 0;
 }
 
+static int pty_get_lock(struct tty_struct *tty, int __user *arg)
+{
+	int locked = test_bit(TTY_PTY_LOCK, &tty->flags);
+	if (put_user(locked, arg))
+		return -EFAULT;
+	return 0;
+}
+
 /* Set the packet mode on a pty */
 static int pty_set_pktmode(struct tty_struct *tty, int __user *arg)
 {
@@ -199,6 +207,25 @@ static int pty_set_pktmode(struct tty_st
 	return 0;
 }
 
+/* Get the packet mode of a pty */
+static int pty_get_pktmode(struct tty_struct *tty, int __user *arg)
+{
+	unsigned long flags;
+	int pktmode;
+
+	if (tty->driver->subtype != PTY_TYPE_MASTER)
+		return -ENOTTY;
+
+	spin_lock_irqsave(&tty->ctrl_lock, flags);
+	pktmode = tty->packet;
+	spin_unlock_irqrestore(&tty->ctrl_lock, flags);
+
+	if (put_user(pktmode, arg))
+		return -EFAULT;
+
+	return 0;
+}
+
 /* Send a signal to the slave */
 static int pty_signal(struct tty_struct *tty, int sig)
 {
@@ -418,8 +445,12 @@ static int pty_bsd_ioctl(struct tty_stru
 	switch (cmd) {
 	case TIOCSPTLCK: /* Set PT Lock (disallow slave open) */
 		return pty_set_lock(tty, (int __user *) arg);
+	case TIOCGPTLCK: /* Get PT Lock status */
+		return pty_get_lock(tty, (int __user *)arg);
 	case TIOCPKT: /* Set PT packet mode */
 		return pty_set_pktmode(tty, (int __user *)arg);
+	case TIOCGPKT: /* Get PT packet mode */
+		return pty_get_pktmode(tty, (int __user *)arg);
 	case TIOCSIG:    /* Send signal to other side of pty */
 		return pty_signal(tty, (int) arg);
 	}
@@ -534,8 +565,12 @@ static int pty_unix98_ioctl(struct tty_s
 	switch (cmd) {
 	case TIOCSPTLCK: /* Set PT Lock (disallow slave open) */
 		return pty_set_lock(tty, (int __user *)arg);
+	case TIOCGPTLCK: /* Get PT Lock status */
+		return pty_get_lock(tty, (int __user *)arg);
 	case TIOCPKT: /* Set PT packet mode */
 		return pty_set_pktmode(tty, (int __user *)arg);
+	case TIOCGPKT: /* Get PT packet mode */
+		return pty_get_pktmode(tty, (int __user *)arg);
 	case TIOCGPTN: /* Get PT Number */
 		return put_user(tty->index, (unsigned int __user *)arg);
 	case TIOCSIG:    /* Send signal to other side of pty */
drivers/tty/tty_io.c +7 -0
Index: tty.git/drivers/tty/tty_io.c
===================================================================
@@ -2693,6 +2693,13 @@ long tty_ioctl(struct file *file, unsign
 	case TIOCNXCL:
 		clear_bit(TTY_EXCLUSIVE, &tty->flags);
 		return 0;
+	case TIOCGEXCL:
+	{
+		int excl = test_bit(TTY_EXCLUSIVE, &tty->flags);
+		if (put_user(excl, (int __user *)p))
+			return -EFAULT;
+		return 0;
+	}
 	case TIOCNOTTY:
 		if (current->signal->tty != tty)
 			return -ENOTTY;
fs/compat_ioctl.c +3 -0
Index: tty.git/fs/compat_ioctl.c
===================================================================
@@ -842,6 +842,9 @@ COMPATIBLE_IOCTL(TIOCGDEV)
 COMPATIBLE_IOCTL(TIOCCBRK)
 COMPATIBLE_IOCTL(TIOCGSID)
 COMPATIBLE_IOCTL(TIOCGICOUNT)
+COMPATIBLE_IOCTL(TIOCGPKT)
+COMPATIBLE_IOCTL(TIOCGPTLCK)
+COMPATIBLE_IOCTL(TIOCGEXCL)
 /* Little t */
 COMPATIBLE_IOCTL(TIOCGETD)
 COMPATIBLE_IOCTL(TIOCSETD)
include/asm-generic/ioctls.h +3 -0
Index: tty.git/include/asm-generic/ioctls.h
===================================================================
@@ -74,6 +74,9 @@
 #define TCSETXW		0x5435
 #define TIOCSIG		_IOW('T', 0x36, int)  /* pty: generate signal */
 #define TIOCVHANGUP	0x5437
+#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */
+#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */
+#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */
 
 #define FIONCLEX	0x5450
 #define FIOCLEX		0x5451
#8 lore raw

Re: [patch 2/2] tty: Add get- ioctls to fetch tty status v2

Quoted 4 lines · Cyrill Gorcunov

For checkpoint/restore we need to know if tty has
exclusive or packet mode set, as well as if pty
is currently locked. Just to be able to restore
this characteristics.

Here is an updated version with redundand code ripped off (by jslaby@)
---
From: Cyrill Gorcunov <[email protected]>
Subject: tty: Add get- ioctls to fetch tty status v2

For checkpoint/restore we need to know if tty has exclusive or packet mode set, as well as if pty is currently locked. Just to be able to restore this characteristics.

For this sake the following ioctl codes are introduced

- TIOCGPKT to get packet mode state
- TIOCGPTLCK to get Pty locked state
- TIOCGEXCL to get Exclusive mode state

Note this ioctls are a bit unsafe in terms of data obtained consistency. The tty characteristics might be changed right after ioctl complete. Keep it in mind and use this ioctl carefully.

v2:
- Use TIOC prefix for ioctl codes (by jslaby@)

CC Alan Cox <[email protected]>
CC "H. Peter Anvin" <[email protected]>
CC Greg Kroah-Hartman <[email protected]>
CC Pavel Emelyanov <[email protected]>
CC Jiri Slaby <[email protected]>
---
 drivers/tty/pty.c            |   32 ++++++++++++++++++++++++++++++++
 drivers/tty/tty_io.c         |    7 +++++++
 fs/compat_ioctl.c            |    3 +++
 include/asm-generic/ioctls.h |    3 +++
 4 files changed, 45 insertions(+)
drivers/tty/pty.c +32 -0
Index: tty.git/drivers/tty/pty.c
===================================================================
@@ -174,6 +174,14 @@ static int pty_set_lock(struct tty_struc
 	return 0;
 }
 
+static int pty_get_lock(struct tty_struct *tty, int __user *arg)
+{
+	int locked = test_bit(TTY_PTY_LOCK, &tty->flags);
+	if (put_user(locked, arg))
+		return -EFAULT;
+	return 0;
+}
+
 /* Set the packet mode on a pty */
 static int pty_set_pktmode(struct tty_struct *tty, int __user *arg)
 {
@@ -196,6 +204,22 @@ static int pty_set_pktmode(struct tty_st
 	return 0;
 }
 
+/* Get the packet mode of a pty */
+static int pty_get_pktmode(struct tty_struct *tty, int __user *arg)
+{
+	unsigned long flags;
+	int pktmode;
+
+	spin_lock_irqsave(&tty->ctrl_lock, flags);
+	pktmode = tty->packet;
+	spin_unlock_irqrestore(&tty->ctrl_lock, flags);
+
+	if (put_user(pktmode, arg))
+		return -EFAULT;
+
+	return 0;
+}
+
 /* Send a signal to the slave */
 static int pty_signal(struct tty_struct *tty, int sig)
 {
@@ -415,8 +439,12 @@ static int pty_bsd_ioctl(struct tty_stru
 	switch (cmd) {
 	case TIOCSPTLCK: /* Set PT Lock (disallow slave open) */
 		return pty_set_lock(tty, (int __user *) arg);
+	case TIOCGPTLCK: /* Get PT Lock status */
+		return pty_get_lock(tty, (int __user *)arg);
 	case TIOCPKT: /* Set PT packet mode */
 		return pty_set_pktmode(tty, (int __user *)arg);
+	case TIOCGPKT: /* Get PT packet mode */
+		return pty_get_pktmode(tty, (int __user *)arg);
 	case TIOCSIG:    /* Send signal to other side of pty */
 		return pty_signal(tty, (int) arg);
 	}
@@ -531,8 +559,12 @@ static int pty_unix98_ioctl(struct tty_s
 	switch (cmd) {
 	case TIOCSPTLCK: /* Set PT Lock (disallow slave open) */
 		return pty_set_lock(tty, (int __user *)arg);
+	case TIOCGPTLCK: /* Get PT Lock status */
+		return pty_get_lock(tty, (int __user *)arg);
 	case TIOCPKT: /* Set PT packet mode */
 		return pty_set_pktmode(tty, (int __user *)arg);
+	case TIOCGPKT: /* Get PT packet mode */
+		return pty_get_pktmode(tty, (int __user *)arg);
 	case TIOCGPTN: /* Get PT Number */
 		return put_user(tty->index, (unsigned int __user *)arg);
 	case TIOCSIG:    /* Send signal to other side of pty */
drivers/tty/tty_io.c +7 -0
Index: tty.git/drivers/tty/tty_io.c
===================================================================
@@ -2693,6 +2693,13 @@ long tty_ioctl(struct file *file, unsign
 	case TIOCNXCL:
 		clear_bit(TTY_EXCLUSIVE, &tty->flags);
 		return 0;
+	case TIOCGEXCL:
+	{
+		int excl = test_bit(TTY_EXCLUSIVE, &tty->flags);
+		if (put_user(excl, (int __user *)p))
+			return -EFAULT;
+		return 0;
+	}
 	case TIOCNOTTY:
 		if (current->signal->tty != tty)
 			return -ENOTTY;
fs/compat_ioctl.c +3 -0
Index: tty.git/fs/compat_ioctl.c
===================================================================
@@ -842,6 +842,9 @@ COMPATIBLE_IOCTL(TIOCGDEV)
 COMPATIBLE_IOCTL(TIOCCBRK)
 COMPATIBLE_IOCTL(TIOCGSID)
 COMPATIBLE_IOCTL(TIOCGICOUNT)
+COMPATIBLE_IOCTL(TIOCGPKT)
+COMPATIBLE_IOCTL(TIOCGPTLCK)
+COMPATIBLE_IOCTL(TIOCGEXCL)
 /* Little t */
 COMPATIBLE_IOCTL(TIOCGETD)
 COMPATIBLE_IOCTL(TIOCSETD)
include/asm-generic/ioctls.h +3 -0
Index: tty.git/include/asm-generic/ioctls.h
===================================================================
@@ -74,6 +74,9 @@
 #define TCSETXW		0x5435
 #define TIOCSIG		_IOW('T', 0x36, int)  /* pty: generate signal */
 #define TIOCVHANGUP	0x5437
+#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */
+#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */
+#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */
 
 #define FIONCLEX	0x5450
 #define FIOCLEX		0x5451
#9 lore raw

Re: [patch 2/2] tty: Add get- ioctls to fetch tty status v2

In reply to Cyrill Gorcunov

drivers/tty/pty.c static int pty_set_pktmode(struct tty_st · line 217

Quoted 12 lines · Cyrill Gorcunov
drivers/tty/pty.c +8 -0
@@ -199,6 +207,25 @@ static int pty_set_pktmode(struct tty_st
 	return 0;
 }
 
+/* Get the packet mode of a pty */
+static int pty_get_pktmode(struct tty_struct *tty, int __user *arg)
+{
+	unsigned long flags;
+	int pktmode;
+
+	if (tty->driver->subtype != PTY_TYPE_MASTER)
+		return -ENOTTY;

The same as for 1/2^UFixed in v3 ;).

drivers/tty/pty.c static int pty_set_pktmode(struct tty_st · line 219

Quoted 1 line
drivers/tty/pty.c +1 -0
+	spin_lock_irqsave(&tty->ctrl_lock, flags);

I believe the lock is not the right one. It protects ctrl_status in TIOCPKT, not the packet. And it very seems that packet is unprotected at all over the code => the lock does not improve anything and is redundant.

drivers/tty/pty.c static int pty_set_pktmode(struct tty_st · line 226

Quoted 7 lines
drivers/tty/pty.c +7 -0
+	pktmode = tty->packet;
+	spin_unlock_irqrestore(&tty->ctrl_lock, flags);
+
+	if (put_user(pktmode, arg))
+		return -EFAULT;
+
+	return 0;

This can be just
return put_user(pktmode, arg);
Right?

Quoted 2 lines
(quoted diff) +2 -0
+}
+

...

include/asm-generic/ioctls.h line 79

Quoted 9 lines
include/asm-generic/ioctls.h +3 -0
@@ -74,6 +74,9 @@
 #define TCSETXW		0x5435
 #define TIOCSIG		_IOW('T', 0x36, int)  /* pty: generate signal */
 #define TIOCVHANGUP	0x5437
+#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */
+#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */
+#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */

This is not enough. Some arches do not include this file in their ioctls.h. You need to update them all.

thanks,

Signature · 2 lines
js
suse labs
#10 lore raw

Re: [patch 2/2] tty: Add get- ioctls to fetch tty status v2

Quoted 5 lines · Jiri Slaby
Quoted 4 lines · Cyrill Gorcunov
drivers/tty/pty.c +0 -0
@@ -199,6 +207,25 @@ static int pty_set_pktmode(struct tty_st
 	return 0;
 }
 
Quoted 10 lines

drivers/tty/pty.c static int pty_set_pktmode(struct tty_st · line 217

Quoted 8 lines
drivers/tty/pty.c +8 -0
+/* Get the packet mode of a pty */
+static int pty_get_pktmode(struct tty_struct *tty, int __user *arg)
+{
+	unsigned long flags;
+	int pktmode;
+
+	if (tty->driver->subtype != PTY_TYPE_MASTER)
+		return -ENOTTY;

The same as for 1/2^UFixed in v3 ;).

Already sent update, thanks :-)

Quoted 6 lines

drivers/tty/pty.c static int pty_set_pktmode(struct tty_st · line 219

Quoted 2 lines
drivers/tty/pty.c +1 -0
+	spin_lock_irqsave(&tty->ctrl_lock, flags);

I believe the lock is not the right one. It protects ctrl_status in TIOCPKT, not the packet. And it very seems that packet is unprotected at all over the code => the lock does not improve anything and is redundant.

Indeed, thanks Jiri!

Quoted 12 lines

drivers/tty/pty.c static int pty_set_pktmode(struct tty_st · line 226

Quoted 8 lines
drivers/tty/pty.c +7 -0
+	pktmode = tty->packet;
+	spin_unlock_irqrestore(&tty->ctrl_lock, flags);
+
+	if (put_user(pktmode, arg))
+		return -EFAULT;
+
+	return 0;

This can be just
return put_user(pktmode, arg);
Right?

As far as I see, yeah, put_user_[n] does return -efault as well.

Quoted 4 lines
Quoted 3 lines
(quoted diff) +2 -0
+}
+

...

Quoted 12 lines

include/asm-generic/ioctls.h line 79

Quoted 9 lines
include/asm-generic/ioctls.h +3 -0
@@ -74,6 +74,9 @@
 #define TCSETXW		0x5435
 #define TIOCSIG		_IOW('T', 0x36, int)  /* pty: generate signal */
 #define TIOCVHANGUP	0x5437
+#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */
+#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */
+#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */

This is not enough. Some arches do not include this file in their ioctls.h. You need to update them all.

Crap, for some reason cscope has not indexed them but git grep helped. I'll update. Thanks, Jiri!

Cyrill

#11 lore raw

Re: [patch 2/2] tty: Add get- ioctls to fetch tty status v2

Quoted 1 line · Cyrill Gorcunov

Crap, for some reason cscope has not indexed them

make ALLSOURCE_ARCHS=all cscope
is needed if you want other than current ARCH.

Signature · 2 lines
js
suse labs