Account Options

  1. Sign in
The old Google Groups will be going away soon, but your browser is incompatible with the new version.
Google Groups Home
« Groups Home
linux.kernel
+ new post
About this group
Subscribe to this group
This is a Usenet group - learn more
[Resubmit][drivers/media] changed ioctls to unlocked
Options
There are currently too many topics in this group that display first. To make this topic appear first, remove this option from another topic.
There was an error processing your request. Please try again.
flag
   5 messages - Collapse all  -  Translate all to Translated (View all originals)
The group you are posting to is a Usenet group. Messages posted to this group will make your email address visible to anyone on the Internet.
Your reply message has not been sent.
Your post was successful
 
From:
To:
Cc:
Followup To:
Add Cc | Add Followup-to | Edit Subject
Subject:
Validation:
For verification purposes please type the characters you see in the picture below or the numbers you hear by clicking the accessibility icon. Listen and type the numbers you hear
 
stoyboy...@gmail.com  
View profile  
 More options Mar 24 2009, 5:50 pm
Newsgroups: linux.kernel
From: stoyboy...@gmail.com
Date: Tue, 24 Mar 2009 22:50:14 +0100
Local: Tues, Mar 24 2009 5:50 pm
Subject: [PATCH 12/13][Resubmit][drivers/media] changed ioctls to unlocked
Print | Individual message | Show original | Report this message | Find messages by this author
From: Stoyan Gaydarov <stoyboy...@gmail.com>

Signed-off-by: Stoyan Gaydarov <stoyboy...@gmail.com>
---
 drivers/media/dvb/bt8xx/dst_ca.c |    7 +++++--
 drivers/media/video/dabusb.c     |   11 ++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index 0258451..d3487c5 100644
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -552,8 +552,10 @@ free_mem_and_exit:
        return result;
 }

-static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long ioctl_arg)
+static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioctl_arg)
 {
+       lock_kernel();
+
        struct dvb_device* dvbdev = (struct dvb_device*) file->private_data;
        struct dst_state* state = (struct dst_state*) dvbdev->priv;
        struct ca_slot_info *p_ca_slot_info;
@@ -647,6 +649,7 @@ static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd
        kfree (p_ca_slot_info);
        kfree (p_ca_caps);

+       unlock_kernel();
        return result;
 }

@@ -684,7 +687,7 @@ static ssize_t dst_ca_write(struct file *file, const char __user *buffer, size_t

 static struct file_operations dst_ca_fops = {
        .owner = THIS_MODULE,
-       .ioctl = dst_ca_ioctl,
+       .unlocked_ioctl = dst_ca_ioctl,
        .open = dst_ca_open,
        .release = dst_ca_release,
        .read = dst_ca_read,
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c
index 298810d..c31e76f 100644
--- a/drivers/media/video/dabusb.c
+++ b/drivers/media/video/dabusb.c
@@ -657,22 +657,26 @@ static int dabusb_release (struct inode *inode, struct file *file)
        return 0;
 }

-static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+static long dabusb_ioctl (struct file *file, unsigned int cmd, unsigned long arg)
 {
        pdabusb_t s = (pdabusb_t) file->private_data;
        pbulk_transfer_t pbulk;
        int ret = 0;
        int version = DABUSB_VERSION;

+       lock_kernel();
        dbg("dabusb_ioctl");

-       if (s->remove_pending)
+       if (s->remove_pending) {
+               unlock_kernel();
                return -EIO;
+       }

        mutex_lock(&s->mutex);

        if (!s->usbdev) {
                mutex_unlock(&s->mutex);
+               unlock_kernel();
                return -EIO;
        }

@@ -713,6 +717,7 @@ static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cm
                break;
        }
        mutex_unlock(&s->mutex);
+       unlock_kernel();
        return ret;
 }

@@ -721,7 +726,7 @@ static const struct file_operations dabusb_fops =
        .owner =        THIS_MODULE,
        .llseek =       no_llseek,
        .read =         dabusb_read,
-       .ioctl =        dabusb_ioctl,
+       .unlocked_ioctl =       dabusb_ioctl,
        .open =         dabusb_open,
        .release =      dabusb_release,
 };
--
1.6.2.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Alexey Klimov  
View profile  
 More options Mar 24 2009, 6:30 pm
Newsgroups: linux.kernel
From: Alexey Klimov <klimov.li...@gmail.com>
Date: Tue, 24 Mar 2009 23:30:14 +0100
Local: Tues, Mar 24 2009 6:30 pm
Subject: Re: [PATCH 12/13][Resubmit][drivers/media] changed ioctls to unlocked
Print | Individual message | Show original | Report this message | Find messages by this author
Hello, Stoyan

May i ask why big kernel lock is used here?
Where is an advantage of BKL here?
Why not to use, for example, one more mutex lock?

--
Best regards, Klimov Alexey

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Stoyan Gaydarov  
View profile  
 More options Mar 24 2009, 6:40 pm
Newsgroups: linux.kernel
From: Stoyan Gaydarov <stoyboy...@gmail.com>
Date: Tue, 24 Mar 2009 23:40:12 +0100
Local: Tues, Mar 24 2009 6:40 pm
Subject: Re: [PATCH 12/13][Resubmit][drivers/media] changed ioctls to unlocked
Print | Individual message | Show original | Report this message | Find messages by this author

The big kernel lock was already being used here, the call to ioctl is
surrounded by lock/unlock kernel, this patch just pushes it down so
that the __locked__ ioctl can be removed and also makes the
maintainers of the code aware that the lock was there. If the lock is
not needed then it can be removed and the function can remain under
the unlocked_ioctl.

> --
> Best regards, Klimov Alexey

--

-Stoyan
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Aguirre Rodriguez, Sergio Alberto  
View profile  
 More options Mar 24 2009, 7:20 pm
Newsgroups: linux.kernel
From: "Aguirre Rodriguez, Sergio Alberto" <saagui...@ti.com>
Date: Wed, 25 Mar 2009 00:20:10 +0100
Local: Tues, Mar 24 2009 7:20 pm
Subject: RE: [PATCH 12/13][Resubmit][drivers/media] changed ioctls to unlocked
Print | Individual message | Show original | Report this message | Find messages by this author

> >  {
> > +     lock_kernel();
> > +

> Why moving to unlocked_ioctl if you're acquiring the Big Kernel Lock
> anyways?

Ok, forget it, just saw Alexey mail chain...

Understood.

Regards,
Sergio
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Aguirre Rodriguez, Sergio Alberto  
View profile  
 More options Mar 24 2009, 7:20 pm
Newsgroups: linux.kernel
From: "Aguirre Rodriguez, Sergio Alberto" <saagui...@ti.com>
Date: Wed, 25 Mar 2009 00:20:10 +0100
Local: Tues, Mar 24 2009 7:20 pm
Subject: RE: [PATCH 12/13][Resubmit][drivers/media] changed ioctls to unlocked
Print | Individual message | Show original | Report this message | Find messages by this author
Hi Stoyan,

Why moving to unlocked_ioctl if you're acquiring the Big Kernel Lock anyways?

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
End of messages
« Back to Discussions « Newer topic     Older topic »

Create a group - Google Groups - Google Home - Terms of Service - Privacy Policy
©2013 Google