BKL removal queued patches
Subsystems (23)
cover BKL removal queued patches
Hi all,
I'm sending out the pending BKL removal patches which I collected so far to avoid duplicate work and to solicit review/comments.
If nobody objects I'd like to keep them in one git branch which is going to be included into linux-next.
Thanks,
tglx
PATCH 1/28 pm_qos: remove BKL
pm_qos_power_open got its lock_kernel() calls from the open() pushdown. A look at the code shows that the only global resources accessed are pm_qos_array and "name". pm_qos_array doesn't change (things pointed to therein do change, but they are atomics and/or are protected by pm_qos_lock). Accesses to "name" are totally unprotected with or without the BKL; that will be fixed shortly. The BKL is not helpful here; take it out.
kernel/pm_qos_params.c +1 -7
@@ -29,7 +29,6 @@#include <linux/pm_qos_params.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/spinlock.h> #include <linux/slab.h> #include <linux/time.h>
@@ -352,20 +351,15 @@ static int pm_qos_power_open(struct inode *inode, struct file *filp)int ret;long pm_qos_class; -lock_kernel (); pm_qos_class =find_pm_qos_object_by_minor (iminor (inode));if (pm_qos_class >=0 ) { filp->private_data = (void *)pm_qos_class;sprintf (name,"process_%d" , current->pid); ret =pm_qos_add_requirement (pm_qos_class, name,PM_QOS_DEFAULT_VALUE ); -if (ret >=0 ) { -unlock_kernel (); +if (ret >=0 )return 0 ; - } } -unlock_kernel (); -return -EPERM ; }
Re: [patch 01/28] pm_qos: remove BKL
Quoted 11 lines · Thomas Gleixner
pm_qos_power_opengot itslock_kernel()calls from theopen()pushdown. A look at the code shows that the only global resources accessed arepm_qos_arrayand "name".pm_qos_arraydoesn't change (things pointed to therein do change, but they are atomics and/or are protected bypm_qos_lock). Accesses to "name" are totally unprotected with or without the BKL; that will be fixed shortly. The BKL is not helpful here; take it out.Signed-off-by Jonathan Corbet <[email protected]>Cc Mark Gross <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>
Quoted 37 lines
kernel/pm_qos_params.c +1
-7@@ -29,7 +29,6 @@#include <linux/pm_qos_params.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/spinlock.h> #include <linux/slab.h> #include <linux/time.h> @@ -352,20 +351,15 @@ static int pm_qos_power_open(struct inode *inode, struct file *filp)int ret;long pm_qos_class; -lock_kernel (); pm_qos_class =find_pm_qos_object_by_minor (iminor (inode));if (pm_qos_class >=0 ) { filp->private_data = (void *)pm_qos_class;sprintf (name,"process_%d" , current->pid); ret =pm_qos_add_requirement (pm_qos_class, name,PM_QOS_DEFAULT_VALUE ); -if (ret >=0 ) { -unlock_kernel (); +if (ret >=0 )return 0 ; - } } -unlock_kernel (); -return -EPERM ; }
Re: [patch 01/28] pm_qos: remove BKL
In reply to Thomas GleixnerI thought we made this change a month or 3 ago.
--mgross
Quoted 47 lines · Thomas Gleixner
pm_qos_power_opengot itslock_kernel()calls from theopen()pushdown. A look at the code shows that the only global resources accessed arepm_qos_arrayand "name".pm_qos_arraydoesn't change (things pointed to therein do change, but they are atomics and/or are protected bypm_qos_lock). Accesses to "name" are totally unprotected with or without the BKL; that will be fixed shortly. The BKL is not helpful here; take it out.Signed-off-by Jonathan Corbet <[email protected]>Cc Mark Gross <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>kernel/pm_qos_params.c +1
-7@@ -29,7 +29,6 @@#include <linux/pm_qos_params.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/spinlock.h> #include <linux/slab.h> #include <linux/time.h> @@ -352,20 +351,15 @@ static int pm_qos_power_open(struct inode *inode, struct file *filp)int ret;long pm_qos_class; -lock_kernel (); pm_qos_class =find_pm_qos_object_by_minor (iminor (inode));if (pm_qos_class >=0 ) { filp->private_data = (void *)pm_qos_class;sprintf (name,"process_%d" , current->pid); ret =pm_qos_add_requirement (pm_qos_class, name,PM_QOS_DEFAULT_VALUE ); -if (ret >=0 ) { -unlock_kernel (); +if (ret >=0 )return 0 ; - } } -unlock_kernel (); -return -EPERM ; }
Re: [patch 01/28] pm_qos: remove BKL
Quoted 3 lines · On Tue, 13 Oct 2009 12:12:18 -0700 mgross <[email protected]> wrote:
I thought we made this change a month or 3 ago.
Signed-off-by Mark Gross <[email protected]>
Change went out but it was caught snoozing during the 2.6.32 merge window.
I think you really want "Acked-by", no?
Thanks,
jon
Re: [patch 01/28] pm_qos: remove BKL
Quoted 11 lines · Jonathan Corbet
Quoted 3 lines · On Tue, 13 Oct 2009 12:12:18 -0700 mgross <[email protected]> wrote:
I thought we made this change a month or 3 ago.
Signed-off-by Mark Gross <[email protected]>Change went out but it was caught snoozing during the 2.6.32 merge window.
I think you really want "Acked-by", no?
Yes. Sorry.
--mgross
Quoted 4 lines
Thanks,
jon
[tip:bkl/core] pm_qos: remove BKL
In reply to Thomas GleixnerCommit-ID: e6fe07a014c7a3466dcd1a387a9ac04d84c2703c Gitweb: http://git.kernel.org/tip/e6fe07a014c7a3466dcd1a387a9ac04d84c2703c Author: Jonathan Corbet <[email protected]> AuthorDate: Thu, 6 Aug 2009 13:22:40 -0600 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 15:31:10 +0200
pm_qos: remove BKL
pm_qos_power_open got its lock_kernel() calls from the open() pushdown. A look at the code shows that the only global resources accessed are pm_qos_array and "name". pm_qos_array doesn't change (things pointed to therein do change, but they are atomics and/or are protected by pm_qos_lock). Accesses to "name" are totally unprotected with or without the BKL; that will be fixed shortly. The BKL is not helpful here; take it out.
LKML-Reference: <[email protected]>
--- kernel/pm_qos_params.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-)
kernel/pm_qos_params.c +1 -7
@@ -29,7 +29,6 @@#include <linux/pm_qos_params.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/spinlock.h> #include <linux/slab.h> #include <linux/time.h>
@@ -352,20 +351,15 @@ static int pm_qos_power_open(struct inode *inode, struct file *filp)int ret;long pm_qos_class; -lock_kernel (); pm_qos_class =find_pm_qos_object_by_minor (iminor (inode));if (pm_qos_class >=0 ) { filp->private_data = (void *)pm_qos_class;sprintf (name,"process_%d" , current->pid); ret =pm_qos_add_requirement (pm_qos_class, name,PM_QOS_DEFAULT_VALUE ); -if (ret >=0 ) { -unlock_kernel (); +if (ret >=0 )return 0 ; - } } -unlock_kernel (); -return -EPERM ; }
PATCH 2/28 pm_qos: clean up racy global "name" variable
In reply to Thomas Gleixner"name" is a poor name for a file-global variable. It was used in three different functions, with no mutual exclusion. But it's just a tiny, temporary string; let's just move it onto the stack in the functions that need it. Also use snprintf() just in case.
kernel/pm_qos_params.c +7 -5
@@ -343,18 +343,18 @@ int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier) }EXPORT_SYMBOL_GPL (pm_qos_remove_notifier); -#define PID_NAME_LEN sizeof("process_1234567890") -static char name[PID_NAME_LEN ]; +#define PID_NAME_LEN 32static int pm_qos_power_open (struct inode *inode,struct file *filp) {int ret;long pm_qos_class; +char name[PID_NAME_LEN ]; pm_qos_class =find_pm_qos_object_by_minor (iminor (inode));if (pm_qos_class >=0 ) { filp->private_data = (void *)pm_qos_class; -sprintf (name,"process_%d" , current->pid); +snprintf (name,PID_NAME_LEN ,"process_%d" , current->pid); ret =pm_qos_add_requirement (pm_qos_class, name,PM_QOS_DEFAULT_VALUE );if (ret >=0 )
@@ -366,9 +366,10 @@ static int pm_qos_power_open(struct inode *inode, struct file *filp)static int pm_qos_power_release (struct inode *inode,struct file *filp) {int pm_qos_class; +char name[PID_NAME_LEN ]; pm_qos_class = (long )filp->private_data; -sprintf (name,"process_%d" , current->pid); +snprintf (name,PID_NAME_LEN ,"process_%d" , current->pid);pm_qos_remove_requirement (pm_qos_class, name);return 0 ;
@@ -379,13 +380,14 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf, {s32 value;int pm_qos_class; +char name[PID_NAME_LEN ]; pm_qos_class = (long )filp->private_data;if (count !=sizeof (s32))return -EINVAL ;if (copy_from_user (&value, buf,sizeof (s32)))return -EFAULT ; -sprintf (name,"process_%d" , current->pid); +snprintf (name,PID_NAME_LEN ,"process_%d" , current->pid);pm_qos_update_requirement (pm_qos_class, name, value);return sizeof (s32);
Re: [patch 02/28] pm_qos: clean up racy global "name" variable
Quoted 15 lines · Thomas Gleixner
"name" is a poor name for a file-global variable. It was used in three different functions, with no mutual exclusion. But it's just a tiny, temporary string; let's just move it onto the stack in the functions that need it. Also use
snprintf()just in case.Signed-off-by Jonathan Corbet <[email protected]>Cc Mark Gross <[email protected]>Reviewed-by Frederic Weisbecker <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>kernel/pm_qos_params.c +0
-0
kernel/pm_qos_params.c int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier) · line 346
Quoted 6 lines
kernel/pm_qos_params.c +1
-2@@ -343,18 +343,18 @@ int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier) }EXPORT_SYMBOL_GPL (pm_qos_remove_notifier); -#define PID_NAME_LEN sizeof("process_1234567890") -static char name[PID_NAME_LEN ]; +#define PID_NAME_LEN 32
Hmnn, why 32? Seems arbitrary. At least you see with "process_1234567890" which is 19, an attempt to show what the maximum string size would be. If a system were configured to enlarge the maximum PID from 32767 to 4194303 that would still only be 7 digits, so "process_1234567" - which is 16 digits with the newline would enough.
So, I suggest you change that to
#define PID_NAME_LEN sizeof("process_1234567")
Other than that, Reviewed-by: John Kacur <[email protected]>
Quoted 46 lines
kernel/pm_qos_params.c +6
-3static int pm_qos_power_open (struct inode *inode,struct file *filp) {int ret;long pm_qos_class; +char name[PID_NAME_LEN ]; pm_qos_class =find_pm_qos_object_by_minor (iminor (inode));if (pm_qos_class >=0 ) { filp->private_data = (void *)pm_qos_class; -sprintf (name,"process_%d" , current->pid); +snprintf (name,PID_NAME_LEN ,"process_%d" , current->pid); ret =pm_qos_add_requirement (pm_qos_class, name,PM_QOS_DEFAULT_VALUE );if (ret >=0 )@@ -366,9 +366,10 @@ static int pm_qos_power_open(struct inode *inode, struct file *filp)static int pm_qos_power_release (struct inode *inode,struct file *filp) {int pm_qos_class; +char name[PID_NAME_LEN ]; pm_qos_class = (long )filp->private_data; -sprintf (name,"process_%d" , current->pid); +snprintf (name,PID_NAME_LEN ,"process_%d" , current->pid);pm_qos_remove_requirement (pm_qos_class, name);return 0 ;@@ -379,13 +380,14 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf, {s32 value;int pm_qos_class; +char name[PID_NAME_LEN ]; pm_qos_class = (long )filp->private_data;if (count !=sizeof (s32))return -EINVAL ;if (copy_from_user (&value, buf,sizeof (s32)))return -EFAULT ; -sprintf (name,"process_%d" , current->pid); +snprintf (name,PID_NAME_LEN ,"process_%d" , current->pid);pm_qos_update_requirement (pm_qos_class, name, value);return sizeof (s32);
Re: [patch 02/28] pm_qos: clean up racy global "name" variable
Quoted 8 lines · On Sat, 10 Oct 2009 21:54:22 +0200 (CEST) John Kacur <[email protected]> wrote:
Hmnn, why 32? Seems arbitrary. At least you see with "
process_1234567890" which is 19, an attempt to show what the maximum string size would be. If a system were configured to enlarge the maximum PID from 32767 to 4194303 that would still only be 7 digits, so "process_1234567" - which is 16 digits with the newline would enough.So, I suggest you change that to
#definePID_NAME_LENsizeof("process_1234567")
...which works great until somebody enables 64-bit process IDs...:)
We're talking about 20 bytes of stack space in an almost-never-called function. I honestly don't think it's worth worrying about, but if somebody wants to tweak it, I'll not complain.
(Thanks for looking at the patch).
jon
Re: [patch 02/28] pm_qos: clean up racy global "name" variable
Quoted 9 lines · Jonathan Corbet
Quoted 6 lines · On Sat, 10 Oct 2009 21:54:22 +0200 (CEST) John Kacur <[email protected]> wrote:
Hmnn, why 32? Seems arbitrary. At least you see with "
process_1234567890" which is 19, an attempt to show what the maximum string size would be. If a system were configured to enlarge the maximum PID from 32767 to 4194303 that would still only be 7 digits, so "process_1234567" - which is 16 digits with the newline would enough.
Quoted 4 lines
Quoted 2 lines
So, I suggest you change that to
#definePID_NAME_LENsizeof("process_1234567")....which works great until somebody enables 64-bit process IDs...:)
PID/TIDs are limited to 2^29, raising it above that will break things like futexes. Raising it above 2^32 will break heaps of userspace.
That said, 512M tasks still seems like a lot, but if history is something to go by we'll eventually run out...
Re: [patch 02/28] pm_qos: clean up racy global "name" variable
In reply to Jonathan CorbetQuoted 12 lines · Jonathan Corbet
Quoted 8 lines · On Sat, 10 Oct 2009 21:54:22 +0200 (CEST) John Kacur <[email protected]> wrote:
Hmnn, why 32? Seems arbitrary. At least you see with "
process_1234567890" which is 19, an attempt to show what the maximum string size would be. If a system were configured to enlarge the maximum PID from 32767 to 4194303 that would still only be 7 digits, so "process_1234567" - which is 16 digits with the newline would enough.So, I suggest you change that to
#definePID_NAME_LENsizeof("process_1234567")
Quoted 8 lines
...which works great until somebody enables 64-bit process IDs...:)
We're talking about 20 bytes of stack space in an almost-never-called function. I honestly don't think it's worth worrying about, but if somebody wants to tweak it, I'll not complain.
(Thanks for looking at the patch).
It was a minor nit at best! My point was less about the stack space than the readability - which you could argue is a personal style choice here. There is nothing else to criticize in these patches. :)
Thomas, I reviewed all 28 patches and applied them.
Thanks
[tip:bkl/core] pm_qos: clean up racy global "name" variable
In reply to Thomas GleixnerCommit-ID: 1a6deaea3584fd7af1cad492b1fe0867060b45db Gitweb: http://git.kernel.org/tip/1a6deaea3584fd7af1cad492b1fe0867060b45db Author: Jonathan Corbet <[email protected]> AuthorDate: Thu, 6 Aug 2009 13:35:44 -0600 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 15:31:10 +0200
pm_qos: clean up racy global "name" variable
"name" is a poor name for a file-global variable. It was used in three different functions, with no mutual exclusion. But it's just a tiny, temporary string; let's just move it onto the stack in the functions that need it. Also use snprintf() just in case.
LKML-Reference: <[email protected]>
--- kernel/pm_qos_params.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
kernel/pm_qos_params.c +7 -5
@@ -343,18 +343,18 @@ int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier) }EXPORT_SYMBOL_GPL (pm_qos_remove_notifier); -#define PID_NAME_LEN sizeof("process_1234567890") -static char name[PID_NAME_LEN ]; +#define PID_NAME_LEN 32static int pm_qos_power_open (struct inode *inode,struct file *filp) {int ret;long pm_qos_class; +char name[PID_NAME_LEN ]; pm_qos_class =find_pm_qos_object_by_minor (iminor (inode));if (pm_qos_class >=0 ) { filp->private_data = (void *)pm_qos_class; -sprintf (name,"process_%d" , current->pid); +snprintf (name,PID_NAME_LEN ,"process_%d" , current->pid); ret =pm_qos_add_requirement (pm_qos_class, name,PM_QOS_DEFAULT_VALUE );if (ret >=0 )
@@ -366,9 +366,10 @@ static int pm_qos_power_open(struct inode *inode, struct file *filp)static int pm_qos_power_release (struct inode *inode,struct file *filp) {int pm_qos_class; +char name[PID_NAME_LEN ]; pm_qos_class = (long )filp->private_data; -sprintf (name,"process_%d" , current->pid); +snprintf (name,PID_NAME_LEN ,"process_%d" , current->pid);pm_qos_remove_requirement (pm_qos_class, name);return 0 ;
@@ -379,13 +380,14 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf, {s32 value;int pm_qos_class; +char name[PID_NAME_LEN ]; pm_qos_class = (long )filp->private_data;if (count !=sizeof (s32))return -EINVAL ;if (copy_from_user (&value, buf,sizeof (s32)))return -EFAULT ; -sprintf (name,"process_%d" , current->pid); +snprintf (name,PID_NAME_LEN ,"process_%d" , current->pid);pm_qos_update_requirement (pm_qos_class, name, value);return sizeof (s32);
PATCH 3/28 net: Remove BKL from tun
In reply to Thomas GleixnerThe lock_kernel/unlock_kernel() in cycle_kernel_lock() which is called in tun_chr_open() is not serializing against anything and safe to remove.
tun_chr_fasync() is serialized by get/put_tun() and fasync_helper() has no dependency on BKL. The modification of tun->flags is racy with and without the BKL so removing it does not make it worse.
--- drivers/net/tun.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/tun.c +1 -4
@@ -44,7 +44,6 @@#include <linux/kernel.h> #include <linux/major.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/poll.h> #include <linux/fcntl.h> #include <linux/init.h>
@@ -1285,7 +1284,6 @@ static int tun_chr_fasync(int fd, structDBG (KERN_INFO "%s: tun_chr_fasync %d\n" , tun->dev->name, on); -lock_kernel ();if ((ret =fasync_helper (fd, file, on, &tun->fasync)) <0 ) goto out;
@@ -1298,7 +1296,6 @@ static int tun_chr_fasync(int fd, struct tun->flags &= ~TUN_FASYNC ; ret =0 ; out: -unlock_kernel ();tun_put (tun);return ret; }
@@ -1306,7 +1303,7 @@ out:static int tun_chr_open (struct inode *inode,struct file * file) {struct tun_file *tfile; -cycle_kernel_lock (); +DBG1 (KERN_INFO "tunX: tun_chr_open\n" ); tfile =kmalloc (sizeof (*tfile),GFP_KERNEL );
Re: [patch 03/28] net: Remove BKL from tun
From: Thomas Gleixner <[email protected]>
Date: Sat, 10 Oct 2009 15:35:33 -0000
Quoted 9 lines
The lock_kernel/unlock_kernel() in
cycle_kernel_lock()which is called intun_chr_open()is not serializing against anything and safe to remove.
tun_chr_fasync()is serialized by get/put_tun() andfasync_helper()has no dependency on BKL. The modification oftun->flagsis racy with and without the BKL so removing it does not make it worse.Signed-off-by Thomas Gleixner <[email protected]>
Applied to net-next-2.6, thanks!
PATCH 4/28 x86: Remove BKL from microcode
In reply to Thomas Gleixnercycle_lock_kernel() in microcode_open() is a worthless exercise as there is nothing to wait for. Remove it.
--- arch/x86/kernel/microcode_core.c | 2 -- 1 file changed, 2 deletions(-)
arch/x86/kernel/microcode_core.c +0 -2
@@ -73,7 +73,6 @@#include <linux/platform_device.h> #include <linux/miscdevice.h> #include <linux/capability.h> -#include <linux/smp_lock.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/mutex.h>
@@ -201,7 +200,6 @@ static int do_microcode_update(const voistatic int microcode_open (struct inode *unused1,struct file *unused2) { -cycle_kernel_lock ();return capable (CAP_SYS_RAWIO ) ?0 : -EPERM ; }
[tip:x86/cleanups] x86: Remove BKL from microcode
Commit-ID: ac06ea2cd06291e63951b51dd7c9a23e6a1f2683 Gitweb: http://git.kernel.org/tip/ac06ea2cd06291e63951b51dd7c9a23e6a1f2683 Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 09:35:48 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:04:48 +0200
x86: Remove BKL from microcode
cycle_lock_kernel() in microcode_open() is a worthless exercise as there is nothing to wait for. Remove it.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/microcode_core.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
arch/x86/kernel/microcode_core.c +0 -2
@@ -73,7 +73,6 @@#include <linux/platform_device.h> #include <linux/miscdevice.h> #include <linux/capability.h> -#include <linux/smp_lock.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/mutex.h>
@@ -201,7 +200,6 @@ static int do_microcode_update(const void __user *buf, size_t size)static int microcode_open (struct inode *unused1,struct file *unused2) { -cycle_kernel_lock ();return capable (CAP_SYS_RAWIO ) ?0 : -EPERM ; }
PATCH 5/28 drivers: Remove BKL from drivers/char/misc.c
In reply to Thomas Gleixnermisc_open() is already serialized with misc_mtx. Remove the BKL locking which got there via the BKL pushdown.
--- drivers/char/misc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/char/misc.c +1 -4
@@ -49,7 +49,6 @@#include <linux/device.h> #include <linux/tty.h> #include <linux/kmod.h> -#include <linux/smp_lock.h> /* * Head entry for the doubly linked miscdevice list
@@ -118,8 +117,7 @@ static int misc_open(struct inode * inodstruct miscdevice *c;int err = -ENODEV ;const struct file_operations *old_fops, *new_fops =NULL ; - -lock_kernel (); +mutex_lock (&misc_mtx);list_for_each_entry (c, &misc_list, list) {
@@ -157,7 +155,6 @@ static int misc_open(struct inode * inodfops_put (old_fops); fail:mutex_unlock (&misc_mtx); -unlock_kernel ();return err; }
Re: [patch 05/28] drivers: Remove BKL from drivers/char/misc.c
Quoted 2 lines · Thomas Gleixner
misc_open()is already serialized withmisc_mtx. Remove the BKL locking which got there via the BKL pushdown.
This only works as long as all misc drivers also don't need the BKL in /their/ open methods. I believe that we did a pushdown into them last year, but new ones may have crept up.
I guess we really should have kill this one off back then, but somehow it was forgotten about.
Arnd <><
[tip:bkl/drivers] drivers: Remove BKL from misc_open
In reply to Thomas GleixnerCommit-ID: 40b798efe3460797a4ac928ee2e038774e2758eb Gitweb: http://git.kernel.org/tip/40b798efe3460797a4ac928ee2e038774e2758eb Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:35:43 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:33:32 +0200
drivers: Remove BKL from misc_open
misc_open() is already serialized with misc_mtx. Remove the BKL locking which got there via the BKL pushdown.
LKML-Reference: <[email protected]>
--- drivers/char/misc.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
drivers/char/misc.c +1 -4
@@ -49,7 +49,6 @@#include <linux/device.h> #include <linux/tty.h> #include <linux/kmod.h> -#include <linux/smp_lock.h> /* * Head entry for the doubly linked miscdevice list
@@ -118,8 +117,7 @@ static int misc_open(struct inode * inode, struct file * file)struct miscdevice *c;int err = -ENODEV ;const struct file_operations *old_fops, *new_fops =NULL ; - -lock_kernel (); +mutex_lock (&misc_mtx);list_for_each_entry (c, &misc_list, list) {
@@ -157,7 +155,6 @@ static int misc_open(struct inode * inode, struct file * file)fops_put (old_fops); fail:mutex_unlock (&misc_mtx); -unlock_kernel ();return err; }
Re: [tip:bkl/drivers] drivers: Remove BKL from misc_open
Quoted 11 lines · tip-bot for Thomas Gleixner
Commit-ID: 40b798efe3460797a4ac928ee2e038774e2758eb Gitweb: http://git.kernel.org/tip/40b798efe3460797a4ac928ee2e038774e2758eb Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:35:43 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:33:32 +0200drivers: Remove BKL from
misc_open
misc_open()is already serialized withmisc_mtx. Remove the BKL locking which got there via the BKL pushdown.
Did you check the misc drivers to make sure this is not silently removing the BKL from drivers that need it?
Arnd <><
Re: [tip:bkl/drivers] drivers: Remove BKL from misc_open
Quoted 8 lines · Arnd Bergmann
Quoted 7 lines · tip-bot for Thomas Gleixner
Commit-ID: 40b798efe3460797a4ac928ee2e038774e2758eb Gitweb: http://git.kernel.org/tip/40b798efe3460797a4ac928ee2e038774e2758eb Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:35:43 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:33:32 +0200
Quoted 7 lines
Quoted 4 lines
drivers: Remove BKL from
misc_open
misc_open()is already serialized withmisc_mtx. Remove the BKL locking which got there via the BKL pushdown.Did you check the misc drivers to make sure this is not silently removing the BKL from drivers that need it?
Yep, they are plastered with cycle_kernel_lock and lock/unlock_kernel already. I might have missed some, but ...
Thanks,
tglx
Alan Cox
NAKRe: [tip:bkl/drivers] drivers: Remove BKL from misc_open
In reply to tip-bot for Thomas GleixnerQuoted 11 lines · On Wed, 14 Oct 2009 15:47:39 GMT tip-bot for Thomas Gleixner…
Commit-ID: 40b798efe3460797a4ac928ee2e038774e2758eb Gitweb: http://git.kernel.org/tip/40b798efe3460797a4ac928ee2e038774e2758eb Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:35:43 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:33:32 +0200drivers: Remove BKL from
misc_open
misc_open()is already serialized withmisc_mtx. Remove the BKL locking which got there via the BKL pushdown.
NAK.
You can't simply assume the mutex is enough - you have to either push it down or review *every* possible called point below the lock_kernel take.
In this case the open method of the misc devices below sometimes uses the BKL.
Re: [tip:bkl/drivers] drivers: Remove BKL from misc_open
Quoted 15 lines · Alan Cox
Quoted 11 lines · On Wed, 14 Oct 2009 15:47:39 GMT tip-bot for Thomas Gleixner…
Commit-ID: 40b798efe3460797a4ac928ee2e038774e2758eb Gitweb: http://git.kernel.org/tip/40b798efe3460797a4ac928ee2e038774e2758eb Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:35:43 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:33:32 +0200drivers: Remove BKL from
misc_open
misc_open()is already serialized withmisc_mtx. Remove the BKL locking which got there via the BKL pushdown.
Quoted 7 lines
NAK.
You can't simply assume the mutex is enough - you have to either push it down or review *every* possible called point below the
lock_kerneltake.In this case the open method of the misc devices below sometimes uses the BKL.
The BKL got pushed down into the open methods of misc dev users and we do not need to take it twice in a row, right ?
Thanks,
tglx
Re: [tip:bkl/drivers] drivers: Remove BKL from misc_open
Quoted 10 lines · Thomas Gleixner
Quoted 5 lines · Alan Cox
You can't simply assume the mutex is enough - you have to either push it down or review *every* possible called point below the
lock_kerneltake.In this case the open method of the misc devices below sometimes uses the BKL.
The BKL got pushed down into the open methods of misc dev users and we do not need to take it twice in a row, right ?
I worked on the original pushdown back then and believed it to be complete. New drivers have come in and some obviously unneeded instances got cleared of the BKL usage. The ones with an open method that does not take the BKL are:
arch/mips/basler/excite/excite_iodev.carch/x86/kernel/apm_32.cdrivers/buetooth/hci_vhci.cdrivers/char/nvram.cdrivers/char/rtc.cdrivers/gpu/vga/vgaarb.cdrivers/hwmon/fschmd.cdrivers/hwmon/lis3lv02d.cdrivers/infiniband/core/ucma.cdrivers/isdn/mISDN/timerdev.cdrivers/s390/char/vmcp.cfs/cachefiles/daemon.cfs/dlm/user.cfs/fuse/cuse.ckernel/power/user.cnet/rfkill/core.c
As well as some drivers from staging and watchdog. I believe the BKL usage in watchdog drivers was removed shortly after the pushdown.
Arnd <><
drivers/staging/android/binder.cdrivers/staging/dream/qdsp5/audio_aac.cdrivers/staging/dream/qdsp5/audio_evrc.cdrivers/staging/dream/qdsp5/audio_in.cdrivers/staging/dream/qdsp5/audio_out.cdrivers/staging/dream/qdsp5/snd.cdrivers/staging/dream/smd/smd_qmi.cdrivers/staging/panel/panel.cdrivers/watchdog/acquirewdt.cdrivers/watchdog/adx_wdt.cdrivers/watchdog/alim7101_wdt.cdrivers/watchdog/at32ap700x_wdt.cdrivers/watchdog/at91sam9_wdt.cdrivers/watchdog/fin_wdt.cdrivers/watchdog/coh901327_wdt.cdrivers/watchdog/ep93xx_wdt.cdrivers/watchdog/gef_wdt.cdrivers/watchdog/geodewdt.cdrivers/watchdog/i6300esb.cdrivers/watchdog/b700wwdt.cdrivers/watchdog/ibmasr.cdrivers/watchdog/iop_wdt.cdrivers/watchdog/it8_wdt.cdrivers/watchdog/ixp4xx_wdt.cdrivers/watchdog/machzwd.cdrivers/watchdog/mpc5200_wdt.cdrivers/watchdog/mpcore_wdt.cdrivers/watchdog/mv64x60_wdt.cdrivers/watchdog/omap_wdt.cdrivers/watchdog/pc87413_wdt.cdrivers/watchdog/pcwd.cdrivers/watchdog/pcwd_pci.cdrivers/watchdog/pcwd_usb.cdrivers/watchdog/pnx4008_wdt.cdrivers/watchdog/rc32434_wdt.cdrivers/watchdog/s3c2410_wdt.cdrivers/watchdog/sb_wdog.cdrivers/watchdog/sbc7240_wdt.cdrivers/watchdog/sbc_epx_c3.cdrivers/watchdog/c1200wdt.cdrivers/watchdog/sch311x_wdt.cdrivers/watchdog/shwdt.cdrivers/watchdog/smsc37b787_wdt.cdrivers/watchdog/stmp3xxx_wdt.cdrivers/watchdog/txx9wdt.cdrivers/watchdog/w83697hf_wdt.cdrivers/watchdog/w83877f_wdt.cdrivers/watchdog/wafer5823wdt.cdrivers/watchdog/wdrtas.cdrivers/watchdog/wdt.cdrivers/watchdog/wdt977.cdrivers/watchdog/wdt_pci.cdrivers/watchdog/wm8350_wdt.c
Re: [tip:bkl/drivers] drivers: Remove BKL from misc_open
Quoted 9 lines · Arnd Bergmann
arch/mips/basler/excite/excite_iodev.cdrivers/char/rtc.cdrivers/infiniband/core/ucma.cdrivers/s390/char/vmcp.cfs/dlm/user.ckernel/power/user.carch/x86/kernel/apm_32.cdrivers/char/nvram.cdrivers/hwmon/fschmd.c
It turns out that these are all ok, the BKL was removed after the pushdown.
Quoted 5 lines
drivers/gpu/vga/vgaarb.cdrivers/hwmon/lis3lv02d.cfs/cachefiles/daemon.cfs/fuse/cuse.cnet/rfkill/core.c
Quoted 8 lines
drivers/staging/android/binder.cdrivers/staging/dream/qdsp5/audio_aac.cdrivers/staging/dream/qdsp5/audio_evrc.cdrivers/staging/dream/qdsp5/audio_in.cdrivers/staging/dream/qdsp5/audio_out.cdrivers/staging/dream/qdsp5/snd.cdrivers/staging/dream/smd/smd_qmi.cdrivers/staging/panel/panel.c
These are new drivers that were merged after the pushdown and should be looked at, though I don't expect that any of them to need it because none of them use the locked ioctl method or any other form of BKL.
Quoted 1 line
drivers/isdn/mISDN/timerdev.c
This one implicitly holds the BKL in both open and ioctl, it's probably not required but I didn't look closely.
Arnd <><
Re: [tip:bkl/drivers] drivers: Remove BKL from misc_open
Quoted 5 lines · Arnd Bergmann
Quoted 5 lines
drivers/gpu/vga/vgaarb.cdrivers/hwmon/lis3lv02d.cfs/cachefiles/daemon.cfs/fuse/cuse.cnet/rfkill/core.c
Sigh, will have a look.
Quoted 8 lines
Quoted 8 lines
drivers/staging/android/binder.cdrivers/staging/dream/qdsp5/audio_aac.cdrivers/staging/dream/qdsp5/audio_evrc.cdrivers/staging/dream/qdsp5/audio_in.cdrivers/staging/dream/qdsp5/audio_out.cdrivers/staging/dream/qdsp5/snd.cdrivers/staging/dream/smd/smd_qmi.cdrivers/staging/panel/panel.c
More sigh.
Quoted 4 lines
These are new drivers that were merged after the pushdown and should be looked at, though I don't expect that any of them to need it because none of them use the locked ioctl method or any other form of BKL.
Right I looked at quite a bunch of them.
Thanks,
tglx
Re: [tip:bkl/drivers] drivers: Remove BKL from misc_open
Hi!!
Quoted 10 lines
Quoted 8 lines
Quoted 8 lines
drivers/staging/android/binder.cdrivers/staging/dream/qdsp5/audio_aac.cdrivers/staging/dream/qdsp5/audio_evrc.cdrivers/staging/dream/qdsp5/audio_in.cdrivers/staging/dream/qdsp5/audio_out.cdrivers/staging/dream/qdsp5/snd.cdrivers/staging/dream/smd/smd_qmi.cdrivers/staging/panel/panel.cMore sigh.
I guess you can just pretend these do not exist.
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [tip:bkl/drivers] drivers: Remove BKL from misc_open
In reply to Thomas GleixnerQuoted 18 lines · On Wed, 14 Oct 2009 18:16:58 +0200 (CEST) Thomas Gleixner <[email protected]>…
Quoted 17 lines · Alan Cox
Quoted 11 lines · On Wed, 14 Oct 2009 15:47:39 GMT tip-bot for Thomas Gleixner…
Commit-ID: 40b798efe3460797a4ac928ee2e038774e2758eb Gitweb: http://git.kernel.org/tip/40b798efe3460797a4ac928ee2e038774e2758eb Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:35:43 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:33:32 +0200drivers: Remove BKL from
misc_open
misc_open()is already serialized withmisc_mtx. Remove the BKL locking which got there via the BKL pushdown.NAK.
Quoted 8 lines
Quoted 5 lines
You can't simply assume the mutex is enough - you have to either push it down or review *every* possible called point below the
lock_kerneltake.In this case the open method of the misc devices below sometimes uses the BKL.
The BKL got pushed down into the open methods of misc dev users and we do not need to take it twice in a row, right ?
Then the comment is misleading and you need to document that you've already pushed the BKL down into each user and checked them.
Alan
Re: [tip:bkl/drivers] drivers: Remove BKL from misc_open
Quoted 24 lines · Alan Cox
Quoted 21 lines · On Wed, 14 Oct 2009 18:16:58 +0200 (CEST) Thomas Gleixner <[email protected]>…
Quoted 20 lines · Alan Cox
Quoted 11 lines · On Wed, 14 Oct 2009 15:47:39 GMT tip-bot for Thomas Gleixner…
Commit-ID: 40b798efe3460797a4ac928ee2e038774e2758eb Gitweb: http://git.kernel.org/tip/40b798efe3460797a4ac928ee2e038774e2758eb Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:35:43 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:33:32 +0200drivers: Remove BKL from
misc_open
misc_open()is already serialized withmisc_mtx. Remove the BKL locking which got there via the BKL pushdown.NAK.
You can't simply assume the mutex is enough - you have to either push it down or review *every* possible called point below the
lock_kerneltake.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
In this case the open method of the misc devices below sometimes uses the BKL.
The BKL got pushed down into the open methods of misc dev users and we do not need to take it twice in a row, right ?
Then the comment is misleading and you need to document that you've already pushed the BKL down into each user and checked them.
Fair enough. I fix that.
tglx
Re: [tip:bkl/drivers] drivers: Remove BKL from misc_open
In reply to Alan CoxQuoted 15 lines · Alan Cox
Quoted 11 lines · On Wed, 14 Oct 2009 15:47:39 GMT tip-bot for Thomas Gleixner…
Commit-ID: 40b798efe3460797a4ac928ee2e038774e2758eb Gitweb: http://git.kernel.org/tip/40b798efe3460797a4ac928ee2e038774e2758eb Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:35:43 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:33:32 +0200drivers: Remove BKL from
misc_open
misc_open()is already serialized withmisc_mtx. Remove the BKL locking which got there via the BKL pushdown.
Quoted 8 lines
NAK.
You can't simply assume the mutex is enough - you have to either push it down or review *every* possible called point below the
lock_kerneltake.In this case the open method of the misc devices below sometimes uses the BKL.
We did that and it's safe in nvram.c. If you know an unsafe please let us know.
Ingo
PATCH 6/28 drivers: Remove BKL from cs5535_gpio
In reply to Thomas GleixnerThe big BKL pushdown added cycle_kernel_lock(). There is nothing to wait for in this driver. Remove it.
--- drivers/char/cs5535_gpio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/char/cs5535_gpio.c +1 -2
@@ -17,7 +17,7 @@#include <linux/cdev.h> #include <linux/ioport.h> #include <linux/pci.h> -#include <linux/smp_lock.h> +#include <asm/uaccess.h> #include <asm/io.h>
@@ -158,7 +158,6 @@ static int cs5535_gpio_open(struct inode {u32 m =iminor (inode); -cycle_kernel_lock ();/* the mask says which pins are usable by this driver */ if ((mask & (1 << m)) ==0 )return -EINVAL ;
[tip:bkl/drivers] drivers: Remove BKL from cs5535_gpio
Commit-ID: a7e63bb5f08378620d913824ab42e49027f22194 Gitweb: http://git.kernel.org/tip/a7e63bb5f08378620d913824ab42e49027f22194 Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:35:48 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:36:48 +0200
drivers: Remove BKL from cs5535_gpio
The big BKL pushdown added cycle_kernel_lock(). There is nothing to wait for in this driver. Remove it.
LKML-Reference: <[email protected]>
--- drivers/char/cs5535_gpio.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/char/cs5535_gpio.c +1 -2
@@ -17,7 +17,7 @@#include <linux/cdev.h> #include <linux/ioport.h> #include <linux/pci.h> -#include <linux/smp_lock.h> +#include <asm/uaccess.h> #include <asm/io.h>
@@ -158,7 +158,6 @@ static int cs5535_gpio_open(struct inode *inode, struct file *file) {u32 m =iminor (inode); -cycle_kernel_lock ();/* the mask says which pins are usable by this driver */ if ((mask & (1 << m)) ==0 )return -EINVAL ;
PATCH 7/28 spi: Remove BKL from spidev_open
In reply to Thomas GleixnerThe BKL was added there with the big pushdown. Remove it as the code is serialized already.
--- drivers/spi/spidev.c | 3 --- 1 file changed, 3 deletions(-)
drivers/spi/spidev.c +0 -3
@@ -30,7 +30,6 @@#include <linux/errno.h> #include <linux/mutex.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/spi/spi.h> #include <linux/spi/spidev.h>
@@ -477,7 +476,6 @@ static int spidev_open(struct inode *inostruct spidev_data *spidev;int status = -ENXIO ; -lock_kernel ();mutex_lock (&device_list_lock);list_for_each_entry (spidev, &device_list, device_entry) {
@@ -503,7 +501,6 @@ static int spidev_open(struct inode *inopr_debug ("spidev: nothing for minor %d\n" ,iminor (inode));mutex_unlock (&device_list_lock); -unlock_kernel ();return status; }
[tip:bkl/drivers] spi: Remove BKL from spidev_open
Commit-ID: 4c2aedc2543248c3fdc8c06c662b589d36c93bbb Gitweb: http://git.kernel.org/tip/4c2aedc2543248c3fdc8c06c662b589d36c93bbb Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:35:52 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:36:48 +0200
spi: Remove BKL from spidev_open
The BKL was added there with the big pushdown. Remove it as the code is serialized already.
LKML-Reference: <[email protected]>
Cc: David Brownell <[email protected]>
--- drivers/spi/spidev.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
drivers/spi/spidev.c +0 -3
@@ -30,7 +30,6 @@#include <linux/errno.h> #include <linux/mutex.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/spi/spi.h> #include <linux/spi/spidev.h>
@@ -477,7 +476,6 @@ static int spidev_open(struct inode *inode, struct file *filp)struct spidev_data *spidev;int status = -ENXIO ; -lock_kernel ();mutex_lock (&device_list_lock);list_for_each_entry (spidev, &device_list, device_entry) {
@@ -503,7 +501,6 @@ static int spidev_open(struct inode *inode, struct file *filp)pr_debug ("spidev: nothing for minor %d\n" ,iminor (inode));mutex_unlock (&device_list_lock); -unlock_kernel ();return status; }
PATCH 8/28 x86: Remove BKL from apm_32
In reply to Thomas GleixnerThe lock/unlock kernel pair in do_open() got there with the BKL push down and protects nothing. Remove it.
Replace the lock/unlock kernel in the ioctl code with a mutex to protect standbys_pending and suspends_pending.
--- arch/x86/kernel/apm_32.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
arch/x86/kernel/apm_32.c +6 -8
@@ -204,7 +204,6 @@#include <linux/module.h> #include <linux/poll.h> -#include <linux/smp_lock.h> #include <linux/types.h> #include <linux/stddef.h> #include <linux/timer.h>
@@ -403,6 +402,7 @@ static DECLARE_WAIT_QUEUE_HEAD(apm_waitqstatic DECLARE_WAIT_QUEUE_HEAD (apm_suspend_waitqueue);static struct apm_user *user_list;static DEFINE_SPINLOCK (user_list_lock); +static DEFINE_MUTEX (apm_mutex);/* * Set up a segment that references the real mode segment 0x40
@@ -1531,7 +1531,7 @@ static long do_ioctl(struct file *filp,return -EPERM ;switch (cmd) {case APM_IOC_STANDBY : -lock_kernel (); +mutex_lock (&apm_mutex);if (as->standbys_read >0 ) { as->standbys_read--; as->standbys_pending--;
@@ -1540,10 +1540,10 @@ static long do_ioctl(struct file *filp,queue_event (APM_USER_STANDBY , as);if (standbys_pending <=0 )standby (); -unlock_kernel (); +mutex_unlock (&apm_mutex);break ;case APM_IOC_SUSPEND : -lock_kernel (); +mutex_lock (&apm_mutex);if (as->suspends_read >0 ) { as->suspends_read--; as->suspends_pending--;
@@ -1552,13 +1552,14 @@ static long do_ioctl(struct file *filp,queue_event (APM_USER_SUSPEND , as);if (suspends_pending <=0 ) { ret =suspend (1 ); +mutex_unlock (&apm_mutex); }else { as->suspend_wait =1 ; +mutex_unlock (&apm_mutex);wait_event_interruptible (apm_suspend_waitqueue, as->suspend_wait ==0 ); ret = as->suspend_result; } -unlock_kernel ();return ret;default :return -ENOTTY ;
@@ -1608,12 +1609,10 @@ static int do_open(struct inode *inode, {struct apm_user *as; -lock_kernel (); as =kmalloc (sizeof (*as),GFP_KERNEL );if (as ==NULL ) {printk (KERN_ERR "apm: cannot allocate struct of size %d bytes\n" ,sizeof (*as)); -unlock_kernel ();return -ENOMEM ; } as->magic =APM_BIOS_MAGIC ;
@@ -1635,7 +1634,6 @@ static int do_open(struct inode *inode, user_list = as;spin_unlock (&user_list_lock); filp->private_data = as; -unlock_kernel ();return 0 ; }
[tip:x86/cleanups] x86: Remove BKL from apm_32
Commit-ID: 05d86412eab6a18cf57697474cc4f8fbfcd6936f Gitweb: http://git.kernel.org/tip/05d86412eab6a18cf57697474cc4f8fbfcd6936f Author: Thomas Gleixner <[email protected]> AuthorDate: Fri, 9 Oct 2009 19:02:20 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:04:48 +0200
x86: Remove BKL from apm_32
The lock/unlock kernel pair in do_open() got there with the BKL push down and protects nothing. Remove it.
Replace the lock/unlock kernel in the ioctl code with a mutex to protect standbys_pending and suspends_pending.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/apm_32.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-)
arch/x86/kernel/apm_32.c +6 -8
@@ -204,7 +204,6 @@#include <linux/module.h> #include <linux/poll.h> -#include <linux/smp_lock.h> #include <linux/types.h> #include <linux/stddef.h> #include <linux/timer.h>
@@ -403,6 +402,7 @@ static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue);static DECLARE_WAIT_QUEUE_HEAD (apm_suspend_waitqueue);static struct apm_user *user_list;static DEFINE_SPINLOCK (user_list_lock); +static DEFINE_MUTEX (apm_mutex);/* * Set up a segment that references the real mode segment 0x40
@@ -1531,7 +1531,7 @@ static long do_ioctl(struct file *filp, u_int cmd, u_long arg)return -EPERM ;switch (cmd) {case APM_IOC_STANDBY : -lock_kernel (); +mutex_lock (&apm_mutex);if (as->standbys_read >0 ) { as->standbys_read--; as->standbys_pending--;
@@ -1540,10 +1540,10 @@ static long do_ioctl(struct file *filp, u_int cmd, u_long arg)queue_event (APM_USER_STANDBY , as);if (standbys_pending <=0 )standby (); -unlock_kernel (); +mutex_unlock (&apm_mutex);break ;case APM_IOC_SUSPEND : -lock_kernel (); +mutex_lock (&apm_mutex);if (as->suspends_read >0 ) { as->suspends_read--; as->suspends_pending--;
@@ -1552,13 +1552,14 @@ static long do_ioctl(struct file *filp, u_int cmd, u_long arg)queue_event (APM_USER_SUSPEND , as);if (suspends_pending <=0 ) { ret =suspend (1 ); +mutex_unlock (&apm_mutex); }else { as->suspend_wait =1 ; +mutex_unlock (&apm_mutex);wait_event_interruptible (apm_suspend_waitqueue, as->suspend_wait ==0 ); ret = as->suspend_result; } -unlock_kernel ();return ret;default :return -ENOTTY ;
@@ -1608,12 +1609,10 @@ static int do_open(struct inode *inode, struct file *filp) {struct apm_user *as; -lock_kernel (); as =kmalloc (sizeof (*as),GFP_KERNEL );if (as ==NULL ) {printk (KERN_ERR "apm: cannot allocate struct of size %d bytes\n" ,sizeof (*as)); -unlock_kernel ();return -ENOMEM ; } as->magic =APM_BIOS_MAGIC ;
@@ -1635,7 +1634,6 @@ static int do_open(struct inode *inode, struct file *filp) user_list = as;spin_unlock (&user_list_lock); filp->private_data = as; -unlock_kernel ();return 0 ; }
PATCH 9/28 sys: Remove BKL from sys_reboot
In reply to Thomas GleixnerSerialization of sys_reboot can be done local. The BKL is not protecting anything else.
--- kernel/sys.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
kernel/sys.c +7 -7
@@ -8,7 +8,6 @@#include <linux/mm.h> #include <linux/utsname.h> #include <linux/mman.h> -#include <linux/smp_lock.h> #include <linux/notifier.h> #include <linux/reboot.h> #include <linux/prctl.h>
@@ -349,6 +348,9 @@ void kernel_power_off(void)machine_power_off (); }EXPORT_SYMBOL_GPL (kernel_power_off); + +static DEFINE_MUTEX (reboot_mutex); +/* * Reboot system call: for obvious reasons only root may call it, * and even root needs to set up some magic numbers in the registers
@@ -381,7 +383,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, intif ((cmd ==LINUX_REBOOT_CMD_POWER_OFF ) && !pm_power_off) cmd =LINUX_REBOOT_CMD_HALT ; -lock_kernel (); +mutex_lock (&reboot_mutex);switch (cmd) {case LINUX_REBOOT_CMD_RESTART :kernel_restart (NULL );
@@ -397,20 +399,18 @@ SYSCALL_DEFINE4(reboot, int, magic1, intcase LINUX_REBOOT_CMD_HALT :kernel_halt (); -unlock_kernel ();do_exit (0 );panic ("cannot halt" );case LINUX_REBOOT_CMD_POWER_OFF :kernel_power_off (); -unlock_kernel ();do_exit (0 );break ;case LINUX_REBOOT_CMD_RESTART2 :if (strncpy_from_user (&buffer[0 ], arg,sizeof (buffer) -1 ) <0 ) { -unlock_kernel (); -return -EFAULT ; + ret = -EFAULT ; +break ; } buffer[sizeof (buffer) -1 ] ='\0' ;
@@ -433,7 +433,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int ret = -EINVAL ;break ; } -unlock_kernel (); +mutex_unlock (&reboot_mutex);return ret; }
[tip:bkl/core] sys: Remove BKL from sys_reboot
Commit-ID: 6f15fa50087c8317e353145319466afbeb27a75d Gitweb: http://git.kernel.org/tip/6f15fa50087c8317e353145319466afbeb27a75d Author: Thomas Gleixner <[email protected]> AuthorDate: Fri, 9 Oct 2009 20:31:33 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 15:31:10 +0200
sys: Remove BKL from sys_reboot
Serialization of sys_reboot can be done local. The BKL is not protecting anything else.
LKML-Reference: <[email protected]>
--- kernel/sys.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
kernel/sys.c +7 -7
@@ -8,7 +8,6 @@#include <linux/mm.h> #include <linux/utsname.h> #include <linux/mman.h> -#include <linux/smp_lock.h> #include <linux/notifier.h> #include <linux/reboot.h> #include <linux/prctl.h>
@@ -349,6 +348,9 @@ void kernel_power_off(void)machine_power_off (); }EXPORT_SYMBOL_GPL (kernel_power_off); + +static DEFINE_MUTEX (reboot_mutex); +/* * Reboot system call: for obvious reasons only root may call it, * and even root needs to set up some magic numbers in the registers
@@ -381,7 +383,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,if ((cmd ==LINUX_REBOOT_CMD_POWER_OFF ) && !pm_power_off) cmd =LINUX_REBOOT_CMD_HALT ; -lock_kernel (); +mutex_lock (&reboot_mutex);switch (cmd) {case LINUX_REBOOT_CMD_RESTART :kernel_restart (NULL );
@@ -397,20 +399,18 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,case LINUX_REBOOT_CMD_HALT :kernel_halt (); -unlock_kernel ();do_exit (0 );panic ("cannot halt" );case LINUX_REBOOT_CMD_POWER_OFF :kernel_power_off (); -unlock_kernel ();do_exit (0 );break ;case LINUX_REBOOT_CMD_RESTART2 :if (strncpy_from_user (&buffer[0 ], arg,sizeof (buffer) -1 ) <0 ) { -unlock_kernel (); -return -EFAULT ; + ret = -EFAULT ; +break ; } buffer[sizeof (buffer) -1 ] ='\0' ;
@@ -433,7 +433,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd, ret = -EINVAL ;break ; } -unlock_kernel (); +mutex_unlock (&reboot_mutex);return ret; }
PATCH 10/28 mem_class: Drop the bkl from memory_open()
In reply to Thomas GleixnerThe generic open callback for the mem class devices is "protected" by the bkl.
Let's look at the datas manipulated inside memory_open:
- inode and file: safe
- the devlist: safe because it is constant
- the memdev classes inside this array are safe too (constant)
After we find out which memdev file operation we need to use, we call its open callback. Depending on the targeted memdev, we call either open_port() that doesn't manipulate any racy data (just a capable() check), or we call nothing.
So it's safe to remove the big kernel lock there.
LKML-Reference: <[email protected]>
--- drivers/char/mem.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
drivers/char/mem.c +5 -12
@@ -26,7 +26,6 @@#include <linux/bootmem.h> #include <linux/splice.h> #include <linux/pfn.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> #include <asm/io.h>
@@ -892,29 +891,23 @@ static int memory_open(struct inode *ino {int minor;const struct memdev *dev; -int ret = -ENXIO ; - -lock_kernel (); minor =iminor (inode);if (minor >=ARRAY_SIZE (devlist)) - goto out; +return -ENXIO ; dev = &devlist[minor];if (!dev->fops) - goto out; +return -ENXIO ; filp->f_op = dev->fops;if (dev->dev_info) filp->f_mapping->backing_dev_info = dev->dev_info;if (dev->fops->open) - ret = dev->fops->open (inode, filp); -else - ret =0 ; -out: -unlock_kernel (); -return ret; +return dev->fops->open (inode, filp); + +return 0 ; }static const struct file_operations memory_fops = {
PATCH 11/28 nvram: Drop the bkl from nvram_llseek()
In reply to Thomas GleixnerThere is nothing to protect inside nvram_llseek(), the file offset doesn't need to be protected and nvram_len is only initialized from an __init path.
It's safe to remove the big kernel lock there.
LKML-Reference: <[email protected]>
--- drivers/char/generic_nvram.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/char/generic_nvram.c +3 -6
@@ -19,7 +19,6 @@#include <linux/miscdevice.h> #include <linux/fcntl.h> #include <linux/init.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> #include <asm/nvram.h> #ifdef CONFIG_PPC_PMAC
@@ -32,7 +31,6 @@ static ssize_t nvram_len;static loff_t nvram_llseek (struct file *file,loff_t offset,int origin) { -lock_kernel ();switch (origin) {case 1 : offset += file->f_pos;
@@ -41,12 +39,11 @@ static loff_t nvram_llseek(struct file * offset += nvram_len;break ; } -if (offset <0 ) { -unlock_kernel (); +if (offset <0 )return -EINVAL ; - } + file->f_pos = offset; -unlock_kernel (); +return file->f_pos; }
Re: [patch 11/28] nvram: Drop the bkl from nvram_llseek()
Quoted 6 lines · Thomas Gleixner
There is nothing to protect inside
nvram_llseek(), the file offset doesn't need to be protected andnvram_lenis only initialized from an__initpath.It's safe to remove the big kernel lock there.
The generic_nvram driver still uses ->ioctl instead of ->unlocked_ioctl. I guess it would be helpful to change that in the same series, so we don't get the BKL back as soon as someone does a pushdown into the remaining ioctl functions.
Arnd <><
Re: [patch 11/28] nvram: Drop the bkl from nvram_llseek()
Quoted 8 lines · Arnd Bergmann
Quoted 6 lines · Thomas Gleixner
There is nothing to protect inside
nvram_llseek(), the file offset doesn't need to be protected andnvram_lenis only initialized from an__initpath.It's safe to remove the big kernel lock there.
Quoted 6 lines
The
generic_nvramdriver still uses ->ioctl instead of ->unlocked_ioctl. I guess it would be helpful to change that in the same series, so we don't get the BKL back as soon as someone does a pushdown into the remaining ioctl functions.Arnd <><
Right!
I'll add that in a second patch.
I've completely forgotten this ioctl/unlocked_ioctl thing.
Re: [patch 11/28] nvram: Drop the bkl from nvram_llseek()
Quoted 14 lines · Frederic Weisbecker
Quoted 13 lines · Arnd Bergmann
Quoted 6 lines · Thomas Gleixner
There is nothing to protect inside
nvram_llseek(), the file offset doesn't need to be protected andnvram_lenis only initialized from an__initpath.It's safe to remove the big kernel lock there.
The
generic_nvramdriver still uses ->ioctl instead of ->unlocked_ioctl. I guess it would be helpful to change that in the same series, so we don't get the BKL back as soon as someone does a pushdown into the remaining ioctl functions.
Quoted 7 lines
Quoted 1 line
Arnd <><Right!
I'll add that in a second patch.I've completely forgotten this ioctl/unlocked_ioctl thing.
BTW, I was focusing on the lock_kernel() callsites in the kernel which are around 626 (I've excluded reiserfs)
Now I'm adding the ioctl() sites too:
git-grep "\.ioctl *=" | grep -P "^\S+\.c" | wc -l
452
Hehe :)
Re: [patch 11/28] nvram: Drop the bkl from nvram_llseek()
Quoted 6 lines · Frederic Weisbecker
Now I'm adding the
ioctl()sites too:git-grep "\.ioctl *=" | grep -P "^\S+\.c" | wc -l
452Hehe :)
Not all of them, fortunately.
There are various *_operations structures that have a .ioctl pointer. While there are a lot of struct file_operations with a locked .ioctl operation, stuff like block_device_operations does not hold the BKL in .ioctl but in .locked_ioctl.
Arnd <><
Re: [patch 11/28] nvram: Drop the bkl from nvram_llseek()
Quoted 8 lines · Arnd Bergmann
Quoted 6 lines · Frederic Weisbecker
Now I'm adding the
ioctl()sites too:git-grep "\.ioctl *=" | grep -P "^\S+\.c" | wc -l
452Hehe :)
Quoted 8 lines
Not all of them, fortunately.
There are various
*_operationsstructures that have a .ioctl pointer. While there are a lot of structfile_operationswith a locked .ioctl operation, stuff likeblock_device_operationsdoes not hold the BKL in .ioctl but in .locked_ioctl.Arnd <><
Oh right. Thanks for the tip.
Re: [patch 11/28] nvram: Drop the bkl from nvram_llseek()
Quoted 9 lines · Frederic Weisbecker
Quoted 5 lines · Arnd Bergmann
There are various
*_operationsstructures that have a .ioctl pointer. While there are a lot of structfile_operationswith a locked .ioctl operation, stuff likeblock_device_operationsdoes not hold the BKL in .ioctl but in .locked_ioctl.Oh right. Thanks for the tip.
FWIW, I've done a grep through the current source tree, this should be the full list of all .ioctl methods in struct file_operations, a total of 141 instances in 2.6.32-rc4.
When we do a pushdown of the BKL into these functions, we can kill off the file operation.
Arnd <><
arch/blackfin/mach-bf561/coreb.c: .ioctl = coreb_ioctl,arch/cris/arch-v10/drivers/ds1302.c: .ioctl = rtc_ioctl,arch/cris/arch-v10/drivers/gpio.c: .ioctl = gpio_ioctl,arch/cris/arch-v10/drivers/i2c.c: .ioctl = i2c_ioctl,arch/cris/arch-v10/drivers/pcf8563.c: .ioctl = pcf8563_ioctl,arch/cris/arch-v10/drivers/sync_serial.c: .ioctl = sync_serial_ioctl,arch/cris/arch-v32/drivers/cryptocop.c: .ioctl = cryptocop_ioctlarch/cris/arch-v32/drivers/i2c.c: .ioctl = i2c_ioctl,arch/cris/arch-v32/drivers/mach-a3/gpio.c: .ioctl = gpio_ioctl,arch/cris/arch-v32/drivers/mach-fs/gpio.c: .ioctl = gpio_ioctl,arch/cris/arch-v32/drivers/pcf8563.c: .ioctl = pcf8563_ioctlarch/cris/arch-v32/drivers/sync_serial.c: .ioctl = sync_serial_ioctl,arch/ia64/kernel/perfmon.c: .ioctl = pfm_ioctl,arch/ia64/sn/kernel/sn2/sn_hwperf.c: .ioctl = sn_hwperf_ioctl,arch/m68k/bvme6000/rtc.c: .ioctl = rtc_ioctl,arch/m68k/mvme16x/rtc.c: .ioctl = rtc_ioctl,arch/powerpc/kernel/nvram_64.c: .ioctl = dev_nvram_ioctl,arch/sh/boards/mach-landisk/gio.c: .ioctl = gio_ioctl, /* ioctl */arch/um/drivers/harddog_kern.c: .ioctl = harddog_ioctl,arch/um/drivers/hostaudio_kern.c: .ioctl = hostaudio_ioctl,arch/um/drivers/mmapper_kern.c: .ioctl = mmapper_ioctl,drivers/block/pktcdvd.c: .ioctl = pkt_ctl_ioctl,drivers/bluetooth/hci_vhci.c: .ioctl = vhci_ioctl,drivers/char/apm-emulation.c: .ioctl = apm_ioctl,drivers/char/applicom.c: .ioctl = ac_ioctl,drivers/char/ds1620.c: .ioctl = ds1620_ioctl,drivers/char/dtlk.c: .ioctl = dtlk_ioctl,drivers/char/nvram.c: .ioctl = nvram_ioctl,drivers/char/generic_nvram.c: .ioctl = nvram_ioctl,drivers/char/genrtc.c: .ioctl = gen_rtc_ioctl,drivers/char/hpet.c: .ioctl = hpet_ioctl,drivers/char/i8k.c: .ioctl = i8k_ioctl,drivers/char/ipmi/ipmi_devintf.c: .ioctl = ipmi_ioctl,drivers/char/ipmi/ipmi_watchdog.c: .ioctl = ipmi_ioctl,drivers/char/istallion.c: .ioctl = stli_memioctl,drivers/char/lp.c: .ioctl = lp_ioctl,drivers/char/nwflash.c: .ioctl = flash_ioctl,drivers/char/raw.c: .ioctl = raw_ioctl,drivers/char/sonypi.c: .ioctl = sonypi_misc_ioctl,drivers/char/stallion.c: .ioctl = stl_memioctl,drivers/char/toshiba.c: .ioctl = tosh_ioctl,drivers/gpu/drm/i810/i810_dma.c: .ioctl = drm_ioctl,drivers/gpu/drm/i810/i810_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/i830/i830_dma.c: .ioctl = drm_ioctl,drivers/gpu/drm/i830/i830_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/i915/i915_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/mga/mga_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/r128/r128_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/radeon/radeon_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/radeon/radeon_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/savage/savage_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/sis/sis_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/tdfx/tdfx_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/via/via_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/i810/i810_dma.c: .ioctl = drm_ioctl,drivers/gpu/drm/i810/i810_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/i830/i830_dma.c: .ioctl = drm_ioctl,drivers/gpu/drm/i830/i830_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/i915/i915_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/mga/mga_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/r128/r128_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/radeon/radeon_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/radeon/radeon_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/savage/savage_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/sis/sis_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/tdfx/tdfx_drv.c: .ioctl = drm_ioctl,drivers/gpu/drm/via/via_drv.c: .ioctl = drm_ioctl,drivers/hwmon/fschmd.c: .ioctl = watchdog_ioctl,drivers/ide/ide-tape.c: .ioctl = idetape_chrdev_ioctl,drivers/input/misc/hp_sdc_rtc.c: .ioctl = hp_sdc_rtc_ioctl,drivers/isdn/capi/capi.c: .ioctl = capi_ioctl,drivers/isdn/divert/divert_procfs.c: .ioctl = isdn_divert_ioctl,drivers/isdn/i4l/isdn_common.c: .ioctl = isdn_ioctl,drivers/isdn/mISDN/timerdev.c: .ioctl = mISDN_ioctl,drivers/macintosh/ans-lcd.c: .ioctl = anslcd_ioctl,drivers/macintosh/nvram.c: .ioctl = nvram_ioctl,drivers/macintosh/via-pmu.c: .ioctl = pmu_ioctl,drivers/media/dvb/dvb-core/dmxdev.c: .ioctl = dvb_demux_ioctl,drivers/media/dvb/dvb-core/dmxdev.c: .ioctl = dvb_dvr_ioctl,drivers/media/dvb/dvb-core/dvb_ca_en50221.c: .ioctl = dvb_ca_en50221_io_ioctl,drivers/media/dvb/dvb-core/dvb_net.c: .ioctl = dvb_net_ioctl,drivers/media/dvb/dvb-core/dvb_frontend.c: .ioctl = dvb_generic_ioctl,drivers/media/dvb/firewire/firedtv-ci.c: .ioctl = dvb_generic_ioctl,drivers/media/dvb/ttpci/av7110.c: .ioctl = dvb_generic_ioctl,drivers/media/dvb/ttpci/av7110_av.c: .ioctl = dvb_generic_ioctl,drivers/media/dvb/ttpci/av7110_av.c: .ioctl = dvb_generic_ioctl,drivers/media/dvb/ttpci/av7110_ca.c: .ioctl = dvb_generic_ioctl,drivers/message/i2o/i2o_config.c: .ioctl = i2o_cfg_ioctl,drivers/mtd/mtdchar.c: .ioctl = mtd_ioctl,drivers/net/wan/cosa.c: .ioctl = cosa_chardev_ioctl,drivers/parisc/eisa_eeprom.c: .ioctl = eisa_eeprom_ioctl,drivers/pcmcia/pcmcia_ioctl.c: .ioctl = ds_ioctl,drivers/rtc/rtc-m41t80.c: .ioctl = wdt_ioctl,drivers/s390/char/tape_char.c: .ioctl = tapechar_ioctl,drivers/s390/char/vmwatchdog.c: .ioctl = &vmwdt_ioctl,drivers/sbus/char/openprom.c: .ioctl = openprom_ioctl,drivers/scsi/3w-9xxx.c: .ioctl = twa_chrdev_ioctl,drivers/scsi/3w-xxxx.c: .ioctl = tw_chrdev_ioctl,drivers/scsi/aacraid/linit.c: .ioctl = aac_cfg_ioctl,drivers/scsi/dpt_i2o.c: .ioctl = adpt_ioctl,drivers/scsi/gdth.c: .ioctl = gdth_ioctl,drivers/scsi/megaraid.c: .ioctl = megadev_ioctl,drivers/scsi/megaraid/megaraid_mm.c: .ioctl = mraid_mm_ioctl,drivers/scsi/osst.c: .ioctl = osst_ioctl,drivers/scsi/sg.c: .ioctl = sg_ioctl,drivers/staging/comedi/comedi_fops.c: .ioctl = comedi_ioctl,drivers/staging/poch/poch.c: .ioctl = poch_ioctl,drivers/staging/sep/sep_driver.c: .ioctl = sep_ioctl,drivers/staging/vme/devices/vme_user.c: .ioctl = vme_user_ioctl,drivers/usb/core/devio.c: .ioctl = usbdev_ioctl,drivers/usb/mon/mon_bin.c: .ioctl = mon_bin_ioctl,fs/autofs/root.c: .ioctl = autofs_root_ioctl,fs/autofs4/root.c: .ioctl = autofs4_root_ioctl,fs/coda/pioctl.c: .ioctl = coda_pioctl,fs/coda/psdev.c: .ioctl = coda_psdev_ioctl,fs/ecryptfs/file.c: .ioctl = ecryptfs_ioctl,fs/ecryptfs/file.c: .ioctl = ecryptfs_ioctl,fs/fat/dir.c: .ioctl = fat_dir_ioctl,fs/fat/file.c: .ioctl = fat_generic_ioctl,fs/hfsplus/dir.c: .ioctl = hfsplus_ioctl,fs/hfsplus/inode.c: .ioctl = hfsplus_ioctl,fs/ncpfs/dir.c: .ioctl = ncp_ioctl,fs/ncpfs/file.c: .ioctl = ncp_ioctl,fs/reiserfs/dir.c: .ioctl = reiserfs_ioctl,fs/reiserfs/file.c: .ioctl = reiserfs_ioctl,fs/smbfs/dir.c: .ioctl = smb_ioctl,fs/smbfs/file.c: .ioctl = smb_ioctl,fs/udf/dir.c: .ioctl = udf_ioctl,fs/udf/file.c: .ioctl = udf_ioctl,
net/sunrpc/cache.c: .ioctl = cache_ioctl_procfs, /* for FIONREAD */ net/sunrpc/cache.c: .ioctl = cache_ioctl_pipefs, /* for FIONREAD */
net/sunrpc/rpc_pipe.c: .ioctl = rpc_pipe_ioctl,sound/oss/dmasound/dmasound_core.c: .ioctl = mixer_ioctl,sound/oss/dmasound/dmasound_core.c: .ioctl = sq_ioctl,sound/oss/msnd_pinnacle.c: .ioctl = dev_ioctl,sound/oss/sh_dac_audio.c: .ioctl = dac_audio_ioctl,sound/oss/soundcard.c: .ioctl = sound_ioctl,sound/oss/swarm_cs4297a.c: .ioctl = cs4297a_ioctl_mixdev,sound/oss/swarm_cs4297a.c: .ioctl = cs4297a_ioctl,sound/oss/vwsnd.c: .ioctl = vwsnd_audio_ioctl,sound/oss/vwsnd.c: .ioctl = vwsnd_mixer_ioctl,
Re: [patch 11/28] nvram: Drop the bkl from nvram_llseek()
Quoted 15 lines · Arnd Bergmann
Quoted 9 lines · Frederic Weisbecker
Quoted 5 lines · Arnd Bergmann
There are various
*_operationsstructures that have a .ioctl pointer. While there are a lot of structfile_operationswith a locked .ioctl operation, stuff likeblock_device_operationsdoes not hold the BKL in .ioctl but in .locked_ioctl.Oh right. Thanks for the tip.
FWIW, I've done a grep through the current source tree, this should be the full list of all .ioctl methods in struct
file_operations, a total of 141 instances in 2.6.32-rc4.
Quoted 6 lines
When we do a pushdown of the BKL into these functions, we can kill off the file operation.
Arnd <><
arch/blackfin/mach-bf561/coreb.c: .ioctl =coreb_ioctl,
That one is scary. The BKL is protecting against parallel ioctl operations, but the operation on the sys control registers is not protected against other operations on the same registers in arch/blackfin/mach-bf561/smp.c. IPI code does not take the BKL afaict. Mike ?
Thanks,
tglx
PATCH 1/1 generic_nvram: Turn nvram_ioctl into an unlocked ioctl
In reply to Arnd Bergmannnvram_ioctl is a bkl locked ioctl, but it can be an unlocked ioctl.
- part is provided by the user
- offset is provided by pmac_get_partition() which is safe as it only touches nvram_partitions, an array inistialized on __init time and read-only the rest of the time.
- nvram_sync() only relies on core99_nvram_sync() which checks is_core_99, nvram_data, nvram_image. Those are variables initialized on __init time only and their direct values are not touched further. The rest modifies the nvram image header, protected by nv_lock already.
So it's safe to call nvram_ioctl without the big kernel lock held.
--- drivers/char/generic_nvram.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/char/generic_nvram.c +5 -5
@@ -118,11 +118,11 @@ static int nvram_ioctl(struct inode *inode, struct file *file, }const struct file_operations nvram_fops = { - .owner =THIS_MODULE , - .llseek = nvram_llseek, - .read = read_nvram, - .write = write_nvram, - .ioctl = nvram_ioctl, + .owner =THIS_MODULE , + .llseek = nvram_llseek, + .read = read_nvram, + .write = write_nvram, + .unlocked_ioctl = nvram_ioctl, };static struct miscdevice nvram_dev = {
Signature · 1 line
1.6.2.3
Re: [PATCH] generic_nvram: Turn nvram_ioctl into an unlocked ioctl
Quoted 14 lines · Frederic Weisbecker
nvram_ioctlis a bkl locked ioctl, but it can be an unlocked ioctl.- part is provided by the user
- offset is provided bypmac_get_partition()which is safe as it only touchesnvram_partitions, an array inistialized on__inittime and read-only the rest of the time.
-nvram_sync()only relies oncore99_nvram_sync()which checksis_core_99,nvram_data,nvram_image. Those are variables initialized on__inittime only and their direct values are not touched further. The rest modifies the nvram image header, protected bynv_lockalready.So it's safe to call
nvram_ioctlwithout the big kernel lock held.
Quoted 10 lines
Reported-by Arnd Bergmann <[email protected]>Signed-off-by Frederic Weisbecker <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc John Kacur <[email protected]>Cc Sven-Thorsten Dietrich <[email protected]>Cc Jonathan Corbet <[email protected]>Cc Alessio Igor Bogani <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Alan Cox <[email protected]>
Hmm, I wish I had not started using the gmail MTA for sending out mail, not that address is public forever.
Quoted 14 lines
drivers/char/generic_nvram.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)drivers/char/generic_nvram.c +0
-3@@ -118,11 +118,11 @@ static int nvram_ioctl(struct inode *inode, struct file *file, }const struct file_operations nvram_fops = { - .owner =THIS_MODULE , - .llseek = nvram_llseek, - .read = read_nvram,
drivers/char/generic_nvram.c static int nvram_ioctl(struct inode *inode, struct file *file, · line 128
Quoted 10 lines
drivers/char/generic_nvram.c +5
-2- .write = write_nvram, - .ioctl = nvram_ioctl, + .owner = THIS_MODULE, + .llseek = nvram_llseek, + .read = read_nvram, + .write = write_nvram, + .unlocked_ioctl = nvram_ioctl, };static struct miscdevice nvram_dev = {
The ioctl and unlocked_ioctl functions have a different signature, so you need to adapt that, not just rename it.
Not sure if we should do it in the same patch, but this driver should also have a compat_ioctl method pointing to the same function. The ioctl numbers in this driver are all 32/64 bit clean, but are not listed in fs/compat_ioctl.c, so adding a .compat_ioctl pointer is the easiest way to fix 32 bit userland accessing the device.
Arnd <><
PATCH v2 1/1 generic_nvram: Turn nvram_ioctl into an unlocked ioctl
nvram_ioctl is a bkl locked ioctl, but it can be an unlocked ioctl.
- part is provided by the user
- offset is provided by pmac_get_partition() which is safe as it only touches nvram_partitions, an array inistialized on __init time and read-only the rest of the time.
- nvram_sync() only relies on core99_nvram_sync() which checks is_core_99, nvram_data, nvram_image. Those are variables initialized on __init time only and their direct values are not touched further. The rest modifies the nvram image header, protected by nv_lock already.
So it's safe to call nvram_ioctl without the big kernel lock held.
v2: Fix nvram_ioctl to fit unlocked_ioctl signature.
--- drivers/char/generic_nvram.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-)
drivers/char/generic_nvram.c +6 -7
@@ -85,8 +85,7 @@ static ssize_t write_nvram(struct file *file, const char __user *buf,return p - buf; } -static int nvram_ioctl (struct inode *inode,struct file *file, -unsigned int cmd,unsigned long arg) +static int nvram_ioctl (struct file *file,unsigned int cmd,unsigned long arg) {switch (cmd) {#ifdef CONFIG_PPC_PMAC
@@ -118,11 +117,11 @@ static int nvram_ioctl(struct inode *inode, struct file *file, }const struct file_operations nvram_fops = { - .owner =THIS_MODULE , - .llseek = nvram_llseek, - .read = read_nvram, - .write = write_nvram, - .ioctl = nvram_ioctl, + .owner =THIS_MODULE , + .llseek = nvram_llseek, + .read = read_nvram, + .write = write_nvram, + .unlocked_ioctl = nvram_ioctl, };static struct miscdevice nvram_dev = {
Signature · 1 line
1.6.2.3
Re: [PATCH] generic_nvram: Turn nvram_ioctl into an unlocked ioctl
In reply to Arnd BergmannQuoted 26 lines · Arnd Bergmann
Quoted 14 lines · Frederic Weisbecker
nvram_ioctlis a bkl locked ioctl, but it can be an unlocked ioctl.- part is provided by the user
- offset is provided bypmac_get_partition()which is safe as it only touchesnvram_partitions, an array inistialized on__inittime and read-only the rest of the time.
-nvram_sync()only relies oncore99_nvram_sync()which checksis_core_99,nvram_data,nvram_image. Those are variables initialized on__inittime only and their direct values are not touched further. The rest modifies the nvram image header, protected bynv_lockalready.So it's safe to call
nvram_ioctlwithout the big kernel lock held.Quoted 10 lines
Reported-by Arnd Bergmann <[email protected]>Signed-off-by Frederic Weisbecker <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc John Kacur <[email protected]>Cc Sven-Thorsten Dietrich <[email protected]>Cc Jonathan Corbet <[email protected]>Cc Alessio Igor Bogani <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Alan Cox <[email protected]>
Quoted 2 lines
Hmm, I wish I had not started using the gmail MTA for sending out mail, not that address is public forever.
Sorry, didn't know about that. I'm then taking Arnd Bergmann <[email protected]> found in the MAINTAINER file for the v2 patch.
Quoted 23 lines
Quoted 23 lines
drivers/char/generic_nvram.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)drivers/char/generic_nvram.c +5
-5@@ -118,11 +118,11 @@ static int nvram_ioctl(struct inode *inode, struct file *file, }const struct file_operations nvram_fops = { - .owner =THIS_MODULE , - .llseek = nvram_llseek, - .read = read_nvram, - .write = write_nvram, - .ioctl = nvram_ioctl, + .owner =THIS_MODULE , + .llseek = nvram_llseek, + .read = read_nvram, + .write = write_nvram, + .unlocked_ioctl = nvram_ioctl, };
Quoted 4 lines
drivers/char/generic_nvram.c static int nvram_ioctl(struct inode *inode, struct file *file, · line 128
Quoted 1 line
drivers/char/generic_nvram.c +0
-0static struct miscdevice nvram_dev = {The ioctl and
unlocked_ioctlfunctions have a different signature, so you need to adapt that, not just rename it.
Hmm, that's the problem with this file I can't event build test. I really should grab a cross compiler for powerpc targets.
Quoted 8 lines
Not sure if we should do it in the same patch, but this driver should also have a
compat_ioctlmethod pointing to the same function. The ioctl numbers in this driver are all 32/64 bit clean, but are not listed infs/compat_ioctl.c, so adding a .compat_ioctl pointer is the easiest way to fix 32 bit userland accessing the device.Arnd <><
Added in my todolist then, for a saperate patch because it fixes another issue.
Thanks!
Arnd Bergmann
maintainerRe: [PATCH] generic_nvram: Turn nvram_ioctl into an unlocked ioctl
Quoted 2 lines · Frederic Weisbecker
Sorry, didn't know about that. I'm then taking Arnd Bergmann <[email protected]> found in the MAINTAINER file for the v2 patch.
Sure, there's no way you could have known about this. Vger started rejecting mail from my usual MTA last week, so until I've found a solution for that I have to use another MTA, but I didn't realize that gmail rewrites the
From: headers...
Arnd <><
PATCH 12/28 nvram: Drop the bkl from non-generic nvram_llseek()
In reply to Thomas GleixnerDrop the bkl from nvram_llseek() as it obviously protects nothing. The file offset is safe in essence.
LKML-Reference: <[email protected]>
--- drivers/char/nvram.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/char/nvram.c +1 -3
@@ -38,7 +38,6 @@#define NVRAM_VERSION "1.3"#include <linux/module.h> -#include <linux/smp_lock.h> #include <linux/nvram.h> #define PC 1
@@ -214,7 +213,6 @@ void nvram_set_checksum(void)static loff_t nvram_llseek (struct file *file,loff_t offset,int origin) { -lock_kernel ();switch (origin) {case 0 :/* nothing to do */
@@ -226,7 +224,7 @@ static loff_t nvram_llseek(struct file * offset +=NVRAM_BYTES ;break ; } -unlock_kernel (); +return (offset >=0 ) ? (file->f_pos = offset) : -EINVAL ; }
PATCH 13/28 s390: Remove BKL from prng
In reply to Thomas Gleixnercycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it.
--- arch/s390/crypto/prng.c | 2 -- 1 file changed, 2 deletions(-)
arch/s390/crypto/prng.c +0 -2
@@ -6,7 +6,6 @@#include <linux/fs.h> #include <linux/init.h> #include <linux/kernel.h> -#include <linux/smp_lock.h> #include <linux/miscdevice.h> #include <linux/module.h> #include <linux/moduleparam.h>
@@ -49,7 +48,6 @@ static unsigned char parm_block[32] = {static int prng_open (struct inode *inode,struct file *file) { -cycle_kernel_lock ();return nonseekable_open (inode, file); }
Re: [patch 13/28] s390: Remove BKL from prng
Quoted 4 lines · Thomas Gleixner
einfaches Textdokument attachment (s390-remove-bkl-from-prng.patch)
cycle_kernel_lock()was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it.
Looks good.
Acked-by: Jan Glauber <jang.linux.vnet.ibm.com>
-- Jan
Quoted 33 lines
Signed-off-by Thomas Gleixner <[email protected]>Cc Martin Schwidefsky <[email protected]>--- arch/s390/crypto/prng.c | 2 -- 1 file changed, 2 deletions(-)Index:
linux-2.6-tip/arch/s390/crypto/prng.c
===================================================================arch/s390/crypto/prng.c +0
-3@@ -6,7 +6,6 @@#include <linux/fs.h> #include <linux/init.h> #include <linux/kernel.h> -#include <linux/smp_lock.h> #include <linux/miscdevice.h> #include <linux/module.h> #include <linux/moduleparam.h> @@ -49,7 +48,6 @@ static unsigned char parm_block[32] = {static int prng_open (struct inode *inode,struct file *file) { -cycle_kernel_lock ();return nonseekable_open (inode, file); } --To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[tip:bkl/arch] s390: Remove BKL from prng
In reply to Thomas GleixnerCommit-ID: ca1b82ba0888e742a7efdb89ed8e2aab453e091f Gitweb: http://git.kernel.org/tip/ca1b82ba0888e742a7efdb89ed8e2aab453e091f Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 10:21:03 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 15:35:50 +0200
s390: Remove BKL from prng
cycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it.
LKML-Reference: <[email protected]>
--- arch/s390/crypto/prng.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
arch/s390/crypto/prng.c +0 -2
@@ -6,7 +6,6 @@#include <linux/fs.h> #include <linux/init.h> #include <linux/kernel.h> -#include <linux/smp_lock.h> #include <linux/miscdevice.h> #include <linux/module.h> #include <linux/moduleparam.h>
@@ -49,7 +48,6 @@ static unsigned char parm_block[32] = {static int prng_open (struct inode *inode,struct file *file) { -cycle_kernel_lock ();return nonseekable_open (inode, file); }
PATCH 14/28 um: Remove BKL from random
In reply to Thomas Gleixnercycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it.
--- arch/um/drivers/random.c | 3 --- 1 file changed, 3 deletions(-)
arch/um/drivers/random.c +0 -3
@@ -7,7 +7,6 @@* of the GNU General Public License, incorporated herein by reference. */ #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/module.h> #include <linux/fs.h> #include <linux/interrupt.h>
@@ -34,8 +33,6 @@ static DECLARE_WAIT_QUEUE_HEAD(host_readstatic int rng_dev_open (struct inode *inode,struct file *filp) { -cycle_kernel_lock (); -/* enforce read-only access to this chrdev */ if ((filp->f_mode &FMODE_READ ) ==0 )return -EINVAL ;
[tip:bkl/arch] um: Remove BKL from random
Commit-ID: df502e389383b219e44819fe757614450d95f297 Gitweb: http://git.kernel.org/tip/df502e389383b219e44819fe757614450d95f297 Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:36:30 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 15:35:51 +0200
um: Remove BKL from random
cycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it.
LKML-Reference: <[email protected]>
Cc: Jeff Dike <[email protected]>
--- arch/um/drivers/random.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
arch/um/drivers/random.c +0 -3
@@ -7,7 +7,6 @@* of the GNU General Public License, incorporated herein by reference. */ #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/module.h> #include <linux/fs.h> #include <linux/interrupt.h>
@@ -34,8 +33,6 @@ static DECLARE_WAIT_QUEUE_HEAD(host_read_wait);static int rng_dev_open (struct inode *inode,struct file *filp) { -cycle_kernel_lock (); -/* enforce read-only access to this chrdev */ if ((filp->f_mode &FMODE_READ ) ==0 )return -EINVAL ;
PATCH 15/28 um: Remove BKL from mmapper
In reply to Thomas Gleixnercycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code.
mmapper_open() cannot be called before misc_register() succeeded, but p_buf might be uninitialized.
Move the initialization of p_buf before the misc_register() call and get rid of cycle_kernel_lock().
--- arch/um/drivers/mmapper_kern.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
arch/um/drivers/mmapper_kern.c +4 -7
@@ -16,7 +16,7 @@#include <linux/miscdevice.h> #include <linux/module.h> #include <linux/mm.h> -#include <linux/smp_lock.h> +#include <asm/uaccess.h> #include "mem_user.h"
@@ -78,7 +78,6 @@ out:static int mmapper_open (struct inode *inode,struct file *file) { -cycle_kernel_lock ();return 0 ; }
@@ -115,18 +114,16 @@ static int __init mmapper_init(void) v_buf = (char *)find_iomem ("mmapper" , &mmapper_size);if (mmapper_size ==0 ) {printk (KERN_ERR "mmapper_init - find_iomem failed\n" ); - goto out; +return -ENODEV ; } + p_buf =__pa (v_buf); err =misc_register (&mmapper_dev);if (err) {printk (KERN_ERR "mmapper - misc_register failed, err = %d\n" , err); - goto out; +return err;; } - - p_buf =__pa (v_buf); -out:return 0 ; }
[tip:bkl/arch] um: Remove BKL from mmapper
Commit-ID: d63c489b881707adf9c0b89f771b30a1d78f4197 Gitweb: http://git.kernel.org/tip/d63c489b881707adf9c0b89f771b30a1d78f4197 Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:36:34 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 15:35:51 +0200
um: Remove BKL from mmapper
cycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code.
mmapper_open() cannot be called before misc_register() succeeded, but p_buf might be uninitialized.
Move the initialization of p_buf before the misc_register() call and get rid of cycle_kernel_lock().
LKML-Reference: <[email protected]>
Cc: Jeff Dike <[email protected]>
--- arch/um/drivers/mmapper_kern.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-)
arch/um/drivers/mmapper_kern.c +4 -7
@@ -16,7 +16,7 @@#include <linux/miscdevice.h> #include <linux/module.h> #include <linux/mm.h> -#include <linux/smp_lock.h> +#include <asm/uaccess.h> #include "mem_user.h"
@@ -78,7 +78,6 @@ out:static int mmapper_open (struct inode *inode,struct file *file) { -cycle_kernel_lock ();return 0 ; }
@@ -115,18 +114,16 @@ static int __init mmapper_init(void) v_buf = (char *)find_iomem ("mmapper" , &mmapper_size);if (mmapper_size ==0 ) {printk (KERN_ERR "mmapper_init - find_iomem failed\n" ); - goto out; +return -ENODEV ; } + p_buf =__pa (v_buf); err =misc_register (&mmapper_dev);if (err) {printk (KERN_ERR "mmapper - misc_register failed, err = %d\n" , err); - goto out; +return err;; } - - p_buf =__pa (v_buf); -out:return 0 ; }
PATCH 16/28 sparc: Remove BKL from apc
In reply to Thomas Gleixnercommit ab772027 (sparc: arch/sparc/kernel/apc.c to unlocked_ioctl) added lock/unlock_kernel() to the apc ioctl code.
The code needs no serialization at all. Neither put/get_user nor the read/write access to the sbus devices require it. Remove BKL.
cycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it as well.
--- arch/sparc/kernel/apc.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-)
arch/sparc/kernel/apc.c +10 -27
@@ -10,7 +10,6 @@#include <linux/errno.h> #include <linux/init.h> #include <linux/miscdevice.h> -#include <linux/smp_lock.h> #include <linux/pm.h> #include <linux/of.h> #include <linux/of_device.h>
@@ -76,7 +75,6 @@ static inline void apc_free(struct of_destatic int apc_open (struct inode *inode,struct file *f) { -cycle_kernel_lock ();return 0 ; }
@@ -87,61 +85,46 @@ static int apc_release(struct inode *inostatic long apc_ioctl (struct file *f,unsigned int cmd,unsigned long __arg) { -__u8 inarg,__user *arg; - - arg = (__u8 __user *) __arg; - -lock_kernel (); +__u8 inarg,__user *arg = (__u8 __user *) __arg;switch (cmd) {case APCIOCGFANCTL : -if (put_user (apc_readb (APC_FANCTL_REG ) &APC_REGMASK , arg)) { -unlock_kernel (); +if (put_user (apc_readb (APC_FANCTL_REG ) &APC_REGMASK , arg))return -EFAULT ; - }break ;case APCIOCGCPWR : -if (put_user (apc_readb (APC_CPOWER_REG ) &APC_REGMASK , arg)) { -unlock_kernel (); +if (put_user (apc_readb (APC_CPOWER_REG ) &APC_REGMASK , arg))return -EFAULT ; - }break ;case APCIOCGBPORT : -if (put_user (apc_readb (APC_BPORT_REG ) &APC_BPMASK , arg)) { -unlock_kernel (); +if (put_user (apc_readb (APC_BPORT_REG ) &APC_BPMASK , arg))return -EFAULT ; - }break ;case APCIOCSFANCTL : -if (get_user (inarg, arg)) { -unlock_kernel (); +if (get_user (inarg, arg))return -EFAULT ; - }apc_writeb (inarg &APC_REGMASK ,APC_FANCTL_REG );break ; +case APCIOCSCPWR : -if (get_user (inarg, arg)) { -unlock_kernel (); +if (get_user (inarg, arg))return -EFAULT ; - }apc_writeb (inarg &APC_REGMASK ,APC_CPOWER_REG );break ; +case APCIOCSBPORT : -if (get_user (inarg, arg)) { -unlock_kernel (); +if (get_user (inarg, arg))return -EFAULT ; - }apc_writeb (inarg &APC_BPMASK ,APC_BPORT_REG );break ; +default : -unlock_kernel ();return -EINVAL ; }; -unlock_kernel ();return 0 ; }
David Miller
maintainerRe: [patch 16/28] sparc: Remove BKL from apc
From: Thomas Gleixner <[email protected]>
Date: Sat, 10 Oct 2009 15:36:39 -0000
Quoted 11 lines
commit
ab772027(sparc:arch/sparc/kernel/apc.ctounlocked_ioctl) added lock/unlock_kernel() to the apc ioctl code.The code needs no serialization at all. Neither put/get_user nor the read/write access to the sbus devices require it. Remove BKL.
cycle_kernel_lock()was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it as well.Signed-off-by Thomas Gleixner <[email protected]>
Sorry, forgot to explicitly say I applied this to sparc-next-2.6, thanks.
PATCH 17/28 watchdog: Fix probe function of riowd
In reply to Thomas GleixnerAfter sucessfully registering the misc device the driver iounmaps the device registers and kfree's the device data structure. Ouch !
This was introduced with commit e42311d75 (riowatchdog: Convert to pure OF driver) and went unnoticed for more than a year :)
Return success instead of dropping into the error cleanup code path.
--- drivers/watchdog/riowd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/riowd.c +1 -1
@@ -206,7 +206,7 @@ static int __devinit riowd_probe(structdev_set_drvdata (&op->dev, p); riowd_device = p; - err =0 ; +return 0 ; out_iounmap:of_iounmap (&op->resource[0 ], p->regs,2 );
PATCH 18/28 watchdog: Remove BKL from rio watchdog driver
In reply to Thomas Gleixnercycle_kernel_lock() was added with the BKL pushdown. The rio driver indeed needs that because riowd_device is initialized after misc_register(). So an open(), write/ioctl() which happens to get between misc_register returning and riowd_device initialization would dereference a NULL pointer.
Move riowd_device initialization before misc_register() and get rid of cycle_kernel_lock().
--- drivers/watchdog/riowd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/watchdog/riowd.c +3 -3
@@ -10,7 +10,6 @@#include <linux/errno.h> #include <linux/init.h> #include <linux/miscdevice.h> -#include <linux/smp_lock.h> #include <linux/watchdog.h> #include <linux/of.h> #include <linux/of_device.h>
@@ -75,7 +74,6 @@ static void riowd_writereg(struct riowdstatic int riowd_open (struct inode *inode,struct file *filp) { -cycle_kernel_lock ();nonseekable_open (inode, filp);return 0 ; }
@@ -194,6 +192,8 @@ static int __devinit riowd_probe(struct printk(KERN_ERR PFX "Cannot map registers.\n"); goto out_free; } +/* Make miscdev useable right away */ + riowd_device = p; err =misc_register (&riowd_miscdev);if (err) {
@@ -205,10 +205,10 @@ static int __devinit riowd_probe(struct "regs at %p\n", riowd_timeout, p->regs);dev_set_drvdata (&op->dev, p); - riowd_device = p;return 0 ; out_iounmap: + riowd_device =NULL ;of_iounmap (&op->resource[0 ], p->regs,2 ); out_free:
David Miller
maintainerRe: [patch 18/28] watchdog: Remove BKL from rio watchdog driver
From: Thomas Gleixner <[email protected]>
Date: Sat, 10 Oct 2009 15:36:48 -0000
Quoted 10 lines
cycle_kernel_lock()was added with the BKL pushdown. The rio driver indeed needs that becauseriowd_deviceis initialized aftermisc_register(). So anopen(), write/ioctl() which happens to get betweenmisc_registerreturning andriowd_deviceinitialization would dereference a NULL pointer.Move
riowd_deviceinitialization beforemisc_register()and get rid ofcycle_kernel_lock().Signed-off-by Thomas Gleixner <[email protected]>
Also applied to sparc-next-2.6, thanks!
PATCH 19/28 hw_random: Remove BKL from core
In reply to Thomas Gleixnerhw_random core is completely serialized with rng_mutex. No need for the cycle_kernel_lock() magic.
--- drivers/char/hw_random/core.c | 1 - 1 file changed, 1 deletion(-)
drivers/char/hw_random/core.c +0 -1
@@ -87,7 +87,6 @@ static int rng_dev_open(struct inode *inreturn -EINVAL ;if (filp->f_mode &FMODE_WRITE )return -EINVAL ; -cycle_kernel_lock ();return 0 ; }
[tip:bkl/drivers] hw_random: Remove BKL from core
Commit-ID: a09ba31a54dbc9a548c4ff90619e4c7128a4282e Gitweb: http://git.kernel.org/tip/a09ba31a54dbc9a548c4ff90619e4c7128a4282e Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 12:36:32 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:36:50 +0200
hw_random: Remove BKL from core
hw_random core is completely serialized with rng_mutex. No need for the cycle_kernel_lock() magic.
LKML-Reference: <[email protected]>
Cc: Herbert Xu <[email protected]>
--- drivers/char/hw_random/core.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/char/hw_random/core.c +0 -1
@@ -87,7 +87,6 @@ static int rng_dev_open(struct inode *inode, struct file *filp)return -EINVAL ;if (filp->f_mode &FMODE_WRITE )return -EINVAL ; -cycle_kernel_lock ();return 0 ; }
Re: [patch 19/28] hw_random: Remove BKL from core
In reply to Thomas GleixnerQuoted 1 line
From
d3da91fe463a0799911ed7c826ec133c38c0a18bMon Sep 17 00:00:00 2001
From: John Kacur <[email protected]>
Date: Wed, 21 Oct 2009 22:46:30 +0200
Subject: [PATCH] RNG: Explicitly set llseek = no_llseek after the BKL is removed.
Now that we've removed the BKL, lets explicitly set llseek to no_llseek since it is not used here.
--- drivers/char/hw_random/core.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/char/hw_random/core.c +1 -0
@@ -147,6 +147,7 @@ static const struct file_operations rng_chrdev_ops = { .owner = THIS_MODULE, .open = rng_dev_open, .read = rng_dev_read, + .llseek = no_llseek, };static struct miscdevice rng_miscdev = {
Signature · 1 line
1.6.0.6
PATCH 20/28 input: Remove BKL from hp_sdc_rtc
In reply to Thomas Gleixnercycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it.
--- drivers/input/misc/hp_sdc_rtc.c | 2 -- 1 file changed, 2 deletions(-)
drivers/input/misc/hp_sdc_rtc.c +0 -2
@@ -35,7 +35,6 @@#include <linux/hp_sdc.h> #include <linux/errno.h> -#include <linux/smp_lock.h> #include <linux/types.h> #include <linux/init.h> #include <linux/module.h>
@@ -409,7 +408,6 @@ static unsigned int hp_sdc_rtc_poll(strustatic int hp_sdc_rtc_open (struct inode *inode,struct file *file) { -cycle_kernel_lock ();return 0 ; }
Re: [patch 20/28] input: Remove BKL from hp_sdc_rtc
Quoted 3 lines · Thomas Gleixner
cycle_kernel_lock()was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it.
The driver still holds the BKL in its ioctl method, which should be removed as well if the above is true.
Arnd <><
Re: [patch 20/28] input: Remove BKL from hp_sdc_rtc
Quoted 7 lines · Arnd Bergmann
Quoted 3 lines · Thomas Gleixner
cycle_kernel_lock()was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it.The driver still holds the BKL in its ioctl method, which should be removed as well if the above is true.
On my list already :)
[tip:bkl/drivers] input: Remove BKL from hp_sdc_rtc
In reply to Thomas GleixnerCommit-ID: d2d23559857e5f34762c61487f8ffb2fa4d7442d Gitweb: http://git.kernel.org/tip/d2d23559857e5f34762c61487f8ffb2fa4d7442d Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 12:41:43 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:36:51 +0200
input: Remove BKL from hp_sdc_rtc
cycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it.
LKML-Reference: <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Dmitry Torokhov <[email protected]>
--- drivers/input/misc/hp_sdc_rtc.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/input/misc/hp_sdc_rtc.c +0 -2
@@ -35,7 +35,6 @@#include <linux/hp_sdc.h> #include <linux/errno.h> -#include <linux/smp_lock.h> #include <linux/types.h> #include <linux/init.h> #include <linux/module.h>
@@ -409,7 +408,6 @@ static unsigned int hp_sdc_rtc_poll(struct file *file, poll_table *wait)static int hp_sdc_rtc_open (struct inode *inode,struct file *file) { -cycle_kernel_lock ();return 0 ; }
PATCH 21/28 bkl: pushdown BKL locking to do_sysctl()
In reply to Thomas GleixnerPush lock/unlock_kernel() into do_sysctl() and remove it from all call sites of do_sysctl().
--- arch/ia64/ia32/sys_ia32.c | 2 -- arch/mips/kernel/linux32.c | 2 -- arch/parisc/kernel/sys_parisc32.c | 2 -- arch/powerpc/kernel/sys_ppc32.c | 2 -- arch/s390/kernel/compat_linux.c | 2 -- arch/sparc/kernel/sys_sparc32.c | 2 -- arch/x86/ia32/sys_ia32.c | 2 -- kernel/sysctl.c | 6 ++++-- 8 files changed, 4 insertions(+), 16 deletions(-)
arch/ia64/ia32/sys_ia32.c +0 -2
@@ -1670,10 +1670,8 @@ sys32_sysctl (struct sysctl32 __user *arreturn -EFAULT ;set_fs (KERNEL_DS ); -lock_kernel (); ret =do_sysctl (namep, a32.nlen, oldvalp, (size_t __user *) &oldlen, newvalp, (size_t ) a32.newlen); -unlock_kernel ();set_fs (old_fs);if (oldvalp &&put_user (oldlen, (int __user *)compat_ptr (a32.oldlenp)))
arch/mips/kernel/linux32.c +0 -2
@@ -302,10 +302,8 @@ SYSCALL_DEFINE1(32_sysctl, struct sysctl oldlenp = (size_t __user *)addr; } -lock_kernel (); error =do_sysctl ((int __user *)A (tmp.name), tmp.nlen, (void __user *)A (tmp.oldval), oldlenp, (void __user *)A (tmp.newval), tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) { if (get_user(oldlen, (size_t __user *)addr) ||
arch/parisc/kernel/sys_parisc32.c +0 -2
@@ -137,11 +137,9 @@ asmlinkage long sys32_sysctl(struct __sy oldlenp = (size_t *)addr; } -lock_kernel (); error =do_sysctl ((int __user *)(u64 )tmp.name, tmp.nlen, (void __user *)(u64 )tmp.oldval, oldlenp, (void __user *)(u64 )tmp.newval, tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) {if (get_user (oldlen, (size_t *)addr)) {
arch/powerpc/kernel/sys_ppc32.c +0 -2
@@ -555,11 +555,9 @@ asmlinkage long compat_sys_sysctl(structreturn -EFAULT ; } -lock_kernel (); error =do_sysctl (compat_ptr (tmp.name), tmp.nlen,compat_ptr (tmp.oldval), oldlenp,compat_ptr (tmp.newval), tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) { if (get_user(oldlen, oldlenp) ||
arch/s390/kernel/compat_linux.c +0 -2
@@ -562,10 +562,8 @@ asmlinkage long sys32_sysctl(struct __sy oldlenp = (size_t __user *)addr; } -lock_kernel (); error =do_sysctl (compat_ptr (tmp.name), tmp.nlen,compat_ptr (tmp.oldval), oldlenp,compat_ptr (tmp.newval), tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) { if (get_user(oldlen, (size_t __user *)addr) ||
arch/sparc/kernel/sys_sparc32.c +0 -2
@@ -627,14 +627,12 @@ asmlinkage long sys32_sysctl(struct __sy oldlenp = (size_t __user *)addr; } -lock_kernel (); error =do_sysctl ((int __user *)(unsigned long ) tmp.name, tmp.nlen, (void __user *)(unsigned long ) tmp.oldval, oldlenp, (void __user *)(unsigned long ) tmp.newval, tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) { if (get_user(oldlen, (size_t __user *)addr) ||
arch/x86/ia32/sys_ia32.c +0 -2
@@ -477,10 +477,8 @@ asmlinkage long sys32_sysctl(struct syscreturn -EFAULT ;set_fs (KERNEL_DS ); -lock_kernel (); ret =do_sysctl (namep, a32.nlen, oldvalp, (size_t __user *)&oldlen, newvalp, (size_t ) a32.newlen); -unlock_kernel ();set_fs (old_fs);if (oldvalp &&put_user (oldlen, (int __user *)compat_ptr (a32.oldlenp)))
kernel/sysctl.c +4 -2
@@ -1848,6 +1848,8 @@ int do_sysctl(int __user *name, int nlenreturn -EFAULT ; } +lock_kernel (); +for (head =sysctl_head_next (NULL ); head; head =sysctl_head_next (head)) { error = parse_table(name, nlen, oldval, oldlenp,
@@ -1858,6 +1860,8 @@ int do_sysctl(int __user *name, int nlenbreak ; } } + +unlock_kernel ();return error; }
@@ -1873,10 +1877,8 @@ SYSCALL_DEFINE1(sysctl, struct __sysctl_if (error) goto out; -lock_kernel (); error =do_sysctl (tmp.name, tmp.nlen, tmp.oldval, tmp.oldlenp, tmp.newval, tmp.newlen); -unlock_kernel (); out:return error; }
Re: [patch 21/28] bkl: pushdown BKL locking to do_sysctl()
Quoted 10 lines · Thomas Gleixner
plain text document attachment (push-bkl-to-do-sysctl.patch) Push lock/unlock_kernel() into
do_sysctl()and remove it from all call sites ofdo_sysctl().Signed-off-by Thomas Gleixner <[email protected]>Cc Tony Luck <[email protected]>Cc Ralf Baechle <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>Cc Martin Schwidefsky <[email protected]>Cc "David S. Miller" <[email protected]>
For the powerpc parts,
Quoted 156 lines
--- arch/ia64/ia32/sys_ia32.c | 2 -- arch/mips/kernel/linux32.c | 2 -- arch/parisc/kernel/sys_parisc32.c | 2 -- arch/powerpc/kernel/sys_ppc32.c | 2 -- arch/s390/kernel/compat_linux.c | 2 -- arch/sparc/kernel/sys_sparc32.c | 2 -- arch/x86/ia32/sys_ia32.c | 2 -- kernel/sysctl.c | 6 ++++-- 8 files changed, 4 insertions(+), 16 deletions(-)Index:
linux-2.6-tip/arch/ia64/ia32/sys_ia32.c
===================================================================arch/ia64/ia32/sys_ia32.c +0
-2@@ -1670,10 +1670,8 @@ sys32_sysctl (struct sysctl32 __user *arreturn -EFAULT ;set_fs (KERNEL_DS ); -lock_kernel (); ret =do_sysctl (namep, a32.nlen, oldvalp, (size_t __user *) &oldlen, newvalp, (size_t ) a32.newlen); -unlock_kernel ();set_fs (old_fs);if (oldvalp &&put_user (oldlen, (int __user *)compat_ptr (a32.oldlenp)))Index:
linux-2.6-tip/arch/mips/kernel/linux32.c
===================================================================arch/mips/kernel/linux32.c +0
-2@@ -302,10 +302,8 @@ SYSCALL_DEFINE1(32_sysctl, struct sysctl oldlenp = (size_t __user *)addr; } -lock_kernel (); error =do_sysctl ((int __user *)A (tmp.name), tmp.nlen, (void __user *)A (tmp.oldval), oldlenp, (void __user *)A (tmp.newval), tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) { if (get_user(oldlen, (size_t __user *)addr) ||Index:
linux-2.6-tip/arch/parisc/kernel/sys_parisc32.c
===================================================================arch/parisc/kernel/sys_parisc32.c +0
-2@@ -137,11 +137,9 @@ asmlinkage long sys32_sysctl(struct __sy oldlenp = (size_t *)addr; } -lock_kernel (); error =do_sysctl ((int __user *)(u64 )tmp.name, tmp.nlen, (void __user *)(u64 )tmp.oldval, oldlenp, (void __user *)(u64 )tmp.newval, tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) {if (get_user (oldlen, (size_t *)addr)) {Index:
linux-2.6-tip/arch/powerpc/kernel/sys_ppc32.c
===================================================================arch/powerpc/kernel/sys_ppc32.c +0
-2@@ -555,11 +555,9 @@ asmlinkage long compat_sys_sysctl(structreturn -EFAULT ; } -lock_kernel (); error =do_sysctl (compat_ptr (tmp.name), tmp.nlen,compat_ptr (tmp.oldval), oldlenp,compat_ptr (tmp.newval), tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) { if (get_user(oldlen, oldlenp) ||Index:
linux-2.6-tip/arch/s390/kernel/compat_linux.c
===================================================================arch/s390/kernel/compat_linux.c +0
-2@@ -562,10 +562,8 @@ asmlinkage long sys32_sysctl(struct __sy oldlenp = (size_t __user *)addr; } -lock_kernel (); error =do_sysctl (compat_ptr (tmp.name), tmp.nlen,compat_ptr (tmp.oldval), oldlenp,compat_ptr (tmp.newval), tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) { if (get_user(oldlen, (size_t __user *)addr) ||Index:
linux-2.6-tip/arch/sparc/kernel/sys_sparc32.c
===================================================================arch/sparc/kernel/sys_sparc32.c +0
-2@@ -627,14 +627,12 @@ asmlinkage long sys32_sysctl(struct __sy oldlenp = (size_t __user *)addr; } -lock_kernel (); error =do_sysctl ((int __user *)(unsigned long ) tmp.name, tmp.nlen, (void __user *)(unsigned long ) tmp.oldval, oldlenp, (void __user *)(unsigned long ) tmp.newval, tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) { if (get_user(oldlen, (size_t __user *)addr) ||Index:
linux-2.6-tip/arch/x86/ia32/sys_ia32.c
===================================================================arch/x86/ia32/sys_ia32.c +0
-2@@ -477,10 +477,8 @@ asmlinkage long sys32_sysctl(struct syscreturn -EFAULT ;set_fs (KERNEL_DS ); -lock_kernel (); ret =do_sysctl (namep, a32.nlen, oldvalp, (size_t __user *)&oldlen, newvalp, (size_t ) a32.newlen); -unlock_kernel ();set_fs (old_fs);if (oldvalp &&put_user (oldlen, (int __user *)compat_ptr (a32.oldlenp)))Index:
linux-2.6-tip/kernel/sysctl.c
===================================================================kernel/sysctl.c +4
-2@@ -1848,6 +1848,8 @@ int do_sysctl(int __user *name, int nlenreturn -EFAULT ; } +lock_kernel (); +for (head =sysctl_head_next (NULL ); head; head =sysctl_head_next (head)) { error = parse_table(name, nlen, oldval, oldlenp,@@ -1858,6 +1860,8 @@ int do_sysctl(int __user *name, int nlenbreak ; } } + +unlock_kernel ();return error; }@@ -1873,10 +1877,8 @@ SYSCALL_DEFINE1(sysctl, struct __sysctl_if (error) goto out; -lock_kernel (); error =do_sysctl (tmp.name, tmp.nlen, tmp.oldval, tmp.oldlenp, tmp.newval, tmp.newlen); -unlock_kernel (); out:return error; }
[tip:bkl/core] bkl: pushdown BKL locking to do_sysctl()
In reply to Thomas GleixnerCommit-ID: e362106d6dcf6607906eff2260837748b1d6c8d5 Gitweb: http://git.kernel.org/tip/e362106d6dcf6607906eff2260837748b1d6c8d5 Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:37:06 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 15:31:41 +0200
bkl: pushdown BKL locking to do_sysctl()
Push lock/unlock_kernel() into do_sysctl() and remove it from all call sites of do_sysctl().
LKML-Reference: <[email protected]>
--- arch/ia64/ia32/sys_ia32.c | 2 -- arch/mips/kernel/linux32.c | 2 -- arch/parisc/kernel/sys_parisc32.c | 2 -- arch/powerpc/kernel/sys_ppc32.c | 2 -- arch/s390/kernel/compat_linux.c | 2 -- arch/sparc/kernel/sys_sparc32.c | 2 -- arch/x86/ia32/sys_ia32.c | 2 -- kernel/sysctl.c | 6 ++++-- 8 files changed, 4 insertions(+), 16 deletions(-)
arch/ia64/ia32/sys_ia32.c +0 -2
@@ -1670,10 +1670,8 @@ sys32_sysctl (struct sysctl32 __user *args)return -EFAULT ;set_fs (KERNEL_DS ); -lock_kernel (); ret =do_sysctl (namep, a32.nlen, oldvalp, (size_t __user *) &oldlen, newvalp, (size_t ) a32.newlen); -unlock_kernel ();set_fs (old_fs);if (oldvalp &&put_user (oldlen, (int __user *)compat_ptr (a32.oldlenp)))
arch/mips/kernel/linux32.c +0 -2
@@ -302,10 +302,8 @@ SYSCALL_DEFINE1(32_sysctl, struct sysctl_args32 __user *, args) oldlenp = (size_t __user *)addr; } -lock_kernel (); error =do_sysctl ((int __user *)A (tmp.name), tmp.nlen, (void __user *)A (tmp.oldval), oldlenp, (void __user *)A (tmp.newval), tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) { if (get_user(oldlen, (size_t __user *)addr) ||
arch/parisc/kernel/sys_parisc32.c +0 -2
@@ -137,11 +137,9 @@ asmlinkage long sys32_sysctl(struct __sysctl_args32 __user *args) oldlenp = (size_t *)addr; } -lock_kernel (); error =do_sysctl ((int __user *)(u64 )tmp.name, tmp.nlen, (void __user *)(u64 )tmp.oldval, oldlenp, (void __user *)(u64 )tmp.newval, tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) {if (get_user (oldlen, (size_t *)addr)) {
arch/powerpc/kernel/sys_ppc32.c +0 -2
@@ -555,11 +555,9 @@ asmlinkage long compat_sys_sysctl(struct __sysctl_args32 __user *args)return -EFAULT ; } -lock_kernel (); error =do_sysctl (compat_ptr (tmp.name), tmp.nlen,compat_ptr (tmp.oldval), oldlenp,compat_ptr (tmp.newval), tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) { if (get_user(oldlen, oldlenp) ||
arch/s390/kernel/compat_linux.c +0 -2
@@ -562,10 +562,8 @@ asmlinkage long sys32_sysctl(struct __sysctl_args32 __user *args) oldlenp = (size_t __user *)addr; } -lock_kernel (); error =do_sysctl (compat_ptr (tmp.name), tmp.nlen,compat_ptr (tmp.oldval), oldlenp,compat_ptr (tmp.newval), tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) { if (get_user(oldlen, (size_t __user *)addr) ||
arch/sparc/kernel/sys_sparc32.c +0 -2
@@ -627,14 +627,12 @@ asmlinkage long sys32_sysctl(struct __sysctl_args32 __user *args) oldlenp = (size_t __user *)addr; } -lock_kernel (); error =do_sysctl ((int __user *)(unsigned long ) tmp.name, tmp.nlen, (void __user *)(unsigned long ) tmp.oldval, oldlenp, (void __user *)(unsigned long ) tmp.newval, tmp.newlen); -unlock_kernel ();if (oldlenp) {if (!error) { if (get_user(oldlen, (size_t __user *)addr) ||
arch/x86/ia32/sys_ia32.c +0 -2
@@ -477,10 +477,8 @@ asmlinkage long sys32_sysctl(struct sysctl_ia32 __user *args32)return -EFAULT ;set_fs (KERNEL_DS ); -lock_kernel (); ret =do_sysctl (namep, a32.nlen, oldvalp, (size_t __user *)&oldlen, newvalp, (size_t ) a32.newlen); -unlock_kernel ();set_fs (old_fs);if (oldvalp &&put_user (oldlen, (int __user *)compat_ptr (a32.oldlenp)))
kernel/sysctl.c +4 -2
@@ -1848,6 +1848,8 @@ int do_sysctl(int __user *name, int nlen, void __user *oldval, size_t __user *olreturn -EFAULT ; } +lock_kernel (); +for (head =sysctl_head_next (NULL ); head; head =sysctl_head_next (head)) { error = parse_table(name, nlen, oldval, oldlenp,
@@ -1858,6 +1860,8 @@ int do_sysctl(int __user *name, int nlen, void __user *oldval, size_t __user *olbreak ; } } + +unlock_kernel ();return error; }
@@ -1873,10 +1877,8 @@ SYSCALL_DEFINE1(sysctl, struct __sysctl_args __user *, args)if (error) goto out; -lock_kernel (); error =do_sysctl (tmp.name, tmp.nlen, tmp.oldval, tmp.oldlenp, tmp.newval, tmp.newlen); -unlock_kernel (); out:return error; }
PATCH 22/28 macintosh: Remove BKL from ans-lcd
In reply to Thomas GleixnerThe ans-lcd driver got the cycle_kernel_lock() in anslcd_open() from the BKL pushdown and it still uses the locked ioctl.
The BKL serialization in this driver is more than obscure and definitely does not cover all possible corner cases. Protect the access to the hardware with a local mutex and get rid of BKL and locked ioctl.
--- drivers/macintosh/ans-lcd.c | 45 +++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-)
drivers/macintosh/ans-lcd.c +28 -17
@@ -3,7 +3,6 @@*/ #include <linux/types.h> -#include <linux/smp_lock.h> #include <linux/errno.h> #include <linux/kernel.h> #include <linux/miscdevice.h>
@@ -26,6 +25,7 @@static unsigned long anslcd_short_delay =80 ;static unsigned long anslcd_long_delay =3280 ;static volatile unsigned char __iomem *anslcd_ptr; +static DEFINE_MUTEX (anslcd_mutex);#undef DEBUG
@@ -65,26 +65,31 @@ anslcd_write( struct file * file, constif (!access_ok (VERIFY_READ , buf, count))return -EFAULT ; + +mutex_lock (&anslcd_mutex);for ( i = *ppos; count >0 ; ++i, ++p, --count ) {char c;__get_user (c, p);anslcd_write_byte_data ( c ); } +mutex_unlock (&anslcd_mutex); *ppos = i;return p - buf; } -static int -anslcd_ioctl (struct inode * inode,struct file * file, -unsigned int cmd,unsigned long arg ) +static long +anslcd_ioctl (struct file *file,unsigned int cmd,unsigned long arg) {char ch,__user *temp; +long ret =0 ;#ifdef DEBUG printk (KERN_DEBUG "LCD: ioctl(%d,%d)\n" ,cmd,arg);#endif +mutex_lock (&anslcd_mutex); +switch ( cmd ) {case ANSLCD_CLEAR :
@@ -93,7 +98,7 @@ anslcd_ioctl( struct inode * inode, struanslcd_write_byte_ctrl (0x06 );anslcd_write_byte_ctrl (0x01 );anslcd_write_byte_ctrl (0x02 ); -return 0 ; +break ;case ANSLCD_SENDCTRL : temp = (char __user *) arg;__get_user (ch, temp);
@@ -101,33 +106,37 @@ anslcd_ioctl( struct inode * inode, struanslcd_write_byte_ctrl ( ch );__get_user (ch, temp); } -return 0 ; +break ;case ANSLCD_SETSHORTDELAY :if (!capable (CAP_SYS_ADMIN )) -return -EACCES ; - anslcd_short_delay=arg; -return 0 ; + ret =-EACCES ; +else + anslcd_short_delay=arg; +break ;case ANSLCD_SETLONGDELAY :if (!capable (CAP_SYS_ADMIN )) -return -EACCES ; - anslcd_long_delay=arg; -return 0 ; + ret = -EACCES ; +else + anslcd_long_delay=arg; +break ;default : -return -EINVAL ; + ret = -EINVAL ; } + +mutex_unlock (&anslcd_mutex); +return ret; }static int anslcd_open (struct inode * inode,struct file * file ) { -cycle_kernel_lock ();return 0 ; }const struct file_operations anslcd_fops = { - .write = anslcd_write, - .ioctl = anslcd_ioctl, - .open = anslcd_open, + .write = anslcd_write, + .unlocked_ioctl = anslcd_ioctl, + .open = anslcd_open, };static struct miscdevice anslcd_dev = {
@@ -168,6 +177,7 @@ anslcd_init(void)printk (KERN_DEBUG "LCD: init\n" );#endif +mutex_lock (&anslcd_mutex);anslcd_write_byte_ctrl (0x38 );anslcd_write_byte_ctrl (0x0c );anslcd_write_byte_ctrl (0x06 );
@@ -176,6 +186,7 @@ anslcd_init(void)for (a=0 ;a<80 ;a++) {anslcd_write_byte_data (anslcd_logo[a]); } +mutex_unlock (&anslcd_mutex);return 0 ; }
Re: [patch 22/28] macintosh: Remove BKL from ans-lcd
Quoted 141 lines · Thomas Gleixner
The ans-lcd driver got the
cycle_kernel_lock()inanslcd_open()from the BKL pushdown and it still uses the locked ioctl.The BKL serialization in this driver is more than obscure and definitely does not cover all possible corner cases. Protect the access to the hardware with a local mutex and get rid of BKL and locked ioctl.
Signed-off-by Thomas Gleixner <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>--- drivers/macintosh/ans-lcd.c | 45 +++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-)Index:
linux-2.6-tip/drivers/macintosh/ans-lcd.c
===================================================================drivers/macintosh/ans-lcd.c +27
-17@@ -3,7 +3,6 @@*/ #include <linux/types.h> -#include <linux/smp_lock.h> #include <linux/errno.h> #include <linux/kernel.h> #include <linux/miscdevice.h> @@ -26,6 +25,7 @@static unsigned long anslcd_short_delay =80 ;static unsigned long anslcd_long_delay =3280 ;static volatile unsigned char __iomem *anslcd_ptr; +static DEFINE_MUTEX (anslcd_mutex);#undef DEBUG@@ -65,26 +65,31 @@ anslcd_write( struct file * file, constif (!access_ok (VERIFY_READ , buf, count))return -EFAULT ; + +mutex_lock (&anslcd_mutex);for ( i = *ppos; count >0 ; ++i, ++p, --count ) {char c;__get_user (c, p);anslcd_write_byte_data ( c ); } +mutex_unlock (&anslcd_mutex); *ppos = i;return p - buf; } -static int -anslcd_ioctl (struct inode * inode,struct file * file, -unsigned int cmd,unsigned long arg ) +static long +anslcd_ioctl (struct file *file,unsigned int cmd,unsigned long arg) {char ch,__user *temp; +long ret =0 ;#ifdef DEBUG printk (KERN_DEBUG "LCD: ioctl(%d,%d)\n" ,cmd,arg);#endif +mutex_lock (&anslcd_mutex); +switch ( cmd ) {case ANSLCD_CLEAR :@@ -93,7 +98,7 @@ anslcd_ioctl( struct inode * inode, struanslcd_write_byte_ctrl (0x06 );anslcd_write_byte_ctrl (0x01 );anslcd_write_byte_ctrl (0x02 ); -return 0 ; +break ;case ANSLCD_SENDCTRL : temp = (char __user *) arg;__get_user (ch, temp);@@ -101,33 +106,37 @@ anslcd_ioctl( struct inode * inode, struanslcd_write_byte_ctrl ( ch );__get_user (ch, temp); } -return 0 ; +break ;case ANSLCD_SETSHORTDELAY :if (!capable (CAP_SYS_ADMIN )) -return -EACCES ; - anslcd_short_delay=arg; -return 0 ; + ret =-EACCES ; +else + anslcd_short_delay=arg; +break ;case ANSLCD_SETLONGDELAY :if (!capable (CAP_SYS_ADMIN )) -return -EACCES ; - anslcd_long_delay=arg; -return 0 ; + ret = -EACCES ; +else + anslcd_long_delay=arg; +break ;default : -return -EINVAL ; + ret = -EINVAL ; } + +mutex_unlock (&anslcd_mutex); +return ret; }static int anslcd_open (struct inode * inode,struct file * file ) { -cycle_kernel_lock ();return 0 ; }const struct file_operations anslcd_fops = { - .write = anslcd_write, - .ioctl = anslcd_ioctl, - .open = anslcd_open, + .write = anslcd_write, + .unlocked_ioctl = anslcd_ioctl, + .open = anslcd_open, };static struct miscdevice anslcd_dev = {@@ -168,6 +177,7 @@ anslcd_init(void)printk (KERN_DEBUG "LCD: init\n" );#endif +mutex_lock (&anslcd_mutex);anslcd_write_byte_ctrl (0x38 );anslcd_write_byte_ctrl (0x0c );anslcd_write_byte_ctrl (0x06 );
drivers/macintosh/ans-lcd.c anslcd_init(void) · line 192
Quoted 7 lines
drivers/macintosh/ans-lcd.c +1
-0@@ -176,6 +186,7 @@ anslcd_init(void)for (a=0 ;a<80 ;a++) {anslcd_write_byte_data (anslcd_logo[a]); } +mutex_unlock (&anslcd_mutex);return 0 ; }
There were 4 checkpatch errors on this patch, all of the type
ERROR: spaces required around that '=' (ctx:WxO) #1466: FILE: drivers/macintosh/ans-lcd.c:112:
+ ret =-EACCES;
Cheers
Re: [patch 22/28] macintosh: Remove BKL from ans-lcd
drivers/macintosh/ans-lcd.c anslcd_ioctl( struct inode * inode, stru · line 112
Quoted 4 lines
There were 4 checkpatch errors on this patch, all of the type
ERROR: spaces required around that '=' (ctx:WxO) #1466: FILE:drivers/macintosh/ans-lcd.c:112:drivers/macintosh/ans-lcd.c +1
-0+ ret =-EACCES ;
Here's a suggestion. If a few spaces bug you that much then instead of complaining about it and posting checkpatch results deal with the file itself.
Wait until the patch goes in and send a follow up patch that fixes up the file to fit codingstyle. There's no point whining about the bits a patch touches when the file wasn't in that format before, but if you've got nothing better to do then doing a pass over the whole file *is* useful.
(Plus it gets a patch to your name ;))
Checkpatch whines on files that simple don't follow style are usually best ignored because they make the file formatting less internally consistent.
Alan
Re: [patch 22/28] macintosh: Remove BKL from ans-lcd
Quoted 14 lines · Alan Cox
drivers/macintosh/ans-lcd.c anslcd_ioctl( struct inode * inode, stru · line 112
Quoted 4 lines
There were 4 checkpatch errors on this patch, all of the type
ERROR: spaces required around that '=' (ctx:WxO) #1466: FILE:drivers/macintosh/ans-lcd.c:112:drivers/macintosh/ans-lcd.c +1
-0+ ret =-EACCES ;Here's a suggestion. If a few spaces bug you that much then instead of complaining about it and posting checkpatch results deal with the file itself.
Wait until the patch goes in and send a follow up patch that fixes up the file to fit codingstyle. There's no point whining about the bits a patch touches when the file wasn't in that format before, but if you've got nothing better to do then doing a pass over the whole file *is* useful.
Quoted 6 lines
(Plus it gets a patch to your name ;))
Checkpatch whines on files that simple don't follow style are usually best ignored because they make the file formatting less internally consistent.
Thanks Alan, I was sincerely debatting whether to send this because I know that checkpatch can be annoying - but on the other hand, I thought it prudent to run it since I was claiming to have reviewed all of those patches.
I like your suggestion though - next time, I won't send the mail, since since the folks submitting these patches are more than capable of checking that kind of thing themselves, and if I feel it's important enough, I'll follow up with a trivial style patch.
Cheers!
John
Re: [patch 22/28] macintosh: Remove BKL from ans-lcd
In reply to Thomas GleixnerQuoted 9 lines · Thomas Gleixner
plain text document attachment (drivers-mac-ans-lcd-remove-bkl.patch) The ans-lcd driver got the
cycle_kernel_lock()inanslcd_open()from the BKL pushdown and it still uses the locked ioctl.The BKL serialization in this driver is more than obscure and definitely does not cover all possible corner cases. Protect the access to the hardware with a local mutex and get rid of BKL and locked ioctl.
Quoted 4 lines
Signed-off-by Thomas Gleixner <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>---
While I -do- have an ANS ... it's rusting in the back of my garage and I really don't have time nor space to set it up and get it back to booting shape :-) (It's a pretty huge thing)
Patch looks good, so if it builds...
Cheers,
Ben.
[tip:bkl/drivers] macintosh: Remove BKL from ans-lcd
In reply to Thomas GleixnerCommit-ID: 95fdac73725c15072d068ac7f131958cf5c324e4 Gitweb: http://git.kernel.org/tip/95fdac73725c15072d068ac7f131958cf5c324e4 Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 13:38:57 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:36:50 +0200
macintosh: Remove BKL from ans-lcd
The ans-lcd driver got the cycle_kernel_lock() in anslcd_open() from the BKL pushdown and it still uses the locked ioctl.
The BKL serialization in this driver is more than obscure and definitely does not cover all possible corner cases. Protect the access to the hardware with a local mutex and get rid of BKL and locked ioctl.
LKML-Reference: <[email protected]>
--- drivers/macintosh/ans-lcd.c | 45 ++++++++++++++++++++++++++---------------- 1 files changed, 28 insertions(+), 17 deletions(-)
drivers/macintosh/ans-lcd.c +28 -17
@@ -3,7 +3,6 @@*/ #include <linux/types.h> -#include <linux/smp_lock.h> #include <linux/errno.h> #include <linux/kernel.h> #include <linux/miscdevice.h>
@@ -26,6 +25,7 @@static unsigned long anslcd_short_delay =80 ;static unsigned long anslcd_long_delay =3280 ;static volatile unsigned char __iomem *anslcd_ptr; +static DEFINE_MUTEX (anslcd_mutex);#undef DEBUG
@@ -65,26 +65,31 @@ anslcd_write( struct file * file, const char __user * buf,if (!access_ok (VERIFY_READ , buf, count))return -EFAULT ; + +mutex_lock (&anslcd_mutex);for ( i = *ppos; count >0 ; ++i, ++p, --count ) {char c;__get_user (c, p);anslcd_write_byte_data ( c ); } +mutex_unlock (&anslcd_mutex); *ppos = i;return p - buf; } -static int -anslcd_ioctl (struct inode * inode,struct file * file, -unsigned int cmd,unsigned long arg ) +static long +anslcd_ioctl (struct file *file,unsigned int cmd,unsigned long arg) {char ch,__user *temp; +long ret =0 ;#ifdef DEBUG printk (KERN_DEBUG "LCD: ioctl(%d,%d)\n" ,cmd,arg);#endif +mutex_lock (&anslcd_mutex); +switch ( cmd ) {case ANSLCD_CLEAR :
@@ -93,7 +98,7 @@ anslcd_ioctl( struct inode * inode, struct file * file,anslcd_write_byte_ctrl (0x06 );anslcd_write_byte_ctrl (0x01 );anslcd_write_byte_ctrl (0x02 ); -return 0 ; +break ;case ANSLCD_SENDCTRL : temp = (char __user *) arg;__get_user (ch, temp);
@@ -101,33 +106,37 @@ anslcd_ioctl( struct inode * inode, struct file * file,anslcd_write_byte_ctrl ( ch );__get_user (ch, temp); } -return 0 ; +break ;case ANSLCD_SETSHORTDELAY :if (!capable (CAP_SYS_ADMIN )) -return -EACCES ; - anslcd_short_delay=arg; -return 0 ; + ret =-EACCES ; +else + anslcd_short_delay=arg; +break ;case ANSLCD_SETLONGDELAY :if (!capable (CAP_SYS_ADMIN )) -return -EACCES ; - anslcd_long_delay=arg; -return 0 ; + ret = -EACCES ; +else + anslcd_long_delay=arg; +break ;default : -return -EINVAL ; + ret = -EINVAL ; } + +mutex_unlock (&anslcd_mutex); +return ret; }static int anslcd_open (struct inode * inode,struct file * file ) { -cycle_kernel_lock ();return 0 ; }const struct file_operations anslcd_fops = { - .write = anslcd_write, - .ioctl = anslcd_ioctl, - .open = anslcd_open, + .write = anslcd_write, + .unlocked_ioctl = anslcd_ioctl, + .open = anslcd_open, };static struct miscdevice anslcd_dev = {
@@ -168,6 +177,7 @@ anslcd_init(void)printk (KERN_DEBUG "LCD: init\n" );#endif +mutex_lock (&anslcd_mutex);anslcd_write_byte_ctrl (0x38 );anslcd_write_byte_ctrl (0x0c );anslcd_write_byte_ctrl (0x06 );
@@ -176,6 +186,7 @@ anslcd_init(void)for (a=0 ;a<80 ;a++) {anslcd_write_byte_data (anslcd_logo[a]); } +mutex_unlock (&anslcd_mutex);return 0 ; }
PATCH 1/1 macintosh: Explicitly set llseek to no_llseek in ans-lcd
In reply to Thomas GleixnerQuoted 1 line
From
0c2b412cdccf73bdeb19bb866bfe556942eaeca2Mon Sep 17 00:00:00 2001
From: John Kacur <[email protected]>
Date: Wed, 21 Oct 2009 23:01:12 +0200
Subject: [PATCH] macintosh: Explicitly set llseek to no_llseek in ans-lcd
Now that we've removed the BKL here, let's explicitly set lleek to no_llseek
--- drivers/macintosh/ans-lcd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/macintosh/ans-lcd.c +1 -0
@@ -137,6 +137,7 @@ const struct file_operations anslcd_fops = { .write = anslcd_write, .unlocked_ioctl = anslcd_ioctl, .open = anslcd_open, + .llseedk = no_llseek, };static struct miscdevice anslcd_dev = {
Signature · 1 line
1.6.0.6
Re: [PATCH] macintosh: Explicitly set llseek to no_llseek in ans-lcd
Quoted 17 lines · John Kacur
From
0c2b412cdccf73bdeb19bb866bfe556942eaeca2Mon Sep 17 00:00:00 2001
From: John Kacur <[email protected]>
Date: Wed, 21 Oct 2009 23:01:12 +0200
Subject: [PATCH] macintosh: Explicitly set llseek tono_llseekin ans-lcdNow that we've removed the BKL here, let's explicitly set lleek to
no_llseekSigned-off-by John Kacur <[email protected]>--- drivers/macintosh/ans-lcd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)drivers/macintosh/ans-lcd.c +0
-0
drivers/macintosh/ans-lcd.c const struct file_operations anslcd_fops = { · line 140
Quoted 4 lines
drivers/macintosh/ans-lcd.c +1
-0@@ -137,6 +137,7 @@ const struct file_operations anslcd_fops = { .write = anslcd_write, .unlocked_ioctl = anslcd_ioctl, .open = anslcd_open, + .llseedk = no_llseek,
llseedk? :)
Should we better pushdown default_llseek to every to every file operations that don't implement llseek?
I don't know how many of them don't implement llseek() though.
That said we can't continue anymore with this default attribution of default_llseek() on new fops.
Re: [PATCH] macintosh: Explicitly set llseek to no_llseek in ans-lcd
Quoted 27 lines · Frederic Weisbecker
Quoted 17 lines · John Kacur
From
0c2b412cdccf73bdeb19bb866bfe556942eaeca2Mon Sep 17 00:00:00 2001
From: John Kacur <[email protected]>
Date: Wed, 21 Oct 2009 23:01:12 +0200
Subject: [PATCH] macintosh: Explicitly set llseek tono_llseekin ans-lcdNow that we've removed the BKL here, let's explicitly set lleek to
no_llseekSigned-off-by John Kacur <[email protected]>--- drivers/macintosh/ans-lcd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)drivers/macintosh/ans-lcd.c +0
-0drivers/macintosh/ans-lcd.c const struct file_operations anslcd_fops = { · line 140
Quoted 4 lines
drivers/macintosh/ans-lcd.c +1
-0@@ -137,6 +137,7 @@ const struct file_operations anslcd_fops = { .write = anslcd_write, .unlocked_ioctl = anslcd_ioctl, .open = anslcd_open, + .llseedk = no_llseek,llseedk? :)
Quoted 7 lines
Should we better pushdown
default_llseekto every to every file operations that don't implement llseek?
I don't know how many of them don't implementllseek()though.That said we can't continue anymore with this default attribution of
default_llseek()on new fops.
If you don't explicitly set it to no_llseek, you automatically get the default_llseek, which uses the BKL. So if your driver doesn't need it, it is best to explicitly set it to no_llseek.
There is also a generic_file_llseek_unlocked, somewhat analogous to the unlocked_ioctls that you can use if you don't need to provide a full llseek yourself.
Re: [PATCH] macintosh: Explicitly set llseek to no_llseek in ans-lcd
Quoted 11 lines · John Kacur
Quoted 7 lines
Should we better pushdown
default_llseekto every to every file operations that don't implement llseek?
I don't know how many of them don't implementllseek()though.That said we can't continue anymore with this default attribution of
default_llseek()on new fops.If you don't explicitly set it to
no_llseek, you automatically get thedefault_llseek, which uses the BKL. So if your driver doesn't need it, it is best to explicitly set it tono_llseek.
Sure, that's the right thing to do.
Quoted 3 lines
There is also a
generic_file_llseek_unlocked, somewhat analogous to theunlocked_ioctlsthat you can use if you don't need to provide a full llseek yourself.
No problem with that. Setting no_llseek or generic_file_llseek_unlocked, depending on the context is the right thing to do.
What I'm wondering about concerns the future code that will have no llsek() implemented in their fops.
We can't continue to use default_llseek() for future code unless we want to continue these post reviews and fixes forever.
Re: [PATCH] macintosh: Explicitly set llseek to no_llseek in ans-lcd
Quoted 22 lines · Frederic Weisbecker
Quoted 11 lines · John Kacur
Quoted 7 lines
Should we better pushdown
default_llseekto every to every file operations that don't implement llseek?
I don't know how many of them don't implementllseek()though.That said we can't continue anymore with this default attribution of
default_llseek()on new fops.If you don't explicitly set it to
no_llseek, you automatically get thedefault_llseek, which uses the BKL. So if your driver doesn't need it, it is best to explicitly set it tono_llseek.Sure, that's the right thing to do.
Quoted 3 lines
There is also a
generic_file_llseek_unlocked, somewhat analogous to theunlocked_ioctlsthat you can use if you don't need to provide a full llseek yourself.
Quoted 9 lines
No problem with that. Setting
no_llseekorgeneric_file_llseek_unlocked, depending on the context is the right thing to do.What I'm wondering about concerns the future code that will have no
llsek()implemented in their fops.We can't continue to use
default_llseek()for future code unless we want to continue these post reviews and fixes forever.
I'm thinking that the simplier approach, would be to make the default_llseek the unlocked one. Then you only have to audit the drivers that have the BKL - ie the ones we are auditing anyway, and explicitly set them to the bkl locked llseek.
There might be a hidden interaction though between the non-unlocked variety of ioctls and default llseek though.
Re: [PATCH] macintosh: Explicitly set llseek to no_llseek in ans-lcd
Quoted 10 lines · John Kacur
Quoted 9 lines
No problem with that. Setting
no_llseekorgeneric_file_llseek_unlocked, depending on the context is the right thing to do.What I'm wondering about concerns the future code that will have no
llsek()implemented in their fops.We can't continue to use
default_llseek()for future code unless we want to continue these post reviews and fixes forever.
Quoted 7 lines
I'm thinking that the simplier approach, would be to make the
default_llseekthe unlocked one. Then you only have to audit the drivers that have the BKL - ie the ones we are auditing anyway, and explicitly set them to the bkl locked llseek.There might be a hidden interaction though between the non-unlocked variety of ioctls and default llseek though.
I fear that won't work because the bkl in default_llseek() does not only synchronizes with others uses of the bkl in a driver, it also synchronizes lseek() itself.
As an example offset change is not atomic. This is a long long, so updating its value is not atomic in 32 bits archs.
Arnd Bergmann
maintainerRe: [PATCH] macintosh: Explicitly set llseek to no_llseek in ans-lcd
Quoted 9 lines · Frederic Weisbecker
Quoted 7 lines
I'm thinking that the simplier approach, would be to make the
default_llseekthe unlocked one. Then you only have to audit the drivers that have the BKL - ie the ones we are auditing anyway, and explicitly set them to the bkl locked llseek.There might be a hidden interaction though between the non-unlocked variety of ioctls and default llseek though.
Quoted 6 lines
I fear that won't work because the bkl in
default_llseek()does not only synchronizes with others uses of the bkl in a driver, it also synchronizeslseek()itself.As an example offset change is not atomic. This is a long long, so updating its value is not atomic in 32 bits archs.
A late follow-up on this one:
I looked at what places in the code manipulate file->f_pos directly and found that almost all the uses in driver code are broken because they don't take any locks. Most of them are in driver specific lseek operations. Others are in read/write methods and are even more broken because the change gets immediately overwritten by vfs_read/vfs_write when the driver method returns.
IMHO, we should complete the pushdown into all ioctl methods that John and Thomas have started working on, fixing the lseek methods in those files we touch.
When that is done, all interaction between default_llseek and driver locking has to be with explicit calls to lock_kernel in those drivers, so we can reasonably well script the search for drivers needing the BKL in llseek: everyhing that
a) defines file_operations without an llseek function,
b) touches f_pos somewhere, and
c) calls lock_kernel() somewhere
That should only be a small number and when they are fixed, we can remove default_llseek and instead call generic_file_llseek for any file operation without a separate llseek method.
Arnd <><
Re: [PATCH] macintosh: Explicitly set llseek to no_llseek in ans-lcd
Quoted 11 lines · Arnd Bergmann
I looked at what places in the code manipulate
file->f_posdirectly and found that almost all the uses in driver code are broken because they don't take any locks. Most of them are in driver specific lseek operations. Others are in read/write methods and are even more broken because the change gets immediately overwritten by vfs_read/vfs_write when the driver method returns.IMHO, we should complete the pushdown into all ioctl methods that John and Thomas have started working on, fixing the lseek methods in those files we touch.
Quoted 10 lines
When that is done, all interaction between
default_llseekand driver locking has to be with explicit calls tolock_kernelin those drivers, so we can reasonably well script the search for drivers needing the BKL in llseek: everyhing that
a) definesfile_operationswithout an llseek function,
b) touchesf_possomewhere, and
c) callslock_kernel()somewhere
That should only be a small number and when they are fixed, we can removedefault_llseekand instead callgeneric_file_llseekfor any file operation without a separate llseek method.
As mentioned before making generic_file_llseek the new default is probably a bad idea. The majority of our file_operations instances don't actually support seeking, so no_llseek should become the new default if you spend some effort on converting things. Anything that wants to allow seeking will have to set a llseek method. This also mirrors what we do for other file operations. None of the major ones has a non-trivial default, it's either silently succeeding for a selected few like open or release or returning an error for operatings that actually do something like read and write.
Arnd Bergmann
maintainerRe: [PATCH] macintosh: Explicitly set llseek to no_llseek in ans-lcd
Quoted 9 lines · Christoph Hellwig
As mentioned before making
generic_file_llseekthe new default is probably a bad idea. The majority of ourfile_operationsinstances don't actually support seeking, sono_llseekshould become the new default if you spend some effort on converting things. Anything that wants to allow seeking will have to set a llseek method. This also mirrors what we do for other file operations. None of the major ones has a non-trivial default, it's either silently succeeding for a selected few like open or release or returning an error for operatings that actually do something like read and write.
Ok, good point.
Do you think we should also prevent pread/pwrite for devices without an llseek operation, like nonseekable_open does? I guess that would be consistent.
Then there is the point that (I forgot who) brought up that changing code to do no_llseek is actually an ABI change. Even if the file position is never used anywhere, some random user application might expect a chardev not to return an error when its llseek method is called, resulting in regressions.
Arnd <><
PATCH 23/28 i2c: Remove big kernel lock from i2cdev_open
In reply to Thomas GleixnerThe BKL is held over a kmalloc so cannot protect anything beyond that. The two calls before the kmalloc have their own locking. Improve device open function by removing the now unnecessary ret variable
LKML-Reference: <[email protected]>
--- drivers/i2c/i2c-dev.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)
drivers/i2c/i2c-dev.c +6 -16
@@ -34,7 +34,6 @@#include <linux/list.h> #include <linux/i2c.h> #include <linux/i2c-dev.h> -#include <linux/smp_lock.h> #include <linux/jiffies.h> #include <asm/uaccess.h>
@@ -445,20 +444,14 @@ static int i2cdev_open(struct inode *inostruct i2c_client *client;struct i2c_adapter *adap;struct i2c_dev *i2c_dev; -int ret =0 ; -lock_kernel (); i2c_dev =i2c_dev_get_by_minor (minor); -if (!i2c_dev) { - ret = -ENODEV ; - goto out; - } +if (!i2c_dev) +return -ENODEV ; adap =i2c_get_adapter (i2c_dev->adap->nr); -if (!adap) { - ret = -ENODEV ; - goto out; - } +if (!adap) +return -ENODEV ;/* This creates an anonymous i2c_client, which may later be * pointed to some address using I2C_SLAVE or I2C_SLAVE_FORCE.
@@ -470,8 +463,7 @@ static int i2cdev_open(struct inode *ino client =kzalloc (sizeof (*client),GFP_KERNEL );if (!client) {i2c_put_adapter (adap); - ret = -ENOMEM ; - goto out; +return -ENOMEM ; }snprintf (client->name,I2C_NAME_SIZE ,"i2c-dev %d" , adap->nr); client->driver = &i2cdev_driver;
@@ -479,9 +471,7 @@ static int i2cdev_open(struct inode *ino client->adapter = adap; file->private_data = client; -out: -unlock_kernel (); -return ret; +return 0 ; }static int i2cdev_release (struct inode *inode,struct file *file)
Re: [patch 23/28] i2c: Remove big kernel lock from i2cdev_open
Hi Thomas,
Quoted 61 lines · Thomas Gleixner
The BKL is held over a kmalloc so cannot protect anything beyond that. The two calls before the kmalloc have their own locking. Improve device open function by removing the now unnecessary ret variable
Signed-off-by Vincent Sanders <[email protected]>LKML-Reference: <[email protected]>
Cc Jean Delvare <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>--- drivers/i2c/i2c-dev.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)Index:
linux-2.6-tip/drivers/i2c/i2c-dev.c
===================================================================drivers/i2c/i2c-dev.c +5
-13@@ -34,7 +34,6 @@#include <linux/list.h> #include <linux/i2c.h> #include <linux/i2c-dev.h> -#include <linux/smp_lock.h> #include <linux/jiffies.h> #include <asm/uaccess.h> @@ -445,20 +444,14 @@ static int i2cdev_open(struct inode *inostruct i2c_client *client;struct i2c_adapter *adap;struct i2c_dev *i2c_dev; -int ret =0 ; -lock_kernel (); i2c_dev =i2c_dev_get_by_minor (minor); -if (!i2c_dev) { - ret = -ENODEV ; - goto out; - } +if (!i2c_dev) +return -ENODEV ; adap =i2c_get_adapter (i2c_dev->adap->nr); -if (!adap) { - ret = -ENODEV ; - goto out; - } +if (!adap) +return -ENODEV ;/* This creates an anonymous i2c_client, which may later be * pointed to some address using I2C_SLAVE or I2C_SLAVE_FORCE. @@ -470,8 +463,7 @@ static int i2cdev_open(struct inode *ino client =kzalloc (sizeof (*client),GFP_KERNEL );if (!client) {i2c_put_adapter (adap); - ret = -ENOMEM ; - goto out; +return -ENOMEM ; }snprintf (client->name,I2C_NAME_SIZE ,"i2c-dev %d" , adap->nr); client->driver = &i2cdev_driver;
drivers/i2c/i2c-dev.c static int i2cdev_open(struct inode *ino · line 477
Quoted 10 lines
drivers/i2c/i2c-dev.c +1
-3@@ -479,9 +471,7 @@ static int i2cdev_open(struct inode *ino client->adapter = adap; file->private_data = client; -out: -unlock_kernel (); -return ret; +return 0 ; }static int i2cdev_release (struct inode *inode,struct file *file)
Looks good to me:
Do you want me to pick this patch in my i2c tree, or will you take care of pushing it upstream? If you're not going to push it quickly, I'd prefer the first solution, to avoid conflicts.
(As a side note, i2c-dev would deserve a partial rewrite as it doesn't integrate into the standard device driver model, and certainly has a number of race conditions. But this is well beyond the scope of your patch.)
Thanks,
Signature · 1 line
Jean Delvare
Re: [patch 23/28] i2c: Remove big kernel lock from i2cdev_open
Jean,
Quoted 7 lines · Jean Delvare
Looks good to me:
Acked-by Jean Delvare <[email protected]>Do you want me to pick this patch in my i2c tree, or will you take care of pushing it upstream? If you're not going to push it quickly, I'd prefer the first solution, to avoid conflicts.
I'm targeting for .33, but please pick it up. I drop it from my queue then.
Quoted 4 lines
(As a side note, i2c-dev would deserve a partial rewrite as it doesn't integrate into the standard device driver model, and certainly has a number of race conditions. But this is well beyond the scope of your patch.)
Yeah, noticed that this code needs some care, but my current dosis of brain wreckage with the BKL stuff is enough :)
Thanks,
tglx
Re: [patch 23/28] i2c: Remove big kernel lock from i2cdev_open
Quoted 5 lines · Thomas Gleixner
Jean,
Quoted 2 lines · Jean Delvare
Looks good to me:
Quoted 8 lines
Quoted 5 lines
Acked-by Jean Delvare <[email protected]>Do you want me to pick this patch in my i2c tree, or will you take care of pushing it upstream? If you're not going to push it quickly, I'd prefer the first solution, to avoid conflicts.
I'm targeting for .33, but please pick it up. I drop it from my queue then.
Will do. I guess I can assume that the patch is from Vincent Sanders, not you, despite the lack of From: header?
Signature · 1 line
Jean Delvare
Re: [patch 23/28] i2c: Remove big kernel lock from i2cdev_open
Jean,
Quoted 12 lines · Jean Delvare
Quoted 11 lines · Thomas Gleixner
Jean,
Quoted 7 lines · Jean Delvare
Looks good to me:
Acked-by Jean Delvare <[email protected]>Do you want me to pick this patch in my i2c tree, or will you take care of pushing it upstream? If you're not going to push it quickly, I'd prefer the first solution, to avoid conflicts.
Quoted 5 lines
Quoted 2 lines
I'm targeting for .33, but please pick it up. I drop it from my queue then.
Will do. I guess I can assume that the patch is from Vincent Sanders, not you, despite the lack of From: header?
Duh, yes. Missed that.
Thanks,
tglx
Re: [patch 23/28] i2c: Remove big kernel lock from i2cdev_open
Quoted 5 lines · Thomas Gleixner
Quoted 3 lines
Will do. I guess I can assume that the patch is from Vincent Sanders, not you, despite the lack of From: header?
Duh, yes. Missed that.
I'm still wanting to fix quilt mail to not mess that up... maybe I should sit down and try and grok that stuff again.
Re: [patch 23/28] i2c: Remove big kernel lock from i2cdev_open
Quoted 9 lines · Peter Zijlstra
Quoted 5 lines · Thomas Gleixner
Quoted 3 lines
Will do. I guess I can assume that the patch is from Vincent Sanders, not you, despite the lack of From: header?
Duh, yes. Missed that.
I'm still wanting to fix quilt mail to not mess that up... maybe I should sit down and try and grok that stuff again.
IIRC it worked some time ago. That's why I did not notice.
Thanks,
tglx
PATCH 24/28 rtc: Remove BKL from efirtc
In reply to Thomas GleixnerBKL locking came to efirtc via the big BKL push down, but the access to the efi functions is protected by efi_rtc_lock already.
Remove it.
---drivers/char/efirtc.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
--- drivers/char/efirtc.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/char/efirtc.c +1 -11
@@ -27,8 +27,6 @@* - Add module support */ - -#include <linux/smp_lock.h> #include <linux/types.h> #include <linux/errno.h> #include <linux/miscdevice.h>
@@ -174,13 +172,12 @@ static long efi_rtc_ioctl(struct file *freturn -EINVAL ;case RTC_RD_TIME : -lock_kernel ();spin_lock_irqsave (&efi_rtc_lock, flags); status = efi.get_time (&eft, &cap);spin_unlock_irqrestore (&efi_rtc_lock,flags); -unlock_kernel (); +if (status !=EFI_SUCCESS ) {/* should never happen */ printk (KERN_ERR "efitime: can't read time\n" );
@@ -202,13 +199,11 @@ static long efi_rtc_ioctl(struct file *fconvert_to_efi_time (&wtime, &eft); -lock_kernel ();spin_lock_irqsave (&efi_rtc_lock, flags); status = efi.set_time (&eft);spin_unlock_irqrestore (&efi_rtc_lock,flags); -unlock_kernel ();return status ==EFI_SUCCESS ?0 : -EINVAL ;
@@ -224,7 +219,6 @@ static long efi_rtc_ioctl(struct file *fconvert_to_efi_time (&wtime, &eft); -lock_kernel ();spin_lock_irqsave (&efi_rtc_lock, flags);/* * XXX Fixme:
@@ -235,19 +229,16 @@ static long efi_rtc_ioctl(struct file *f status = efi.set_wakeup_time ((efi_bool_t )enabled, &eft);spin_unlock_irqrestore (&efi_rtc_lock,flags); -unlock_kernel ();return status ==EFI_SUCCESS ?0 : -EINVAL ;case RTC_WKALM_RD : -lock_kernel ();spin_lock_irqsave (&efi_rtc_lock, flags); status = efi.get_wakeup_time ((efi_bool_t *)&enabled, (efi_bool_t *)&pending, &eft);spin_unlock_irqrestore (&efi_rtc_lock,flags); -unlock_kernel ();if (status !=EFI_SUCCESS )return -EINVAL ;
@@ -277,7 +268,6 @@ static int efi_rtc_open(struct inode *in* We do accept multiple open files at the same time as we * synchronize on the per call operation. */ -cycle_kernel_lock ();return 0 ; }
[tip:bkl/drivers] rtc: Remove BKL from efirtc
Commit-ID: a5ee6dc9ebe8fc2640ee3fbf2c340bd853e2fd36 Gitweb: http://git.kernel.org/tip/a5ee6dc9ebe8fc2640ee3fbf2c340bd853e2fd36 Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:14:03 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:36:51 +0200
rtc: Remove BKL from efirtc
BKL locking came to efirtc via the big BKL push down, but the access to the efi functions is protected by efi_rtc_lock already.
Remove it.
LKML-Reference: <[email protected]>
--- drivers/char/efirtc.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-)
drivers/char/efirtc.c +1 -11
@@ -27,8 +27,6 @@* - Add module support */ - -#include <linux/smp_lock.h> #include <linux/types.h> #include <linux/errno.h> #include <linux/miscdevice.h>
@@ -174,13 +172,12 @@ static long efi_rtc_ioctl(struct file *file, unsigned int cmd,return -EINVAL ;case RTC_RD_TIME : -lock_kernel ();spin_lock_irqsave (&efi_rtc_lock, flags); status = efi.get_time (&eft, &cap);spin_unlock_irqrestore (&efi_rtc_lock,flags); -unlock_kernel (); +if (status !=EFI_SUCCESS ) {/* should never happen */ printk (KERN_ERR "efitime: can't read time\n" );
@@ -202,13 +199,11 @@ static long efi_rtc_ioctl(struct file *file, unsigned int cmd,convert_to_efi_time (&wtime, &eft); -lock_kernel ();spin_lock_irqsave (&efi_rtc_lock, flags); status = efi.set_time (&eft);spin_unlock_irqrestore (&efi_rtc_lock,flags); -unlock_kernel ();return status ==EFI_SUCCESS ?0 : -EINVAL ;
@@ -224,7 +219,6 @@ static long efi_rtc_ioctl(struct file *file, unsigned int cmd,convert_to_efi_time (&wtime, &eft); -lock_kernel ();spin_lock_irqsave (&efi_rtc_lock, flags);/* * XXX Fixme:
@@ -235,19 +229,16 @@ static long efi_rtc_ioctl(struct file *file, unsigned int cmd, status = efi.set_wakeup_time ((efi_bool_t )enabled, &eft);spin_unlock_irqrestore (&efi_rtc_lock,flags); -unlock_kernel ();return status ==EFI_SUCCESS ?0 : -EINVAL ;case RTC_WKALM_RD : -lock_kernel ();spin_lock_irqsave (&efi_rtc_lock, flags); status = efi.get_wakeup_time ((efi_bool_t *)&enabled, (efi_bool_t *)&pending, &eft);spin_unlock_irqrestore (&efi_rtc_lock,flags); -unlock_kernel ();if (status !=EFI_SUCCESS )return -EINVAL ;
@@ -277,7 +268,6 @@ static int efi_rtc_open(struct inode *inode, struct file *file)* We do accept multiple open files at the same time as we * synchronize on the per call operation. */ -cycle_kernel_lock ();return 0 ; }
Subject: [PATCH] rtc: Explicitly set llseek to no_llseek
In reply to Thomas GleixnerQuoted 1 line
From
e1b7175258b33da3b0564ef04a0b1956f04f0cc7Mon Sep 17 00:00:00 2001
From: John Kacur <[email protected]>
Date: Wed, 21 Oct 2009 23:10:30 +0200
Subject: [PATCH] rtc: Explicitly set llseek to no_llseek
Now that we've removed the BKL here, lets explicitly set llseek to no_llseek since the default llseek is not used here.
--- drivers/char/efirtc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/char/efirtc.c +1 -0
@@ -285,6 +285,7 @@ static const struct file_operations efi_rtc_fops = { .unlocked_ioctl = efi_rtc_ioctl, .open = efi_rtc_open, .release = efi_rtc_close, + .llseek = no_llseek, };static struct miscdevice efi_rtc_dev= {
Signature · 1 line
1.6.0.6
Re: Subject: [PATCH] rtc: Explicitly set llseek to no_llseek
Quoted 8 lines · On Wed, 21 Oct 2009 23:13:26 +0200 (CEST) John Kacur <[email protected]> wrote:
Quoted 1 line
From
e1b7175258b33da3b0564ef04a0b1956f04f0cc7Mon Sep 17 00:00:00 2001From: John Kacur <[email protected]>
Date: Wed, 21 Oct 2009 23:10:30 +0200
Subject: [PATCH] rtc: Explicitly set llseek tono_llseekNow that we've removed the BKL here, lets explicitly set llseek to
no_llseeksince the default llseek is not used here.
I don't understand.
drivers/char/efirtc.c static const struct file_operations efi_rtc_fops = { · line 291
Quoted 13 lines
drivers/char/efirtc.c +1
-0@@ -285,6 +285,7 @@ static const struct file_operations efi_rtc_fops = { .unlocked_ioctl = efi_rtc_ioctl, .open = efi_rtc_open, .release = efi_rtc_close, + .llseek = no_llseek, };static struct miscdevice efi_rtc_dev= {
What has this change to do with the BKL?
Re: Subject: [PATCH] rtc: Explicitly set llseek to no_llseek
Quoted 26 lines · Andrew Morton
Quoted 8 lines · On Wed, 21 Oct 2009 23:13:26 +0200 (CEST) John Kacur <[email protected]> wrote:
Quoted 1 line
From
e1b7175258b33da3b0564ef04a0b1956f04f0cc7Mon Sep 17 00:00:00 2001From: John Kacur <[email protected]>
Date: Wed, 21 Oct 2009 23:10:30 +0200
Subject: [PATCH] rtc: Explicitly set llseek tono_llseekNow that we've removed the BKL here, lets explicitly set llseek to
no_llseeksince the default llseek is not used here.I don't understand.
Quoted 12 lines
drivers/char/efirtc.c +1
-0@@ -285,6 +285,7 @@ static const struct file_operations efi_rtc_fops = { .unlocked_ioctl = efi_rtc_ioctl, .open = efi_rtc_open, .release = efi_rtc_close, + .llseek = no_llseek, };
Quoted 3 lines
drivers/char/efirtc.c static const struct file_operations efi_rtc_fops = { · line 291
Quoted 1 line
drivers/char/efirtc.c +0
-0static struct miscdevice efi_rtc_dev= {What has this change to do with the BKL?
The default_llseek function still contains the BKL.
When we are auditing code to see if we can remove the BKL, this is one of the hidden considerations we need to take into account.
i.e., is there syncronization between code that has the BKL and llseek.
At the same time we remove the BKL it would be a good idea to do indicate when no llseek function is required, so we don't have to revisit this code again, when we are trying to determine if we can remove the BKL from the default_llseek.
PATCH 25/28 parisc: Remove BKL from eisa_eeprom
In reply to Thomas GleixnerRemove the empty ioctl and the cycle_kernel_lock() in eisa_eeprom_open() which got there with the big BKL push down. There is nothing to wait for and sychronize with after the misc device has been registered.
--- drivers/parisc/eisa_eeprom.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/parisc/eisa_eeprom.c +0 -10
@@ -75,17 +75,8 @@ static ssize_t eisa_eeprom_read(struct freturn ret; } -static int eisa_eeprom_ioctl (struct inode *inode,struct file *file, -unsigned int cmd, -unsigned long arg) -{ -return -ENOTTY ; -} -static int eisa_eeprom_open (struct inode *inode,struct file *file) { -cycle_kernel_lock (); -if (file->f_mode &FMODE_WRITE )return -EINVAL ;
@@ -104,7 +95,6 @@ static const struct file_operations eisa .owner = THIS_MODULE, .llseek = eisa_eeprom_llseek, .read = eisa_eeprom_read, - .ioctl = eisa_eeprom_ioctl, .open = eisa_eeprom_open, .release = eisa_eeprom_release, };
[tip:bkl/drivers] parisc: Remove BKL from eisa_eeprom
Commit-ID: eb29b758a8b0b2dbffd8dc898490237d3ee783e4 Gitweb: http://git.kernel.org/tip/eb29b758a8b0b2dbffd8dc898490237d3ee783e4 Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:33:17 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:36:52 +0200
parisc: Remove BKL from eisa_eeprom
Remove the empty ioctl and the cycle_kernel_lock() in eisa_eeprom_open() which got there with the big BKL push down. There is nothing to wait for and sychronize with after the misc device has been registered.
Remove the empty ioctl as well. The generic code handles the -ENOTTY if no ioctl function is provided.
LKML-Reference: <[email protected]>
Cc: Kyle McMartin <[email protected]>
--- drivers/parisc/eisa_eeprom.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-)
drivers/parisc/eisa_eeprom.c +0 -10
@@ -75,17 +75,8 @@ static ssize_t eisa_eeprom_read(struct file * file,return ret; } -static int eisa_eeprom_ioctl (struct inode *inode,struct file *file, -unsigned int cmd, -unsigned long arg) -{ -return -ENOTTY ; -} -static int eisa_eeprom_open (struct inode *inode,struct file *file) { -cycle_kernel_lock (); -if (file->f_mode &FMODE_WRITE )return -EINVAL ;
@@ -104,7 +95,6 @@ static const struct file_operations eisa_eeprom_fops = { .owner = THIS_MODULE, .llseek = eisa_eeprom_llseek, .read = eisa_eeprom_read, - .ioctl = eisa_eeprom_ioctl, .open = eisa_eeprom_open, .release = eisa_eeprom_release, };
Re: [patch 25/28] parisc: Remove BKL from eisa_eeprom
In reply to Thomas GleixnerQuoted 7 lines · Thomas Gleixner
Remove the empty ioctl and the
cycle_kernel_lock()ineisa_eeprom_open()which got there with the big BKL push down. There is nothing to wait for and sychronize with after the misc device has been registered.Signed-off-by Thomas Gleixner <[email protected]>Cc Kyle McMartin <[email protected]>
Looks good to me.
PATCH 26/28 drivers: Remove BKL from pc8736x_gpio
In reply to Thomas Gleixnercycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it.
--- drivers/char/pc8736x_gpio.c | 2 -- 1 file changed, 2 deletions(-)
drivers/char/pc8736x_gpio.c +0 -2
@@ -20,7 +20,6 @@#include <linux/mutex.h> #include <linux/nsc_gpio.h> #include <linux/platform_device.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> #define DEVNAME "pc8736x_gpio"
@@ -223,7 +222,6 @@ static int pc8736x_gpio_open(struct inodunsigned m =iminor (inode); file->private_data = &pc8736x_gpio_ops; -cycle_kernel_lock ();dev_dbg (&pdev->dev,"open %d\n" , m);if (m >=PC8736X_GPIO_CT )
[tip:bkl/drivers] drivers: Remove BKL from pc8736x_gpio
Commit-ID: 71d69bc2c0202f438669073d849999d2f6b6ca31 Gitweb: http://git.kernel.org/tip/71d69bc2c0202f438669073d849999d2f6b6ca31 Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 15:56:00 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:36:52 +0200
drivers: Remove BKL from pc8736x_gpio
cycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it.
LKML-Reference: <[email protected]>
--- drivers/char/pc8736x_gpio.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/char/pc8736x_gpio.c +0 -2
@@ -20,7 +20,6 @@#include <linux/mutex.h> #include <linux/nsc_gpio.h> #include <linux/platform_device.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> #define DEVNAME "pc8736x_gpio"
@@ -223,7 +222,6 @@ static int pc8736x_gpio_open(struct inode *inode, struct file *file)unsigned m =iminor (inode); file->private_data = &pc8736x_gpio_ops; -cycle_kernel_lock ();dev_dbg (&pdev->dev,"open %d\n" , m);if (m >=PC8736X_GPIO_CT )
PATCH 27/28 drivers: Remove BKL from scx200_gpio
In reply to Thomas Gleixnercycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it.
--- drivers/char/scx200_gpio.c | 2 -- 1 file changed, 2 deletions(-)
drivers/char/scx200_gpio.c +0 -2
@@ -12,7 +12,6 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> #include <asm/io.h>
@@ -52,7 +51,6 @@ static int scx200_gpio_open(struct inodeunsigned m =iminor (inode); file->private_data = &scx200_gpio_ops; -cycle_kernel_lock ();if (m >=MAX_PINS )return -EINVAL ;return nonseekable_open (inode, file);
[tip:bkl/drivers] drivers: Remove BKL from scx200_gpio
Commit-ID: 3a8183a2061ba54c4c2b3cd31c3add6fd717e853 Gitweb: http://git.kernel.org/tip/3a8183a2061ba54c4c2b3cd31c3add6fd717e853 Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 16:02:53 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:36:53 +0200
drivers: Remove BKL from scx200_gpio
cycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it.
LKML-Reference: <[email protected]>
--- drivers/char/scx200_gpio.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/char/scx200_gpio.c +0 -2
@@ -12,7 +12,6 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> #include <asm/io.h>
@@ -52,7 +51,6 @@ static int scx200_gpio_open(struct inode *inode, struct file *file)unsigned m =iminor (inode); file->private_data = &scx200_gpio_ops; -cycle_kernel_lock ();if (m >=MAX_PINS )return -EINVAL ;return nonseekable_open (inode, file);
PATCH 28/28 mips: Remove BKL from tb0219
In reply to Thomas Gleixnercycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code.
tb0219_base is initialized before the character device is registered, but the spinlock is not initialized.
Initialize the spinlock statically and remove cycle_kernel_lock().
--- drivers/char/tb0219.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/char/tb0219.c +1 -5
@@ -21,7 +21,6 @@#include <linux/fs.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/smp_lock.h> #include <asm/io.h> #include <asm/reboot.h>
@@ -38,7 +37,7 @@ MODULE_PARM_DESC(major, "Major device nustatic void (*old_machine_restart)(char *command);static void __iomem *tb0219_base; -static spinlock_t tb0219_lock; +static DEFINE_SPINLOCK (tb0219_lock);#define tb0219_read (offset) readw(tb0219_base + (offset))#define tb0219_write (offset, value) writew((value), tb0219_base + (offset))
@@ -237,7 +236,6 @@ static int tanbac_tb0219_open(struct ino {unsigned int minor; -cycle_kernel_lock (); minor =iminor (inode);switch (minor) {case 0 :
@@ -306,8 +304,6 @@ static int __devinit tb0219_probe(structreturn retval; } -spin_lock_init (&tb0219_lock); - old_machine_restart = _machine_restart; _machine_restart = tb0219_restart;
[tip:bkl/drivers] mips: Remove BKL from tb0219
Commit-ID: d2a7be0be1099c2554f4705d2c1c5081f8f96efc Gitweb: http://git.kernel.org/tip/d2a7be0be1099c2554f4705d2c1c5081f8f96efc Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 10 Oct 2009 16:07:03 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 14 Oct 2009 17:36:53 +0200
mips: Remove BKL from tb0219
cycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code.
tb0219_base is initialized before the character device is registered, but the spinlock is not initialized.
Initialize the spinlock statically and remove cycle_kernel_lock().
LKML-Reference: <[email protected]>
Cc: Yoichi Yuasa <[email protected]>
Cc: Ralf Baechle <[email protected]>
--- drivers/char/tb0219.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
drivers/char/tb0219.c +1 -5
@@ -21,7 +21,6 @@#include <linux/fs.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/smp_lock.h> #include <asm/io.h> #include <asm/reboot.h>
@@ -38,7 +37,7 @@ MODULE_PARM_DESC(major, "Major device number");static void (*old_machine_restart)(char *command);static void __iomem *tb0219_base; -static spinlock_t tb0219_lock; +static DEFINE_SPINLOCK (tb0219_lock);#define tb0219_read (offset) readw(tb0219_base + (offset))#define tb0219_write (offset, value) writew((value), tb0219_base + (offset))
@@ -237,7 +236,6 @@ static int tanbac_tb0219_open(struct inode *inode, struct file *file) {unsigned int minor; -cycle_kernel_lock (); minor =iminor (inode);switch (minor) {case 0 :
@@ -306,8 +304,6 @@ static int __devinit tb0219_probe(struct platform_device *dev)return retval; } -spin_lock_init (&tb0219_lock); - old_machine_restart = _machine_restart; _machine_restart = tb0219_restart;
Quoted 11 lines · Thomas Gleixner
Hi all,
I'm sending out the pending BKL removal patches which I collected so far to avoid duplicate work and to solicit review/comments.
If nobody objects I'd like to keep them in one git branch which is going to be included into linux-next.
Thanks,
tglx
Seems like a great idea to me. I'm applying them all to a private git-branch against the latest from Linus to avoid duplicate work.
Please let us know when there is a tip branch we can work with.
John
Arnd Bergmann
maintainerPATCH 1/2 compat_ioctl: remove VT specific ioctl handlers
In reply to Thomas GleixnerThe VT driver now handles all of these ioctls directly, so we can remove the handlers from common code.
These are the only handlers that require the BKL because they directly perform the ioctl action rather than just converting the data structures. Once they are gone, we can remove the BKL from the remaining ioctl conversion handlers.
--- fs/compat_ioctl.c | 188 +---------------------------------------------------- 1 files changed, 1 insertions(+), 187 deletions(-)
I guess it makes sense to merge these two through the BKL removal queue.
Arnd <><
fs/compat_ioctl.c +1 -187
@@ -1039,161 +1039,6 @@ static int mt_ioctl_trans(unsigned int fd, unsigned int cmd, unsigned long arg)#endif /* CONFIG_BLOCK */ -#ifdef CONFIG_VT - -static int vt_check (struct file *file) -{ -struct tty_struct *tty; -struct inode *inode = file->f_path.dentry->d_inode; -struct vc_data *vc; - -if (file->f_op->unlocked_ioctl != tty_ioctl) -return -EINVAL ; - - tty = (struct tty_struct *)file->private_data; -if (tty_paranoia_check (tty, inode,"tty_ioctl" )) -return -EINVAL ; - -if (tty->ops->ioctl != vt_ioctl) -return -EINVAL ; - - vc = (struct vc_data *)tty->driver_data; -if (!vc_cons_allocated (vc->vc_num))/* impossible? */ -return -ENOIOCTLCMD ; - -/* -* To have permissions to do most of the vt ioctls, we either have -* to be the owner of the tty, or have CAP_SYS_TTY_CONFIG. -*/ -if (current->signal->tty == tty ||capable (CAP_SYS_TTY_CONFIG )) -return 1 ; -return 0 ; -} - -struct consolefontdesc32 { -unsigned short charcount;/* characters in font (256 or 512) */ -unsigned short charheight;/* scan lines per character (1-32) */ -compat_caddr_t chardata;/* font data in expanded form */ -}; - -static int do_fontx_ioctl (unsigned int fd,unsigned int cmd,unsigned long arg,struct file *file) -{ -struct consolefontdesc32 __user *user_cfd =compat_ptr (arg); -struct console_font_op op; -compat_caddr_t data; -int i, perm; - - perm =vt_check (file); -if (perm <0 )return perm; - -switch (cmd) { -case PIO_FONTX : -if (!perm) -return -EPERM ; - op.op =KD_FONT_OP_SET ; - op.flags =0 ; - op.width =8 ; -if (get_user (op.height, &user_cfd->charheight) || -get_user (op.charcount, &user_cfd->charcount) || -get_user (data, &user_cfd->chardata)) -return -EFAULT ; - op.data =compat_ptr (data); -return con_font_op (vc_cons[fg_console].d, &op); -case GIO_FONTX : - op.op =KD_FONT_OP_GET ; - op.flags =0 ; - op.width =8 ; -if (get_user (op.height, &user_cfd->charheight) || -get_user (op.charcount, &user_cfd->charcount) || -get_user (data, &user_cfd->chardata)) -return -EFAULT ; -if (!data) -return 0 ; - op.data =compat_ptr (data); - i =con_font_op (vc_cons[fg_console].d, &op); -if (i) -return i; -if (put_user (op.height, &user_cfd->charheight) || -put_user (op.charcount, &user_cfd->charcount) || -put_user ((compat_caddr_t )(unsigned long )op.data, - &user_cfd->chardata)) -return -EFAULT ; -return 0 ; - } -return -EINVAL ; -} - -struct console_font_op32 { -compat_uint_t op;/* operation code KD_FONT_OP_* */ -compat_uint_t flags;/* KD_FONT_FLAG_* */ -compat_uint_t width, height;/* font size */ -compat_uint_t charcount; -compat_caddr_t data;/* font data with height fixed to 32 */ -}; - -static int do_kdfontop_ioctl (unsigned int fd,unsigned int cmd,unsigned long arg,struct file *file) -{ -struct console_font_op op; -struct console_font_op32 __user *fontop =compat_ptr (arg); -int perm =vt_check (file), i; -struct vc_data *vc; - -if (perm <0 )return perm; - -if (copy_from_user (&op, fontop,sizeof (struct console_font_op32 ))) -return -EFAULT ; -if (!perm && op.op !=KD_FONT_OP_GET ) -return -EPERM ; - op.data =compat_ptr (((struct console_font_op32 *)&op)->data); - op.flags |=KD_FONT_FLAG_OLD ; - vc = ((struct tty_struct *)file->private_data)->driver_data; - i =con_font_op (vc, &op); -if (i) -return i; - ((struct console_font_op32 *)&op)->data = (unsigned long )op.data; -if (copy_to_user (fontop, &op,sizeof (struct console_font_op32 ))) -return -EFAULT ; -return 0 ; -} - -struct unimapdesc32 { -unsigned short entry_ct; -compat_caddr_t entries; -}; - -static int do_unimap_ioctl (unsigned int fd,unsigned int cmd,unsigned long arg,struct file *file) -{ -struct unimapdesc32 tmp; -struct unimapdesc32 __user *user_ud =compat_ptr (arg); -int perm =vt_check (file); -struct vc_data *vc; - -if (perm <0 ) -return perm; -if (copy_from_user (&tmp, user_ud,sizeof tmp)) -return -EFAULT ; -if (tmp.entries) -if (!access_ok (VERIFY_WRITE ,compat_ptr (tmp.entries), - tmp.entry_ct*sizeof (struct unipair ))) -return -EFAULT ; - vc = ((struct tty_struct *)file->private_data)->driver_data; -switch (cmd) { -case PIO_UNIMAP : -if (!perm) -return -EPERM ; -return con_set_unimap (vc, tmp.entry_ct, -compat_ptr (tmp.entries)); -case GIO_UNIMAP : -if (!perm && fg_console != vc->vc_num) -return -EPERM ; -return con_get_unimap (vc, tmp.entry_ct, &(user_ud->entry_ct), -compat_ptr (tmp.entries)); - } -return 0 ; -} - -#endif /* CONFIG_VT */ -static int do_smb_getmountuid (unsigned int fd,unsigned int cmd,unsigned long arg) {mm_segment_t old_fs =get_fs ();
@@ -1934,11 +1779,7 @@ COMPATIBLE_IOCTL(STOP_ARRAY_RO) COMPATIBLE_IOCTL(RESTART_ARRAY_RW) COMPATIBLE_IOCTL(GET_BITMAP_FILE) ULONG_IOCTL(SET_BITMAP_FILE) -/* Big K */ -COMPATIBLE_IOCTL(PIO_FONT) -COMPATIBLE_IOCTL(GIO_FONT) -COMPATIBLE_IOCTL(PIO_CMAP) -COMPATIBLE_IOCTL(GIO_CMAP) +/* Keyboard -- can be removed once tty3270 uses ops->compat_ioctl */ ULONG_IOCTL(KDSIGACCEPT) COMPATIBLE_IOCTL(KDGETKEYCODE) COMPATIBLE_IOCTL(KDSETKEYCODE)
@@ -1962,12 +1803,6 @@ COMPATIBLE_IOCTL(KDGKBLED) ULONG_IOCTL(KDSKBLED) COMPATIBLE_IOCTL(KDGETLED) ULONG_IOCTL(KDSETLED) -COMPATIBLE_IOCTL(GIO_SCRNMAP) -COMPATIBLE_IOCTL(PIO_SCRNMAP) -COMPATIBLE_IOCTL(GIO_UNISCRNMAP) -COMPATIBLE_IOCTL(PIO_UNISCRNMAP) -COMPATIBLE_IOCTL(PIO_FONTRESET) -COMPATIBLE_IOCTL(PIO_UNIMAPCLR)#ifdef CONFIG_BLOCK /* Big S */ COMPATIBLE_IOCTL (SCSI_IOCTL_GET_IDLUN )
@@ -1991,20 +1826,6 @@ COMPATIBLE_IOCTL(TUNSETOFFLOAD) COMPATIBLE_IOCTL(TUNSETTXFILTER) COMPATIBLE_IOCTL(TUNGETSNDBUF) COMPATIBLE_IOCTL(TUNSETSNDBUF) -/* Big V */ -COMPATIBLE_IOCTL(VT_SETMODE) -COMPATIBLE_IOCTL(VT_GETMODE) -COMPATIBLE_IOCTL(VT_GETSTATE) -COMPATIBLE_IOCTL(VT_OPENQRY) -ULONG_IOCTL(VT_ACTIVATE) -ULONG_IOCTL(VT_WAITACTIVE) -ULONG_IOCTL(VT_RELDISP) -ULONG_IOCTL(VT_DISALLOCATE) -COMPATIBLE_IOCTL(VT_RESIZE) -COMPATIBLE_IOCTL(VT_RESIZEX) -COMPATIBLE_IOCTL(VT_LOCKSWITCH) -COMPATIBLE_IOCTL(VT_UNLOCKSWITCH) -COMPATIBLE_IOCTL(VT_GETHIFONTMASK) /* Little p (/dev/rtc, /dev/envctrl, etc.) */ COMPATIBLE_IOCTL(RTC_AIE_ON) COMPATIBLE_IOCTL(RTC_AIE_OFF)
@@ -2603,13 +2424,6 @@ HANDLE_IOCTL(MTIOCPOS32, mt_ioctl_trans)#endif #define AUTOFS_IOC_SETTIMEOUT32 _IOWR(0x93,0x64,unsigned int)HANDLE_IOCTL (AUTOFS_IOC_SETTIMEOUT32 , ioc_settimeout) -#ifdef CONFIG_VT -HANDLE_IOCTL(PIO_FONTX, do_fontx_ioctl) -HANDLE_IOCTL(GIO_FONTX, do_fontx_ioctl) -HANDLE_IOCTL(PIO_UNIMAP, do_unimap_ioctl) -HANDLE_IOCTL(GIO_UNIMAP, do_unimap_ioctl) -HANDLE_IOCTL(KDFONTOP, do_kdfontop_ioctl) -#endif /* One SMB ioctl needs translations. */#define SMB_IOC_GETMOUNTUID_32 _IOR('u', 1, compat_uid_t)HANDLE_IOCTL (SMB_IOC_GETMOUNTUID_32 , do_smb_getmountuid)
Signature · 1 line
1.6.3.3
Arnd Bergmann
maintainerPATCH 2/2 compat_ioctl: do not hold BKL in handlers
We have always called ioctl conversion handlers under the big kernel lock, although that is generally not necessary. In particular it is not needed for conversion of data structures and for calling sys_ioctl or do_vfs_ioctl, which will get the BKL again if needed.
Handlers doing more than those two have been moved out, so we can kill off the BKL from compat_sys_ioctl. This may significantly improve latencies with 32 bit applications, and it avoids a common scenario where a thread acquires the BKL twice.
--- fs/compat_ioctl.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
fs/compat_ioctl.c +0 -2
@@ -2663,9 +2663,7 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd, found_handler:if (t->handler) { -lock_kernel (); error = t->handler (fd, cmd, arg, filp); -unlock_kernel (); goto out_fput; }
Signature · 1 line
1.6.3.3
Re: [PATCH 1/2] compat_ioctl: remove VT specific ioctl handlers
In reply to Arnd BergmannQuoted 8 lines · Arnd Bergmann
The VT driver now handles all of these ioctls directly, so we can remove the handlers from common code.
These are the only handlers that require the BKL because they directly perform the ioctl action rather than just converting the data structures. Once they are gone, we can remove the BKL from the remaining ioctl conversion handlers.
Quoted 7 lines
Signed-off-by Arnd Bergmann <[email protected]>--- fs/compat_ioctl.c | 188 +---------------------------------------------------- 1 files changed, 1 insertions(+), 187 deletions(-)I guess it makes sense to merge these two through the BKL removal queue.
That's fine with me:
thanks,
greg k-h