Re: [PATCH] input: remove BKL from uinput open function

[Thadeu Lima de Souza Cascardo]

On Mon, Feb 01, 2010 at 09:27:22PM +0100, John Kacur wrote:
> On Mon, Feb 1, 2010 at 9:22 PM, John Kacur <jkacur@xxxxxxxxxx> wrote:
> > On Sun, Jan 31, 2010 at 6:29 AM, Dmitry Torokhov
> > <dmitry.torokhov@xxxxxxxxx> wrote:
> >> On Sun, Jan 31, 2010 at 05:20:55AM +0100, Arnd Bergmann wrote:
> >>> On Sunday 31 January 2010, John Kacur wrote:
> >>> > > Sorry, I should have been clearer, but not implementing llseek
> >>> > > is the problem I was referring to: When a driver has no explicit
> >>> > > .llseek operation in its file operations and does not call
> >>> > > nonseekable_open from its open operation, the VFS layer will
> >>> > > implicitly use default_llseek, which takes the BKL. We're
> >>> > > in the process of changing drivers not to do this, one by one
> >>> > > so we can kill the BKL in the end.
> >>> > >
> >>> >
> >>> > I know we've discussed this before, but why wouldn't the following
> >>> > make more sense?
> >>> > Â.llseek     = no_llseek,
> >>>
> >>> That's one of the possible solutions. Assigning it to generic_file_llseek
> >>> also gets rid of the BKL but keeps the current behaviour (calling seek
> >>> returns success without having an effect, no_llseek returns -ESPIPE),
> >>> while calling nonseekable_open has the other side-effect of making
> >>> pread/pwrite fail with -ESPIPE, which is more consistent than
> >>> only failing seek.
> >>>
> >>
> >> OK, so how about the patch below (on top of Thadeu's patch)?
> >>
> >> --
> >> Dmitry
> >>
> >> Input: uinput - use nonseekable_open
> >>
> >> Seeking does not make sense for uinput so let's use nonseekable_open
> >> to mark the device non-seekable.
> >>
> >> Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
> >> ---
> >>
> >> Âdrivers/input/misc/uinput.c | Â Â7 +++++++
> >> Â1 files changed, 7 insertions(+), 0 deletions(-)
> >>
> >>
> >> diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
> >> index 18206e1..7089151 100644
> >> --- a/drivers/input/misc/uinput.c
> >> +++ b/drivers/input/misc/uinput.c
> >> @@ -278,6 +278,7 @@ static int uinput_create_device(struct uinput_device *udev)
> >> Âstatic int uinput_open(struct inode *inode, struct file *file)
> >> Â{
> >> Â Â Â Âstruct uinput_device *newdev;
> >> + Â Â Â int error;
> >>
> >> Â Â Â Ânewdev = kzalloc(sizeof(struct uinput_device), GFP_KERNEL);
> >> Â Â Â Âif (!newdev)
> >> @@ -291,6 +292,12 @@ static int uinput_open(struct inode *inode, struct file *file)
> >>
> >> Â Â Â Âfile->private_data = newdev;
> >>
> >> + Â Â Â error = nonseekable_open(inode, file);
> >> + Â Â Â if (error) {
> >> + Â Â Â Â Â Â Â kfree(newdev);
> >> + Â Â Â Â Â Â Â return error;
> >> + Â Â Â }
> >> +
> >> Â Â Â Âreturn 0;
> >> Â}
> >>
> >>
> >
> > Hmnn, if you look at nonseekable_open() it will always return 0. I
> > think you can just do the following.
> >
> > diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
> > index 18206e1..697c0a6 100644
> > --- a/drivers/input/misc/uinput.c
> > +++ b/drivers/input/misc/uinput.c
> > @@ -291,7 +291,7 @@ static int uinput_open(struct inode *inode, struct file *fil
> >
> > Â Â Â Âfile->private_data = newdev;
> >
> > - Â Â Â return 0;
> > + Â Â Â return nonseekable_open(inode, file);
> > Â}
> >
> > Signed-off-by: John Kacur <jkacur@xxxxxxxxxx>
> >
> 
> Btw, Thadeu Lima de Souza Cascardo should just combine that all into
> one patch, no point really in making two patches out of that.

That's fine to me. But since Dmitry has already applied it, I see no
problem at all that this is two commits. Or would there be any problem
removing the lock in open and not doing nonseekable_open?

As far as I get, nonseekable_open only resets the flags that will make
it do the right thing for lseek, pread and pwrite. This will get rid of
the BKL for these calls, but this is independent of getting rid of it
for the open call.

I don't disagree that doing both at the same time is OK. But I don't
agree that doing them separately is not OK. This way, you may get the
credits for what you (and not I) have done.  :-)

But either way is fine for me.

Regards,
Cascardo.

Attachment: signature.asc
Description: Digital signature