Re: [PATCH 09/13] remove race between use and initialization oflocks
From: Andrew Morton
Date: Sat Dec 22 2007 - 01:01:07 EST
On Thu, 20 Dec 2007 17:15:57 -0500 "Ed L. Cashin" <ecashin@xxxxxxxxxx> wrote:
> Alexey Dobriyan noticed a race in the initialization of the dynamic
> locks in ...
>
> Message-ID: <20070325190221.GA5308@xxxxxxxxxxxxxxxxxxxxxx>
>
> Andrew Morton commented that these locks should be initialized at
> compile time, so this patch does that.
>
> Signed-off-by: Ed L. Cashin <ecashin@xxxxxxxxxx>
> ---
> drivers/block/aoe/aoechr.c | 6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
> index 1bc85aa..670bba6 100644
> --- a/drivers/block/aoe/aoechr.c
> +++ b/drivers/block/aoe/aoechr.c
> @@ -35,8 +35,8 @@ struct ErrMsg {
>
> static struct ErrMsg emsgs[NMSG];
> static int emsgs_head_idx, emsgs_tail_idx;
> -static struct semaphore emsgs_sema;
> -static spinlock_t emsgs_lock;
> +static __DECLARE_SEMAPHORE_GENERIC(emsgs_sema, 0);
That's not very attractive. This would be the only user of
__DECLARE_SEMAPHORE_GENERIC() in the tree. It seems that all architectures
(apart from uml) do implement this (although I didn't verify that they all
offer the same interface for it). But still...
And no, we don't appear to have a proper interface to statically declare a
locked semaphore. Nor do we appear to have one for mutexes(!).
> +static DEFINE_SPINLOCK(emsgs_lock);
> static int nblocked_emsgs_readers;
> static struct class *aoe_class;
> static struct aoe_chardev chardevs[] = {
> @@ -264,8 +264,6 @@ aoechr_init(void)
> printk(KERN_ERR "aoe: can't register char device\n");
> return n;
> }
> - sema_init(&emsgs_sema, 0);
> - spin_lock_init(&emsgs_lock);
> aoe_class = class_create(THIS_MODULE, "aoe");
> if (IS_ERR(aoe_class)) {
> unregister_chrdev(AOE_MAJOR, "aoechr");
I think it would be better to go back to initialising emsgs_lock at runtime
rather than fattening the exported semaphore API like this.
emssgs_sema is a weird-looking thing. There really should be some comments
in there because it is unobvious what the code is attempting to do.
What is the code attempting to do?
It appears to me that nblocked_emsgs_readers gets incorrectly decremented
if the down_interruptible() got interrupted, btw.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/