d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consistently use local_irq_disable/local_irq_enable

Browse Source 
It was observed that spl_kmem_cache_alloc() uses local_irq_save()
and saves the interrupt state in a local variable.  This would
normally be fine except that spl_kmem_cache_alloc() calls
spl_cache_refill() which re-enables interrupts.  It is then
possible that while interrupts are enabled the process is
rescheduled to a different cpu before being disable again.
This could result in us restoring the saved interrupt state
from one cpu to another.

What the consequences of this are aren't perfectly clear, but
this is clearly a bug and it has the potential to cause issues.
The code has been updated to just use local_irq_enable() and
local_irq_disable() to avoid this.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf 2013-09-25 14:52:29 -07:00
parent 6a69693961
commit 429fe89cee
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
module/spl/spl-kmem.c
View File

@ -1995,7 +1995,6 @@ void *
spl_kmem_cache_alloc(spl_kmem_cache_t *skc, int flags) spl_kmem_cache_alloc(spl_kmem_cache_t *skc, int flags)
{ {
spl_kmem_magazine_t *skm; spl_kmem_magazine_t *skm;
unsigned long irq_flags;
void *obj = NULL; void *obj = NULL;
SENTRY; SENTRY;
@ -2003,7 +2002,7 @@ spl_kmem_cache_alloc(spl_kmem_cache_t *skc, int flags)
ASSERT(!test_bit(KMC_BIT_DESTROY, &skc->skc_flags)); ASSERT(!test_bit(KMC_BIT_DESTROY, &skc->skc_flags));
ASSERT(flags & KM_SLEEP); ASSERT(flags & KM_SLEEP);
atomic_inc(&skc->skc_ref); atomic_inc(&skc->skc_ref);
local_irq_save(irq_flags); local_irq_disable();
restart: restart:
/* Safe to update per-cpu structure without lock, but /* Safe to update per-cpu structure without lock, but
@ -2025,7 +2024,7 @@ spl_kmem_cache_alloc(spl_kmem_cache_t *skc, int flags)
SGOTO(restart, obj = NULL); SGOTO(restart, obj = NULL);
} }
local_irq_restore(irq_flags); local_irq_enable();
ASSERT(obj); ASSERT(obj);
ASSERT(IS_P2ALIGNED(obj, skc->skc_obj_align)); ASSERT(IS_P2ALIGNED(obj, skc->skc_obj_align));