Commit bc92b956 authored by Uros Bizjak's avatar Uros Bizjak Committed by Steven Rostedt (Google)

ring_buffer: Change some static functions to bool

The return values of some functions are of boolean type. Change the
type of these function to bool and adjust their return values. Also
change type of some internal varibles to bool.

No functional change intended.

Link: https://lkml.kernel.org/r/20230305155532.5549-3-ubizjak@gmail.com

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarUros Bizjak <ubizjak@gmail.com>
Reviewed-by: default avatarMukesh Ojha <quic_mojha@quicinc.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent b4b55dfd
...@@ -163,7 +163,7 @@ enum { ...@@ -163,7 +163,7 @@ enum {
#define extended_time(event) \ #define extended_time(event) \
(event->type_len >= RINGBUF_TYPE_TIME_EXTEND) (event->type_len >= RINGBUF_TYPE_TIME_EXTEND)
static inline int rb_null_event(struct ring_buffer_event *event) static inline bool rb_null_event(struct ring_buffer_event *event)
{ {
return event->type_len == RINGBUF_TYPE_PADDING && !event->time_delta; return event->type_len == RINGBUF_TYPE_PADDING && !event->time_delta;
} }
...@@ -363,11 +363,9 @@ static void free_buffer_page(struct buffer_page *bpage) ...@@ -363,11 +363,9 @@ static void free_buffer_page(struct buffer_page *bpage)
/* /*
* We need to fit the time_stamp delta into 27 bits. * We need to fit the time_stamp delta into 27 bits.
*/ */
static inline int test_time_stamp(u64 delta) static inline bool test_time_stamp(u64 delta)
{ {
if (delta & TS_DELTA_TEST) return !!(delta & TS_DELTA_TEST);
return 1;
return 0;
} }
#define BUF_PAGE_SIZE (PAGE_SIZE - BUF_PAGE_HDR_SIZE) #define BUF_PAGE_SIZE (PAGE_SIZE - BUF_PAGE_HDR_SIZE)
...@@ -696,7 +694,7 @@ rb_time_read_cmpxchg(local_t *l, unsigned long expect, unsigned long set) ...@@ -696,7 +694,7 @@ rb_time_read_cmpxchg(local_t *l, unsigned long expect, unsigned long set)
return ret == expect; return ret == expect;
} }
static int rb_time_cmpxchg(rb_time_t *t, u64 expect, u64 set) static bool rb_time_cmpxchg(rb_time_t *t, u64 expect, u64 set)
{ {
unsigned long cnt, top, bottom, msb; unsigned long cnt, top, bottom, msb;
unsigned long cnt2, top2, bottom2, msb2; unsigned long cnt2, top2, bottom2, msb2;
...@@ -1486,7 +1484,7 @@ rb_set_head_page(struct ring_buffer_per_cpu *cpu_buffer) ...@@ -1486,7 +1484,7 @@ rb_set_head_page(struct ring_buffer_per_cpu *cpu_buffer)
return NULL; return NULL;
} }
static int rb_head_page_replace(struct buffer_page *old, static bool rb_head_page_replace(struct buffer_page *old,
struct buffer_page *new) struct buffer_page *new)
{ {
unsigned long *ptr = (unsigned long *)&old->list.prev->next; unsigned long *ptr = (unsigned long *)&old->list.prev->next;
...@@ -1913,7 +1911,7 @@ static inline unsigned long rb_page_write(struct buffer_page *bpage) ...@@ -1913,7 +1911,7 @@ static inline unsigned long rb_page_write(struct buffer_page *bpage)
return local_read(&bpage->write) & RB_WRITE_MASK; return local_read(&bpage->write) & RB_WRITE_MASK;
} }
static int static bool
rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned long nr_pages) rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned long nr_pages)
{ {
struct list_head *tail_page, *to_remove, *next_page; struct list_head *tail_page, *to_remove, *next_page;
...@@ -2026,12 +2024,13 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned long nr_pages) ...@@ -2026,12 +2024,13 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned long nr_pages)
return nr_removed == 0; return nr_removed == 0;
} }
static int static bool
rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer) rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer)
{ {
struct list_head *pages = &cpu_buffer->new_pages; struct list_head *pages = &cpu_buffer->new_pages;
int retries, success;
unsigned long flags; unsigned long flags;
bool success;
int retries;
/* Can be called at early boot up, where interrupts must not been enabled */ /* Can be called at early boot up, where interrupts must not been enabled */
raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags); raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
...@@ -2050,7 +2049,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer) ...@@ -2050,7 +2049,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer)
* spinning. * spinning.
*/ */
retries = 10; retries = 10;
success = 0; success = false;
while (retries--) { while (retries--) {
struct list_head *head_page, *prev_page, *r; struct list_head *head_page, *prev_page, *r;
struct list_head *last_page, *first_page; struct list_head *last_page, *first_page;
...@@ -2079,7 +2078,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer) ...@@ -2079,7 +2078,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer)
* pointer to point to end of list * pointer to point to end of list
*/ */
head_page->prev = last_page; head_page->prev = last_page;
success = 1; success = true;
break; break;
} }
} }
...@@ -2107,7 +2106,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer) ...@@ -2107,7 +2106,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer)
static void rb_update_pages(struct ring_buffer_per_cpu *cpu_buffer) static void rb_update_pages(struct ring_buffer_per_cpu *cpu_buffer)
{ {
int success; bool success;
if (cpu_buffer->nr_pages_to_update > 0) if (cpu_buffer->nr_pages_to_update > 0)
success = rb_insert_pages(cpu_buffer); success = rb_insert_pages(cpu_buffer);
...@@ -2990,7 +2989,7 @@ static u64 rb_time_delta(struct ring_buffer_event *event) ...@@ -2990,7 +2989,7 @@ static u64 rb_time_delta(struct ring_buffer_event *event)
} }
} }
static inline int static inline bool
rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer, rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
struct ring_buffer_event *event) struct ring_buffer_event *event)
{ {
...@@ -3011,7 +3010,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer, ...@@ -3011,7 +3010,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
delta = rb_time_delta(event); delta = rb_time_delta(event);
if (!rb_time_read(&cpu_buffer->write_stamp, &write_stamp)) if (!rb_time_read(&cpu_buffer->write_stamp, &write_stamp))
return 0; return false;
/* Make sure the write stamp is read before testing the location */ /* Make sure the write stamp is read before testing the location */
barrier(); barrier();
...@@ -3024,7 +3023,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer, ...@@ -3024,7 +3023,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
/* Something came in, can't discard */ /* Something came in, can't discard */
if (!rb_time_cmpxchg(&cpu_buffer->write_stamp, if (!rb_time_cmpxchg(&cpu_buffer->write_stamp,
write_stamp, write_stamp - delta)) write_stamp, write_stamp - delta))
return 0; return false;
/* /*
* It's possible that the event time delta is zero * It's possible that the event time delta is zero
...@@ -3057,12 +3056,12 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer, ...@@ -3057,12 +3056,12 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
if (index == old_index) { if (index == old_index) {
/* update counters */ /* update counters */
local_sub(event_length, &cpu_buffer->entries_bytes); local_sub(event_length, &cpu_buffer->entries_bytes);
return 1; return true;
} }
} }
/* could not discard */ /* could not discard */
return 0; return false;
} }
static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer) static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
...@@ -3277,7 +3276,7 @@ rb_wakeups(struct trace_buffer *buffer, struct ring_buffer_per_cpu *cpu_buffer) ...@@ -3277,7 +3276,7 @@ rb_wakeups(struct trace_buffer *buffer, struct ring_buffer_per_cpu *cpu_buffer)
* Note: The TRANSITION bit only handles a single transition between context. * Note: The TRANSITION bit only handles a single transition between context.
*/ */
static __always_inline int static __always_inline bool
trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer) trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
{ {
unsigned int val = cpu_buffer->current_context; unsigned int val = cpu_buffer->current_context;
...@@ -3294,14 +3293,14 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer) ...@@ -3294,14 +3293,14 @@ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
bit = RB_CTX_TRANSITION; bit = RB_CTX_TRANSITION;
if (val & (1 << (bit + cpu_buffer->nest))) { if (val & (1 << (bit + cpu_buffer->nest))) {
do_ring_buffer_record_recursion(); do_ring_buffer_record_recursion();
return 1; return true;
} }
} }
val |= (1 << (bit + cpu_buffer->nest)); val |= (1 << (bit + cpu_buffer->nest));
cpu_buffer->current_context = val; cpu_buffer->current_context = val;
return 0; return false;
} }
static __always_inline void static __always_inline void
...@@ -4530,7 +4529,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer) ...@@ -4530,7 +4529,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
unsigned long overwrite; unsigned long overwrite;
unsigned long flags; unsigned long flags;
int nr_loops = 0; int nr_loops = 0;
int ret; bool ret;
local_irq_save(flags); local_irq_save(flags);
arch_spin_lock(&cpu_buffer->lock); arch_spin_lock(&cpu_buffer->lock);
...@@ -5405,8 +5404,8 @@ bool ring_buffer_empty(struct trace_buffer *buffer) ...@@ -5405,8 +5404,8 @@ bool ring_buffer_empty(struct trace_buffer *buffer)
struct ring_buffer_per_cpu *cpu_buffer; struct ring_buffer_per_cpu *cpu_buffer;
unsigned long flags; unsigned long flags;
bool dolock; bool dolock;
bool ret;
int cpu; int cpu;
int ret;
/* yes this is racy, but if you don't like the race, lock the buffer */ /* yes this is racy, but if you don't like the race, lock the buffer */
for_each_buffer_cpu(buffer, cpu) { for_each_buffer_cpu(buffer, cpu) {
...@@ -5435,7 +5434,7 @@ bool ring_buffer_empty_cpu(struct trace_buffer *buffer, int cpu) ...@@ -5435,7 +5434,7 @@ bool ring_buffer_empty_cpu(struct trace_buffer *buffer, int cpu)
struct ring_buffer_per_cpu *cpu_buffer; struct ring_buffer_per_cpu *cpu_buffer;
unsigned long flags; unsigned long flags;
bool dolock; bool dolock;
int ret; bool ret;
if (!cpumask_test_cpu(cpu, buffer->cpumask)) if (!cpumask_test_cpu(cpu, buffer->cpumask))
return true; return true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment