Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262876AbVAFPzn (ORCPT ); Thu, 6 Jan 2005 10:55:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262881AbVAFPzn (ORCPT ); Thu, 6 Jan 2005 10:55:43 -0500 Received: from mail.mellanox.co.il ([194.90.237.34]:42718 "EHLO mtlex01.yok.mtl.com") by vger.kernel.org with ESMTP id S262876AbVAFPzL (ORCPT ); Thu, 6 Jan 2005 10:55:11 -0500 Date: Thu, 6 Jan 2005 17:56:48 +0200 From: "Michael S. Tsirkin" To: Christoph Hellwig , Andrew Morton , ak@suse.de, mingo@elte.hu, rlrevell@joe-job.com, tiwai@suse.de, linux-kernel@vger.kernel.org, pavel@suse.cz, discuss@x86-64.org, gordon.jin@intel.com, alsa-devel@lists.sourceforge.net, greg@kroah.com Subject: Re: [PATCH] deprecate (un)register_ioctl32_conversion Message-ID: <20050106155648.GD25955@mellanox.co.il> Reply-To: "Michael S. Tsirkin" References: <20041215065650.GM27225@wotan.suse.de> <20041217014345.GA11926@mellanox.co.il> <20050105144043.GB19434@mellanox.co.il> <20050105144603.GA1419@infradead.org> <20050105150310.GA19758@mellanox.co.il> <20050105133358.16ce6891.akpm@osdl.org> <20050106144116.GA25898@mellanox.co.il> <20050106145527.GB18725@infradead.org> <20050106152248.GA25955@mellanox.co.il> <20050106153016.GA19324@infradead.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20050106153016.GA19324@infradead.org> User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3302 Lines: 96 Hello! Quoting r. Christoph Hellwig (hch@infradead.org) "Re: [PATCH] deprecate (un)register_ioctl32_conversion": > On Thu, Jan 06, 2005 at 05:22:48PM +0200, Michael S. Tsirkin wrote: > > > + if (!filp->f_op || !filp->f_op->ioctl) > > > + goto do_ioctl; > > > + > > > + if (filp->f_op || filp->f_op->compat_ioctl) { > > > error = filp->f_op->compat_ioctl(filp, cmd, arg); > > > goto out_fput; > > > } > > > > So now if I dont have ->ioctl the ioctl_compat wont be called. > > What if I only have unlocked_ioctl? > > Indeed. In my test setup I didn't have a driver using both. So let's > think a little more what checks we want. > > The original intention (pre-patch) was that without an ioctl entry > we'd skip the hash table lookup and skip right to trying the few standard > ioctls. > > So with ->compat_ioctl we should try that one first, then checking > for either ->ioctl or ->unlocked_ioctl beeing there. Like the patch > below (this time it's actually untested because all my 64bit machines > are in use): > > > --- linux-2.6.10-mm2.orig/fs/compat.c 2005-01-06 11:40:18.831900000 +0100 > +++ linux-2.6.10-mm2/fs/compat.c 2005-01-06 16:36:17.340977664 +0100 > @@ -436,14 +436,15 @@ > if (!filp) > goto out; > > - if (!filp->f_op) { > - if (!filp->f_op->ioctl) > - goto do_ioctl; > - } else if (filp->f_op->compat_ioctl) { > + if (filp->f_op && filp->f_op->compat_ioctl) { > error = filp->f_op->compat_ioctl(filp, cmd, arg); > goto out_fput; > } > > + if (!filp->f_op || > + (!filp->f_op->ioctl && !filp->f_op->unlocked_ioctl)) > + goto do_ioctl; > + > down_read(&ioctl32_sem); > for (t = ioctl32_hash_table[ioctl32_hash(cmd)]; t; t = t->next) { > if (t->cmd == cmd) > > > > > > > MST > ---end quoted text--- Amen to that. Since it conflicts with this change, here again is my patch to make it possible for the compat_ioctl to drop back on the standard conversions. Applied on top of Christoph's last patch (above). Signed-off-by: Michael S. Tsirkn diff -rup linux-2.6.10-mm2/fs/compat.c linux-2.6.10-ioctls/fs/compat.c --- linux-2.6.10-mm2/fs/compat.c 2005-01-06 21:30:57.485167280 +0200 +++ linux-2.6.10-ioctls/fs/compat.c 2005-01-06 21:33:17.608865240 +0200 @@ -431,9 +431,10 @@ asmlinkage long compat_sys_ioctl(unsigne if (!filp) goto out; if (filp->f_op && filp->f_op->compat_ioctl) { error = filp->f_op->compat_ioctl(filp, cmd, arg); - goto out_fput; + if (error != -ENOIOCTLCMD) + goto out_fput; } if (!filp->f_op || diff -rup linux-2.6.10-mm2/fs/ioctl.c linux-2.6.10-ioctls/fs/ioctl.c --- linux-2.6.10-mm2/fs/ioctl.c 2005-01-06 17:54:13.000000000 +0200 +++ linux-2.6.10-ioctls/fs/ioctl.c 2005-01-06 20:34:09.329285728 +0200 @@ -26,6 +26,9 @@ static long do_ioctl(struct file *filp, if (filp->f_op->unlocked_ioctl) { error = filp->f_op->unlocked_ioctl(filp, cmd, arg); + if (error == -ENOIOCTLCMD) + error = -EINVAL; + goto out; } else if (filp->f_op->ioctl) { lock_kernel(); error = filp->f_op->ioctl(filp->f_dentry->d_inode, - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/