Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d21a29f authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

locking, oprofile: Annotate oprofilefs lock as raw 



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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6b2c1800

arch/x86/oprofile/nmi_int.c

+2 −2
Original line number Diff line number Diff line
@@ -355,10 +355,10 @@ static void nmi_cpu_setup(void *dummy) 
	int cpu = smp_processor_id();

	struct op_msrs *msrs = &per_cpu(cpu_msrs, cpu);

	nmi_cpu_save_registers(msrs);

	spin_lock(&oprofilefs_lock);

	raw_spin_lock(&oprofilefs_lock);

	model->setup_ctrs(model, 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);

	apic_write(APIC_LVTPC, APIC_DM_NMI);

}

drivers/oprofile/event_buffer.c

+2 −2
Original line number Diff line number Diff line
@@ -82,10 +82,10 @@ int alloc_event_buffer(void) 
{

	unsigned long flags;



	spin_lock_irqsave(&oprofilefs_lock, flags);

	raw_spin_lock_irqsave(&oprofilefs_lock, flags);

	buffer_size = oprofile_buffer_size;

	buffer_watershed = oprofile_buffer_watershed;

	spin_unlock_irqrestore(&oprofilefs_lock, flags);

	raw_spin_unlock_irqrestore(&oprofilefs_lock, flags);



	if (buffer_watershed >= buffer_size)

		return -EINVAL;

drivers/oprofile/oprofile_perf.c

+2 −2
Original line number Diff line number Diff line
@@ -160,9 +160,9 @@ static int oprofile_perf_create_files(struct super_block *sb, struct dentry *roo 


static int oprofile_perf_setup(void)

{

	spin_lock(&oprofilefs_lock);

	raw_spin_lock(&oprofilefs_lock);

	op_perf_setup();

	spin_unlock(&oprofilefs_lock);

	raw_spin_unlock(&oprofilefs_lock);

	return 0;

}

drivers/oprofile/oprofilefs.c

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#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)

{
@@ -76,9 +76,9 @@ int oprofilefs_ulong_from_user(unsigned long *val, char const __user *buf, size_ 
	if (copy_from_user(tmpbuf, buf, count))

		return -EFAULT;



	spin_lock_irqsave(&oprofilefs_lock, flags);

	raw_spin_lock_irqsave(&oprofilefs_lock, flags);

	*val = simple_strtoul(tmpbuf, NULL, 0);

	spin_unlock_irqrestore(&oprofilefs_lock, flags);

	raw_spin_unlock_irqrestore(&oprofilefs_lock, flags);

	return 0;

}

include/linux/oprofile.h

+1 −1
Original line number Diff line number Diff line
@@ -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);



/** 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.