bsdacct: delete timer with sync intension
Hi, Andrew!
27.04.10, 15:54, "Andrew Morton" <[email protected]>:
Quoted 34 lines
Quoted 4 lines · On Thu, 25 Mar 2010 17:35:10 +0300 Vitaliy Gusev wrote:
acct_exit_ns-->acct_file_reopendeletes timer without check timer execution on other CPUs. Soacct_timeout()can change an unmapped memory.That sounds ugly.
Quoted 24 lines
--- kernel/acct.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-)kernel/acct.c +3
-6@@ -353,17 +353,18 @@ restart:void acct_exit_ns (struct pid_namespace *ns) { -struct bsd_acct_struct *acct; +struct bsd_acct_struct *acct = ns->bacct; -spin_lock (&acct_lock); - acct = ns->bacct; -if (acct !=NULL ) { -if (acct->file !=NULL ) -acct_file_reopen (acct,NULL ,NULL ); +if (acct ==NULL ) +return ;
Quoted 15 lines
kernel/acct.c restart: · line 369
Quoted 11 lines
kernel/acct.c +6
-2-kfree (acct); - } +del_timer_sync (&acct->timer); +spin_lock (&acct_lock); +if (acct->file !=NULL ) +acct_file_reopen (acct,NULL ,NULL );spin_unlock (&acct_lock); + +kfree (acct); }Is this sufficient?
acct_file_reopen()does adel_timer(), soacct_timeout()could be running concurrently withacct_file_reopen(), butacct_file_reopen()is merrily altering data at *acct.
Yes, It is sufficient. Don't mind about concurency acct_file_reopen() with acct_timeout(). It is safe. Even if acct_timeout occurs after del_timer, then only one bad thing can be - set needcheck at valid *acct.
Quoted 2 lines
Perhaps
acct_file_reopen()should be usingdel_timer_sync()?
acct_file_reopen() is called within locked &acct_lock, and unlock/lock will bring another race.
Quoted 7 lines
check_free_space()is doing a similar thing:del_timer(&acct->timer); acct->needcheck = 0;the currently-running timer handler now goes and sets needcheck again!
check_free_space() is called only for active task in pid_namespace. But acct_exit_ns() is called when there is no any thread in pid_namespace. Thus timer handler will no set again.
Quoted 4 lines
Methinks the whole thing needs a bit of a rethink, bearing in mind how
del_timer()actually works.
--
Vitaliy Gusev