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

Commit 9966718d authored by Robert Richter's avatar Robert Richter
Browse files

oprofile: remove ring buffer inline functions in cpu_buffer.h 



This patch moves ring buffer inline functions to cpu_buffer.c.

Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
parent 6d2c53f3

drivers/oprofile/cpu_buffer.c

+46 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ 
 * can be changed to a single buffer solution when the ring buffer

 * access is implemented as non-locking atomic code.

 */

struct ring_buffer *op_ring_buffer_read;

struct ring_buffer *op_ring_buffer_write;

static struct ring_buffer *op_ring_buffer_read;

static struct ring_buffer *op_ring_buffer_write;

DEFINE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer);



static void wq_sync_buffer(struct work_struct *work);
@@ -145,6 +145,50 @@ void end_cpu_work(void) 
	flush_scheduled_work();

}



int op_cpu_buffer_write_entry(struct op_entry *entry)

{

	entry->event = ring_buffer_lock_reserve(op_ring_buffer_write,

						sizeof(struct op_sample),

						&entry->irq_flags);

	if (entry->event)

		entry->sample = ring_buffer_event_data(entry->event);

	else

		entry->sample = NULL;



	if (!entry->sample)

		return -ENOMEM;



	return 0;

}



int op_cpu_buffer_write_commit(struct op_entry *entry)

{

	return ring_buffer_unlock_commit(op_ring_buffer_write, entry->event,

					 entry->irq_flags);

}



struct op_sample *op_cpu_buffer_read_entry(int cpu)

{

	struct ring_buffer_event *e;

	e = ring_buffer_consume(op_ring_buffer_read, cpu, NULL);

	if (e)

		return ring_buffer_event_data(e);

	if (ring_buffer_swap_cpu(op_ring_buffer_read,

				 op_ring_buffer_write,

				 cpu))

		return NULL;

	e = ring_buffer_consume(op_ring_buffer_read, cpu, NULL);

	if (e)

		return ring_buffer_event_data(e);

	return NULL;

}



unsigned long op_cpu_buffer_entries(int cpu)

{

	return ring_buffer_entries_cpu(op_ring_buffer_read, cpu)

		+ ring_buffer_entries_cpu(op_ring_buffer_write, cpu);

}



static inline int

add_sample(struct oprofile_cpu_buffer *cpu_buf,

	   unsigned long pc, unsigned long event)

drivers/oprofile/cpu_buffer.h

+4 −46
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ struct oprofile_cpu_buffer { 
	struct delayed_work work;

};



extern struct ring_buffer *op_ring_buffer_read;

extern struct ring_buffer *op_ring_buffer_write;

DECLARE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer);



/*
@@ -72,50 +70,10 @@ static inline void op_cpu_buffer_reset(int cpu) 
	cpu_buf->last_task = NULL;

}



static inline int op_cpu_buffer_write_entry(struct op_entry *entry)

{

	entry->event = ring_buffer_lock_reserve(op_ring_buffer_write,

						sizeof(struct op_sample),

						&entry->irq_flags);

	if (entry->event)

		entry->sample = ring_buffer_event_data(entry->event);

	else

		entry->sample = NULL;



	if (!entry->sample)

		return -ENOMEM;



	return 0;

}



static inline int op_cpu_buffer_write_commit(struct op_entry *entry)

{

	return ring_buffer_unlock_commit(op_ring_buffer_write, entry->event,

					 entry->irq_flags);

}



static inline struct op_sample *op_cpu_buffer_read_entry(int cpu)

{

	struct ring_buffer_event *e;

	e = ring_buffer_consume(op_ring_buffer_read, cpu, NULL);

	if (e)

		return ring_buffer_event_data(e);

	if (ring_buffer_swap_cpu(op_ring_buffer_read,

				 op_ring_buffer_write,

				 cpu))

		return NULL;

	e = ring_buffer_consume(op_ring_buffer_read, cpu, NULL);

	if (e)

		return ring_buffer_event_data(e);

	return NULL;

}



/* "acquire" as many cpu buffer slots as we can */

static inline unsigned long op_cpu_buffer_entries(int cpu)

{

	return ring_buffer_entries_cpu(op_ring_buffer_read, cpu)

		+ ring_buffer_entries_cpu(op_ring_buffer_write, cpu);

}

int op_cpu_buffer_write_entry(struct op_entry *entry);

int op_cpu_buffer_write_commit(struct op_entry *entry);

struct op_sample *op_cpu_buffer_read_entry(int cpu);

unsigned long op_cpu_buffer_entries(int cpu);



/* transient events for the CPU buffer -> event buffer */

#define CPU_IS_KERNEL 1