Commit 8230f27b authored by Steven Rostedt (Google)'s avatar Steven Rostedt (Google)
Browse files

tracing: Add __cpumask to denote a trace event field that is a cpumask_t 

The trace events have a __bitmask field that can be used for anything
that requires bitmasks. Although currently it is only used for CPU
masks, it could be used in the future for any type of bitmasks.

There is some user space tooling that wants to know if a field is a CPU
mask and not just some random unsigned long bitmask. Introduce
"__cpumask()" helper functions that work the same as the current
__bitmask() helpers but displays in the format file:

  field:__data_loc cpumask_t *[] mask;    offset:36;      size:4; signed:0;

Instead of:

  field:__data_loc unsigned long[] mask;  offset:32;      size:4; signed:0;

The main difference is the type. Instead of "unsigned long" it is
"cpumask_t *". Note, this type field needs to be a real type in the
__dynamic_array() logic that both __cpumask and__bitmask use, but the
comparison field requires it to be a scalar type whereas cpumask_t is a
structure (non-scalar). But everything works when making it a pointer.

Valentin added changes to remove the need of passing in "nr_bits" and the
__cpumask will always use nr_cpumask_bits as its size.

Link: https://lkml.kernel.org/r/20221014080456.1d32b989@rorschach.local.home



Requested-by: default avatarValentin Schneider <vschneid@redhat.com>
Reviewed-by: default avatarValentin Schneider <vschneid@redhat.com>
Signed-off-by: default avatarValentin Schneider <vschneid@redhat.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 78a01feb

include/trace/bpf_probe.h

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
#undef __get_bitmask

#define __get_bitmask(field) (char *)__get_dynamic_array(field)



#undef __get_cpumask

#define __get_cpumask(field) (char *)__get_dynamic_array(field)



#undef __get_sockaddr

#define __get_sockaddr(field) ((struct sockaddr *)__get_dynamic_array(field))
@@ -40,6 +43,9 @@ 
#undef __get_rel_bitmask

#define __get_rel_bitmask(field) (char *)__get_rel_dynamic_array(field)



#undef __get_rel_cpumask

#define __get_rel_cpumask(field) (char *)__get_rel_dynamic_array(field)



#undef __get_rel_sockaddr

#define __get_rel_sockaddr(field) ((struct sockaddr *)__get_rel_dynamic_array(field))

include/trace/perf.h

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
#undef __get_bitmask

#define __get_bitmask(field) (char *)__get_dynamic_array(field)



#undef __get_cpumask

#define __get_cpumask(field) (char *)__get_dynamic_array(field)



#undef __get_sockaddr

#define __get_sockaddr(field) ((struct sockaddr *)__get_dynamic_array(field))
@@ -41,6 +44,9 @@ 
#undef __get_rel_bitmask

#define __get_rel_bitmask(field) (char *)__get_rel_dynamic_array(field)



#undef __get_rel_cpumask

#define __get_rel_cpumask(field) (char *)__get_rel_dynamic_array(field)



#undef __get_rel_sockaddr

#define __get_rel_sockaddr(field) ((struct sockaddr *)__get_rel_dynamic_array(field))

include/trace/stages/stage1_struct_define.h

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ 
#undef __bitmask

#define __bitmask(item, nr_bits) __dynamic_array(char, item, -1)



#undef __cpumask

#define __cpumask(item) __dynamic_array(char, item, -1)



#undef __sockaddr

#define __sockaddr(field, len) __dynamic_array(u8, field, len)
@@ -47,6 +50,9 @@ 
#undef __rel_bitmask

#define __rel_bitmask(item, nr_bits) __rel_dynamic_array(char, item, -1)



#undef __rel_cpumask

#define __rel_cpumask(item) __rel_dynamic_array(char, item, -1)



#undef __rel_sockaddr

#define __rel_sockaddr(field, len) __rel_dynamic_array(u8, field, len)

include/trace/stages/stage2_data_offsets.h

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ 
#undef __bitmask

#define __bitmask(item, nr_bits) __dynamic_array(unsigned long, item, -1)



#undef __cpumask

#define __cpumask(item) __dynamic_array(unsigned long, item, -1)



#undef __sockaddr

#define __sockaddr(field, len) __dynamic_array(u8, field, len)
@@ -53,5 +56,8 @@ 
#undef __rel_bitmask

#define __rel_bitmask(item, nr_bits) __rel_dynamic_array(unsigned long, item, -1)



#undef __rel_cpumask

#define __rel_cpumask(item) __rel_dynamic_array(unsigned long, item, -1)



#undef __rel_sockaddr

#define __rel_sockaddr(field, len) __rel_dynamic_array(u8, field, len)

include/trace/stages/stage3_trace_output.h

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ 
		trace_print_bitmask_seq(p, __bitmask, __bitmask_size);	\

	})



#undef __get_cpumask

#define __get_cpumask(field) __get_bitmask(field)



#undef __get_rel_bitmask

#define __get_rel_bitmask(field)						\

	({								\
@@ -51,6 +54,9 @@ 
		trace_print_bitmask_seq(p, __bitmask, __bitmask_size);	\

	})



#undef __get_rel_cpumask

#define __get_rel_cpumask(field) __get_rel_bitmask(field)



#undef __get_sockaddr

#define __get_sockaddr(field)	((struct sockaddr *)__get_dynamic_array(field))