Commit 1c7efed1 authored by Bob Miller's avatar Bob Miller Committed by Linus Torvalds

[PATCH] 2.5.6-pre3 Fix small race in BSD accounting

While looking at the bug fix for part 1 I coded up this patch
to change the BSD accounting code to use a spinlock instead
of the BKL.
parent fd98b342
...@@ -72,13 +72,29 @@ int acct_parm[3] = {4, 2, 30}; ...@@ -72,13 +72,29 @@ int acct_parm[3] = {4, 2, 30};
/* /*
* External references and all of the globals. * External references and all of the globals.
*/ */
static volatile int acct_active;
static volatile int acct_needcheck;
static struct file *acct_file;
static struct timer_list acct_timer;
static void do_acct_process(long, struct file *); static void do_acct_process(long, struct file *);
/*
* This structure is used so that all the data protected by lock
* can be placed in the same cache line as the lock. This primes
* the cache line to have the data after getting the lock.
*/
struct acct_glbs {
spinlock_t lock;
volatile int active;
volatile int needcheck;
struct file *file;
struct timer_list timer;
};
static struct acct_glbs acct_globals __cacheline_aligned = {SPIN_LOCK_UNLOCKED};
#define acct_lock acct_globals.lock
#define acct_active acct_globals.active
#define acct_needcheck acct_globals.needcheck
#define acct_file acct_globals.file
#define acct_timer acct_globals.timer
/* /*
* Called whenever the timer says to check the free space. * Called whenever the timer says to check the free space.
*/ */
...@@ -96,11 +112,11 @@ static int check_free_space(struct file *file) ...@@ -96,11 +112,11 @@ static int check_free_space(struct file *file)
int res; int res;
int act; int act;
lock_kernel(); spin_lock(&acct_lock);
res = acct_active; res = acct_active;
if (!file || !acct_needcheck) if (!file || !acct_needcheck)
goto out; goto out;
unlock_kernel(); spin_unlock(&acct_lock);
/* May block */ /* May block */
if (vfs_statfs(file->f_dentry->d_inode->i_sb, &sbuf)) if (vfs_statfs(file->f_dentry->d_inode->i_sb, &sbuf))
...@@ -117,7 +133,7 @@ static int check_free_space(struct file *file) ...@@ -117,7 +133,7 @@ static int check_free_space(struct file *file)
* If some joker switched acct_file under us we'ld better be * If some joker switched acct_file under us we'ld better be
* silent and _not_ touch anything. * silent and _not_ touch anything.
*/ */
lock_kernel(); spin_lock(&acct_lock);
if (file != acct_file) { if (file != acct_file) {
if (act) if (act)
res = act>0; res = act>0;
...@@ -142,22 +158,26 @@ static int check_free_space(struct file *file) ...@@ -142,22 +158,26 @@ static int check_free_space(struct file *file)
add_timer(&acct_timer); add_timer(&acct_timer);
res = acct_active; res = acct_active;
out: out:
unlock_kernel(); spin_unlock(&acct_lock);
return res; return res;
} }
/* /*
* sys_acct() is the only system call needed to implement process * acct_common() is the main routine that implements process accounting.
* accounting. It takes the name of the file where accounting records * It takes the name of the file where accounting records should be
* should be written. If the filename is NULL, accounting will be * written. If the filename is NULL, accounting will be shutdown.
* shutdown.
*/ */
asmlinkage long sys_acct(const char *name) long acct_common(const char *name, int locked)
{ {
struct file *file = NULL, *old_acct = NULL; struct file *file = NULL, *old_acct = NULL;
char *tmp; char *tmp;
int error; int error;
/*
* Should only have locked set when name is NULL (enforce this).
*/
BUG_ON(locked && name);
if (!capable(CAP_SYS_PACCT)) if (!capable(CAP_SYS_PACCT))
return -EPERM; return -EPERM;
...@@ -183,7 +203,8 @@ asmlinkage long sys_acct(const char *name) ...@@ -183,7 +203,8 @@ asmlinkage long sys_acct(const char *name)
} }
error = 0; error = 0;
lock_kernel(); if (!locked)
spin_lock(&acct_lock);
if (acct_file) { if (acct_file) {
old_acct = acct_file; old_acct = acct_file;
del_timer(&acct_timer); del_timer(&acct_timer);
...@@ -201,7 +222,7 @@ asmlinkage long sys_acct(const char *name) ...@@ -201,7 +222,7 @@ asmlinkage long sys_acct(const char *name)
acct_timer.expires = jiffies + ACCT_TIMEOUT*HZ; acct_timer.expires = jiffies + ACCT_TIMEOUT*HZ;
add_timer(&acct_timer); add_timer(&acct_timer);
} }
unlock_kernel(); spin_unlock(&acct_lock);
if (old_acct) { if (old_acct) {
do_acct_process(0,old_acct); do_acct_process(0,old_acct);
filp_close(old_acct, NULL); filp_close(old_acct, NULL);
...@@ -213,12 +234,25 @@ asmlinkage long sys_acct(const char *name) ...@@ -213,12 +234,25 @@ asmlinkage long sys_acct(const char *name)
goto out; goto out;
} }
/*
* sys_acct() is the only system call needed to implement process
* accounting. It takes the name of the file where accounting records
* should be written. If the filename is NULL, accounting will be
* shutdown.
*/
asmlinkage long sys_acct(const char *name)
{
return (acct_common(name, 0));
}
void acct_auto_close(struct super_block *sb) void acct_auto_close(struct super_block *sb)
{ {
lock_kernel(); spin_lock(&acct_lock);
if (acct_file && acct_file->f_dentry->d_inode->i_sb == sb) if (acct_file && acct_file->f_dentry->d_inode->i_sb == sb) {
sys_acct(NULL); (void) acct_common(NULL, 1);
unlock_kernel(); } else {
spin_unlock(&acct_lock);
}
} }
/* /*
...@@ -349,15 +383,15 @@ static void do_acct_process(long exitcode, struct file *file) ...@@ -349,15 +383,15 @@ static void do_acct_process(long exitcode, struct file *file)
int acct_process(long exitcode) int acct_process(long exitcode)
{ {
struct file *file = NULL; struct file *file = NULL;
lock_kernel(); spin_lock(&acct_lock);
if (acct_file) { if (acct_file) {
file = acct_file; file = acct_file;
get_file(file); get_file(file);
unlock_kernel(); spin_unlock(&acct_lock);
do_acct_process(exitcode, file); do_acct_process(exitcode, file);
fput(file); fput(file);
} else } else
unlock_kernel(); spin_unlock(&acct_lock);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment