summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2026-09-04 15:16:41 -0400
committerSteven Rostedt <rostedt@goodmis.org>2026-09-04 16:20:23 -0400
commitd80e12156f1fd490adf29a8d28489725a3ac817a (patch)
tree74fad0df12c1e4e570b931cd42c7665df69bd044
parent5cbea500775dd1944995f23320af030b9b24b24b (diff)
downloadlinux-d80e12156f1fd490adf29a8d28489725a3ac817a.tar.gz
linux-d80e12156f1fd490adf29a8d28489725a3ac817a.zip
ring-buffer: Use a macro for static buffer bits
Instead of hard coding 30 for the number of bits used for the static buffer ids in two places, create a macro. This way if it changes in the future, it will change in all the locations that use it. Link: https://patch.msgid.link/20260904151641.17eae0aa@gandalf.local.home Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--kernel/trace/ring_buffer.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 220b8405adfc..b88c75b52e8f 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -335,6 +335,9 @@ static __always_inline unsigned int rb_read_page_capacity(struct buffer_data_rea
return (PAGE_SIZE << rpage->order) - BUF_PAGE_HDR_SIZE;
}
+/* The number of bits for static buffer ids */
+#define RB_STATIC_BITS 30
+
/*
* Note, the buffer_page list must be first. The buffer pages
* are allocated in cache lines, which means that each buffer
@@ -350,7 +353,7 @@ struct buffer_page {
local_t entries; /* entries on this page */
unsigned long real_end; /* real end of data */
unsigned order; /* order of the page */
- u32 id:30; /* ID for external mapping */
+ u32 id:RB_STATIC_BITS; /* ID for external mapping */
u32 range:1; /* Mapped via a range */
struct buffer_data_page *page; /* Actual data page */
};
@@ -663,7 +666,7 @@ static unsigned long rb_static_max_pages(void)
* Static ring buffers are using bpage::id and must account for the
* reader page.
*/
- return (1UL << 30) - 1;
+ return (1UL << RB_STATIC_BITS) - 1;
}
struct ring_buffer_iter {