compat_ioctl question
Subsystems (2)
I need to add ioctl translations for my driver to
allow 32 bit access on 64 bit systems.
After digging through the kernel code there seems to be 3 methods of doing this:
1. define compat_ioctl() file operation for device and implement translation code in individual driver
2. add COMPATIBLE_IOCTL entry to include/linux/compat_ioctl.h to mark an ioctl code as the same in any environment
3. add HANDLE_IOCTL entry to fs/compat_ioctl.c with translation code implemented in the same file
There is no way to implement #1 for a tty driver without modifying the kernel tty code to allow registration of a compat_ioctl() handler.
#3 would put a lot of driver specific stuff in a common kernel file. This method also seems to break if there is an ioctl code collision.
All of these methods involve changes to code outside of my driver.
--
Before I spend a lot of time on this I need to know what the officially sanctioned method is. I haven't found any definitive documentation and a review of mailing list archives does not suggest a prevailing opinion.
Does anyone have pointers on which way would be most likely to be accepted as a patch?
Thanks,
Paul
Signature · 2 lines
Paul Fulghum Microgate Systems, Ltd
Arnd Bergmann
maintainerQuoted 25 lines · Paul Fulghum
I need to add ioctl translations for my driver to
allow 32 bit access on 64 bit systems.After digging through the kernel code there seems to be 3 methods of doing this:
1. define
compat_ioctl()file operation for device and implement translation code in individual driver
2. addCOMPATIBLE_IOCTLentry toinclude/linux/compat_ioctl.hto mark an ioctl code as the same in any environment
3. addHANDLE_IOCTLentry tofs/compat_ioctl.cwith translation code implemented in the same fileThere is no way to implement #1 for a tty driver without modifying the kernel tty code to allow registration of a
compat_ioctl()handler.#3 would put a lot of driver specific stuff in a common kernel file. This method also seems to break if there is an ioctl code collision.
All of these methods involve changes to code outside of my driver.
--
Quoted 7 lines
Before I spend a lot of time on this I need to know what the officially sanctioned method is. I haven't found any definitive documentation and a review of mailing list archives does not suggest a prevailing opinion.
Does anyone have pointers on which way would be most likely to be accepted as a patch?
It depends a lot on what your specific driver does in the ioctl handler, but normally you should define a compat_ioctl() function. What driver are you talking about?
Arnd <><
Quoted 3 lines · Arnd Bergmann
It depends a lot on what your specific driver does in the ioctl handler, but normally you should define a
compat_ioctl()function. What driver are you talking about?
drivers/char/synclink.cdrivers/char/synclinkmp.cdrivers/char/synclink_gt.cdrivers/char/pcmcia/synclink_cs.c
All use the same set of ioctl() codes that are peculiar to the synclink drivers.
Defining compat_ioctl() seems to be the best way, but that will require modifying the base tty code to allow the individual tty drivers to register compat_ioctl().
Currently the tty file ops do not include that and tty_io.c does not register a compat_ioctl(), instead relying on compat_ioctl.h and compat_ioctl.c
--
Paul
Arnd Bergmann
maintainerQuoted 5 lines · Paul Fulghum
Quoted 3 lines · Arnd Bergmann
It depends a lot on what your specific driver does in the ioctl handler, but normally you should define a
compat_ioctl()function. What driver are you talking about?
Quoted 7 lines
drivers/char/synclink.cdrivers/char/synclinkmp.cdrivers/char/synclink_gt.cdrivers/char/pcmcia/synclink_cs.cAll use the same set of
ioctl()codes that are peculiar to the synclink drivers.
So you are interested in the MGSL_* set of ioctls, right? AFAICS, they are all compatible, with the exception of MGSL_IOCGPARAMS and MGSL_IOCSPARAMS.
Fortunately, these two have different ioctl numbers on 64 bit, so you can define a new
#define MGSL_IOCSPARAMS32 _IOR(MGSL_MAGIC_IOC,0,struct _MGSL_PARAMS32) #define MGSL_IOCGPARAMS32 _IOR(MGSL_MAGIC_IOC,1,struct _MGSL_PARAMS32)
and handle both versions in the ioctl function.
Quoted 3 lines
Defining
compat_ioctl()seems to be the best way, but that will require modifying the base tty code to allow the individual tty drivers to registercompat_ioctl().
Yes, that would be the right solution. I've started this some time ago, but never finished it:
http://www.uwsg.iu.edu/hypermail/linux/kernel/0511.0/1732.html
Quoted 3 lines
Currently the tty file ops do not include that and
tty_io.cdoes not register acompat_ioctl(), instead relying oncompat_ioctl.handcompat_ioctl.c
Just adding the hook in tty_io.c should be trivial, please do that. If you like, you can also move the vt ioctls in order to reduce the size of fs/compat_ioctl.c.
Arnd <><
Quoted 11 lines · Arnd Bergmann
So you are interested in the MGSL_* set of ioctls, right? AFAICS, they are all compatible, with the exception of
MGSL_IOCGPARAMSandMGSL_IOCSPARAMS.Fortunately, these two have different ioctl numbers on 64 bit, so you can define a new
#define
MGSL_IOCSPARAMS32_IOR(MGSL_MAGIC_IOC,0,struct _MGSL_PARAMS32)#defineMGSL_IOCGPARAMS32_IOR(MGSL_MAGIC_IOC,1,struct _MGSL_PARAMS32)and handle both versions in the ioctl function.
I missed that approach, thanks.
Quoted 11 lines
Yes, that would be the right solution. I've started this some time ago, but never finished it:
http://www.uwsg.iu.edu/hypermail/linux/kernel/0511.0/1732.htmlQuoted 3 lines
Currently the tty file ops do not include that and
tty_io.cdoes not register acompat_ioctl(), instead relying oncompat_ioctl.handcompat_ioctl.cJust adding the hook in
tty_io.cshould be trivial, please do that. If you like, you can also move the vt ioctls in order to reduce the size offs/compat_ioctl.c.
I'll look at that.
You have given me precisely the information I need.
I just wanted to be sure I did not pursue a dead end and have people go 'ewwww... why did you do it that way?'
Thanks,
Paul
PATCH 1/1 tty add compat_ioctl method
In reply to Arnd BergmannAdd compat_ioctl method for tty code to allow processing of 32 bit ioctl calls on 64 bit systems by tty core, tty drivers, and line disciplines.
Based on patch by Arnd Bergmann:
http://www.uwsg.iu.edu/hypermail/linux/kernel/0511.0/1732.html
This patch does not remove tty ioctl entries in compat_ioctl.[ch] That will be implemented in a separate patch.
drivers/char/n_tty.c +13 -16
@@ -1545,21 +1545,18 @@ static unsigned int normal_poll(struct t }struct tty_ldisc tty_ldisc_N_TTY = { -TTY_LDISC_MAGIC ,/* magic */ -"n_tty" ,/* name */ -0 ,/* num */ -0 ,/* flags */ - n_tty_open,/* open */ - n_tty_close,/* close */ - n_tty_flush_buffer,/* flush_buffer */ - n_tty_chars_in_buffer,/* chars_in_buffer */ - read_chan,/* read */ - write_chan,/* write */ - n_tty_ioctl,/* ioctl */ - n_tty_set_termios,/* set_termios */ - normal_poll,/* poll */ -NULL ,/* hangup */ - n_tty_receive_buf,/* receive_buf */ - n_tty_write_wakeup/* write_wakeup */ + .magic =TTY_LDISC_MAGIC , + .name ="n_tty" , + .open = n_tty_open, + .close = n_tty_close, + .flush_buffer = n_tty_flush_buffer, + .chars_in_buffer = n_tty_chars_in_buffer, + .read = read_chan, + .write = write_chan, + .ioctl = n_tty_ioctl, + .set_termios = n_tty_set_termios, + .poll = normal_poll, + .receive_buf = n_tty_receive_buf, + .write_wakeup = n_tty_write_wakeup };
include/linux/tty_driver.h +8 -0
@@ -132,6 +132,10 @@ struct tty_operations {int (*chars_in_buffer)(struct tty_struct *tty);int (*ioctl)(struct tty_struct *tty,struct file * file,unsigned int cmd,unsigned long arg); +#ifdef CONFIG_COMPAT +long (*compat_ioctl)(struct tty_struct *tty,struct file * file, +unsigned int cmd,unsigned long arg); +#endif void (*set_termios)(struct tty_struct *tty,struct termios * old);void (*throttle)(struct tty_struct * tty);void (*unthrottle)(struct tty_struct * tty);
@@ -193,6 +197,10 @@ struct tty_driver {int (*chars_in_buffer)(struct tty_struct *tty);int (*ioctl)(struct tty_struct *tty,struct file * file,unsigned int cmd,unsigned long arg); +#ifdef CONFIG_COMPAT +long (*compat_ioctl)(struct tty_struct *tty,struct file * file, +unsigned int cmd,unsigned long arg); +#endif void (*set_termios)(struct tty_struct *tty,struct termios * old);void (*throttle)(struct tty_struct * tty);void (*unthrottle)(struct tty_struct * tty);
drivers/char/tty_io.c +47 -3
98 lines not on this page · raw message
include/linux/tty_ldisc.h +9 -0
@@ -59,6 +59,11 @@* low-level driver can "grab" an ioctl request before the line * discpline has a chance to see it. * +* long (*compat_ioctl)(struct tty_struct * tty, struct file * file, +* unsigned int cmd, unsigned long arg); +* +* Process ioctl calls from 32-bit process on 64-bit system +* * void (*set_termios)(struct tty_struct *tty, struct termios * old); * * This function notifies the line discpline that a change has
@@ -118,6 +123,10 @@ struct tty_ldisc { const unsigned char * buf, size_t nr);int (*ioctl)(struct tty_struct * tty,struct file * file,unsigned int cmd,unsigned long arg); +#ifdef CONFIG_COMPAT +long (*compat_ioctl)(struct tty_struct * tty,struct file * file, +unsigned int cmd,unsigned long arg); +#endif void (*set_termios)(struct tty_struct *tty,struct termios * old);unsigned int (*poll)(struct tty_struct *,struct file *,struct poll_table_struct *);
Arnd Bergmann
maintainerRe: [PATCH] tty add compat_ioctl method
Quoted 3 lines · Paul Fulghum
Add
compat_ioctlmethod for tty code to allow processing of 32 bit ioctl calls on 64 bit systems by tty core, tty drivers, and line disciplines.
Looks ok mostly. Just some details:
Quoted 14 lines
include/linux/tty_driver.h +4
-0@@ -132,6 +132,10 @@ struct tty_operations {int (*chars_in_buffer)(struct tty_struct *tty);int (*ioctl)(struct tty_struct *tty,struct file * file,unsigned int cmd,unsigned long arg); +#ifdef CONFIG_COMPAT +long (*compat_ioctl)(struct tty_struct *tty,struct file * file, +unsigned int cmd,unsigned long arg); +#endif void (*set_termios)(struct tty_struct *tty,struct termios * old);void (*throttle)(struct tty_struct * tty);void (*unthrottle)(struct tty_struct * tty);
include/linux/tty_driver.h struct tty_driver { · line 206
Quoted 10 lines
include/linux/tty_driver.h +4
-0@@ -193,6 +197,10 @@ struct tty_driver {int (*chars_in_buffer)(struct tty_struct *tty);int (*ioctl)(struct tty_struct *tty,struct file * file,unsigned int cmd,unsigned long arg); +#ifdef CONFIG_COMPAT +long (*compat_ioctl)(struct tty_struct *tty,struct file * file, +unsigned int cmd,unsigned long arg); +#endif void (*set_termios)(struct tty_struct *tty,struct termios * old);void (*throttle)(struct tty_struct * tty);void (*unthrottle)(struct tty_struct * tty);
I wouldn't hide this inside of an #ifdef. The structures are all static and therefore a single field per driver doesn't add much bload, but being able to always assign the .compat_ioctl pointer makes the code somewhat nicer
drivers/char/tty_io.c static int tty_open(struct inode *, stru · line 158
Quoted 11 lines
drivers/char/tty_io.c +3
-0@@ -151,6 +151,9 @@ static int tty_open(struct inode *, strustatic int tty_release (struct inode *,struct file *);int tty_ioctl (struct inode * inode,struct file * file,unsigned int cmd,unsigned long arg); +#ifdef CONFIG_COMPAT +long tty_compat_ioctl (struct file * file,unsigned int cmd,unsigned long arg); +#endif static int tty_fasync (int fd,struct file * filp,int on);static void release_mem (struct tty_struct *tty,int idx);
declarations should never be hidden inside of an #ifdef. If you want to be extra clever here, you can do
#ifdef CONFIG_COMPAT
long tty_compat_ioctl(struct file * file, unsigned int cmd, unsigned long arg); #else
#define tty_compat_ioctl NULL
#endif
then you don't need an #ifdef in the code setting the function pointers.
drivers/char/tty_io.c int tty_ioctl(struct inode * inode, stru · line 3310
Quoted 13 lines
drivers/char/tty_io.c +9
-0@@ -3284,6 +3299,32 @@ int tty_ioctl(struct inode * inode, strureturn retval; } +#ifdef CONFIG_COMPAT +long tty_compat_ioctl (struct file * file,unsigned int cmd,unsigned long arg) +{ +struct inode *inode = file->f_dentry->d_inode; +struct tty_struct *tty; +struct tty_ldisc *ld; +int retval = -ENOIOCTLCMD ; + + tty = (struct tty_struct *)file->private_data;
no need for the cast, ->private_data is void*.
Arnd <><
Re: [PATCH] tty add compat_ioctl method
Quoted 12 lines · Arnd Bergmann
Looks ok mostly. Just some details:
...include/linux/tty_driver.h struct tty_operations { · line 138
Quoted 4 lines
include/linux/tty_driver.h +4
-0+#ifdef CONFIG_COMPAT +long (*compat_ioctl)(struct tty_struct *tty,struct file * file, +unsigned int cmd,unsigned long arg); +#endif I wouldn't hide this inside of an #ifdef. The structures are all static and therefore a single field per driver doesn't add much bload, but being able to always assign the .compat_ioctl pointer makes the code somewhat nicer
OK
Quoted 6 lines
Quoted 6 lines
drivers/char/tty_io.c +0
-0@@ -151,6 +151,9 @@ static int tty_open(struct inode *, strustatic int tty_release (struct inode *,struct file *);int tty_ioctl (struct inode * inode,struct file * file,unsigned int cmd,unsigned long arg);
Quoted 8 lines
drivers/char/tty_io.c static int tty_open(struct inode *, stru · line 158
Quoted 5 lines
drivers/char/tty_io.c +3
-0+#ifdef CONFIG_COMPAT +long tty_compat_ioctl (struct file * file,unsigned int cmd,unsigned long arg); +#endif static int tty_fasync (int fd,struct file * filp,int on);static void release_mem (struct tty_struct *tty,int idx);declarations should never be hidden inside of an #ifdef. If you want to be extra clever here, you can do
OK, I have no problem with that.
A declaration without implementation won't generate a warning?
Quoted 7 lines
#ifdef
CONFIG_COMPAT
longtty_compat_ioctl(struct file * file, unsigned int cmd, unsigned long arg); #else
#definetty_compat_ioctlNULL
#endifthen you don't need an #ifdef in the code setting the function pointers.
OK
Quoted 3 lines
drivers/char/tty_io.c int tty_ioctl(struct inode * inode, stru · line 3310
Quoted 1 line
drivers/char/tty_io.c +1
-0+ tty = (struct tty_struct *)file->private_data;no need for the cast, ->private_data is void*.
Yes, an easy fix.
--
Paul
Arnd Bergmann
maintainerRe: [PATCH] tty add compat_ioctl method
Quoted 6 lines · Paul Fulghum
Quoted 3 lines
declarations should never be hidden inside of an #ifdef. If you want to be extra clever here, you can do
OK, I have no problem with that.
A declaration without implementation won't generate a warning?
You only get a warning for static declarations without an implementation, not for globals.
Arnd <><
Quoted 11 lines · Paul Fulghum
1. define
compat_ioctl()file operation for device and implement translation code in individual driver
2. addCOMPATIBLE_IOCTLentry toinclude/linux/compat_ioctl.hto mark an ioctl code as the same in any environment
3. addHANDLE_IOCTLentry tofs/compat_ioctl.cwith translation code implemented in the same fileThere is no way to implement #1 for a tty driver without modifying the kernel tty code to allow registration of a
compat_ioctl()handler.
(1) is really the recommended solution for all new code
I would recommend you modify the tty driver to pass compat_ioctl through through. Should not do very hard.
-Andi