Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

locking, oprofile: Annotate oprofilefs lock as raw

Browse source 
The oprofilefs_lock can be taken in atomic context (in profiling
interrupts) and therefore cannot cannot be preempted on -rt -
annotate it.

In mainline this change documents the low level nature of
the lock - otherwise there's no functional difference. Lockdep
and Sparse checking will work as usual.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner 2009-07-25 16:18:34 +02:00 committed by Ingo Molnar
parent 6b2c1800f1
commit 2d21a29fb6
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/oprofile/nmi_int.c
View file

@ -355,10 +355,10 @@ static void nmi_cpu_setup(void *dummy)
int cpu = smp_processor_id(); int cpu = smp_processor_id();
struct op_msrs *msrs = &per_cpu(cpu_msrs, cpu); struct op_msrs *msrs = &per_cpu(cpu_msrs, cpu);
nmi_cpu_save_registers(msrs); nmi_cpu_save_registers(msrs);
spin_lock(&oprofilefs_lock); raw_spin_lock(&oprofilefs_lock);
model->setup_ctrs(model, msrs); model->setup_ctrs(model, msrs);
nmi_cpu_setup_mux(cpu, msrs); nmi_cpu_setup_mux(cpu, msrs);
spin_unlock(&oprofilefs_lock); raw_spin_unlock(&oprofilefs_lock);
per_cpu(saved_lvtpc, cpu) = apic_read(APIC_LVTPC); per_cpu(saved_lvtpc, cpu) = apic_read(APIC_LVTPC);
apic_write(APIC_LVTPC, APIC_DM_NMI); apic_write(APIC_LVTPC, APIC_DM_NMI);
} }

4
drivers/oprofile/event_buffer.c
View file

@ -82,10 +82,10 @@ int alloc_event_buffer(void)
{ {
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&oprofilefs_lock, flags); raw_spin_lock_irqsave(&oprofilefs_lock, flags);
buffer_size = oprofile_buffer_size; buffer_size = oprofile_buffer_size;
buffer_watershed = oprofile_buffer_watershed; buffer_watershed = oprofile_buffer_watershed;
spin_unlock_irqrestore(&oprofilefs_lock, flags); raw_spin_unlock_irqrestore(&oprofilefs_lock, flags);
if (buffer_watershed >= buffer_size) if (buffer_watershed >= buffer_size)
return -EINVAL; return -EINVAL;

4
drivers/oprofile/oprofile_perf.c
View file

@ -160,9 +160,9 @@ static int oprofile_perf_create_files(struct super_block *sb, struct dentry *roo
static int oprofile_perf_setup(void) static int oprofile_perf_setup(void)
{ {
spin_lock(&oprofilefs_lock); raw_spin_lock(&oprofilefs_lock);
op_perf_setup(); op_perf_setup();
spin_unlock(&oprofilefs_lock); raw_spin_unlock(&oprofilefs_lock);
return 0; return 0;
} }

6
drivers/oprofile/oprofilefs.c
View file

@ -21,7 +21,7 @@
#define OPROFILEFS_MAGIC 0x6f70726f #define OPROFILEFS_MAGIC 0x6f70726f
DEFINE_SPINLOCK(oprofilefs_lock); DEFINE_RAW_SPINLOCK(oprofilefs_lock);
static struct inode *oprofilefs_get_inode(struct super_block *sb, int mode) static struct inode *oprofilefs_get_inode(struct super_block *sb, int mode)
{ {
@ -76,9 +76,9 @@ int oprofilefs_ulong_from_user(unsigned long *val, char const __user *buf, size_
if (copy_from_user(tmpbuf, buf, count)) if (copy_from_user(tmpbuf, buf, count))
return -EFAULT; return -EFAULT;
spin_lock_irqsave(&oprofilefs_lock, flags); raw_spin_lock_irqsave(&oprofilefs_lock, flags);
*val = simple_strtoul(tmpbuf, NULL, 0); *val = simple_strtoul(tmpbuf, NULL, 0);
spin_unlock_irqrestore(&oprofilefs_lock, flags); raw_spin_unlock_irqrestore(&oprofilefs_lock, flags);
return 0; return 0;
} }

2
include/linux/oprofile.h
View file

@ -166,7 +166,7 @@ ssize_t oprofilefs_ulong_to_user(unsigned long val, char __user * buf, size_t co
int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count); int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count);
/** lock for read/write safety */ /** lock for read/write safety */
extern spinlock_t oprofilefs_lock; extern raw_spinlock_t oprofilefs_lock;
/** /**
* Add the contents of a circular buffer to the event buffer. * Add the contents of a circular buffer to the event buffer.