* [PATCH 00/11] v4l2: Add tracing for stateless codecs
@ 2026-02-12 16:23 Detlev Casanova
2026-02-12 16:23 ` [PATCH 02/11] media: Reformat v4l2-requests trace event printk Detlev Casanova
` (11 more replies)
0 siblings, 12 replies; 20+ messages in thread
From: Detlev Casanova @ 2026-02-12 16:23 UTC (permalink / raw)
To: linux-kernel
Cc: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel,
Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida,
Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil,
Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Detlev Casanova,
Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi,
Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel,
linux-trace-kernel, kernel
Hi !
This patchset aims to improve codec event tracing in v4l2.
The traces added in visl by Daniel Almeida are moved to the global trace
events and slightly reworked to be printed in a more consistent format.
To each trace are also added a tgid and fd fields, helping userspace track
different decoding sessions (contexts) based on the given file descriptor
used by the given process id.
Also for better tracking, stream on and stream off events are added as
well as HW run and HW done events to track decoder core usage.
Finally, add a show_fdinfo callback on video device files, allowing drivers
to expose usage information.
Currently only used for frame buffer memory usage.
The main focus is to be able to generate perfetto traces to show VPU usage,
a perfetto producer using this can be found at [1].
[1]: https://gitlab.collabora.com/detlev/hantro-perf/-/tree/hantro-improved-info
Detlev Casanova (11):
media: Move visl traces to v4l2-core
media: Reformat v4l2-requests trace event printk
media: Add tgid and fd fields in v4l2_fh struct
media: Add tgid and fd to the v4l2-requests trace fields
media: Add missing types to v4l2_ctrl_ptr
media: Trace the stateless controls when set in v4l2-ctrls-core.c
media: Add stream on/off traces and run them in the ioctl
media: Add HW run/done trace events
media: hantro: Add v4l2_hw run/done traces
media: v4l2: Add callback for show_fdinfo
media: hantro: Add fdinfo callback
drivers/media/platform/verisilicon/hantro.h | 2 +
.../media/platform/verisilicon/hantro_drv.c | 25 +
.../media/platform/verisilicon/hantro_v4l2.c | 10 +-
.../verisilicon/rockchip_vpu981_regs.h | 1 +
.../platform/verisilicon/rockchip_vpu_hw.c | 4 +
drivers/media/test-drivers/visl/Makefile | 2 +-
drivers/media/test-drivers/visl/visl-dec.c | 76 -
.../media/test-drivers/visl/visl-trace-av1.h | 314 ---
.../media/test-drivers/visl/visl-trace-fwht.h | 66 -
.../media/test-drivers/visl/visl-trace-h264.h | 349 ----
.../media/test-drivers/visl/visl-trace-hevc.h | 464 -----
.../test-drivers/visl/visl-trace-mpeg2.h | 99 -
.../test-drivers/visl/visl-trace-points.c | 11 -
.../media/test-drivers/visl/visl-trace-vp8.h | 156 --
.../media/test-drivers/visl/visl-trace-vp9.h | 292 ---
drivers/media/v4l2-core/v4l2-ctrls-api.c | 10 +
drivers/media/v4l2-core/v4l2-ctrls-core.c | 114 +
drivers/media/v4l2-core/v4l2-dev.c | 10 +
drivers/media/v4l2-core/v4l2-fh.c | 1 +
drivers/media/v4l2-core/v4l2-ioctl.c | 37 +-
drivers/media/v4l2-core/v4l2-trace.c | 48 +
include/media/v4l2-ctrls.h | 19 +
include/media/v4l2-dev.h | 1 +
include/media/v4l2-fh.h | 4 +
include/trace/events/v4l2.h | 58 +
include/trace/events/v4l2_requests.h | 1836 +++++++++++++++++
26 files changed, 2178 insertions(+), 1831 deletions(-)
delete mode 100644 drivers/media/test-drivers/visl/visl-trace-av1.h
delete mode 100644 drivers/media/test-drivers/visl/visl-trace-fwht.h
delete mode 100644 drivers/media/test-drivers/visl/visl-trace-h264.h
delete mode 100644 drivers/media/test-drivers/visl/visl-trace-hevc.h
delete mode 100644 drivers/media/test-drivers/visl/visl-trace-mpeg2.h
delete mode 100644 drivers/media/test-drivers/visl/visl-trace-points.c
delete mode 100644 drivers/media/test-drivers/visl/visl-trace-vp8.h
delete mode 100644 drivers/media/test-drivers/visl/visl-trace-vp9.h
create mode 100644 include/trace/events/v4l2_requests.h
--
2.53.0
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 02/11] media: Reformat v4l2-requests trace event printk 2026-02-12 16:23 [PATCH 00/11] v4l2: Add tracing for stateless codecs Detlev Casanova @ 2026-02-12 16:23 ` Detlev Casanova 2026-04-28 19:28 ` Nicolas Dufresne 2026-02-12 16:23 ` [PATCH 03/11] media: Add tgid and fd fields in v4l2_fh struct Detlev Casanova ` (10 subsequent siblings) 11 siblings, 1 reply; 20+ messages in thread From: Detlev Casanova @ 2026-02-12 16:23 UTC (permalink / raw) To: linux-kernel Cc: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Detlev Casanova, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel When printing the v4l2-request traces the format was not stable. Sometimes using a ':' separator, sometimes with an extra space and using new lines. Reformat the printk calls to match the format used in v4l2.h so that parsers can use the same format for all events. Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> --- include/trace/events/v4l2_requests.h | 649 ++++++++++++++------------- 1 file changed, 328 insertions(+), 321 deletions(-) diff --git a/include/trace/events/v4l2_requests.h b/include/trace/events/v4l2_requests.h index 1e137d39d5fe..34f4a74df5ea 100644 --- a/include/trace/events/v4l2_requests.h +++ b/include/trace/events/v4l2_requests.h @@ -14,8 +14,8 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_seq_tmpl, TP_ARGS(s), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_sequence, s)), TP_fast_assign(__entry->s = *s;), - TP_printk("\nflags %s\nseq_profile: %u\norder_hint_bits: %u\nbit_depth: %u\n" - "max_frame_width_minus_1: %u\nmax_frame_height_minus_1: %u\n", + TP_printk("flags = %s, seq_profile = %u, order_hint_bits = %u, bit_depth = %u, " + "max_frame_width_minus_1 = %u, max_frame_height_minus_1 = %u", __print_flags(__entry->s.flags, "|", {V4L2_AV1_SEQUENCE_FLAG_STILL_PICTURE, "STILL_PICTURE"}, {V4L2_AV1_SEQUENCE_FLAG_USE_128X128_SUPERBLOCK, "USE_128X128_SUPERBLOCK"}, @@ -50,7 +50,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_tge_tmpl, TP_ARGS(t), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_tile_group_entry, t)), TP_fast_assign(__entry->t = *t;), - TP_printk("\ntile_offset: %u\n tile_size: %u\n tile_row: %u\ntile_col: %u\n", + TP_printk("tile_offset = %u, tile_size = %u, tile_row = %u, tile_col = %u", __entry->t.tile_offset, __entry->t.tile_size, __entry->t.tile_row, @@ -63,30 +63,30 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_frame_tmpl, TP_ARGS(f), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_frame, f)), TP_fast_assign(__entry->f = *f;), - TP_printk("\ntile_info.flags: %s\ntile_info.context_update_tile_id: %u\n" - "tile_info.tile_cols: %u\ntile_info.tile_rows: %u\n" - "tile_info.mi_col_starts: %s\ntile_info.mi_row_starts: %s\n" - "tile_info.width_in_sbs_minus_1: %s\ntile_info.height_in_sbs_minus_1: %s\n" - "tile_info.tile_size_bytes: %u\nquantization.flags: %s\n" - "quantization.base_q_idx: %u\nquantization.delta_q_y_dc: %d\n" - "quantization.delta_q_u_dc: %d\nquantization.delta_q_u_ac: %d\n" - "quantization.delta_q_v_dc: %d\nquantization.delta_q_v_ac: %d\n" - "quantization.qm_y: %u\nquantization.qm_u: %u\nquantization.qm_v: %u\n" - "quantization.delta_q_res: %u\nsuperres_denom: %u\nsegmentation.flags: %s\n" - "segmentation.last_active_seg_id: %u\nsegmentation.feature_enabled:%s\n" - "loop_filter.flags: %s\nloop_filter.level: %s\nloop_filter.sharpness: %u\n" - "loop_filter.ref_deltas: %s\nloop_filter.mode_deltas: %s\n" - "loop_filter.delta_lf_res: %u\ncdef.damping_minus_3: %u\ncdef.bits: %u\n" - "cdef.y_pri_strength: %s\ncdef.y_sec_strength: %s\n" - "cdef.uv_pri_strength: %s\ncdef.uv_sec_strength:%s\nskip_mode_frame: %s\n" - "primary_ref_frame: %u\nloop_restoration.flags: %s\n" - "loop_restoration.lr_unit_shift: %u\nloop_restoration.lr_uv_shift: %u\n" - "loop_restoration.frame_restoration_type: %s\n" - "loop_restoration.loop_restoration_size: %s\nflags: %s\norder_hint: %u\n" - "upscaled_width: %u\nframe_width_minus_1: %u\nframe_height_minus_1: %u\n" - "render_width_minus_1: %u\nrender_height_minus_1: %u\ncurrent_frame_id: %u\n" - "buffer_removal_time: %s\norder_hints: %s\nreference_frame_ts: %s\n" - "ref_frame_idx: %s\nrefresh_frame_flags: %u\n", + TP_printk("tile_info.flags = %s, tile_info.context_update_tile_id = %u, " + "tile_info.tile_cols = %u, tile_info.tile_rows = %u, " + "tile_info.mi_col_starts = %s, tile_info.mi_row_starts = %s, " + "tile_info.width_in_sbs_minus_1 = %s, tile_info.height_in_sbs_minus_1 = %s, " + "tile_info.tile_size_bytes = %u, quantization.flags = %s, " + "quantization.base_q_idx = %u, quantization.delta_q_y_dc = %d, " + "quantization.delta_q_u_dc = %d, quantization.delta_q_u_ac = %d, " + "quantization.delta_q_v_dc = %d, quantization.delta_q_v_ac = %d, " + "quantization.qm_y = %u, quantization.qm_u = %u, quantization.qm_v = %u, " + "quantization.delta_q_res = %u, superres_denom = %u, segmentation.flags = %s, " + "segmentation.last_active_seg_id = %u, segmentation.feature_enabled = %s, " + "loop_filter.flags = %s, loop_filter.level = %s, loop_filter.sharpness = %u, " + "loop_filter.ref_deltas = %s, loop_filter.mode_deltas = %s, " + "loop_filter.delta_lf_res = %u, cdef.damping_minus_3 = %u, cdef.bits = %u, " + "cdef.y_pri_strength = %s, cdef.y_sec_strength = %s, " + "cdef.uv_pri_strength = %s, cdef.uv_sec_strength = %s, skip_mode_frame = %s, " + "primary_ref_frame = %u, loop_restoration.flags = %s, " + "loop_restoration.lr_unit_shift = %u, loop_restoration.lr_uv_shift = %u, " + "loop_restoration.frame_restoration_type = %s, " + "loop_restoration.loop_restoration_size = %s, flags = %s, order_hint = %u, " + "upscaled_width = %u, frame_width_minus_1 = %u, frame_height_minus_1 = %u, " + "render_width_minus_1 = %u, render_height_minus_1 = %u, current_frame_id = %u, " + "buffer_removal_time = %s, order_hints = %s, reference_frame_ts = %s, " + "ref_frame_idx = %s, refresh_frame_flags = %u", __print_flags(__entry->f.tile_info.flags, "|", {V4L2_AV1_TILE_INFO_FLAG_UNIFORM_TILE_SPACING, "UNIFORM_TILE_SPACING"}), __entry->f.tile_info.context_update_tile_id, @@ -226,15 +226,15 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_film_grain_tmpl, TP_ARGS(f), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_film_grain, f)), TP_fast_assign(__entry->f = *f;), - TP_printk("\nflags %s\ncr_mult: %u\ngrain_seed: %u\n" - "film_grain_params_ref_idx: %u\nnum_y_points: %u\npoint_y_value: %s\n" - "point_y_scaling: %s\nnum_cb_points: %u\npoint_cb_value: %s\n" - "point_cb_scaling: %s\nnum_cr_points: %u\npoint_cr_value: %s\n" - "point_cr_scaling: %s\ngrain_scaling_minus_8: %u\nar_coeff_lag: %u\n" - "ar_coeffs_y_plus_128: %s\nar_coeffs_cb_plus_128: %s\n" - "ar_coeffs_cr_plus_128: %s\nar_coeff_shift_minus_6: %u\n" - "grain_scale_shift: %u\ncb_mult: %u\ncb_luma_mult: %u\ncr_luma_mult: %u\n" - "cb_offset: %u\ncr_offset: %u\n", + TP_printk("flags = %s, cr_mult = %u, grain_seed = %u, " + "film_grain_params_ref_idx = %u, num_y_points = %u, point_y_value = %s, " + "point_y_scaling = %s, num_cb_points = %u, point_cb_value = %s, " + "point_cb_scaling = %s, num_cr_points = %u, point_cr_value = %s, " + "point_cr_scaling = %s, grain_scaling_minus_8 = %u, ar_coeff_lag = %u, " + "ar_coeffs_y_plus_128 = %s, ar_coeffs_cb_plus_128 = %s, " + "ar_coeffs_cr_plus_128 = %s, ar_coeff_shift_minus_6 = %u, " + "grain_scale_shift = %u, cb_mult = %u, cb_luma_mult = %u, cr_luma_mult = %u, " + "cb_offset = %u, cr_offset = %u", __print_flags(__entry->f.flags, "|", {V4L2_AV1_FILM_GRAIN_FLAG_APPLY_GRAIN, "APPLY_GRAIN"}, {V4L2_AV1_FILM_GRAIN_FLAG_UPDATE_GRAIN, "UPDATE_GRAIN"}, @@ -333,7 +333,15 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_fwht_params_tmpl, __entry->ycbcr_enc = p->ycbcr_enc; __entry->quantization = p->quantization; ), - TP_printk("backward_ref_ts %llu version %u width %u height %u flags %s colorspace %u xfer_func %u ycbcr_enc %u quantization %u", + TP_printk("backward_ref_ts = %llu, " + "version = %u, " + "width = %u, " + "height = %u, " + "flags = %s, " + "colorspace = %u, " + "xfer_func = %u, " + "ycbcr_enc = %u, " + "quantization = %u", __entry->backward_ref_ts, __entry->version, __entry->width, __entry->height, __print_flags(__entry->flags, "|", {V4L2_FWHT_FL_IS_INTERLACED, "IS_INTERLACED"}, @@ -364,24 +372,24 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_sps_tmpl, TP_ARGS(s), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_sps, s)), TP_fast_assign(__entry->s = *s), - TP_printk("\nprofile_idc %u\n" - "constraint_set_flags %s\n" - "level_idc %u\n" - "seq_parameter_set_id %u\n" - "chroma_format_idc %u\n" - "bit_depth_luma_minus8 %u\n" - "bit_depth_chroma_minus8 %u\n" - "log2_max_frame_num_minus4 %u\n" - "pic_order_cnt_type %u\n" - "log2_max_pic_order_cnt_lsb_minus4 %u\n" - "max_num_ref_frames %u\n" - "num_ref_frames_in_pic_order_cnt_cycle %u\n" - "offset_for_ref_frame %s\n" - "offset_for_non_ref_pic %d\n" - "offset_for_top_to_bottom_field %d\n" - "pic_width_in_mbs_minus1 %u\n" - "pic_height_in_map_units_minus1 %u\n" - "flags %s", + TP_printk("profile_idc = %u, " + "constraint_set_flags = %s, " + "level_idc = %u, " + "seq_parameter_set_id = %u, " + "chroma_format_idc = %u, " + "bit_depth_luma_minus8 = %u, " + "bit_depth_chroma_minus8 = %u, " + "log2_max_frame_num_minus4 = %u, " + "pic_order_cnt_type = %u, " + "log2_max_pic_order_cnt_lsb_minus4 = %u, " + "max_num_ref_frames = %u, " + "num_ref_frames_in_pic_order_cnt_cycle = %u, " + "offset_for_ref_frame = %s, " + "offset_for_non_ref_pic = %d, " + "offset_for_top_to_bottom_field = %d, " + "pic_width_in_mbs_minus1 = %u, " + "pic_height_in_map_units_minus1 = %u, " + "flags = %s", __entry->s.profile_idc, __print_flags(__entry->s.constraint_set_flags, "|", {V4L2_H264_SPS_CONSTRAINT_SET0_FLAG, "CONSTRAINT_SET0_FLAG"}, @@ -423,17 +431,17 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pps_tmpl, TP_ARGS(p), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_pps, p)), TP_fast_assign(__entry->p = *p), - TP_printk("\npic_parameter_set_id %u\n" - "seq_parameter_set_id %u\n" - "num_slice_groups_minus1 %u\n" - "num_ref_idx_l0_default_active_minus1 %u\n" - "num_ref_idx_l1_default_active_minus1 %u\n" - "weighted_bipred_idc %u\n" - "pic_init_qp_minus26 %d\n" - "pic_init_qs_minus26 %d\n" - "chroma_qp_index_offset %d\n" - "second_chroma_qp_index_offset %d\n" - "flags %s", + TP_printk("pic_parameter_set_id = %u, " + "seq_parameter_set_id = %u, " + "num_slice_groups_minus1 = %u, " + "num_ref_idx_l0_default_active_minus1 = %u, " + "num_ref_idx_l1_default_active_minus1 = %u, " + "weighted_bipred_idc = %u, " + "pic_init_qp_minus26 = %d, " + "pic_init_qs_minus26 = %d, " + "chroma_qp_index_offset = %d, " + "second_chroma_qp_index_offset = %d, " + "flags = %s", __entry->p.pic_parameter_set_id, __entry->p.seq_parameter_set_id, __entry->p.num_slice_groups_minus1, @@ -461,7 +469,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_scaling_matrix_tmpl, TP_ARGS(s), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_scaling_matrix, s)), TP_fast_assign(__entry->s = *s), - TP_printk("\nscaling_list_4x4 {%s}\nscaling_list_8x8 {%s}", + TP_printk("scaling_list_4x4 = {%s}, scaling_list_8x8 = {%s}", __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, __entry->s.scaling_list_4x4, sizeof(__entry->s.scaling_list_4x4), @@ -478,16 +486,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pred_weights_tmpl, TP_ARGS(p), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_pred_weights, p)), TP_fast_assign(__entry->p = *p), - TP_printk("\nluma_log2_weight_denom %u\n" - "chroma_log2_weight_denom %u\n" - "weight_factor[0].luma_weight %s\n" - "weight_factor[0].luma_offset %s\n" - "weight_factor[0].chroma_weight {%s}\n" - "weight_factor[0].chroma_offset {%s}\n" - "weight_factor[1].luma_weight %s\n" - "weight_factor[1].luma_offset %s\n" - "weight_factor[1].chroma_weight {%s}\n" - "weight_factor[1].chroma_offset {%s}\n", + TP_printk("luma_log2_weight_denom = %u, " + "chroma_log2_weight_denom = %u, " + "weight_factor[0].luma_weight = %s, " + "weight_factor[0].luma_offset = %s, " + "weight_factor[0].chroma_weight = {%s}, " + "weight_factor[0].chroma_offset = {%s}, " + "weight_factor[1].luma_weight = %s, " + "weight_factor[1].luma_offset = %s, " + "weight_factor[1].chroma_weight = {%s}, " + "weight_factor[1].chroma_offset = {%s}", __entry->p.luma_log2_weight_denom, __entry->p.chroma_log2_weight_denom, __print_array(__entry->p.weight_factors[0].luma_weight, @@ -526,20 +534,20 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_slice_params_tmpl, TP_ARGS(s), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_slice_params, s)), TP_fast_assign(__entry->s = *s), - TP_printk("\nheader_bit_size %u\n" - "first_mb_in_slice %u\n" - "slice_type %s\n" - "colour_plane_id %u\n" - "redundant_pic_cnt %u\n" - "cabac_init_idc %u\n" - "slice_qp_delta %d\n" - "slice_qs_delta %d\n" - "disable_deblocking_filter_idc %u\n" - "slice_alpha_c0_offset_div2 %u\n" - "slice_beta_offset_div2 %u\n" - "num_ref_idx_l0_active_minus1 %u\n" - "num_ref_idx_l1_active_minus1 %u\n" - "flags %s", + TP_printk("header_bit_size = %u, " + "first_mb_in_slice = %u, " + "slice_type = %s, " + "colour_plane_id = %u, " + "redundant_pic_cnt = %u, " + "cabac_init_idc = %u, " + "slice_qp_delta = %d, " + "slice_qs_delta = %d, " + "disable_deblocking_filter_idc = %u, " + "slice_alpha_c0_offset_div2 = %u, " + "slice_beta_offset_div2 = %u, " + "num_ref_idx_l0_active_minus1 = %u, " + "num_ref_idx_l1_active_minus1 = %u, " + "flags = %s", __entry->s.header_bit_size, __entry->s.first_mb_in_slice, __print_symbolic(__entry->s.slice_type, @@ -570,7 +578,7 @@ DECLARE_EVENT_CLASS(v4l2_h264_reference_tmpl, TP_STRUCT__entry(__field_struct(struct v4l2_h264_reference, r) __field(int, i)), TP_fast_assign(__entry->r = *r; __entry->i = i;), - TP_printk("[%d]: fields %s index %u", + TP_printk("[%d]: fields = %s, index = %u", __entry->i, __print_flags(__entry->r.fields, "|", {V4L2_H264_TOP_FIELD_REF, "TOP_FIELD_REF"}, @@ -585,19 +593,19 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_decode_params_tmpl, TP_ARGS(d), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_decode_params, d)), TP_fast_assign(__entry->d = *d), - TP_printk("\nnal_ref_idc %u\n" - "frame_num %u\n" - "top_field_order_cnt %d\n" - "bottom_field_order_cnt %d\n" - "idr_pic_id %u\n" - "pic_order_cnt_lsb %u\n" - "delta_pic_order_cnt_bottom %d\n" - "delta_pic_order_cnt0 %d\n" - "delta_pic_order_cnt1 %d\n" - "dec_ref_pic_marking_bit_size %u\n" - "pic_order_cnt_bit_size %u\n" - "slice_group_change_cycle %u\n" - "flags %s\n", + TP_printk("nal_ref_idc = %u, " + "frame_num = %u, " + "top_field_order_cnt = %d, " + "bottom_field_order_cnt = %d, " + "idr_pic_id = %u, " + "pic_order_cnt_lsb = %u, " + "delta_pic_order_cnt_bottom = %d, " + "delta_pic_order_cnt0 = %d, " + "delta_pic_order_cnt1 = %d, " + "dec_ref_pic_marking_bit_size = %u, " + "pic_order_cnt_bit_size = %u, " + "slice_group_change_cycle = %u, " + "flags = %s", __entry->d.nal_ref_idc, __entry->d.frame_num, __entry->d.top_field_order_cnt, @@ -625,8 +633,8 @@ DECLARE_EVENT_CLASS(v4l2_h264_dpb_entry_tmpl, TP_STRUCT__entry(__field_struct(struct v4l2_h264_dpb_entry, e) __field(int, i)), TP_fast_assign(__entry->e = *e; __entry->i = i;), - TP_printk("[%d]: reference_ts %llu, pic_num %u frame_num %u fields %s " - "top_field_order_cnt %d bottom_field_order_cnt %d flags %s", + TP_printk("[%d]: reference_ts = %llu, pic_num = %u, frame_num = %u, fields = %s " + "top_field_order_cnt = %d, bottom_field_order_cnt = %d, flags = %s", __entry->i, __entry->e.reference_ts, __entry->e.pic_num, @@ -642,7 +650,6 @@ DECLARE_EVENT_CLASS(v4l2_h264_dpb_entry_tmpl, {V4L2_H264_DPB_ENTRY_FLAG_ACTIVE, "ACTIVE"}, {V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM, "LONG_TERM"}, {V4L2_H264_DPB_ENTRY_FLAG_FIELD, "FIELD"}) - ) ); @@ -698,31 +705,31 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_sps_tmpl, TP_ARGS(s), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_sps, s)), TP_fast_assign(__entry->s = *s), - TP_printk("\nvideo_parameter_set_id %u\n" - "seq_parameter_set_id %u\n" - "pic_width_in_luma_samples %u\n" - "pic_height_in_luma_samples %u\n" - "bit_depth_luma_minus8 %u\n" - "bit_depth_chroma_minus8 %u\n" - "log2_max_pic_order_cnt_lsb_minus4 %u\n" - "sps_max_dec_pic_buffering_minus1 %u\n" - "sps_max_num_reorder_pics %u\n" - "sps_max_latency_increase_plus1 %u\n" - "log2_min_luma_coding_block_size_minus3 %u\n" - "log2_diff_max_min_luma_coding_block_size %u\n" - "log2_min_luma_transform_block_size_minus2 %u\n" - "log2_diff_max_min_luma_transform_block_size %u\n" - "max_transform_hierarchy_depth_inter %u\n" - "max_transform_hierarchy_depth_intra %u\n" - "pcm_sample_bit_depth_luma_minus1 %u\n" - "pcm_sample_bit_depth_chroma_minus1 %u\n" - "log2_min_pcm_luma_coding_block_size_minus3 %u\n" - "log2_diff_max_min_pcm_luma_coding_block_size %u\n" - "num_short_term_ref_pic_sets %u\n" - "num_long_term_ref_pics_sps %u\n" - "chroma_format_idc %u\n" - "sps_max_sub_layers_minus1 %u\n" - "flags %s", + TP_printk("video_parameter_set_id = %u, " + "seq_parameter_set_id = %u, " + "pic_width_in_luma_samples = %u, " + "pic_height_in_luma_samples = %u, " + "bit_depth_luma_minus8 = %u, " + "bit_depth_chroma_minus8 = %u, " + "log2_max_pic_order_cnt_lsb_minus4 = %u, " + "sps_max_dec_pic_buffering_minus1 = %u, " + "sps_max_num_reorder_pics = %u, " + "sps_max_latency_increase_plus1 = %u, " + "log2_min_luma_coding_block_size_minus3 = %u, " + "log2_diff_max_min_luma_coding_block_size = %u, " + "log2_min_luma_transform_block_size_minus2 = %u, " + "log2_diff_max_min_luma_transform_block_size = %u, " + "max_transform_hierarchy_depth_inter = %u, " + "max_transform_hierarchy_depth_intra = %u, " + "pcm_sample_bit_depth_luma_minus1 = %u, " + "pcm_sample_bit_depth_chroma_minus1 = %u, " + "log2_min_pcm_luma_coding_block_size_minus3 = %u, " + "log2_diff_max_min_pcm_luma_coding_block_size = %u, " + "num_short_term_ref_pic_sets = %u, " + "num_long_term_ref_pics_sps = %u, " + "chroma_format_idc = %u, " + "sps_max_sub_layers_minus1 = %u, " + "flags = %s", __entry->s.video_parameter_set_id, __entry->s.seq_parameter_set_id, __entry->s.pic_width_in_luma_samples, @@ -767,22 +774,22 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_pps_tmpl, TP_ARGS(p), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_pps, p)), TP_fast_assign(__entry->p = *p), - TP_printk("\npic_parameter_set_id %u\n" - "num_extra_slice_header_bits %u\n" - "num_ref_idx_l0_default_active_minus1 %u\n" - "num_ref_idx_l1_default_active_minus1 %u\n" - "init_qp_minus26 %d\n" - "diff_cu_qp_delta_depth %u\n" - "pps_cb_qp_offset %d\n" - "pps_cr_qp_offset %d\n" - "num_tile_columns_minus1 %d\n" - "num_tile_rows_minus1 %d\n" - "column_width_minus1 %s\n" - "row_height_minus1 %s\n" - "pps_beta_offset_div2 %d\n" - "pps_tc_offset_div2 %d\n" - "log2_parallel_merge_level_minus2 %u\n" - "flags %s", + TP_printk("pic_parameter_set_id = %u, " + "num_extra_slice_header_bits = %u, " + "num_ref_idx_l0_default_active_minus1 = %u, " + "num_ref_idx_l1_default_active_minus1 = %u, " + "init_qp_minus26 = %d, " + "diff_cu_qp_delta_depth = %u, " + "pps_cb_qp_offset = %d, " + "pps_cr_qp_offset = %d, " + "num_tile_columns_minus1 = %d, " + "num_tile_rows_minus1 = %d, " + "column_width_minus1 = %s, " + "row_height_minus1 = %s, " + "pps_beta_offset_div2 = %d, " + "pps_tc_offset_div2 = %d, " + "log2_parallel_merge_level_minus2 = %u, " + "flags = %s", __entry->p.pic_parameter_set_id, __entry->p.num_extra_slice_header_bits, __entry->p.num_ref_idx_l0_default_active_minus1, @@ -834,33 +841,33 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_slice_params_tmpl, TP_ARGS(s), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_slice_params, s)), TP_fast_assign(__entry->s = *s), - TP_printk("\nbit_size %u\n" - "data_byte_offset %u\n" - "num_entry_point_offsets %u\n" - "nal_unit_type %u\n" - "nuh_temporal_id_plus1 %u\n" - "slice_type %u\n" - "colour_plane_id %u\n" - "slice_pic_order_cnt %d\n" - "num_ref_idx_l0_active_minus1 %u\n" - "num_ref_idx_l1_active_minus1 %u\n" - "collocated_ref_idx %u\n" - "five_minus_max_num_merge_cand %u\n" - "slice_qp_delta %d\n" - "slice_cb_qp_offset %d\n" - "slice_cr_qp_offset %d\n" - "slice_act_y_qp_offset %d\n" - "slice_act_cb_qp_offset %d\n" - "slice_act_cr_qp_offset %d\n" - "slice_beta_offset_div2 %d\n" - "slice_tc_offset_div2 %d\n" - "pic_struct %u\n" - "slice_segment_addr %u\n" - "ref_idx_l0 %s\n" - "ref_idx_l1 %s\n" - "short_term_ref_pic_set_size %u\n" - "long_term_ref_pic_set_size %u\n" - "flags %s", + TP_printk("bit_size = %u, " + "data_byte_offset = %u, " + "num_entry_point_offsets = %u, " + "nal_unit_type = %u, " + "nuh_temporal_id_plus1 = %u, " + "slice_type = %u, " + "colour_plane_id = %u, " + "slice_pic_order_cnt = %d, " + "num_ref_idx_l0_active_minus1 = %u, " + "num_ref_idx_l1_active_minus1 = %u, " + "collocated_ref_idx = %u, " + "five_minus_max_num_merge_cand = %u, " + "slice_qp_delta = %d, " + "slice_cb_qp_offset = %d, " + "slice_cr_qp_offset = %d, " + "slice_act_y_qp_offset = %d, " + "slice_act_cb_qp_offset = %d, " + "slice_act_cr_qp_offset = %d, " + "slice_beta_offset_div2 = %d, " + "slice_tc_offset_div2 = %d, " + "pic_struct = %u, " + "slice_segment_addr = %u, " + "ref_idx_l0 = %s, " + "ref_idx_l1 = %s, " + "short_term_ref_pic_set_size = %u, " + "long_term_ref_pic_set_size = %u, " + "flags = %s", __entry->s.bit_size, __entry->s.data_byte_offset, __entry->s.num_entry_point_offsets, @@ -911,16 +918,16 @@ DECLARE_EVENT_CLASS(v4l2_hevc_pred_weight_table_tmpl, TP_ARGS(p), TP_STRUCT__entry(__field_struct(struct v4l2_hevc_pred_weight_table, p)), TP_fast_assign(__entry->p = *p), - TP_printk("\ndelta_luma_weight_l0 %s\n" - "luma_offset_l0 %s\n" - "delta_chroma_weight_l0 {%s}\n" - "chroma_offset_l0 {%s}\n" - "delta_luma_weight_l1 %s\n" - "luma_offset_l1 %s\n" - "delta_chroma_weight_l1 {%s}\n" - "chroma_offset_l1 {%s}\n" - "luma_log2_weight_denom %d\n" - "delta_chroma_log2_weight_denom %d\n", + TP_printk("delta_luma_weight_l0 = %s, " + "luma_offset_l0 = %s, " + "delta_chroma_weight_l0 = {%s}, " + "chroma_offset_l0 = {%s}, " + "delta_luma_weight_l1 = %s, " + "luma_offset_l1 = %s, " + "delta_chroma_weight_l1 = {%s}, " + "chroma_offset_l1 = {%s}, " + "luma_log2_weight_denom = %d, " + "delta_chroma_log2_weight_denom = %d", __print_array(__entry->p.delta_luma_weight_l0, ARRAY_SIZE(__entry->p.delta_luma_weight_l0), sizeof(__entry->p.delta_luma_weight_l0[0])), @@ -959,12 +966,12 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_scaling_matrix_tmpl, TP_ARGS(s), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_scaling_matrix, s)), TP_fast_assign(__entry->s = *s), - TP_printk("\nscaling_list_4x4 {%s}\n" - "scaling_list_8x8 {%s}\n" - "scaling_list_16x16 {%s}\n" - "scaling_list_32x32 {%s}\n" - "scaling_list_dc_coef_16x16 %s\n" - "scaling_list_dc_coef_32x32 %s\n", + TP_printk("scaling_list_4x4 = {%s}, " + "scaling_list_8x8 = {%s}, " + "scaling_list_16x16 = {%s}, " + "scaling_list_32x32 = {%s}, " + "scaling_list_dc_coef_16x16 = %s, " + "scaling_list_dc_coef_32x32 = %s", __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, __entry->s.scaling_list_4x4, sizeof(__entry->s.scaling_list_4x4), @@ -994,17 +1001,17 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_decode_params_tmpl, TP_ARGS(d), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_decode_params, d)), TP_fast_assign(__entry->d = *d), - TP_printk("\npic_order_cnt_val %d\n" - "short_term_ref_pic_set_size %u\n" - "long_term_ref_pic_set_size %u\n" - "num_active_dpb_entries %u\n" - "num_poc_st_curr_before %u\n" - "num_poc_st_curr_after %u\n" - "num_poc_lt_curr %u\n" - "poc_st_curr_before %s\n" - "poc_st_curr_after %s\n" - "poc_lt_curr %s\n" - "flags %s", + TP_printk("pic_order_cnt_val = %d, " + "short_term_ref_pic_set_size = %u, " + "long_term_ref_pic_set_size = %u, " + "num_active_dpb_entries = %u, " + "num_poc_st_curr_before = %u, " + "num_poc_st_curr_after = %u, " + "num_poc_lt_curr = %u, " + "poc_st_curr_before = %s, " + "poc_st_curr_after = %s, " + "poc_lt_curr = %s, " + "flags = %s", __entry->d.pic_order_cnt_val, __entry->d.short_term_ref_pic_set_size, __entry->d.long_term_ref_pic_set_size, @@ -1033,8 +1040,8 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_ext_sps_lt_rps_tmpl, TP_ARGS(lt), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_ext_sps_lt_rps, lt)), TP_fast_assign(__entry->lt = *lt), - TP_printk("\nflags %s\n" - "lt_ref_pic_poc_lsb_sps %x\n", + TP_printk("flags = %s, " + "lt_ref_pic_poc_lsb_sps = %x", __print_flags(__entry->lt.flags, "|", {V4L2_HEVC_EXT_SPS_LT_RPS_FLAG_USED_LT, "USED_LT"} ), @@ -1047,16 +1054,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_ext_sps_st_rps_tmpl, TP_ARGS(st), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_ext_sps_st_rps, st)), TP_fast_assign(__entry->st = *st), - TP_printk("\nflags %s\n" - "delta_idx_minus1: %u\n" - "delta_rps_sign: %u\n" - "abs_delta_rps_minus1: %u\n" - "num_negative_pics: %u\n" - "num_positive_pics: %u\n" - "used_by_curr_pic: %08x\n" - "use_delta_flag: %08x\n" - "delta_poc_s0_minus1: %s\n" - "delta_poc_s1_minus1: %s\n", + TP_printk("flags = %s, " + "delta_idx_minus1 = %u, " + "delta_rps_sign = %u, " + "abs_delta_rps_minus1 = %u, " + "num_negative_pics = %u, " + "num_positive_pics = %u, " + "used_by_curr_pic = %08x, " + "use_delta_flag = %08x, " + "delta_poc_s0_minus1 = %s, " + "delta_poc_s1_minus1 = %s", __print_flags(__entry->st.flags, "|", {V4L2_HEVC_EXT_SPS_ST_RPS_FLAG_INTER_REF_PIC_SET_PRED, "INTER_REF_PIC_SET_PRED"} ), @@ -1081,10 +1088,10 @@ DECLARE_EVENT_CLASS(v4l2_hevc_dpb_entry_tmpl, TP_ARGS(e), TP_STRUCT__entry(__field_struct(struct v4l2_hevc_dpb_entry, e)), TP_fast_assign(__entry->e = *e), - TP_printk("\ntimestamp %llu\n" - "flags %s\n" - "field_pic %u\n" - "pic_order_cnt_val %d\n", + TP_printk("timestamp = %llu, " + "flags = %s, " + "field_pic = %u, " + "pic_order_cnt_val = %d", __entry->e.timestamp, __print_flags(__entry->e.flags, "|", {V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE, "LONG_TERM_REFERENCE"} @@ -1145,8 +1152,8 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_seq_tmpl, TP_ARGS(s), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_mpeg2_sequence, s)), TP_fast_assign(__entry->s = *s;), - TP_printk("\nhorizontal_size %u\nvertical_size %u\nvbv_buffer_size %u\n" - "profile_and_level_indication %u\nchroma_format %u\nflags %s\n", + TP_printk("horizontal_size = %u, vertical_size = %u, vbv_buffer_size = %u, " + "profile_and_level_indication = %u, chroma_format = %u, flags = %s", __entry->s.horizontal_size, __entry->s.vertical_size, __entry->s.vbv_buffer_size, @@ -1162,8 +1169,8 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_pic_tmpl, TP_ARGS(p), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_mpeg2_picture, p)), TP_fast_assign(__entry->p = *p;), - TP_printk("\nbackward_ref_ts %llu\nforward_ref_ts %llu\nflags %s\nf_code {%s}\n" - "picture_coding_type: %u\npicture_structure %u\nintra_dc_precision %u\n", + TP_printk("backward_ref_ts = %llu, forward_ref_ts = %llu, flags = %s, f_code = {%s}, " + "picture_coding_type = %u, picture_structure = %u, intra_dc_precision = %u", __entry->p.backward_ref_ts, __entry->p.forward_ref_ts, __print_flags(__entry->p.flags, "|", @@ -1190,8 +1197,8 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_quant_tmpl, TP_ARGS(q), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_mpeg2_quantisation, q)), TP_fast_assign(__entry->q = *q;), - TP_printk("\nintra_quantiser_matrix %s\nnon_intra_quantiser_matrix %s\n" - "chroma_intra_quantiser_matrix %s\nchroma_non_intra_quantiser_matrix %s\n", + TP_printk("intra_quantiser_matrix = %s, non_intra_quantiser_matrix = %s, " + "chroma_intra_quantiser_matrix = %s, chroma_non_intra_quantiser_matrix = %s", __print_array(__entry->q.intra_quantiser_matrix, ARRAY_SIZE(__entry->q.intra_quantiser_matrix), sizeof(__entry->q.intra_quantiser_matrix[0])), @@ -1229,10 +1236,10 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp8_entropy_tmpl, TP_ARGS(f), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp8_frame, f)), TP_fast_assign(__entry->f = *f;), - TP_printk("\nentropy.coeff_probs {%s}\n" - "entropy.y_mode_probs %s\n" - "entropy.uv_mode_probs %s\n" - "entropy.mv_probs {%s}", + TP_printk("entropy.coeff_probs = {%s}, " + "entropy.y_mode_probs = %s, " + "entropy.uv_mode_probs = %s, " + "entropy.mv_probs = {%s}", __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, __entry->f.entropy.coeff_probs, sizeof(__entry->f.entropy.coeff_probs), @@ -1255,41 +1262,41 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp8_frame_tmpl, TP_ARGS(f), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp8_frame, f)), TP_fast_assign(__entry->f = *f;), - TP_printk("\nsegment.quant_update %s\n" - "segment.lf_update %s\n" - "segment.segment_probs %s\n" - "segment.flags %s\n" - "lf.ref_frm_delta %s\n" - "lf.mb_mode_delta %s\n" - "lf.sharpness_level %u\n" - "lf.level %u\n" - "lf.flags %s\n" - "quant.y_ac_qi %u\n" - "quant.y_dc_delta %d\n" - "quant.y2_dc_delta %d\n" - "quant.y2_ac_delta %d\n" - "quant.uv_dc_delta %d\n" - "quant.uv_ac_delta %d\n" - "coder_state.range %u\n" - "coder_state.value %u\n" - "coder_state.bit_count %u\n" - "width %u\n" - "height %u\n" - "horizontal_scale %u\n" - "vertical_scale %u\n" - "version %u\n" - "prob_skip_false %u\n" - "prob_intra %u\n" - "prob_last %u\n" - "prob_gf %u\n" - "num_dct_parts %u\n" - "first_part_size %u\n" - "first_part_header_bits %u\n" - "dct_part_sizes %s\n" - "last_frame_ts %llu\n" - "golden_frame_ts %llu\n" - "alt_frame_ts %llu\n" - "flags %s", + TP_printk("segment.quant_update = %s, " + "segment.lf_update = %s, " + "segment.segment_probs = %s, " + "segment.flags = %s, " + "lf.ref_frm_delta = %s, " + "lf.mb_mode_delta = %s, " + "lf.sharpness_level = %u, " + "lf.level = %u, " + "lf.flags = %s, " + "quant.y_ac_qi = %u, " + "quant.y_dc_delta = %d, " + "quant.y2_dc_delta = %d, " + "quant.y2_ac_delta = %d, " + "quant.uv_dc_delta = %d, " + "quant.uv_ac_delta = %d, " + "coder_state.range = %u, " + "coder_state.value = %u, " + "coder_state.bit_count = %u, " + "width = %u, " + "height = %u, " + "horizontal_scale = %u, " + "vertical_scale = %u, " + "version = %u, " + "prob_skip_false = %u, " + "prob_intra = %u, " + "prob_last = %u, " + "prob_gf = %u, " + "num_dct_parts = %u, " + "first_part_size = %u, " + "first_part_header_bits = %u, " + "dct_part_sizes = %s, " + "last_frame_ts = %llu, " + "golden_frame_ts = %llu, " + "alt_frame_ts = %llu, " + "flags = %s", __print_array(__entry->f.segment.quant_update, ARRAY_SIZE(__entry->f.segment.quant_update), sizeof(__entry->f.segment.quant_update[0])), @@ -1370,39 +1377,39 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_frame_tmpl, TP_ARGS(f), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp9_frame, f)), TP_fast_assign(__entry->f = *f;), - TP_printk("\nlf.ref_deltas %s\n" - "lf.mode_deltas %s\n" - "lf.level %u\n" - "lf.sharpness %u\n" - "lf.flags %s\n" - "quant.base_q_idx %u\n" - "quant.delta_q_y_dc %d\n" - "quant.delta_q_uv_dc %d\n" - "quant.delta_q_uv_ac %d\n" - "seg.feature_data {%s}\n" - "seg.feature_enabled %s\n" - "seg.tree_probs %s\n" - "seg.pred_probs %s\n" - "seg.flags %s\n" - "flags %s\n" - "compressed_header_size %u\n" - "uncompressed_header_size %u\n" - "frame_width_minus_1 %u\n" - "frame_height_minus_1 %u\n" - "render_width_minus_1 %u\n" - "render_height_minus_1 %u\n" - "last_frame_ts %llu\n" - "golden_frame_ts %llu\n" - "alt_frame_ts %llu\n" - "ref_frame_sign_bias %s\n" - "reset_frame_context %s\n" - "frame_context_idx %u\n" - "profile %u\n" - "bit_depth %u\n" - "interpolation_filter %s\n" - "tile_cols_log2 %u\n" - "tile_rows_log_2 %u\n" - "reference_mode %s\n", + TP_printk("lf.ref_deltas = %s, " + "lf.mode_deltas = %s, " + "lf.level = %u, " + "lf.sharpness = %u, " + "lf.flags = %s, " + "quant.base_q_idx = %u, " + "quant.delta_q_y_dc = %d, " + "quant.delta_q_uv_dc = %d, " + "quant.delta_q_uv_ac = %d, " + "seg.feature_data = {%s}, " + "seg.feature_enabled = %s, " + "seg.tree_probs = %s, " + "seg.pred_probs = %s, " + "seg.flags = %s, " + "flags = %s, " + "compressed_header_size = %u, " + "uncompressed_header_size = %u, " + "frame_width_minus_1 = %u, " + "frame_height_minus_1 = %u, " + "render_width_minus_1 = %u, " + "render_height_minus_1 = %u, " + "last_frame_ts = %llu, " + "golden_frame_ts = %llu, " + "alt_frame_ts = %llu, " + "ref_frame_sign_bias = %s, " + "reset_frame_context = %s, " + "frame_context_idx = %u, " + "profile = %u, " + "bit_depth = %u, " + "interpolation_filter = %s, " + "tile_cols_log2 = %u, " + "tile_rows_log_2 = %u, " + "reference_mode = %s", __print_array(__entry->f.lf.ref_deltas, ARRAY_SIZE(__entry->f.lf.ref_deltas), sizeof(__entry->f.lf.ref_deltas[0])), @@ -1487,20 +1494,20 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_compressed_hdr_tmpl, TP_ARGS(h), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp9_compressed_hdr, h)), TP_fast_assign(__entry->h = *h;), - TP_printk("\ntx_mode %s\n" - "tx8 {%s}\n" - "tx16 {%s}\n" - "tx32 {%s}\n" - "skip %s\n" - "inter_mode {%s}\n" - "interp_filter {%s}\n" - "is_inter %s\n" - "comp_mode %s\n" - "single_ref {%s}\n" - "comp_ref %s\n" - "y_mode {%s}\n" - "uv_mode {%s}\n" - "partition {%s}\n", + TP_printk("tx_mode = %s, " + "tx8 = {%s}, " + "tx16 = {%s}, " + "tx32 = {%s}, " + "skip = %s, " + "inter_mode = {%s}, " + "interp_filter = {%s}, " + "is_inter = %s, " + "comp_mode = %s, " + "single_ref = {%s}, " + "comp_ref = %s, " + "y_mode = {%s}, " + "uv_mode = {%s}, " + "partition = {%s}", __print_symbolic(__entry->h.tx_mode, {V4L2_VP9_TX_MODE_ONLY_4X4, "TX_MODE_ONLY_4X4"}, {V4L2_VP9_TX_MODE_ALLOW_8X8, "TX_MODE_ALLOW_8X8"}, @@ -1563,7 +1570,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_compressed_coef_tmpl, TP_ARGS(h), TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp9_compressed_hdr, h)), TP_fast_assign(__entry->h = *h;), - TP_printk("\n coef {%s}", + TP_printk("coef = {%s}", __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, __entry->h.coef, sizeof(__entry->h.coef), @@ -1576,15 +1583,15 @@ DECLARE_EVENT_CLASS(v4l2_vp9_mv_probs_tmpl, TP_ARGS(p), TP_STRUCT__entry(__field_struct(struct v4l2_vp9_mv_probs, p)), TP_fast_assign(__entry->p = *p;), - TP_printk("\n joint %s\n" - "sign %s\n" - "classes {%s}\n" - "class0_bit %s\n" - "bits {%s}\n" - "class0_fr {%s}\n" - "fr {%s}\n" - "class0_hp %s\n" - "hp %s\n", + TP_printk("joint = %s, " + "sign = %s, " + "classes = {%s}, " + "class0_bit = %s, " + "bits = {%s}, " + "class0_fr = {%s}, " + "fr = {%s}, " + "class0_hp = %s, " + "hp = %s", __print_array(__entry->p.joint, ARRAY_SIZE(__entry->p.joint), sizeof(__entry->p.joint[0])), -- 2.53.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 02/11] media: Reformat v4l2-requests trace event printk 2026-02-12 16:23 ` [PATCH 02/11] media: Reformat v4l2-requests trace event printk Detlev Casanova @ 2026-04-28 19:28 ` Nicolas Dufresne 0 siblings, 0 replies; 20+ messages in thread From: Nicolas Dufresne @ 2026-04-28 19:28 UTC (permalink / raw) To: Detlev Casanova, linux-kernel Cc: Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel [-- Attachment #1: Type: text/plain, Size: 39894 bytes --] Le jeudi 12 février 2026 à 11:23 -0500, Detlev Casanova a écrit : > When printing the v4l2-request traces the format was not stable. > Sometimes using a ':' separator, sometimes with an extra space and using > new lines. > > Reformat the printk calls to match the format used in v4l2.h so that > parsers can use the same format for all events. > > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> Could easily be done against visl now and merged early if you have time. Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> > --- > include/trace/events/v4l2_requests.h | 649 ++++++++++++++------------- > 1 file changed, 328 insertions(+), 321 deletions(-) > > diff --git a/include/trace/events/v4l2_requests.h > b/include/trace/events/v4l2_requests.h > index 1e137d39d5fe..34f4a74df5ea 100644 > --- a/include/trace/events/v4l2_requests.h > +++ b/include/trace/events/v4l2_requests.h > @@ -14,8 +14,8 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_seq_tmpl, > TP_ARGS(s), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_sequence, s)), > TP_fast_assign(__entry->s = *s;), > - TP_printk("\nflags %s\nseq_profile: %u\norder_hint_bits: > %u\nbit_depth: %u\n" > - "max_frame_width_minus_1: %u\nmax_frame_height_minus_1: > %u\n", > + TP_printk("flags = %s, seq_profile = %u, order_hint_bits = %u, > bit_depth = %u, " > + "max_frame_width_minus_1 = %u, max_frame_height_minus_1 = > %u", > __print_flags(__entry->s.flags, "|", > {V4L2_AV1_SEQUENCE_FLAG_STILL_PICTURE, "STILL_PICTURE"}, > {V4L2_AV1_SEQUENCE_FLAG_USE_128X128_SUPERBLOCK, > "USE_128X128_SUPERBLOCK"}, > @@ -50,7 +50,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_tge_tmpl, > TP_ARGS(t), > TP_STRUCT__entry(__field_struct(struct > v4l2_ctrl_av1_tile_group_entry, t)), > TP_fast_assign(__entry->t = *t;), > - TP_printk("\ntile_offset: %u\n tile_size: %u\n tile_row: > %u\ntile_col: %u\n", > + TP_printk("tile_offset = %u, tile_size = %u, tile_row = %u, tile_col > = %u", > __entry->t.tile_offset, > __entry->t.tile_size, > __entry->t.tile_row, > @@ -63,30 +63,30 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_frame_tmpl, > TP_ARGS(f), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_frame, f)), > TP_fast_assign(__entry->f = *f;), > - TP_printk("\ntile_info.flags: %s\ntile_info.context_update_tile_id: > %u\n" > - "tile_info.tile_cols: %u\ntile_info.tile_rows: %u\n" > - "tile_info.mi_col_starts: %s\ntile_info.mi_row_starts: > %s\n" > - "tile_info.width_in_sbs_minus_1: > %s\ntile_info.height_in_sbs_minus_1: %s\n" > - "tile_info.tile_size_bytes: %u\nquantization.flags: %s\n" > - "quantization.base_q_idx: %u\nquantization.delta_q_y_dc: > %d\n" > - "quantization.delta_q_u_dc: %d\nquantization.delta_q_u_ac: > %d\n" > - "quantization.delta_q_v_dc: %d\nquantization.delta_q_v_ac: > %d\n" > - "quantization.qm_y: %u\nquantization.qm_u: > %u\nquantization.qm_v: %u\n" > - "quantization.delta_q_res: %u\nsuperres_denom: > %u\nsegmentation.flags: %s\n" > - "segmentation.last_active_seg_id: > %u\nsegmentation.feature_enabled:%s\n" > - "loop_filter.flags: %s\nloop_filter.level: > %s\nloop_filter.sharpness: %u\n" > - "loop_filter.ref_deltas: %s\nloop_filter.mode_deltas: %s\n" > - "loop_filter.delta_lf_res: %u\ncdef.damping_minus_3: > %u\ncdef.bits: %u\n" > - "cdef.y_pri_strength: %s\ncdef.y_sec_strength: %s\n" > - "cdef.uv_pri_strength: > %s\ncdef.uv_sec_strength:%s\nskip_mode_frame: %s\n" > - "primary_ref_frame: %u\nloop_restoration.flags: %s\n" > - "loop_restoration.lr_unit_shift: > %u\nloop_restoration.lr_uv_shift: %u\n" > - "loop_restoration.frame_restoration_type: %s\n" > - "loop_restoration.loop_restoration_size: %s\nflags: > %s\norder_hint: %u\n" > - "upscaled_width: %u\nframe_width_minus_1: > %u\nframe_height_minus_1: %u\n" > - "render_width_minus_1: %u\nrender_height_minus_1: > %u\ncurrent_frame_id: %u\n" > - "buffer_removal_time: %s\norder_hints: > %s\nreference_frame_ts: %s\n" > - "ref_frame_idx: %s\nrefresh_frame_flags: %u\n", > + TP_printk("tile_info.flags = %s, tile_info.context_update_tile_id = > %u, " > + "tile_info.tile_cols = %u, tile_info.tile_rows = %u, " > + "tile_info.mi_col_starts = %s, tile_info.mi_row_starts = > %s, " > + "tile_info.width_in_sbs_minus_1 = %s, > tile_info.height_in_sbs_minus_1 = %s, " > + "tile_info.tile_size_bytes = %u, quantization.flags = %s, " > + "quantization.base_q_idx = %u, quantization.delta_q_y_dc = > %d, " > + "quantization.delta_q_u_dc = %d, quantization.delta_q_u_ac > = %d, " > + "quantization.delta_q_v_dc = %d, quantization.delta_q_v_ac > = %d, " > + "quantization.qm_y = %u, quantization.qm_u = %u, > quantization.qm_v = %u, " > + "quantization.delta_q_res = %u, superres_denom = %u, > segmentation.flags = %s, " > + "segmentation.last_active_seg_id = %u, > segmentation.feature_enabled = %s, " > + "loop_filter.flags = %s, loop_filter.level = %s, > loop_filter.sharpness = %u, " > + "loop_filter.ref_deltas = %s, loop_filter.mode_deltas = %s, > " > + "loop_filter.delta_lf_res = %u, cdef.damping_minus_3 = %u, > cdef.bits = %u, " > + "cdef.y_pri_strength = %s, cdef.y_sec_strength = %s, " > + "cdef.uv_pri_strength = %s, cdef.uv_sec_strength = %s, > skip_mode_frame = %s, " > + "primary_ref_frame = %u, loop_restoration.flags = %s, " > + "loop_restoration.lr_unit_shift = %u, > loop_restoration.lr_uv_shift = %u, " > + "loop_restoration.frame_restoration_type = %s, " > + "loop_restoration.loop_restoration_size = %s, flags = %s, > order_hint = %u, " > + "upscaled_width = %u, frame_width_minus_1 = %u, > frame_height_minus_1 = %u, " > + "render_width_minus_1 = %u, render_height_minus_1 = %u, > current_frame_id = %u, " > + "buffer_removal_time = %s, order_hints = %s, > reference_frame_ts = %s, " > + "ref_frame_idx = %s, refresh_frame_flags = %u", > __print_flags(__entry->f.tile_info.flags, "|", > {V4L2_AV1_TILE_INFO_FLAG_UNIFORM_TILE_SPACING, > "UNIFORM_TILE_SPACING"}), > __entry->f.tile_info.context_update_tile_id, > @@ -226,15 +226,15 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_film_grain_tmpl, > TP_ARGS(f), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_film_grain, f)), > TP_fast_assign(__entry->f = *f;), > - TP_printk("\nflags %s\ncr_mult: %u\ngrain_seed: %u\n" > - "film_grain_params_ref_idx: %u\nnum_y_points: > %u\npoint_y_value: %s\n" > - "point_y_scaling: %s\nnum_cb_points: %u\npoint_cb_value: > %s\n" > - "point_cb_scaling: %s\nnum_cr_points: %u\npoint_cr_value: > %s\n" > - "point_cr_scaling: %s\ngrain_scaling_minus_8: > %u\nar_coeff_lag: %u\n" > - "ar_coeffs_y_plus_128: %s\nar_coeffs_cb_plus_128: %s\n" > - "ar_coeffs_cr_plus_128: %s\nar_coeff_shift_minus_6: %u\n" > - "grain_scale_shift: %u\ncb_mult: %u\ncb_luma_mult: > %u\ncr_luma_mult: %u\n" > - "cb_offset: %u\ncr_offset: %u\n", > + TP_printk("flags = %s, cr_mult = %u, grain_seed = %u, " > + "film_grain_params_ref_idx = %u, num_y_points = %u, > point_y_value = %s, " > + "point_y_scaling = %s, num_cb_points = %u, point_cb_value = > %s, " > + "point_cb_scaling = %s, num_cr_points = %u, point_cr_value > = %s, " > + "point_cr_scaling = %s, grain_scaling_minus_8 = %u, > ar_coeff_lag = %u, " > + "ar_coeffs_y_plus_128 = %s, ar_coeffs_cb_plus_128 = %s, " > + "ar_coeffs_cr_plus_128 = %s, ar_coeff_shift_minus_6 = %u, " > + "grain_scale_shift = %u, cb_mult = %u, cb_luma_mult = %u, > cr_luma_mult = %u, " > + "cb_offset = %u, cr_offset = %u", > __print_flags(__entry->f.flags, "|", > {V4L2_AV1_FILM_GRAIN_FLAG_APPLY_GRAIN, "APPLY_GRAIN"}, > {V4L2_AV1_FILM_GRAIN_FLAG_UPDATE_GRAIN, "UPDATE_GRAIN"}, > @@ -333,7 +333,15 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_fwht_params_tmpl, > __entry->ycbcr_enc = p->ycbcr_enc; > __entry->quantization = p->quantization; > ), > - TP_printk("backward_ref_ts %llu version %u width %u height %u flags > %s colorspace %u xfer_func %u ycbcr_enc %u quantization %u", > + TP_printk("backward_ref_ts = %llu, " > + "version = %u, " > + "width = %u, " > + "height = %u, " > + "flags = %s, " > + "colorspace = %u, " > + "xfer_func = %u, " > + "ycbcr_enc = %u, " > + "quantization = %u", > __entry->backward_ref_ts, __entry->version, __entry->width, > __entry->height, > __print_flags(__entry->flags, "|", > {V4L2_FWHT_FL_IS_INTERLACED, "IS_INTERLACED"}, > @@ -364,24 +372,24 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_sps_tmpl, > TP_ARGS(s), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_sps, s)), > TP_fast_assign(__entry->s = *s), > - TP_printk("\nprofile_idc %u\n" > - "constraint_set_flags %s\n" > - "level_idc %u\n" > - "seq_parameter_set_id %u\n" > - "chroma_format_idc %u\n" > - "bit_depth_luma_minus8 %u\n" > - "bit_depth_chroma_minus8 %u\n" > - "log2_max_frame_num_minus4 %u\n" > - "pic_order_cnt_type %u\n" > - "log2_max_pic_order_cnt_lsb_minus4 %u\n" > - "max_num_ref_frames %u\n" > - "num_ref_frames_in_pic_order_cnt_cycle %u\n" > - "offset_for_ref_frame %s\n" > - "offset_for_non_ref_pic %d\n" > - "offset_for_top_to_bottom_field %d\n" > - "pic_width_in_mbs_minus1 %u\n" > - "pic_height_in_map_units_minus1 %u\n" > - "flags %s", > + TP_printk("profile_idc = %u, " > + "constraint_set_flags = %s, " > + "level_idc = %u, " > + "seq_parameter_set_id = %u, " > + "chroma_format_idc = %u, " > + "bit_depth_luma_minus8 = %u, " > + "bit_depth_chroma_minus8 = %u, " > + "log2_max_frame_num_minus4 = %u, " > + "pic_order_cnt_type = %u, " > + "log2_max_pic_order_cnt_lsb_minus4 = %u, " > + "max_num_ref_frames = %u, " > + "num_ref_frames_in_pic_order_cnt_cycle = %u, " > + "offset_for_ref_frame = %s, " > + "offset_for_non_ref_pic = %d, " > + "offset_for_top_to_bottom_field = %d, " > + "pic_width_in_mbs_minus1 = %u, " > + "pic_height_in_map_units_minus1 = %u, " > + "flags = %s", > __entry->s.profile_idc, > __print_flags(__entry->s.constraint_set_flags, "|", > {V4L2_H264_SPS_CONSTRAINT_SET0_FLAG, > "CONSTRAINT_SET0_FLAG"}, > @@ -423,17 +431,17 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pps_tmpl, > TP_ARGS(p), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_pps, p)), > TP_fast_assign(__entry->p = *p), > - TP_printk("\npic_parameter_set_id %u\n" > - "seq_parameter_set_id %u\n" > - "num_slice_groups_minus1 %u\n" > - "num_ref_idx_l0_default_active_minus1 %u\n" > - "num_ref_idx_l1_default_active_minus1 %u\n" > - "weighted_bipred_idc %u\n" > - "pic_init_qp_minus26 %d\n" > - "pic_init_qs_minus26 %d\n" > - "chroma_qp_index_offset %d\n" > - "second_chroma_qp_index_offset %d\n" > - "flags %s", > + TP_printk("pic_parameter_set_id = %u, " > + "seq_parameter_set_id = %u, " > + "num_slice_groups_minus1 = %u, " > + "num_ref_idx_l0_default_active_minus1 = %u, " > + "num_ref_idx_l1_default_active_minus1 = %u, " > + "weighted_bipred_idc = %u, " > + "pic_init_qp_minus26 = %d, " > + "pic_init_qs_minus26 = %d, " > + "chroma_qp_index_offset = %d, " > + "second_chroma_qp_index_offset = %d, " > + "flags = %s", > __entry->p.pic_parameter_set_id, > __entry->p.seq_parameter_set_id, > __entry->p.num_slice_groups_minus1, > @@ -461,7 +469,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_scaling_matrix_tmpl, > TP_ARGS(s), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_scaling_matrix, > s)), > TP_fast_assign(__entry->s = *s), > - TP_printk("\nscaling_list_4x4 {%s}\nscaling_list_8x8 {%s}", > + TP_printk("scaling_list_4x4 = {%s}, scaling_list_8x8 = {%s}", > __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, > __entry->s.scaling_list_4x4, > sizeof(__entry->s.scaling_list_4x4), > @@ -478,16 +486,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pred_weights_tmpl, > TP_ARGS(p), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_pred_weights, > p)), > TP_fast_assign(__entry->p = *p), > - TP_printk("\nluma_log2_weight_denom %u\n" > - "chroma_log2_weight_denom %u\n" > - "weight_factor[0].luma_weight %s\n" > - "weight_factor[0].luma_offset %s\n" > - "weight_factor[0].chroma_weight {%s}\n" > - "weight_factor[0].chroma_offset {%s}\n" > - "weight_factor[1].luma_weight %s\n" > - "weight_factor[1].luma_offset %s\n" > - "weight_factor[1].chroma_weight {%s}\n" > - "weight_factor[1].chroma_offset {%s}\n", > + TP_printk("luma_log2_weight_denom = %u, " > + "chroma_log2_weight_denom = %u, " > + "weight_factor[0].luma_weight = %s, " > + "weight_factor[0].luma_offset = %s, " > + "weight_factor[0].chroma_weight = {%s}, " > + "weight_factor[0].chroma_offset = {%s}, " > + "weight_factor[1].luma_weight = %s, " > + "weight_factor[1].luma_offset = %s, " > + "weight_factor[1].chroma_weight = {%s}, " > + "weight_factor[1].chroma_offset = {%s}", > __entry->p.luma_log2_weight_denom, > __entry->p.chroma_log2_weight_denom, > __print_array(__entry->p.weight_factors[0].luma_weight, > @@ -526,20 +534,20 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_slice_params_tmpl, > TP_ARGS(s), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_slice_params, > s)), > TP_fast_assign(__entry->s = *s), > - TP_printk("\nheader_bit_size %u\n" > - "first_mb_in_slice %u\n" > - "slice_type %s\n" > - "colour_plane_id %u\n" > - "redundant_pic_cnt %u\n" > - "cabac_init_idc %u\n" > - "slice_qp_delta %d\n" > - "slice_qs_delta %d\n" > - "disable_deblocking_filter_idc %u\n" > - "slice_alpha_c0_offset_div2 %u\n" > - "slice_beta_offset_div2 %u\n" > - "num_ref_idx_l0_active_minus1 %u\n" > - "num_ref_idx_l1_active_minus1 %u\n" > - "flags %s", > + TP_printk("header_bit_size = %u, " > + "first_mb_in_slice = %u, " > + "slice_type = %s, " > + "colour_plane_id = %u, " > + "redundant_pic_cnt = %u, " > + "cabac_init_idc = %u, " > + "slice_qp_delta = %d, " > + "slice_qs_delta = %d, " > + "disable_deblocking_filter_idc = %u, " > + "slice_alpha_c0_offset_div2 = %u, " > + "slice_beta_offset_div2 = %u, " > + "num_ref_idx_l0_active_minus1 = %u, " > + "num_ref_idx_l1_active_minus1 = %u, " > + "flags = %s", > __entry->s.header_bit_size, > __entry->s.first_mb_in_slice, > __print_symbolic(__entry->s.slice_type, > @@ -570,7 +578,7 @@ DECLARE_EVENT_CLASS(v4l2_h264_reference_tmpl, > TP_STRUCT__entry(__field_struct(struct v4l2_h264_reference, r) > __field(int, i)), > TP_fast_assign(__entry->r = *r; __entry->i = i;), > - TP_printk("[%d]: fields %s index %u", > + TP_printk("[%d]: fields = %s, index = %u", > __entry->i, > __print_flags(__entry->r.fields, "|", > {V4L2_H264_TOP_FIELD_REF, "TOP_FIELD_REF"}, > @@ -585,19 +593,19 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_decode_params_tmpl, > TP_ARGS(d), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_decode_params, > d)), > TP_fast_assign(__entry->d = *d), > - TP_printk("\nnal_ref_idc %u\n" > - "frame_num %u\n" > - "top_field_order_cnt %d\n" > - "bottom_field_order_cnt %d\n" > - "idr_pic_id %u\n" > - "pic_order_cnt_lsb %u\n" > - "delta_pic_order_cnt_bottom %d\n" > - "delta_pic_order_cnt0 %d\n" > - "delta_pic_order_cnt1 %d\n" > - "dec_ref_pic_marking_bit_size %u\n" > - "pic_order_cnt_bit_size %u\n" > - "slice_group_change_cycle %u\n" > - "flags %s\n", > + TP_printk("nal_ref_idc = %u, " > + "frame_num = %u, " > + "top_field_order_cnt = %d, " > + "bottom_field_order_cnt = %d, " > + "idr_pic_id = %u, " > + "pic_order_cnt_lsb = %u, " > + "delta_pic_order_cnt_bottom = %d, " > + "delta_pic_order_cnt0 = %d, " > + "delta_pic_order_cnt1 = %d, " > + "dec_ref_pic_marking_bit_size = %u, " > + "pic_order_cnt_bit_size = %u, " > + "slice_group_change_cycle = %u, " > + "flags = %s", > __entry->d.nal_ref_idc, > __entry->d.frame_num, > __entry->d.top_field_order_cnt, > @@ -625,8 +633,8 @@ DECLARE_EVENT_CLASS(v4l2_h264_dpb_entry_tmpl, > TP_STRUCT__entry(__field_struct(struct v4l2_h264_dpb_entry, e) > __field(int, i)), > TP_fast_assign(__entry->e = *e; __entry->i = i;), > - TP_printk("[%d]: reference_ts %llu, pic_num %u frame_num %u fields %s > " > - "top_field_order_cnt %d bottom_field_order_cnt %d flags > %s", > + TP_printk("[%d]: reference_ts = %llu, pic_num = %u, frame_num = %u, > fields = %s " > + "top_field_order_cnt = %d, bottom_field_order_cnt = %d, > flags = %s", > __entry->i, > __entry->e.reference_ts, > __entry->e.pic_num, > @@ -642,7 +650,6 @@ DECLARE_EVENT_CLASS(v4l2_h264_dpb_entry_tmpl, > {V4L2_H264_DPB_ENTRY_FLAG_ACTIVE, "ACTIVE"}, > {V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM, "LONG_TERM"}, > {V4L2_H264_DPB_ENTRY_FLAG_FIELD, "FIELD"}) > - > ) > ); > > @@ -698,31 +705,31 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_sps_tmpl, > TP_ARGS(s), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_sps, s)), > TP_fast_assign(__entry->s = *s), > - TP_printk("\nvideo_parameter_set_id %u\n" > - "seq_parameter_set_id %u\n" > - "pic_width_in_luma_samples %u\n" > - "pic_height_in_luma_samples %u\n" > - "bit_depth_luma_minus8 %u\n" > - "bit_depth_chroma_minus8 %u\n" > - "log2_max_pic_order_cnt_lsb_minus4 %u\n" > - "sps_max_dec_pic_buffering_minus1 %u\n" > - "sps_max_num_reorder_pics %u\n" > - "sps_max_latency_increase_plus1 %u\n" > - "log2_min_luma_coding_block_size_minus3 %u\n" > - "log2_diff_max_min_luma_coding_block_size %u\n" > - "log2_min_luma_transform_block_size_minus2 %u\n" > - "log2_diff_max_min_luma_transform_block_size %u\n" > - "max_transform_hierarchy_depth_inter %u\n" > - "max_transform_hierarchy_depth_intra %u\n" > - "pcm_sample_bit_depth_luma_minus1 %u\n" > - "pcm_sample_bit_depth_chroma_minus1 %u\n" > - "log2_min_pcm_luma_coding_block_size_minus3 %u\n" > - "log2_diff_max_min_pcm_luma_coding_block_size %u\n" > - "num_short_term_ref_pic_sets %u\n" > - "num_long_term_ref_pics_sps %u\n" > - "chroma_format_idc %u\n" > - "sps_max_sub_layers_minus1 %u\n" > - "flags %s", > + TP_printk("video_parameter_set_id = %u, " > + "seq_parameter_set_id = %u, " > + "pic_width_in_luma_samples = %u, " > + "pic_height_in_luma_samples = %u, " > + "bit_depth_luma_minus8 = %u, " > + "bit_depth_chroma_minus8 = %u, " > + "log2_max_pic_order_cnt_lsb_minus4 = %u, " > + "sps_max_dec_pic_buffering_minus1 = %u, " > + "sps_max_num_reorder_pics = %u, " > + "sps_max_latency_increase_plus1 = %u, " > + "log2_min_luma_coding_block_size_minus3 = %u, " > + "log2_diff_max_min_luma_coding_block_size = %u, " > + "log2_min_luma_transform_block_size_minus2 = %u, " > + "log2_diff_max_min_luma_transform_block_size = %u, " > + "max_transform_hierarchy_depth_inter = %u, " > + "max_transform_hierarchy_depth_intra = %u, " > + "pcm_sample_bit_depth_luma_minus1 = %u, " > + "pcm_sample_bit_depth_chroma_minus1 = %u, " > + "log2_min_pcm_luma_coding_block_size_minus3 = %u, " > + "log2_diff_max_min_pcm_luma_coding_block_size = %u, " > + "num_short_term_ref_pic_sets = %u, " > + "num_long_term_ref_pics_sps = %u, " > + "chroma_format_idc = %u, " > + "sps_max_sub_layers_minus1 = %u, " > + "flags = %s", > __entry->s.video_parameter_set_id, > __entry->s.seq_parameter_set_id, > __entry->s.pic_width_in_luma_samples, > @@ -767,22 +774,22 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_pps_tmpl, > TP_ARGS(p), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_pps, p)), > TP_fast_assign(__entry->p = *p), > - TP_printk("\npic_parameter_set_id %u\n" > - "num_extra_slice_header_bits %u\n" > - "num_ref_idx_l0_default_active_minus1 %u\n" > - "num_ref_idx_l1_default_active_minus1 %u\n" > - "init_qp_minus26 %d\n" > - "diff_cu_qp_delta_depth %u\n" > - "pps_cb_qp_offset %d\n" > - "pps_cr_qp_offset %d\n" > - "num_tile_columns_minus1 %d\n" > - "num_tile_rows_minus1 %d\n" > - "column_width_minus1 %s\n" > - "row_height_minus1 %s\n" > - "pps_beta_offset_div2 %d\n" > - "pps_tc_offset_div2 %d\n" > - "log2_parallel_merge_level_minus2 %u\n" > - "flags %s", > + TP_printk("pic_parameter_set_id = %u, " > + "num_extra_slice_header_bits = %u, " > + "num_ref_idx_l0_default_active_minus1 = %u, " > + "num_ref_idx_l1_default_active_minus1 = %u, " > + "init_qp_minus26 = %d, " > + "diff_cu_qp_delta_depth = %u, " > + "pps_cb_qp_offset = %d, " > + "pps_cr_qp_offset = %d, " > + "num_tile_columns_minus1 = %d, " > + "num_tile_rows_minus1 = %d, " > + "column_width_minus1 = %s, " > + "row_height_minus1 = %s, " > + "pps_beta_offset_div2 = %d, " > + "pps_tc_offset_div2 = %d, " > + "log2_parallel_merge_level_minus2 = %u, " > + "flags = %s", > __entry->p.pic_parameter_set_id, > __entry->p.num_extra_slice_header_bits, > __entry->p.num_ref_idx_l0_default_active_minus1, > @@ -834,33 +841,33 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_slice_params_tmpl, > TP_ARGS(s), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_slice_params, > s)), > TP_fast_assign(__entry->s = *s), > - TP_printk("\nbit_size %u\n" > - "data_byte_offset %u\n" > - "num_entry_point_offsets %u\n" > - "nal_unit_type %u\n" > - "nuh_temporal_id_plus1 %u\n" > - "slice_type %u\n" > - "colour_plane_id %u\n" > - "slice_pic_order_cnt %d\n" > - "num_ref_idx_l0_active_minus1 %u\n" > - "num_ref_idx_l1_active_minus1 %u\n" > - "collocated_ref_idx %u\n" > - "five_minus_max_num_merge_cand %u\n" > - "slice_qp_delta %d\n" > - "slice_cb_qp_offset %d\n" > - "slice_cr_qp_offset %d\n" > - "slice_act_y_qp_offset %d\n" > - "slice_act_cb_qp_offset %d\n" > - "slice_act_cr_qp_offset %d\n" > - "slice_beta_offset_div2 %d\n" > - "slice_tc_offset_div2 %d\n" > - "pic_struct %u\n" > - "slice_segment_addr %u\n" > - "ref_idx_l0 %s\n" > - "ref_idx_l1 %s\n" > - "short_term_ref_pic_set_size %u\n" > - "long_term_ref_pic_set_size %u\n" > - "flags %s", > + TP_printk("bit_size = %u, " > + "data_byte_offset = %u, " > + "num_entry_point_offsets = %u, " > + "nal_unit_type = %u, " > + "nuh_temporal_id_plus1 = %u, " > + "slice_type = %u, " > + "colour_plane_id = %u, " > + "slice_pic_order_cnt = %d, " > + "num_ref_idx_l0_active_minus1 = %u, " > + "num_ref_idx_l1_active_minus1 = %u, " > + "collocated_ref_idx = %u, " > + "five_minus_max_num_merge_cand = %u, " > + "slice_qp_delta = %d, " > + "slice_cb_qp_offset = %d, " > + "slice_cr_qp_offset = %d, " > + "slice_act_y_qp_offset = %d, " > + "slice_act_cb_qp_offset = %d, " > + "slice_act_cr_qp_offset = %d, " > + "slice_beta_offset_div2 = %d, " > + "slice_tc_offset_div2 = %d, " > + "pic_struct = %u, " > + "slice_segment_addr = %u, " > + "ref_idx_l0 = %s, " > + "ref_idx_l1 = %s, " > + "short_term_ref_pic_set_size = %u, " > + "long_term_ref_pic_set_size = %u, " > + "flags = %s", > __entry->s.bit_size, > __entry->s.data_byte_offset, > __entry->s.num_entry_point_offsets, > @@ -911,16 +918,16 @@ DECLARE_EVENT_CLASS(v4l2_hevc_pred_weight_table_tmpl, > TP_ARGS(p), > TP_STRUCT__entry(__field_struct(struct v4l2_hevc_pred_weight_table, > p)), > TP_fast_assign(__entry->p = *p), > - TP_printk("\ndelta_luma_weight_l0 %s\n" > - "luma_offset_l0 %s\n" > - "delta_chroma_weight_l0 {%s}\n" > - "chroma_offset_l0 {%s}\n" > - "delta_luma_weight_l1 %s\n" > - "luma_offset_l1 %s\n" > - "delta_chroma_weight_l1 {%s}\n" > - "chroma_offset_l1 {%s}\n" > - "luma_log2_weight_denom %d\n" > - "delta_chroma_log2_weight_denom %d\n", > + TP_printk("delta_luma_weight_l0 = %s, " > + "luma_offset_l0 = %s, " > + "delta_chroma_weight_l0 = {%s}, " > + "chroma_offset_l0 = {%s}, " > + "delta_luma_weight_l1 = %s, " > + "luma_offset_l1 = %s, " > + "delta_chroma_weight_l1 = {%s}, " > + "chroma_offset_l1 = {%s}, " > + "luma_log2_weight_denom = %d, " > + "delta_chroma_log2_weight_denom = %d", > __print_array(__entry->p.delta_luma_weight_l0, > ARRAY_SIZE(__entry->p.delta_luma_weight_l0), > sizeof(__entry->p.delta_luma_weight_l0[0])), > @@ -959,12 +966,12 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_scaling_matrix_tmpl, > TP_ARGS(s), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_scaling_matrix, > s)), > TP_fast_assign(__entry->s = *s), > - TP_printk("\nscaling_list_4x4 {%s}\n" > - "scaling_list_8x8 {%s}\n" > - "scaling_list_16x16 {%s}\n" > - "scaling_list_32x32 {%s}\n" > - "scaling_list_dc_coef_16x16 %s\n" > - "scaling_list_dc_coef_32x32 %s\n", > + TP_printk("scaling_list_4x4 = {%s}, " > + "scaling_list_8x8 = {%s}, " > + "scaling_list_16x16 = {%s}, " > + "scaling_list_32x32 = {%s}, " > + "scaling_list_dc_coef_16x16 = %s, " > + "scaling_list_dc_coef_32x32 = %s", > __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, > __entry->s.scaling_list_4x4, > sizeof(__entry->s.scaling_list_4x4), > @@ -994,17 +1001,17 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_decode_params_tmpl, > TP_ARGS(d), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_decode_params, > d)), > TP_fast_assign(__entry->d = *d), > - TP_printk("\npic_order_cnt_val %d\n" > - "short_term_ref_pic_set_size %u\n" > - "long_term_ref_pic_set_size %u\n" > - "num_active_dpb_entries %u\n" > - "num_poc_st_curr_before %u\n" > - "num_poc_st_curr_after %u\n" > - "num_poc_lt_curr %u\n" > - "poc_st_curr_before %s\n" > - "poc_st_curr_after %s\n" > - "poc_lt_curr %s\n" > - "flags %s", > + TP_printk("pic_order_cnt_val = %d, " > + "short_term_ref_pic_set_size = %u, " > + "long_term_ref_pic_set_size = %u, " > + "num_active_dpb_entries = %u, " > + "num_poc_st_curr_before = %u, " > + "num_poc_st_curr_after = %u, " > + "num_poc_lt_curr = %u, " > + "poc_st_curr_before = %s, " > + "poc_st_curr_after = %s, " > + "poc_lt_curr = %s, " > + "flags = %s", > __entry->d.pic_order_cnt_val, > __entry->d.short_term_ref_pic_set_size, > __entry->d.long_term_ref_pic_set_size, > @@ -1033,8 +1040,8 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_ext_sps_lt_rps_tmpl, > TP_ARGS(lt), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_ext_sps_lt_rps, > lt)), > TP_fast_assign(__entry->lt = *lt), > - TP_printk("\nflags %s\n" > - "lt_ref_pic_poc_lsb_sps %x\n", > + TP_printk("flags = %s, " > + "lt_ref_pic_poc_lsb_sps = %x", > __print_flags(__entry->lt.flags, "|", > {V4L2_HEVC_EXT_SPS_LT_RPS_FLAG_USED_LT, "USED_LT"} > ), > @@ -1047,16 +1054,16 @@ > DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_ext_sps_st_rps_tmpl, > TP_ARGS(st), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_ext_sps_st_rps, > st)), > TP_fast_assign(__entry->st = *st), > - TP_printk("\nflags %s\n" > - "delta_idx_minus1: %u\n" > - "delta_rps_sign: %u\n" > - "abs_delta_rps_minus1: %u\n" > - "num_negative_pics: %u\n" > - "num_positive_pics: %u\n" > - "used_by_curr_pic: %08x\n" > - "use_delta_flag: %08x\n" > - "delta_poc_s0_minus1: %s\n" > - "delta_poc_s1_minus1: %s\n", > + TP_printk("flags = %s, " > + "delta_idx_minus1 = %u, " > + "delta_rps_sign = %u, " > + "abs_delta_rps_minus1 = %u, " > + "num_negative_pics = %u, " > + "num_positive_pics = %u, " > + "used_by_curr_pic = %08x, " > + "use_delta_flag = %08x, " > + "delta_poc_s0_minus1 = %s, " > + "delta_poc_s1_minus1 = %s", > __print_flags(__entry->st.flags, "|", > {V4L2_HEVC_EXT_SPS_ST_RPS_FLAG_INTER_REF_PIC_SET_PRED, > "INTER_REF_PIC_SET_PRED"} > ), > @@ -1081,10 +1088,10 @@ DECLARE_EVENT_CLASS(v4l2_hevc_dpb_entry_tmpl, > TP_ARGS(e), > TP_STRUCT__entry(__field_struct(struct v4l2_hevc_dpb_entry, e)), > TP_fast_assign(__entry->e = *e), > - TP_printk("\ntimestamp %llu\n" > - "flags %s\n" > - "field_pic %u\n" > - "pic_order_cnt_val %d\n", > + TP_printk("timestamp = %llu, " > + "flags = %s, " > + "field_pic = %u, " > + "pic_order_cnt_val = %d", > __entry->e.timestamp, > __print_flags(__entry->e.flags, "|", > {V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE, > "LONG_TERM_REFERENCE"} > @@ -1145,8 +1152,8 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_seq_tmpl, > TP_ARGS(s), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_mpeg2_sequence, s)), > TP_fast_assign(__entry->s = *s;), > - TP_printk("\nhorizontal_size %u\nvertical_size %u\nvbv_buffer_size > %u\n" > - "profile_and_level_indication %u\nchroma_format %u\nflags > %s\n", > + TP_printk("horizontal_size = %u, vertical_size = %u, vbv_buffer_size > = %u, " > + "profile_and_level_indication = %u, chroma_format = %u, > flags = %s", > __entry->s.horizontal_size, > __entry->s.vertical_size, > __entry->s.vbv_buffer_size, > @@ -1162,8 +1169,8 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_pic_tmpl, > TP_ARGS(p), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_mpeg2_picture, p)), > TP_fast_assign(__entry->p = *p;), > - TP_printk("\nbackward_ref_ts %llu\nforward_ref_ts %llu\nflags > %s\nf_code {%s}\n" > - "picture_coding_type: %u\npicture_structure > %u\nintra_dc_precision %u\n", > + TP_printk("backward_ref_ts = %llu, forward_ref_ts = %llu, flags = %s, > f_code = {%s}, " > + "picture_coding_type = %u, picture_structure = %u, > intra_dc_precision = %u", > __entry->p.backward_ref_ts, > __entry->p.forward_ref_ts, > __print_flags(__entry->p.flags, "|", > @@ -1190,8 +1197,8 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_quant_tmpl, > TP_ARGS(q), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_mpeg2_quantisation, > q)), > TP_fast_assign(__entry->q = *q;), > - TP_printk("\nintra_quantiser_matrix %s\nnon_intra_quantiser_matrix > %s\n" > - "chroma_intra_quantiser_matrix > %s\nchroma_non_intra_quantiser_matrix %s\n", > + TP_printk("intra_quantiser_matrix = %s, non_intra_quantiser_matrix = > %s, " > + "chroma_intra_quantiser_matrix = %s, > chroma_non_intra_quantiser_matrix = %s", > __print_array(__entry->q.intra_quantiser_matrix, > ARRAY_SIZE(__entry- > >q.intra_quantiser_matrix), > sizeof(__entry- > >q.intra_quantiser_matrix[0])), > @@ -1229,10 +1236,10 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp8_entropy_tmpl, > TP_ARGS(f), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp8_frame, f)), > TP_fast_assign(__entry->f = *f;), > - TP_printk("\nentropy.coeff_probs {%s}\n" > - "entropy.y_mode_probs %s\n" > - "entropy.uv_mode_probs %s\n" > - "entropy.mv_probs {%s}", > + TP_printk("entropy.coeff_probs = {%s}, " > + "entropy.y_mode_probs = %s, " > + "entropy.uv_mode_probs = %s, " > + "entropy.mv_probs = {%s}", > __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, > __entry->f.entropy.coeff_probs, > sizeof(__entry->f.entropy.coeff_probs), > @@ -1255,41 +1262,41 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp8_frame_tmpl, > TP_ARGS(f), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp8_frame, f)), > TP_fast_assign(__entry->f = *f;), > - TP_printk("\nsegment.quant_update %s\n" > - "segment.lf_update %s\n" > - "segment.segment_probs %s\n" > - "segment.flags %s\n" > - "lf.ref_frm_delta %s\n" > - "lf.mb_mode_delta %s\n" > - "lf.sharpness_level %u\n" > - "lf.level %u\n" > - "lf.flags %s\n" > - "quant.y_ac_qi %u\n" > - "quant.y_dc_delta %d\n" > - "quant.y2_dc_delta %d\n" > - "quant.y2_ac_delta %d\n" > - "quant.uv_dc_delta %d\n" > - "quant.uv_ac_delta %d\n" > - "coder_state.range %u\n" > - "coder_state.value %u\n" > - "coder_state.bit_count %u\n" > - "width %u\n" > - "height %u\n" > - "horizontal_scale %u\n" > - "vertical_scale %u\n" > - "version %u\n" > - "prob_skip_false %u\n" > - "prob_intra %u\n" > - "prob_last %u\n" > - "prob_gf %u\n" > - "num_dct_parts %u\n" > - "first_part_size %u\n" > - "first_part_header_bits %u\n" > - "dct_part_sizes %s\n" > - "last_frame_ts %llu\n" > - "golden_frame_ts %llu\n" > - "alt_frame_ts %llu\n" > - "flags %s", > + TP_printk("segment.quant_update = %s, " > + "segment.lf_update = %s, " > + "segment.segment_probs = %s, " > + "segment.flags = %s, " > + "lf.ref_frm_delta = %s, " > + "lf.mb_mode_delta = %s, " > + "lf.sharpness_level = %u, " > + "lf.level = %u, " > + "lf.flags = %s, " > + "quant.y_ac_qi = %u, " > + "quant.y_dc_delta = %d, " > + "quant.y2_dc_delta = %d, " > + "quant.y2_ac_delta = %d, " > + "quant.uv_dc_delta = %d, " > + "quant.uv_ac_delta = %d, " > + "coder_state.range = %u, " > + "coder_state.value = %u, " > + "coder_state.bit_count = %u, " > + "width = %u, " > + "height = %u, " > + "horizontal_scale = %u, " > + "vertical_scale = %u, " > + "version = %u, " > + "prob_skip_false = %u, " > + "prob_intra = %u, " > + "prob_last = %u, " > + "prob_gf = %u, " > + "num_dct_parts = %u, " > + "first_part_size = %u, " > + "first_part_header_bits = %u, " > + "dct_part_sizes = %s, " > + "last_frame_ts = %llu, " > + "golden_frame_ts = %llu, " > + "alt_frame_ts = %llu, " > + "flags = %s", > __print_array(__entry->f.segment.quant_update, > ARRAY_SIZE(__entry->f.segment.quant_update), > sizeof(__entry->f.segment.quant_update[0])), > @@ -1370,39 +1377,39 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_frame_tmpl, > TP_ARGS(f), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp9_frame, f)), > TP_fast_assign(__entry->f = *f;), > - TP_printk("\nlf.ref_deltas %s\n" > - "lf.mode_deltas %s\n" > - "lf.level %u\n" > - "lf.sharpness %u\n" > - "lf.flags %s\n" > - "quant.base_q_idx %u\n" > - "quant.delta_q_y_dc %d\n" > - "quant.delta_q_uv_dc %d\n" > - "quant.delta_q_uv_ac %d\n" > - "seg.feature_data {%s}\n" > - "seg.feature_enabled %s\n" > - "seg.tree_probs %s\n" > - "seg.pred_probs %s\n" > - "seg.flags %s\n" > - "flags %s\n" > - "compressed_header_size %u\n" > - "uncompressed_header_size %u\n" > - "frame_width_minus_1 %u\n" > - "frame_height_minus_1 %u\n" > - "render_width_minus_1 %u\n" > - "render_height_minus_1 %u\n" > - "last_frame_ts %llu\n" > - "golden_frame_ts %llu\n" > - "alt_frame_ts %llu\n" > - "ref_frame_sign_bias %s\n" > - "reset_frame_context %s\n" > - "frame_context_idx %u\n" > - "profile %u\n" > - "bit_depth %u\n" > - "interpolation_filter %s\n" > - "tile_cols_log2 %u\n" > - "tile_rows_log_2 %u\n" > - "reference_mode %s\n", > + TP_printk("lf.ref_deltas = %s, " > + "lf.mode_deltas = %s, " > + "lf.level = %u, " > + "lf.sharpness = %u, " > + "lf.flags = %s, " > + "quant.base_q_idx = %u, " > + "quant.delta_q_y_dc = %d, " > + "quant.delta_q_uv_dc = %d, " > + "quant.delta_q_uv_ac = %d, " > + "seg.feature_data = {%s}, " > + "seg.feature_enabled = %s, " > + "seg.tree_probs = %s, " > + "seg.pred_probs = %s, " > + "seg.flags = %s, " > + "flags = %s, " > + "compressed_header_size = %u, " > + "uncompressed_header_size = %u, " > + "frame_width_minus_1 = %u, " > + "frame_height_minus_1 = %u, " > + "render_width_minus_1 = %u, " > + "render_height_minus_1 = %u, " > + "last_frame_ts = %llu, " > + "golden_frame_ts = %llu, " > + "alt_frame_ts = %llu, " > + "ref_frame_sign_bias = %s, " > + "reset_frame_context = %s, " > + "frame_context_idx = %u, " > + "profile = %u, " > + "bit_depth = %u, " > + "interpolation_filter = %s, " > + "tile_cols_log2 = %u, " > + "tile_rows_log_2 = %u, " > + "reference_mode = %s", > __print_array(__entry->f.lf.ref_deltas, > ARRAY_SIZE(__entry->f.lf.ref_deltas), > sizeof(__entry->f.lf.ref_deltas[0])), > @@ -1487,20 +1494,20 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_compressed_hdr_tmpl, > TP_ARGS(h), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp9_compressed_hdr, > h)), > TP_fast_assign(__entry->h = *h;), > - TP_printk("\ntx_mode %s\n" > - "tx8 {%s}\n" > - "tx16 {%s}\n" > - "tx32 {%s}\n" > - "skip %s\n" > - "inter_mode {%s}\n" > - "interp_filter {%s}\n" > - "is_inter %s\n" > - "comp_mode %s\n" > - "single_ref {%s}\n" > - "comp_ref %s\n" > - "y_mode {%s}\n" > - "uv_mode {%s}\n" > - "partition {%s}\n", > + TP_printk("tx_mode = %s, " > + "tx8 = {%s}, " > + "tx16 = {%s}, " > + "tx32 = {%s}, " > + "skip = %s, " > + "inter_mode = {%s}, " > + "interp_filter = {%s}, " > + "is_inter = %s, " > + "comp_mode = %s, " > + "single_ref = {%s}, " > + "comp_ref = %s, " > + "y_mode = {%s}, " > + "uv_mode = {%s}, " > + "partition = {%s}", > __print_symbolic(__entry->h.tx_mode, > {V4L2_VP9_TX_MODE_ONLY_4X4, "TX_MODE_ONLY_4X4"}, > {V4L2_VP9_TX_MODE_ALLOW_8X8, "TX_MODE_ALLOW_8X8"}, > @@ -1563,7 +1570,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_compressed_coef_tmpl, > TP_ARGS(h), > TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp9_compressed_hdr, > h)), > TP_fast_assign(__entry->h = *h;), > - TP_printk("\n coef {%s}", > + TP_printk("coef = {%s}", > __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, > __entry->h.coef, > sizeof(__entry->h.coef), > @@ -1576,15 +1583,15 @@ DECLARE_EVENT_CLASS(v4l2_vp9_mv_probs_tmpl, > TP_ARGS(p), > TP_STRUCT__entry(__field_struct(struct v4l2_vp9_mv_probs, p)), > TP_fast_assign(__entry->p = *p;), > - TP_printk("\n joint %s\n" > - "sign %s\n" > - "classes {%s}\n" > - "class0_bit %s\n" > - "bits {%s}\n" > - "class0_fr {%s}\n" > - "fr {%s}\n" > - "class0_hp %s\n" > - "hp %s\n", > + TP_printk("joint = %s, " > + "sign = %s, " > + "classes = {%s}, " > + "class0_bit = %s, " > + "bits = {%s}, " > + "class0_fr = {%s}, " > + "fr = {%s}, " > + "class0_hp = %s, " > + "hp = %s", > __print_array(__entry->p.joint, > ARRAY_SIZE(__entry->p.joint), > sizeof(__entry->p.joint[0])), [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 03/11] media: Add tgid and fd fields in v4l2_fh struct 2026-02-12 16:23 [PATCH 00/11] v4l2: Add tracing for stateless codecs Detlev Casanova 2026-02-12 16:23 ` [PATCH 02/11] media: Reformat v4l2-requests trace event printk Detlev Casanova @ 2026-02-12 16:23 ` Detlev Casanova 2026-04-28 19:31 ` Nicolas Dufresne 2026-02-12 16:23 ` [PATCH 04/11] media: Add tgid and fd to the v4l2-requests trace fields Detlev Casanova ` (9 subsequent siblings) 11 siblings, 1 reply; 20+ messages in thread From: Detlev Casanova @ 2026-02-12 16:23 UTC (permalink / raw) To: linux-kernel Cc: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Detlev Casanova, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel These fields will be used in traces to help userspace tracing tools identify streams. The tgid field will keep the PID of the process that opened the video file. That is needed because trace calls can happen in IRQs, for which there is no current PID. The fd field helps identify the context in case the same process opens the video device multiple times. Note that the fd field is set in the __video_do_ioctl() function. That is because the file descriptor has not been allocated yet when v4l2_open() is called. Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> --- drivers/media/v4l2-core/v4l2-fh.c | 1 + drivers/media/v4l2-core/v4l2-ioctl.c | 17 +++++++++++++++++ include/media/v4l2-fh.h | 4 ++++ 3 files changed, 22 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-fh.c b/drivers/media/v4l2-core/v4l2-fh.c index df3ba9d4674b..86e8223b46cb 100644 --- a/drivers/media/v4l2-core/v4l2-fh.c +++ b/drivers/media/v4l2-core/v4l2-fh.c @@ -37,6 +37,7 @@ void v4l2_fh_init(struct v4l2_fh *fh, struct video_device *vdev) INIT_LIST_HEAD(&fh->available); INIT_LIST_HEAD(&fh->subscribed); fh->sequence = -1; + fh->tgid = current->tgid; mutex_init(&fh->subscribe_lock); } EXPORT_SYMBOL_GPL(v4l2_fh_init); diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 37d33d4a363d..a3b6df0571d6 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -9,6 +9,7 @@ */ #include <linux/compat.h> +#include <linux/fdtable.h> #include <linux/mm.h> #include <linux/module.h> #include <linux/slab.h> @@ -3061,6 +3062,16 @@ void v4l_printk_ioctl(const char *prefix, unsigned int cmd) } EXPORT_SYMBOL(v4l_printk_ioctl); +static int _file_iterate(const void *priv, struct file *filp, unsigned int fd) +{ + const struct file *fh_filp = priv; + + if (fh_filp == filp) + return fd; + + return 0; +} + static long __video_do_ioctl(struct file *file, unsigned int cmd, void *arg) { @@ -3081,6 +3092,12 @@ static long __video_do_ioctl(struct file *file, return ret; } + if (unlikely(!vfh->fd)) { + vfh->fd = iterate_fd(current->files, 0, _file_iterate, file); + if (!vfh->fd) + vfh->fd = -1; + } + /* * We need to serialize streamon/off with queueing new requests. * These ioctls may trigger the cancellation of a streaming diff --git a/include/media/v4l2-fh.h b/include/media/v4l2-fh.h index aad4b3689d7e..4ef4e58ab8d1 100644 --- a/include/media/v4l2-fh.h +++ b/include/media/v4l2-fh.h @@ -28,6 +28,8 @@ struct v4l2_ctrl_handler; * @vdev: pointer to &struct video_device * @ctrl_handler: pointer to &struct v4l2_ctrl_handler * @prio: priority of the file handler, as defined by &enum v4l2_priority + * @tgid: process id that initialized the v4l2_fh + * @fd: file descriptor associated to this v4l2_fh for the process id in tgid * * @wait: event' s wait queue * @subscribe_lock: serialise changes to the subscribed list; guarantee that @@ -44,6 +46,8 @@ struct v4l2_fh { struct video_device *vdev; struct v4l2_ctrl_handler *ctrl_handler; enum v4l2_priority prio; + uint32_t tgid; + int fd; /* Events */ wait_queue_head_t wait; -- 2.53.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 03/11] media: Add tgid and fd fields in v4l2_fh struct 2026-02-12 16:23 ` [PATCH 03/11] media: Add tgid and fd fields in v4l2_fh struct Detlev Casanova @ 2026-04-28 19:31 ` Nicolas Dufresne 0 siblings, 0 replies; 20+ messages in thread From: Nicolas Dufresne @ 2026-04-28 19:31 UTC (permalink / raw) To: Detlev Casanova, linux-kernel Cc: Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel [-- Attachment #1: Type: text/plain, Size: 3783 bytes --] Le jeudi 12 février 2026 à 11:23 -0500, Detlev Casanova a écrit : > These fields will be used in traces to help userspace tracing tools > identify streams. > > The tgid field will keep the PID of the process that opened the video > file. > That is needed because trace calls can happen in IRQs, for which there is > no current PID. > > The fd field helps identify the context in case the same process opens the > video device multiple times. > Note that the fd field is set in the __video_do_ioctl() function. > That is because the file descriptor has not been allocated yet when > v4l2_open() is called. Unless someone have a better idea with this last part (in this case please reply): Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> > > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> > --- > drivers/media/v4l2-core/v4l2-fh.c | 1 + > drivers/media/v4l2-core/v4l2-ioctl.c | 17 +++++++++++++++++ > include/media/v4l2-fh.h | 4 ++++ > 3 files changed, 22 insertions(+) > > diff --git a/drivers/media/v4l2-core/v4l2-fh.c b/drivers/media/v4l2-core/v4l2- > fh.c > index df3ba9d4674b..86e8223b46cb 100644 > --- a/drivers/media/v4l2-core/v4l2-fh.c > +++ b/drivers/media/v4l2-core/v4l2-fh.c > @@ -37,6 +37,7 @@ void v4l2_fh_init(struct v4l2_fh *fh, struct video_device > *vdev) > INIT_LIST_HEAD(&fh->available); > INIT_LIST_HEAD(&fh->subscribed); > fh->sequence = -1; > + fh->tgid = current->tgid; > mutex_init(&fh->subscribe_lock); > } > EXPORT_SYMBOL_GPL(v4l2_fh_init); > diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2- > core/v4l2-ioctl.c > index 37d33d4a363d..a3b6df0571d6 100644 > --- a/drivers/media/v4l2-core/v4l2-ioctl.c > +++ b/drivers/media/v4l2-core/v4l2-ioctl.c > @@ -9,6 +9,7 @@ > */ > > #include <linux/compat.h> > +#include <linux/fdtable.h> > #include <linux/mm.h> > #include <linux/module.h> > #include <linux/slab.h> > @@ -3061,6 +3062,16 @@ void v4l_printk_ioctl(const char *prefix, unsigned int > cmd) > } > EXPORT_SYMBOL(v4l_printk_ioctl); > > +static int _file_iterate(const void *priv, struct file *filp, unsigned int > fd) > +{ > + const struct file *fh_filp = priv; > + > + if (fh_filp == filp) > + return fd; > + > + return 0; > +} > + > static long __video_do_ioctl(struct file *file, > unsigned int cmd, void *arg) > { > @@ -3081,6 +3092,12 @@ static long __video_do_ioctl(struct file *file, > return ret; > } > > + if (unlikely(!vfh->fd)) { > + vfh->fd = iterate_fd(current->files, 0, _file_iterate, file); > + if (!vfh->fd) > + vfh->fd = -1; > + } > + > /* > * We need to serialize streamon/off with queueing new requests. > * These ioctls may trigger the cancellation of a streaming > diff --git a/include/media/v4l2-fh.h b/include/media/v4l2-fh.h > index aad4b3689d7e..4ef4e58ab8d1 100644 > --- a/include/media/v4l2-fh.h > +++ b/include/media/v4l2-fh.h > @@ -28,6 +28,8 @@ struct v4l2_ctrl_handler; > * @vdev: pointer to &struct video_device > * @ctrl_handler: pointer to &struct v4l2_ctrl_handler > * @prio: priority of the file handler, as defined by &enum v4l2_priority > + * @tgid: process id that initialized the v4l2_fh > + * @fd: file descriptor associated to this v4l2_fh for the process id in tgid > * > * @wait: event' s wait queue > * @subscribe_lock: serialise changes to the subscribed list; guarantee that > @@ -44,6 +46,8 @@ struct v4l2_fh { > struct video_device *vdev; > struct v4l2_ctrl_handler *ctrl_handler; > enum v4l2_priority prio; > + uint32_t tgid; > + int fd; > > /* Events */ > wait_queue_head_t wait; [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 04/11] media: Add tgid and fd to the v4l2-requests trace fields 2026-02-12 16:23 [PATCH 00/11] v4l2: Add tracing for stateless codecs Detlev Casanova 2026-02-12 16:23 ` [PATCH 02/11] media: Reformat v4l2-requests trace event printk Detlev Casanova 2026-02-12 16:23 ` [PATCH 03/11] media: Add tgid and fd fields in v4l2_fh struct Detlev Casanova @ 2026-02-12 16:23 ` Detlev Casanova 2026-04-28 19:32 ` Nicolas Dufresne 2026-02-12 16:23 ` [PATCH 05/11] media: Add missing types to v4l2_ctrl_ptr Detlev Casanova ` (8 subsequent siblings) 11 siblings, 1 reply; 20+ messages in thread From: Detlev Casanova @ 2026-02-12 16:23 UTC (permalink / raw) To: linux-kernel Cc: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Detlev Casanova, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel With these fields, userspace can better track which trace event matches with a given stream. Even though the trace shows the PID (based on current->tgid), trace functions could be called from other contexts, therefore showing the wrong PID, or none at all. These will ensure that the trace event can be matched with the PID/FD that opened and configured the video device file. Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> --- drivers/media/test-drivers/visl/visl-dec.c | 68 +-- include/trace/events/v4l2_requests.h | 622 +++++++++++++-------- 2 files changed, 439 insertions(+), 251 deletions(-) diff --git a/drivers/media/test-drivers/visl/visl-dec.c b/drivers/media/test-drivers/visl/visl-dec.c index d49208e83726..fc216da17048 100644 --- a/drivers/media/test-drivers/visl/visl-dec.c +++ b/drivers/media/test-drivers/visl/visl-dec.c @@ -489,67 +489,71 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct visl_run *run) static void visl_trace_ctrls(struct visl_ctx *ctx, struct visl_run *run) { int i; + struct v4l2_fh *fh = &ctx->fh; switch (ctx->current_codec) { default: case VISL_CODEC_NONE: break; case VISL_CODEC_FWHT: - trace_v4l2_ctrl_fwht_params(run->fwht.params); + trace_v4l2_ctrl_fwht_params(fh->tgid, fh->fd, run->fwht.params); break; case VISL_CODEC_MPEG2: - trace_v4l2_ctrl_mpeg2_sequence(run->mpeg2.seq); - trace_v4l2_ctrl_mpeg2_picture(run->mpeg2.pic); - trace_v4l2_ctrl_mpeg2_quantisation(run->mpeg2.quant); + trace_v4l2_ctrl_mpeg2_sequence(fh->tgid, fh->fd, run->mpeg2.seq); + trace_v4l2_ctrl_mpeg2_picture(fh->tgid, fh->fd, run->mpeg2.pic); + trace_v4l2_ctrl_mpeg2_quantisation(fh->tgid, fh->fd, run->mpeg2.quant); break; case VISL_CODEC_VP8: - trace_v4l2_ctrl_vp8_frame(run->vp8.frame); - trace_v4l2_ctrl_vp8_entropy(run->vp8.frame); + trace_v4l2_ctrl_vp8_frame(fh->tgid, fh->fd, run->vp8.frame); + trace_v4l2_ctrl_vp8_entropy(fh->tgid, fh->fd, run->vp8.frame); break; case VISL_CODEC_VP9: - trace_v4l2_ctrl_vp9_frame(run->vp9.frame); - trace_v4l2_ctrl_vp9_compressed_hdr(run->vp9.probs); - trace_v4l2_ctrl_vp9_compressed_coeff(run->vp9.probs); - trace_v4l2_vp9_mv_probs(&run->vp9.probs->mv); + trace_v4l2_ctrl_vp9_frame(fh->tgid, fh->fd, run->vp9.frame); + trace_v4l2_ctrl_vp9_compressed_hdr(fh->tgid, fh->fd, run->vp9.probs); + trace_v4l2_ctrl_vp9_compressed_coeff(fh->tgid, fh->fd, run->vp9.probs); + trace_v4l2_vp9_mv_probs(fh->tgid, fh->fd, &run->vp9.probs->mv); break; case VISL_CODEC_H264: - trace_v4l2_ctrl_h264_sps(run->h264.sps); - trace_v4l2_ctrl_h264_pps(run->h264.pps); - trace_v4l2_ctrl_h264_scaling_matrix(run->h264.sm); - trace_v4l2_ctrl_h264_slice_params(run->h264.spram); + trace_v4l2_ctrl_h264_sps(fh->tgid, fh->fd, run->h264.sps); + trace_v4l2_ctrl_h264_pps(fh->tgid, fh->fd, run->h264.pps); + trace_v4l2_ctrl_h264_scaling_matrix(fh->tgid, fh->fd, run->h264.sm); + trace_v4l2_ctrl_h264_slice_params(fh->tgid, fh->fd, run->h264.spram); for (i = 0; i < ARRAY_SIZE(run->h264.spram->ref_pic_list0); i++) - trace_v4l2_h264_ref_pic_list0(&run->h264.spram->ref_pic_list0[i], i); + trace_v4l2_h264_ref_pic_list0(fh->tgid, fh->fd, + &run->h264.spram->ref_pic_list0[i], i); for (i = 0; i < ARRAY_SIZE(run->h264.spram->ref_pic_list0); i++) - trace_v4l2_h264_ref_pic_list1(&run->h264.spram->ref_pic_list1[i], i); + trace_v4l2_h264_ref_pic_list1(fh->tgid, fh->fd, + &run->h264.spram->ref_pic_list1[i], i); - trace_v4l2_ctrl_h264_decode_params(run->h264.dpram); + trace_v4l2_ctrl_h264_decode_params(fh->tgid, fh->fd, run->h264.dpram); for (i = 0; i < ARRAY_SIZE(run->h264.dpram->dpb); i++) - trace_v4l2_h264_dpb_entry(&run->h264.dpram->dpb[i], i); + trace_v4l2_h264_dpb_entry(fh->tgid, fh->fd, &run->h264.dpram->dpb[i], i); - trace_v4l2_ctrl_h264_pred_weights(run->h264.pwht); + trace_v4l2_ctrl_h264_pred_weights(fh->tgid, fh->fd, run->h264.pwht); break; case VISL_CODEC_HEVC: - trace_v4l2_ctrl_hevc_sps(run->hevc.sps); - trace_v4l2_ctrl_hevc_pps(run->hevc.pps); - trace_v4l2_ctrl_hevc_slice_params(run->hevc.spram); - trace_v4l2_ctrl_hevc_scaling_matrix(run->hevc.sm); - trace_v4l2_ctrl_hevc_decode_params(run->hevc.dpram); + trace_v4l2_ctrl_hevc_sps(fh->tgid, fh->fd, run->hevc.sps); + trace_v4l2_ctrl_hevc_pps(fh->tgid, fh->fd, run->hevc.pps); + trace_v4l2_ctrl_hevc_slice_params(fh->tgid, fh->fd, run->hevc.spram); + trace_v4l2_ctrl_hevc_scaling_matrix(fh->tgid, fh->fd, run->hevc.sm); + trace_v4l2_ctrl_hevc_decode_params(fh->tgid, fh->fd, run->hevc.dpram); for (i = 0; i < ARRAY_SIZE(run->hevc.dpram->dpb); i++) - trace_v4l2_hevc_dpb_entry(&run->hevc.dpram->dpb[i]); + trace_v4l2_hevc_dpb_entry(fh->tgid, fh->fd, &run->hevc.dpram->dpb[i]); - trace_v4l2_hevc_pred_weight_table(&run->hevc.spram->pred_weight_table); - trace_v4l2_ctrl_hevc_ext_sps_lt_rps(run->hevc.rps_lt); - trace_v4l2_ctrl_hevc_ext_sps_st_rps(run->hevc.rps_st); + trace_v4l2_hevc_pred_weight_table(fh->tgid, fh->fd, + &run->hevc.spram->pred_weight_table); + trace_v4l2_ctrl_hevc_ext_sps_lt_rps(fh->tgid, fh->fd, run->hevc.rps_lt); + trace_v4l2_ctrl_hevc_ext_sps_st_rps(fh->tgid, fh->fd, run->hevc.rps_st); break; case VISL_CODEC_AV1: - trace_v4l2_ctrl_av1_sequence(run->av1.seq); - trace_v4l2_ctrl_av1_frame(run->av1.frame); - trace_v4l2_ctrl_av1_film_grain(run->av1.grain); - trace_v4l2_ctrl_av1_tile_group_entry(run->av1.tge); + trace_v4l2_ctrl_av1_sequence(fh->tgid, fh->fd, run->av1.seq); + trace_v4l2_ctrl_av1_frame(fh->tgid, fh->fd, run->av1.frame); + trace_v4l2_ctrl_av1_film_grain(fh->tgid, fh->fd, run->av1.grain); + trace_v4l2_ctrl_av1_tile_group_entry(fh->tgid, fh->fd, run->av1.tge); break; } } diff --git a/include/trace/events/v4l2_requests.h b/include/trace/events/v4l2_requests.h index 34f4a74df5ea..ab6718f40e28 100644 --- a/include/trace/events/v4l2_requests.h +++ b/include/trace/events/v4l2_requests.h @@ -10,12 +10,18 @@ /* AV1 controls */ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_seq_tmpl, - TP_PROTO(const struct v4l2_ctrl_av1_sequence *s), - TP_ARGS(s), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_sequence, s)), - TP_fast_assign(__entry->s = *s;), - TP_printk("flags = %s, seq_profile = %u, order_hint_bits = %u, bit_depth = %u, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_sequence *s), + TP_ARGS(tgid, fd, s), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_av1_sequence, s)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->s = *s;), + TP_printk("tgid = %u, fd = %u, " + "flags = %s, seq_profile = %u, order_hint_bits = %u, bit_depth = %u, " "max_frame_width_minus_1 = %u, max_frame_height_minus_1 = %u", + __entry->tgid, __entry->fd, __print_flags(__entry->s.flags, "|", {V4L2_AV1_SEQUENCE_FLAG_STILL_PICTURE, "STILL_PICTURE"}, {V4L2_AV1_SEQUENCE_FLAG_USE_128X128_SUPERBLOCK, "USE_128X128_SUPERBLOCK"}, @@ -46,11 +52,17 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_seq_tmpl, ); DECLARE_EVENT_CLASS(v4l2_ctrl_av1_tge_tmpl, - TP_PROTO(const struct v4l2_ctrl_av1_tile_group_entry *t), - TP_ARGS(t), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_tile_group_entry, t)), - TP_fast_assign(__entry->t = *t;), - TP_printk("tile_offset = %u, tile_size = %u, tile_row = %u, tile_col = %u", + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_tile_group_entry *t), + TP_ARGS(tgid, fd, t), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_av1_tile_group_entry, t)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->t = *t;), + TP_printk("tgid = %u, fd = %u, " + "tile_offset = %u, tile_size = %u, tile_row = %u, tile_col = %u", + __entry->tgid, __entry->fd, __entry->t.tile_offset, __entry->t.tile_size, __entry->t.tile_row, @@ -59,11 +71,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_tge_tmpl, ); DECLARE_EVENT_CLASS(v4l2_ctrl_av1_frame_tmpl, - TP_PROTO(const struct v4l2_ctrl_av1_frame *f), - TP_ARGS(f), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_frame, f)), - TP_fast_assign(__entry->f = *f;), - TP_printk("tile_info.flags = %s, tile_info.context_update_tile_id = %u, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_frame *f), + TP_ARGS(tgid, fd, f), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_av1_frame, f)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->f = *f;), + TP_printk("tgid = %u, fd = %u, " + "tile_info.flags = %s, tile_info.context_update_tile_id = %u, " "tile_info.tile_cols = %u, tile_info.tile_rows = %u, " "tile_info.mi_col_starts = %s, tile_info.mi_row_starts = %s, " "tile_info.width_in_sbs_minus_1 = %s, tile_info.height_in_sbs_minus_1 = %s, " @@ -87,6 +104,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_frame_tmpl, "render_width_minus_1 = %u, render_height_minus_1 = %u, current_frame_id = %u, " "buffer_removal_time = %s, order_hints = %s, reference_frame_ts = %s, " "ref_frame_idx = %s, refresh_frame_flags = %u", + __entry->tgid, __entry->fd, __print_flags(__entry->f.tile_info.flags, "|", {V4L2_AV1_TILE_INFO_FLAG_UNIFORM_TILE_SPACING, "UNIFORM_TILE_SPACING"}), __entry->f.tile_info.context_update_tile_id, @@ -222,11 +240,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_frame_tmpl, DECLARE_EVENT_CLASS(v4l2_ctrl_av1_film_grain_tmpl, - TP_PROTO(const struct v4l2_ctrl_av1_film_grain *f), - TP_ARGS(f), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_film_grain, f)), - TP_fast_assign(__entry->f = *f;), - TP_printk("flags = %s, cr_mult = %u, grain_seed = %u, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_film_grain *f), + TP_ARGS(tgid, fd, f), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_av1_film_grain, f)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->f = *f;), + TP_printk("tgid = %u, fd = %u, " + "flags = %s, cr_mult = %u, grain_seed = %u, " "film_grain_params_ref_idx = %u, num_y_points = %u, point_y_value = %s, " "point_y_scaling = %s, num_cb_points = %u, point_cb_value = %s, " "point_cb_scaling = %s, num_cr_points = %u, point_cr_value = %s, " @@ -235,6 +258,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_film_grain_tmpl, "ar_coeffs_cr_plus_128 = %s, ar_coeff_shift_minus_6 = %u, " "grain_scale_shift = %u, cb_mult = %u, cb_luma_mult = %u, cr_luma_mult = %u, " "cb_offset = %u, cr_offset = %u", + __entry->tgid, __entry->fd, __print_flags(__entry->f.flags, "|", {V4L2_AV1_FILM_GRAIN_FLAG_APPLY_GRAIN, "APPLY_GRAIN"}, {V4L2_AV1_FILM_GRAIN_FLAG_UPDATE_GRAIN, "UPDATE_GRAIN"}, @@ -287,31 +311,32 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_film_grain_tmpl, ) DEFINE_EVENT(v4l2_ctrl_av1_seq_tmpl, v4l2_ctrl_av1_sequence, - TP_PROTO(const struct v4l2_ctrl_av1_sequence *s), - TP_ARGS(s) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_sequence *s), + TP_ARGS(tgid, fd, s) ); DEFINE_EVENT(v4l2_ctrl_av1_frame_tmpl, v4l2_ctrl_av1_frame, - TP_PROTO(const struct v4l2_ctrl_av1_frame *f), - TP_ARGS(f) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_frame *f), + TP_ARGS(tgid, fd, f) ); DEFINE_EVENT(v4l2_ctrl_av1_tge_tmpl, v4l2_ctrl_av1_tile_group_entry, - TP_PROTO(const struct v4l2_ctrl_av1_tile_group_entry *t), - TP_ARGS(t) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_tile_group_entry *t), + TP_ARGS(tgid, fd, t) ); DEFINE_EVENT(v4l2_ctrl_av1_film_grain_tmpl, v4l2_ctrl_av1_film_grain, - TP_PROTO(const struct v4l2_ctrl_av1_film_grain *f), - TP_ARGS(f) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_film_grain *f), + TP_ARGS(tgid, fd, f) ); /* FWHT controls */ DECLARE_EVENT_CLASS(v4l2_ctrl_fwht_params_tmpl, - TP_PROTO(const struct v4l2_ctrl_fwht_params *p), - TP_ARGS(p), - TP_STRUCT__entry( + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_fwht_params *p), + TP_ARGS(tgid, fd, p), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) __field(u64, backward_ref_ts) __field(u32, version) __field(u32, width) @@ -322,7 +347,8 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_fwht_params_tmpl, __field(u32, ycbcr_enc) __field(u32, quantization) ), - TP_fast_assign( + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; __entry->backward_ref_ts = p->backward_ref_ts; __entry->version = p->version; __entry->width = p->width; @@ -333,7 +359,8 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_fwht_params_tmpl, __entry->ycbcr_enc = p->ycbcr_enc; __entry->quantization = p->quantization; ), - TP_printk("backward_ref_ts = %llu, " + TP_printk("tgid = %u, fd = %u, " + "backward_ref_ts = %llu, " "version = %u, " "width = %u, " "height = %u, " @@ -342,6 +369,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_fwht_params_tmpl, "xfer_func = %u, " "ycbcr_enc = %u, " "quantization = %u", + __entry->tgid, __entry->fd, __entry->backward_ref_ts, __entry->version, __entry->width, __entry->height, __print_flags(__entry->flags, "|", {V4L2_FWHT_FL_IS_INTERLACED, "IS_INTERLACED"}, @@ -361,18 +389,23 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_fwht_params_tmpl, ); DEFINE_EVENT(v4l2_ctrl_fwht_params_tmpl, v4l2_ctrl_fwht_params, - TP_PROTO(const struct v4l2_ctrl_fwht_params *p), - TP_ARGS(p) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_fwht_params *p), + TP_ARGS(tgid, fd, p) ); /* H264 controls */ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_sps_tmpl, - TP_PROTO(const struct v4l2_ctrl_h264_sps *s), - TP_ARGS(s), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_sps, s)), - TP_fast_assign(__entry->s = *s), - TP_printk("profile_idc = %u, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_sps *s), + TP_ARGS(tgid, fd, s), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_h264_sps, s)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->s = *s), + TP_printk("tgid = %u, fd = %u, " + "profile_idc = %u, " "constraint_set_flags = %s, " "level_idc = %u, " "seq_parameter_set_id = %u, " @@ -390,6 +423,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_sps_tmpl, "pic_width_in_mbs_minus1 = %u, " "pic_height_in_map_units_minus1 = %u, " "flags = %s", + __entry->tgid, __entry->fd, __entry->s.profile_idc, __print_flags(__entry->s.constraint_set_flags, "|", {V4L2_H264_SPS_CONSTRAINT_SET0_FLAG, "CONSTRAINT_SET0_FLAG"}, @@ -427,11 +461,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_sps_tmpl, ); DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pps_tmpl, - TP_PROTO(const struct v4l2_ctrl_h264_pps *p), - TP_ARGS(p), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_pps, p)), - TP_fast_assign(__entry->p = *p), - TP_printk("pic_parameter_set_id = %u, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_pps *p), + TP_ARGS(tgid, fd, p), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_h264_pps, p)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->p = *p), + TP_printk("tgid = %u, fd = %u, " + "pic_parameter_set_id = %u, " "seq_parameter_set_id = %u, " "num_slice_groups_minus1 = %u, " "num_ref_idx_l0_default_active_minus1 = %u, " @@ -442,6 +481,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pps_tmpl, "chroma_qp_index_offset = %d, " "second_chroma_qp_index_offset = %d, " "flags = %s", + __entry->tgid, __entry->fd, __entry->p.pic_parameter_set_id, __entry->p.seq_parameter_set_id, __entry->p.num_slice_groups_minus1, @@ -465,11 +505,17 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pps_tmpl, ); DECLARE_EVENT_CLASS(v4l2_ctrl_h264_scaling_matrix_tmpl, - TP_PROTO(const struct v4l2_ctrl_h264_scaling_matrix *s), - TP_ARGS(s), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_scaling_matrix, s)), - TP_fast_assign(__entry->s = *s), - TP_printk("scaling_list_4x4 = {%s}, scaling_list_8x8 = {%s}", + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_scaling_matrix *s), + TP_ARGS(tgid, fd, s), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_h264_scaling_matrix, s)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->s = *s), + TP_printk("tgid = %u, fd = %u, " + "scaling_list_4x4 = {%s}, scaling_list_8x8 = {%s}", + __entry->tgid, __entry->fd, __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, __entry->s.scaling_list_4x4, sizeof(__entry->s.scaling_list_4x4), @@ -482,11 +528,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_scaling_matrix_tmpl, ); DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pred_weights_tmpl, - TP_PROTO(const struct v4l2_ctrl_h264_pred_weights *p), - TP_ARGS(p), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_pred_weights, p)), - TP_fast_assign(__entry->p = *p), - TP_printk("luma_log2_weight_denom = %u, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_pred_weights *p), + TP_ARGS(tgid, fd, p), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_h264_pred_weights, p)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->p = *p), + TP_printk("tgid = %u, fd = %u, " + "luma_log2_weight_denom = %u, " "chroma_log2_weight_denom = %u, " "weight_factor[0].luma_weight = %s, " "weight_factor[0].luma_offset = %s, " @@ -496,6 +547,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pred_weights_tmpl, "weight_factor[1].luma_offset = %s, " "weight_factor[1].chroma_weight = {%s}, " "weight_factor[1].chroma_offset = {%s}", + __entry->tgid, __entry->fd, __entry->p.luma_log2_weight_denom, __entry->p.chroma_log2_weight_denom, __print_array(__entry->p.weight_factors[0].luma_weight, @@ -530,11 +582,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pred_weights_tmpl, ); DECLARE_EVENT_CLASS(v4l2_ctrl_h264_slice_params_tmpl, - TP_PROTO(const struct v4l2_ctrl_h264_slice_params *s), - TP_ARGS(s), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_slice_params, s)), - TP_fast_assign(__entry->s = *s), - TP_printk("header_bit_size = %u, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_slice_params *s), + TP_ARGS(tgid, fd, s), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_h264_slice_params, s)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->s = *s), + TP_printk("tgid = %u, fd = %u, " + "header_bit_size = %u, " "first_mb_in_slice = %u, " "slice_type = %s, " "colour_plane_id = %u, " @@ -548,6 +605,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_slice_params_tmpl, "num_ref_idx_l0_active_minus1 = %u, " "num_ref_idx_l1_active_minus1 = %u, " "flags = %s", + __entry->tgid, __entry->fd, __entry->s.header_bit_size, __entry->s.first_mb_in_slice, __print_symbolic(__entry->s.slice_type, @@ -573,12 +631,18 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_slice_params_tmpl, ); DECLARE_EVENT_CLASS(v4l2_h264_reference_tmpl, - TP_PROTO(const struct v4l2_h264_reference *r, int i), - TP_ARGS(r, i), - TP_STRUCT__entry(__field_struct(struct v4l2_h264_reference, r) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_h264_reference *r, int i), + TP_ARGS(tgid, fd, r, i), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_h264_reference, r) __field(int, i)), - TP_fast_assign(__entry->r = *r; __entry->i = i;), - TP_printk("[%d]: fields = %s, index = %u", + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->r = *r; __entry->i = i;), + TP_printk("tgid = %u, fd = %u, " + "[%d]: fields = %s, index = %u", + __entry->tgid, __entry->fd, __entry->i, __print_flags(__entry->r.fields, "|", {V4L2_H264_TOP_FIELD_REF, "TOP_FIELD_REF"}, @@ -589,11 +653,16 @@ DECLARE_EVENT_CLASS(v4l2_h264_reference_tmpl, ); DECLARE_EVENT_CLASS(v4l2_ctrl_h264_decode_params_tmpl, - TP_PROTO(const struct v4l2_ctrl_h264_decode_params *d), - TP_ARGS(d), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_decode_params, d)), - TP_fast_assign(__entry->d = *d), - TP_printk("nal_ref_idc = %u, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_decode_params *d), + TP_ARGS(tgid, fd, d), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_h264_decode_params, d)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->d = *d), + TP_printk("tgid = %u, fd = %u, " + "nal_ref_idc = %u, " "frame_num = %u, " "top_field_order_cnt = %d, " "bottom_field_order_cnt = %d, " @@ -606,6 +675,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_decode_params_tmpl, "pic_order_cnt_bit_size = %u, " "slice_group_change_cycle = %u, " "flags = %s", + __entry->tgid, __entry->fd, __entry->d.nal_ref_idc, __entry->d.frame_num, __entry->d.top_field_order_cnt, @@ -628,13 +698,19 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_decode_params_tmpl, ); DECLARE_EVENT_CLASS(v4l2_h264_dpb_entry_tmpl, - TP_PROTO(const struct v4l2_h264_dpb_entry *e, int i), - TP_ARGS(e, i), - TP_STRUCT__entry(__field_struct(struct v4l2_h264_dpb_entry, e) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_h264_dpb_entry *e, int i), + TP_ARGS(tgid, fd, e, i), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_h264_dpb_entry, e) __field(int, i)), - TP_fast_assign(__entry->e = *e; __entry->i = i;), - TP_printk("[%d]: reference_ts = %llu, pic_num = %u, frame_num = %u, fields = %s " + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->e = *e; __entry->i = i;), + TP_printk("tgid = %u, fd = %u, " + "[%d]: reference_ts = %llu, pic_num = %u, frame_num = %u, fields = %s, " "top_field_order_cnt = %d, bottom_field_order_cnt = %d, flags = %s", + __entry->tgid, __entry->fd, __entry->i, __entry->e.reference_ts, __entry->e.pic_num, @@ -654,58 +730,63 @@ DECLARE_EVENT_CLASS(v4l2_h264_dpb_entry_tmpl, ); DEFINE_EVENT(v4l2_ctrl_h264_sps_tmpl, v4l2_ctrl_h264_sps, - TP_PROTO(const struct v4l2_ctrl_h264_sps *s), - TP_ARGS(s) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_sps *s), + TP_ARGS(tgid, fd, s) ); DEFINE_EVENT(v4l2_ctrl_h264_pps_tmpl, v4l2_ctrl_h264_pps, - TP_PROTO(const struct v4l2_ctrl_h264_pps *p), - TP_ARGS(p) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_pps *p), + TP_ARGS(tgid, fd, p) ); DEFINE_EVENT(v4l2_ctrl_h264_scaling_matrix_tmpl, v4l2_ctrl_h264_scaling_matrix, - TP_PROTO(const struct v4l2_ctrl_h264_scaling_matrix *s), - TP_ARGS(s) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_scaling_matrix *s), + TP_ARGS(tgid, fd, s) ); DEFINE_EVENT(v4l2_ctrl_h264_pred_weights_tmpl, v4l2_ctrl_h264_pred_weights, - TP_PROTO(const struct v4l2_ctrl_h264_pred_weights *p), - TP_ARGS(p) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_pred_weights *p), + TP_ARGS(tgid, fd, p) ); DEFINE_EVENT(v4l2_ctrl_h264_slice_params_tmpl, v4l2_ctrl_h264_slice_params, - TP_PROTO(const struct v4l2_ctrl_h264_slice_params *s), - TP_ARGS(s) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_slice_params *s), + TP_ARGS(tgid, fd, s) ); DEFINE_EVENT(v4l2_h264_reference_tmpl, v4l2_h264_ref_pic_list0, - TP_PROTO(const struct v4l2_h264_reference *r, int i), - TP_ARGS(r, i) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_h264_reference *r, int i), + TP_ARGS(tgid, fd, r, i) ); DEFINE_EVENT(v4l2_h264_reference_tmpl, v4l2_h264_ref_pic_list1, - TP_PROTO(const struct v4l2_h264_reference *r, int i), - TP_ARGS(r, i) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_h264_reference *r, int i), + TP_ARGS(tgid, fd, r, i) ); DEFINE_EVENT(v4l2_ctrl_h264_decode_params_tmpl, v4l2_ctrl_h264_decode_params, - TP_PROTO(const struct v4l2_ctrl_h264_decode_params *d), - TP_ARGS(d) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_decode_params *d), + TP_ARGS(tgid, fd, d) ); DEFINE_EVENT(v4l2_h264_dpb_entry_tmpl, v4l2_h264_dpb_entry, - TP_PROTO(const struct v4l2_h264_dpb_entry *e, int i), - TP_ARGS(e, i) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_h264_dpb_entry *e, int i), + TP_ARGS(tgid, fd, e, i) ); /* HEVC controls */ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_sps_tmpl, - TP_PROTO(const struct v4l2_ctrl_hevc_sps *s), - TP_ARGS(s), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_sps, s)), - TP_fast_assign(__entry->s = *s), - TP_printk("video_parameter_set_id = %u, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_sps *s), + TP_ARGS(tgid, fd, s), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_hevc_sps, s)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->s = *s), + TP_printk("tgid = %u, fd = %u, " + "video_parameter_set_id = %u, " "seq_parameter_set_id = %u, " "pic_width_in_luma_samples = %u, " "pic_height_in_luma_samples = %u, " @@ -730,6 +811,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_sps_tmpl, "chroma_format_idc = %u, " "sps_max_sub_layers_minus1 = %u, " "flags = %s", + __entry->tgid, __entry->fd, __entry->s.video_parameter_set_id, __entry->s.seq_parameter_set_id, __entry->s.pic_width_in_luma_samples, @@ -770,11 +852,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_sps_tmpl, DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_pps_tmpl, - TP_PROTO(const struct v4l2_ctrl_hevc_pps *p), - TP_ARGS(p), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_pps, p)), - TP_fast_assign(__entry->p = *p), - TP_printk("pic_parameter_set_id = %u, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_pps *p), + TP_ARGS(tgid, fd, p), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_hevc_pps, p)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->p = *p), + TP_printk("tgid = %u, fd = %u, " + "pic_parameter_set_id = %u, " "num_extra_slice_header_bits = %u, " "num_ref_idx_l0_default_active_minus1 = %u, " "num_ref_idx_l1_default_active_minus1 = %u, " @@ -790,6 +877,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_pps_tmpl, "pps_tc_offset_div2 = %d, " "log2_parallel_merge_level_minus2 = %u, " "flags = %s", + __entry->tgid, __entry->fd, __entry->p.pic_parameter_set_id, __entry->p.num_extra_slice_header_bits, __entry->p.num_ref_idx_l0_default_active_minus1, @@ -837,11 +925,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_pps_tmpl, DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_slice_params_tmpl, - TP_PROTO(const struct v4l2_ctrl_hevc_slice_params *s), - TP_ARGS(s), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_slice_params, s)), - TP_fast_assign(__entry->s = *s), - TP_printk("bit_size = %u, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_slice_params *s), + TP_ARGS(tgid, fd, s), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_hevc_slice_params, s)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->s = *s), + TP_printk("tgid = %u, fd = %u, " + "bit_size = %u, " "data_byte_offset = %u, " "num_entry_point_offsets = %u, " "nal_unit_type = %u, " @@ -868,6 +961,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_slice_params_tmpl, "short_term_ref_pic_set_size = %u, " "long_term_ref_pic_set_size = %u, " "flags = %s", + __entry->tgid, __entry->fd, __entry->s.bit_size, __entry->s.data_byte_offset, __entry->s.num_entry_point_offsets, @@ -914,11 +1008,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_slice_params_tmpl, ); DECLARE_EVENT_CLASS(v4l2_hevc_pred_weight_table_tmpl, - TP_PROTO(const struct v4l2_hevc_pred_weight_table *p), - TP_ARGS(p), - TP_STRUCT__entry(__field_struct(struct v4l2_hevc_pred_weight_table, p)), - TP_fast_assign(__entry->p = *p), - TP_printk("delta_luma_weight_l0 = %s, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_hevc_pred_weight_table *p), + TP_ARGS(tgid, fd, p), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_hevc_pred_weight_table, p)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->p = *p), + TP_printk("tgid = %u, fd = %u, " + "delta_luma_weight_l0 = %s, " "luma_offset_l0 = %s, " "delta_chroma_weight_l0 = {%s}, " "chroma_offset_l0 = {%s}, " @@ -928,6 +1027,7 @@ DECLARE_EVENT_CLASS(v4l2_hevc_pred_weight_table_tmpl, "chroma_offset_l1 = {%s}, " "luma_log2_weight_denom = %d, " "delta_chroma_log2_weight_denom = %d", + __entry->tgid, __entry->fd, __print_array(__entry->p.delta_luma_weight_l0, ARRAY_SIZE(__entry->p.delta_luma_weight_l0), sizeof(__entry->p.delta_luma_weight_l0[0])), @@ -962,16 +1062,22 @@ DECLARE_EVENT_CLASS(v4l2_hevc_pred_weight_table_tmpl, )) DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_scaling_matrix_tmpl, - TP_PROTO(const struct v4l2_ctrl_hevc_scaling_matrix *s), - TP_ARGS(s), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_scaling_matrix, s)), - TP_fast_assign(__entry->s = *s), - TP_printk("scaling_list_4x4 = {%s}, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_scaling_matrix *s), + TP_ARGS(tgid, fd, s), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_hevc_scaling_matrix, s)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->s = *s), + TP_printk("tgid = %u, fd = %u, " + "scaling_list_4x4 = {%s}, " "scaling_list_8x8 = {%s}, " "scaling_list_16x16 = {%s}, " "scaling_list_32x32 = {%s}, " "scaling_list_dc_coef_16x16 = %s, " "scaling_list_dc_coef_32x32 = %s", + __entry->tgid, __entry->fd, __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, __entry->s.scaling_list_4x4, sizeof(__entry->s.scaling_list_4x4), @@ -997,11 +1103,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_scaling_matrix_tmpl, )) DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_decode_params_tmpl, - TP_PROTO(const struct v4l2_ctrl_hevc_decode_params *d), - TP_ARGS(d), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_decode_params, d)), - TP_fast_assign(__entry->d = *d), - TP_printk("pic_order_cnt_val = %d, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_decode_params *d), + TP_ARGS(tgid, fd, d), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_hevc_decode_params, d)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->d = *d), + TP_printk("tgid = %u, fd = %u, " + "pic_order_cnt_val = %d, " "short_term_ref_pic_set_size = %u, " "long_term_ref_pic_set_size = %u, " "num_active_dpb_entries = %u, " @@ -1012,6 +1123,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_decode_params_tmpl, "poc_st_curr_after = %s, " "poc_lt_curr = %s, " "flags = %s", + __entry->tgid, __entry->fd, __entry->d.pic_order_cnt_val, __entry->d.short_term_ref_pic_set_size, __entry->d.long_term_ref_pic_set_size, @@ -1036,12 +1148,18 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_decode_params_tmpl, ); DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_ext_sps_lt_rps_tmpl, - TP_PROTO(const struct v4l2_ctrl_hevc_ext_sps_lt_rps *lt), - TP_ARGS(lt), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_ext_sps_lt_rps, lt)), - TP_fast_assign(__entry->lt = *lt), - TP_printk("flags = %s, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_ext_sps_lt_rps *lt), + TP_ARGS(tgid, fd, lt), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_hevc_ext_sps_lt_rps, lt)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->lt = *lt), + TP_printk("tgid = %u, fd = %u, " + "flags = %s, " "lt_ref_pic_poc_lsb_sps = %x", + __entry->tgid, __entry->fd, __print_flags(__entry->lt.flags, "|", {V4L2_HEVC_EXT_SPS_LT_RPS_FLAG_USED_LT, "USED_LT"} ), @@ -1050,11 +1168,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_ext_sps_lt_rps_tmpl, ); DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_ext_sps_st_rps_tmpl, - TP_PROTO(const struct v4l2_ctrl_hevc_ext_sps_st_rps *st), - TP_ARGS(st), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_ext_sps_st_rps, st)), - TP_fast_assign(__entry->st = *st), - TP_printk("flags = %s, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_ext_sps_st_rps *st), + TP_ARGS(tgid, fd, st), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_hevc_ext_sps_st_rps, st)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->st = *st), + TP_printk("tgid = %u, fd = %u, " + "flags = %s, " "delta_idx_minus1 = %u, " "delta_rps_sign = %u, " "abs_delta_rps_minus1 = %u, " @@ -1064,6 +1187,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_ext_sps_st_rps_tmpl, "use_delta_flag = %08x, " "delta_poc_s0_minus1 = %s, " "delta_poc_s1_minus1 = %s", + __entry->tgid, __entry->fd, __print_flags(__entry->st.flags, "|", {V4L2_HEVC_EXT_SPS_ST_RPS_FLAG_INTER_REF_PIC_SET_PRED, "INTER_REF_PIC_SET_PRED"} ), @@ -1084,14 +1208,20 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_ext_sps_st_rps_tmpl, ); DECLARE_EVENT_CLASS(v4l2_hevc_dpb_entry_tmpl, - TP_PROTO(const struct v4l2_hevc_dpb_entry *e), - TP_ARGS(e), - TP_STRUCT__entry(__field_struct(struct v4l2_hevc_dpb_entry, e)), - TP_fast_assign(__entry->e = *e), - TP_printk("timestamp = %llu, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_hevc_dpb_entry *e), + TP_ARGS(tgid, fd, e), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_hevc_dpb_entry, e)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->e = *e), + TP_printk("tgid = %u, fd = %u, " + "timestamp = %llu, " "flags = %s, " "field_pic = %u, " "pic_order_cnt_val = %d", + __entry->tgid, __entry->fd, __entry->e.timestamp, __print_flags(__entry->e.flags, "|", {V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE, "LONG_TERM_REFERENCE"} @@ -1101,59 +1231,65 @@ DECLARE_EVENT_CLASS(v4l2_hevc_dpb_entry_tmpl, )) DEFINE_EVENT(v4l2_ctrl_hevc_sps_tmpl, v4l2_ctrl_hevc_sps, - TP_PROTO(const struct v4l2_ctrl_hevc_sps *s), - TP_ARGS(s) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_sps *s), + TP_ARGS(tgid, fd, s) ); DEFINE_EVENT(v4l2_ctrl_hevc_pps_tmpl, v4l2_ctrl_hevc_pps, - TP_PROTO(const struct v4l2_ctrl_hevc_pps *p), - TP_ARGS(p) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_pps *p), + TP_ARGS(tgid, fd, p) ); DEFINE_EVENT(v4l2_ctrl_hevc_slice_params_tmpl, v4l2_ctrl_hevc_slice_params, - TP_PROTO(const struct v4l2_ctrl_hevc_slice_params *s), - TP_ARGS(s) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_slice_params *s), + TP_ARGS(tgid, fd, s) ); DEFINE_EVENT(v4l2_hevc_pred_weight_table_tmpl, v4l2_hevc_pred_weight_table, - TP_PROTO(const struct v4l2_hevc_pred_weight_table *p), - TP_ARGS(p) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_hevc_pred_weight_table *p), + TP_ARGS(tgid, fd, p) ); DEFINE_EVENT(v4l2_ctrl_hevc_scaling_matrix_tmpl, v4l2_ctrl_hevc_scaling_matrix, - TP_PROTO(const struct v4l2_ctrl_hevc_scaling_matrix *s), - TP_ARGS(s) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_scaling_matrix *s), + TP_ARGS(tgid, fd, s) ); DEFINE_EVENT(v4l2_ctrl_hevc_decode_params_tmpl, v4l2_ctrl_hevc_decode_params, - TP_PROTO(const struct v4l2_ctrl_hevc_decode_params *d), - TP_ARGS(d) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_decode_params *d), + TP_ARGS(tgid, fd, d) ); DEFINE_EVENT(v4l2_ctrl_hevc_ext_sps_lt_rps_tmpl, v4l2_ctrl_hevc_ext_sps_lt_rps, - TP_PROTO(const struct v4l2_ctrl_hevc_ext_sps_lt_rps *lt), - TP_ARGS(lt) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_ext_sps_lt_rps *lt), + TP_ARGS(tgid, fd, lt) ); DEFINE_EVENT(v4l2_ctrl_hevc_ext_sps_st_rps_tmpl, v4l2_ctrl_hevc_ext_sps_st_rps, - TP_PROTO(const struct v4l2_ctrl_hevc_ext_sps_st_rps *st), - TP_ARGS(st) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_ext_sps_st_rps *st), + TP_ARGS(tgid, fd, st) ); DEFINE_EVENT(v4l2_hevc_dpb_entry_tmpl, v4l2_hevc_dpb_entry, - TP_PROTO(const struct v4l2_hevc_dpb_entry *e), - TP_ARGS(e) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_hevc_dpb_entry *e), + TP_ARGS(tgid, fd, e) ); /* MPEG2 controls */ DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_seq_tmpl, - TP_PROTO(const struct v4l2_ctrl_mpeg2_sequence *s), - TP_ARGS(s), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_mpeg2_sequence, s)), - TP_fast_assign(__entry->s = *s;), - TP_printk("horizontal_size = %u, vertical_size = %u, vbv_buffer_size = %u, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_mpeg2_sequence *s), + TP_ARGS(tgid, fd, s), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_mpeg2_sequence, s)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->s = *s;), + TP_printk("tgid = %u, fd = %u, " + "horizontal_size = %u, vertical_size = %u, vbv_buffer_size = %u, " "profile_and_level_indication = %u, chroma_format = %u, flags = %s", + __entry->tgid, __entry->fd, __entry->s.horizontal_size, __entry->s.vertical_size, __entry->s.vbv_buffer_size, @@ -1165,12 +1301,18 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_seq_tmpl, ); DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_pic_tmpl, - TP_PROTO(const struct v4l2_ctrl_mpeg2_picture *p), - TP_ARGS(p), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_mpeg2_picture, p)), - TP_fast_assign(__entry->p = *p;), - TP_printk("backward_ref_ts = %llu, forward_ref_ts = %llu, flags = %s, f_code = {%s}, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_mpeg2_picture *p), + TP_ARGS(tgid, fd, p), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_mpeg2_picture, p)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->p = *p;), + TP_printk("tgid = %u, fd = %u, " + "backward_ref_ts = %llu, forward_ref_ts = %llu, flags = %s, f_code = {%s}, " "picture_coding_type = %u, picture_structure = %u, intra_dc_precision = %u", + __entry->tgid, __entry->fd, __entry->p.backward_ref_ts, __entry->p.forward_ref_ts, __print_flags(__entry->p.flags, "|", @@ -1193,12 +1335,18 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_pic_tmpl, ); DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_quant_tmpl, - TP_PROTO(const struct v4l2_ctrl_mpeg2_quantisation *q), - TP_ARGS(q), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_mpeg2_quantisation, q)), - TP_fast_assign(__entry->q = *q;), - TP_printk("intra_quantiser_matrix = %s, non_intra_quantiser_matrix = %s, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_mpeg2_quantisation *q), + TP_ARGS(tgid, fd, q), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_mpeg2_quantisation, q)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->q = *q;), + TP_printk("tgid = %u, fd = %u, " + "intra_quantiser_matrix = %s, non_intra_quantiser_matrix = %s, " "chroma_intra_quantiser_matrix = %s, chroma_non_intra_quantiser_matrix = %s", + __entry->tgid, __entry->fd, __print_array(__entry->q.intra_quantiser_matrix, ARRAY_SIZE(__entry->q.intra_quantiser_matrix), sizeof(__entry->q.intra_quantiser_matrix[0])), @@ -1215,31 +1363,37 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_quant_tmpl, ) DEFINE_EVENT(v4l2_ctrl_mpeg2_seq_tmpl, v4l2_ctrl_mpeg2_sequence, - TP_PROTO(const struct v4l2_ctrl_mpeg2_sequence *s), - TP_ARGS(s) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_mpeg2_sequence *s), + TP_ARGS(tgid, fd, s) ); DEFINE_EVENT(v4l2_ctrl_mpeg2_pic_tmpl, v4l2_ctrl_mpeg2_picture, - TP_PROTO(const struct v4l2_ctrl_mpeg2_picture *p), - TP_ARGS(p) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_mpeg2_picture *p), + TP_ARGS(tgid, fd, p) ); DEFINE_EVENT(v4l2_ctrl_mpeg2_quant_tmpl, v4l2_ctrl_mpeg2_quantisation, - TP_PROTO(const struct v4l2_ctrl_mpeg2_quantisation *q), - TP_ARGS(q) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_mpeg2_quantisation *q), + TP_ARGS(tgid, fd, q) ); /* VP8 controls */ DECLARE_EVENT_CLASS(v4l2_ctrl_vp8_entropy_tmpl, - TP_PROTO(const struct v4l2_ctrl_vp8_frame *f), - TP_ARGS(f), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp8_frame, f)), - TP_fast_assign(__entry->f = *f;), - TP_printk("entropy.coeff_probs = {%s}, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp8_frame *f), + TP_ARGS(tgid, fd, f), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_vp8_frame, f)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->f = *f;), + TP_printk("tgid = %u, fd = %u, " + "entropy.coeff_probs = {%s}, " "entropy.y_mode_probs = %s, " "entropy.uv_mode_probs = %s, " "entropy.mv_probs = {%s}", + __entry->tgid, __entry->fd, __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, __entry->f.entropy.coeff_probs, sizeof(__entry->f.entropy.coeff_probs), @@ -1258,11 +1412,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp8_entropy_tmpl, ) DECLARE_EVENT_CLASS(v4l2_ctrl_vp8_frame_tmpl, - TP_PROTO(const struct v4l2_ctrl_vp8_frame *f), - TP_ARGS(f), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp8_frame, f)), - TP_fast_assign(__entry->f = *f;), - TP_printk("segment.quant_update = %s, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp8_frame *f), + TP_ARGS(tgid, fd, f), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_vp8_frame, f)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->f = *f;), + TP_printk("tgid = %u, fd = %u, " + "segment.quant_update = %s, " "segment.lf_update = %s, " "segment.segment_probs = %s, " "segment.flags = %s, " @@ -1297,6 +1456,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp8_frame_tmpl, "golden_frame_ts = %llu, " "alt_frame_ts = %llu, " "flags = %s", + __entry->tgid, __entry->fd, __print_array(__entry->f.segment.quant_update, ARRAY_SIZE(__entry->f.segment.quant_update), sizeof(__entry->f.segment.quant_update[0])), @@ -1361,23 +1521,28 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp8_frame_tmpl, ); DEFINE_EVENT(v4l2_ctrl_vp8_frame_tmpl, v4l2_ctrl_vp8_frame, - TP_PROTO(const struct v4l2_ctrl_vp8_frame *f), - TP_ARGS(f) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp8_frame *f), + TP_ARGS(tgid, fd, f) ); DEFINE_EVENT(v4l2_ctrl_vp8_entropy_tmpl, v4l2_ctrl_vp8_entropy, - TP_PROTO(const struct v4l2_ctrl_vp8_frame *f), - TP_ARGS(f) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp8_frame *f), + TP_ARGS(tgid, fd, f) ); /* VP9 controls */ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_frame_tmpl, - TP_PROTO(const struct v4l2_ctrl_vp9_frame *f), - TP_ARGS(f), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp9_frame, f)), - TP_fast_assign(__entry->f = *f;), - TP_printk("lf.ref_deltas = %s, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp9_frame *f), + TP_ARGS(tgid, fd, f), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_vp9_frame, f)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->f = *f;), + TP_printk("tgid = %u, fd = %u, " + "lf.ref_deltas = %s, " "lf.mode_deltas = %s, " "lf.level = %u, " "lf.sharpness = %u, " @@ -1410,6 +1575,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_frame_tmpl, "tile_cols_log2 = %u, " "tile_rows_log_2 = %u, " "reference_mode = %s", + __entry->tgid, __entry->fd, __print_array(__entry->f.lf.ref_deltas, ARRAY_SIZE(__entry->f.lf.ref_deltas), sizeof(__entry->f.lf.ref_deltas[0])), @@ -1490,11 +1656,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_frame_tmpl, ); DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_compressed_hdr_tmpl, - TP_PROTO(const struct v4l2_ctrl_vp9_compressed_hdr *h), - TP_ARGS(h), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp9_compressed_hdr, h)), - TP_fast_assign(__entry->h = *h;), - TP_printk("tx_mode = %s, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp9_compressed_hdr *h), + TP_ARGS(tgid, fd, h), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_vp9_compressed_hdr, h)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->h = *h;), + TP_printk("tgid = %u, fd = %u, " + "tx_mode = %s, " "tx8 = {%s}, " "tx16 = {%s}, " "tx32 = {%s}, " @@ -1508,6 +1679,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_compressed_hdr_tmpl, "y_mode = {%s}, " "uv_mode = {%s}, " "partition = {%s}", + __entry->tgid, __entry->fd, __print_symbolic(__entry->h.tx_mode, {V4L2_VP9_TX_MODE_ONLY_4X4, "TX_MODE_ONLY_4X4"}, {V4L2_VP9_TX_MODE_ALLOW_8X8, "TX_MODE_ALLOW_8X8"}, @@ -1566,11 +1738,17 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_compressed_hdr_tmpl, ); DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_compressed_coef_tmpl, - TP_PROTO(const struct v4l2_ctrl_vp9_compressed_hdr *h), - TP_ARGS(h), - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp9_compressed_hdr, h)), - TP_fast_assign(__entry->h = *h;), - TP_printk("coef = {%s}", + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp9_compressed_hdr *h), + TP_ARGS(tgid, fd, h), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_ctrl_vp9_compressed_hdr, h)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->h = *h;), + TP_printk("tgid = %u, fd = %u, " + "coef = {%s}", + __entry->tgid, __entry->fd, __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, __entry->h.coef, sizeof(__entry->h.coef), @@ -1579,11 +1757,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_compressed_coef_tmpl, ); DECLARE_EVENT_CLASS(v4l2_vp9_mv_probs_tmpl, - TP_PROTO(const struct v4l2_vp9_mv_probs *p), - TP_ARGS(p), - TP_STRUCT__entry(__field_struct(struct v4l2_vp9_mv_probs, p)), - TP_fast_assign(__entry->p = *p;), - TP_printk("joint = %s, " + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_vp9_mv_probs *p), + TP_ARGS(tgid, fd, p), + TP_STRUCT__entry(__field(u32, tgid) + __field(u32, fd) + __field_struct(struct v4l2_vp9_mv_probs, p)), + TP_fast_assign(__entry->tgid = tgid; + __entry->fd = fd; + __entry->p = *p;), + TP_printk("tgid = %u, fd = %u, " + "joint = %s, " "sign = %s, " "classes = {%s}, " "class0_bit = %s, " @@ -1592,6 +1775,7 @@ DECLARE_EVENT_CLASS(v4l2_vp9_mv_probs_tmpl, "fr = {%s}, " "class0_hp = %s, " "hp = %s", + __entry->tgid, __entry->fd, __print_array(__entry->p.joint, ARRAY_SIZE(__entry->p.joint), sizeof(__entry->p.joint[0])), @@ -1627,24 +1811,24 @@ DECLARE_EVENT_CLASS(v4l2_vp9_mv_probs_tmpl, ); DEFINE_EVENT(v4l2_ctrl_vp9_frame_tmpl, v4l2_ctrl_vp9_frame, - TP_PROTO(const struct v4l2_ctrl_vp9_frame *f), - TP_ARGS(f) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp9_frame *f), + TP_ARGS(tgid, fd, f) ); DEFINE_EVENT(v4l2_ctrl_vp9_compressed_hdr_tmpl, v4l2_ctrl_vp9_compressed_hdr, - TP_PROTO(const struct v4l2_ctrl_vp9_compressed_hdr *h), - TP_ARGS(h) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp9_compressed_hdr *h), + TP_ARGS(tgid, fd, h) ); DEFINE_EVENT(v4l2_ctrl_vp9_compressed_coef_tmpl, v4l2_ctrl_vp9_compressed_coeff, - TP_PROTO(const struct v4l2_ctrl_vp9_compressed_hdr *h), - TP_ARGS(h) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp9_compressed_hdr *h), + TP_ARGS(tgid, fd, h) ); DEFINE_EVENT(v4l2_vp9_mv_probs_tmpl, v4l2_vp9_mv_probs, - TP_PROTO(const struct v4l2_vp9_mv_probs *p), - TP_ARGS(p) + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_vp9_mv_probs *p), + TP_ARGS(tgid, fd, p) ); #endif /* if !defined(_TRACE_V4L2_REQUESTS_H_) || defined(TRACE_HEADER_MULTI_READ) */ -- 2.53.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 04/11] media: Add tgid and fd to the v4l2-requests trace fields 2026-02-12 16:23 ` [PATCH 04/11] media: Add tgid and fd to the v4l2-requests trace fields Detlev Casanova @ 2026-04-28 19:32 ` Nicolas Dufresne 0 siblings, 0 replies; 20+ messages in thread From: Nicolas Dufresne @ 2026-04-28 19:32 UTC (permalink / raw) To: Detlev Casanova, linux-kernel Cc: Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel [-- Attachment #1: Type: text/plain, Size: 53197 bytes --] Le jeudi 12 février 2026 à 11:23 -0500, Detlev Casanova a écrit : > With these fields, userspace can better track which trace event matches > with a given stream. > > Even though the trace shows the PID (based on current->tgid), trace > functions could be called from other contexts, therefore showing the wrong > PID, or none at all. > > These will ensure that the trace event can be matched with the PID/FD that > opened and configured the video device file. > > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> > --- > drivers/media/test-drivers/visl/visl-dec.c | 68 +-- > include/trace/events/v4l2_requests.h | 622 +++++++++++++-------- > 2 files changed, 439 insertions(+), 251 deletions(-) > > diff --git a/drivers/media/test-drivers/visl/visl-dec.c b/drivers/media/test-drivers/visl/visl-dec.c > index d49208e83726..fc216da17048 100644 > --- a/drivers/media/test-drivers/visl/visl-dec.c > +++ b/drivers/media/test-drivers/visl/visl-dec.c > @@ -489,67 +489,71 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct visl_run *run) > static void visl_trace_ctrls(struct visl_ctx *ctx, struct visl_run *run) > { > int i; > + struct v4l2_fh *fh = &ctx->fh; > > switch (ctx->current_codec) { > default: > case VISL_CODEC_NONE: > break; > case VISL_CODEC_FWHT: > - trace_v4l2_ctrl_fwht_params(run->fwht.params); > + trace_v4l2_ctrl_fwht_params(fh->tgid, fh->fd, run->fwht.params); > break; > case VISL_CODEC_MPEG2: > - trace_v4l2_ctrl_mpeg2_sequence(run->mpeg2.seq); > - trace_v4l2_ctrl_mpeg2_picture(run->mpeg2.pic); > - trace_v4l2_ctrl_mpeg2_quantisation(run->mpeg2.quant); > + trace_v4l2_ctrl_mpeg2_sequence(fh->tgid, fh->fd, run->mpeg2.seq); > + trace_v4l2_ctrl_mpeg2_picture(fh->tgid, fh->fd, run->mpeg2.pic); > + trace_v4l2_ctrl_mpeg2_quantisation(fh->tgid, fh->fd, run->mpeg2.quant); > break; > case VISL_CODEC_VP8: > - trace_v4l2_ctrl_vp8_frame(run->vp8.frame); > - trace_v4l2_ctrl_vp8_entropy(run->vp8.frame); > + trace_v4l2_ctrl_vp8_frame(fh->tgid, fh->fd, run->vp8.frame); > + trace_v4l2_ctrl_vp8_entropy(fh->tgid, fh->fd, run->vp8.frame); > break; > case VISL_CODEC_VP9: > - trace_v4l2_ctrl_vp9_frame(run->vp9.frame); > - trace_v4l2_ctrl_vp9_compressed_hdr(run->vp9.probs); > - trace_v4l2_ctrl_vp9_compressed_coeff(run->vp9.probs); > - trace_v4l2_vp9_mv_probs(&run->vp9.probs->mv); > + trace_v4l2_ctrl_vp9_frame(fh->tgid, fh->fd, run->vp9.frame); > + trace_v4l2_ctrl_vp9_compressed_hdr(fh->tgid, fh->fd, run->vp9.probs); > + trace_v4l2_ctrl_vp9_compressed_coeff(fh->tgid, fh->fd, run->vp9.probs); > + trace_v4l2_vp9_mv_probs(fh->tgid, fh->fd, &run->vp9.probs->mv); > break; > case VISL_CODEC_H264: > - trace_v4l2_ctrl_h264_sps(run->h264.sps); > - trace_v4l2_ctrl_h264_pps(run->h264.pps); > - trace_v4l2_ctrl_h264_scaling_matrix(run->h264.sm); > - trace_v4l2_ctrl_h264_slice_params(run->h264.spram); > + trace_v4l2_ctrl_h264_sps(fh->tgid, fh->fd, run->h264.sps); > + trace_v4l2_ctrl_h264_pps(fh->tgid, fh->fd, run->h264.pps); > + trace_v4l2_ctrl_h264_scaling_matrix(fh->tgid, fh->fd, run->h264.sm); > + trace_v4l2_ctrl_h264_slice_params(fh->tgid, fh->fd, run->h264.spram); > > for (i = 0; i < ARRAY_SIZE(run->h264.spram->ref_pic_list0); i++) > - trace_v4l2_h264_ref_pic_list0(&run->h264.spram->ref_pic_list0[i], i); > + trace_v4l2_h264_ref_pic_list0(fh->tgid, fh->fd, > + &run->h264.spram->ref_pic_list0[i], i); > for (i = 0; i < ARRAY_SIZE(run->h264.spram->ref_pic_list0); i++) > - trace_v4l2_h264_ref_pic_list1(&run->h264.spram->ref_pic_list1[i], i); > + trace_v4l2_h264_ref_pic_list1(fh->tgid, fh->fd, > + &run->h264.spram->ref_pic_list1[i], i); > > - trace_v4l2_ctrl_h264_decode_params(run->h264.dpram); > + trace_v4l2_ctrl_h264_decode_params(fh->tgid, fh->fd, run->h264.dpram); > > for (i = 0; i < ARRAY_SIZE(run->h264.dpram->dpb); i++) > - trace_v4l2_h264_dpb_entry(&run->h264.dpram->dpb[i], i); > + trace_v4l2_h264_dpb_entry(fh->tgid, fh->fd, &run->h264.dpram->dpb[i], i); > > - trace_v4l2_ctrl_h264_pred_weights(run->h264.pwht); > + trace_v4l2_ctrl_h264_pred_weights(fh->tgid, fh->fd, run->h264.pwht); > break; > case VISL_CODEC_HEVC: > - trace_v4l2_ctrl_hevc_sps(run->hevc.sps); > - trace_v4l2_ctrl_hevc_pps(run->hevc.pps); > - trace_v4l2_ctrl_hevc_slice_params(run->hevc.spram); > - trace_v4l2_ctrl_hevc_scaling_matrix(run->hevc.sm); > - trace_v4l2_ctrl_hevc_decode_params(run->hevc.dpram); > + trace_v4l2_ctrl_hevc_sps(fh->tgid, fh->fd, run->hevc.sps); > + trace_v4l2_ctrl_hevc_pps(fh->tgid, fh->fd, run->hevc.pps); > + trace_v4l2_ctrl_hevc_slice_params(fh->tgid, fh->fd, run->hevc.spram); > + trace_v4l2_ctrl_hevc_scaling_matrix(fh->tgid, fh->fd, run->hevc.sm); > + trace_v4l2_ctrl_hevc_decode_params(fh->tgid, fh->fd, run->hevc.dpram); > > for (i = 0; i < ARRAY_SIZE(run->hevc.dpram->dpb); i++) > - trace_v4l2_hevc_dpb_entry(&run->hevc.dpram->dpb[i]); > + trace_v4l2_hevc_dpb_entry(fh->tgid, fh->fd, &run->hevc.dpram->dpb[i]); > > - trace_v4l2_hevc_pred_weight_table(&run->hevc.spram->pred_weight_table); > - trace_v4l2_ctrl_hevc_ext_sps_lt_rps(run->hevc.rps_lt); > - trace_v4l2_ctrl_hevc_ext_sps_st_rps(run->hevc.rps_st); > > + trace_v4l2_hevc_pred_weight_table(fh->tgid, fh->fd, > + &run->hevc.spram->pred_weight_table); > + trace_v4l2_ctrl_hevc_ext_sps_lt_rps(fh->tgid, fh->fd, run->hevc.rps_lt); > + trace_v4l2_ctrl_hevc_ext_sps_st_rps(fh->tgid, fh->fd, run->hevc.rps_st); > break; > case VISL_CODEC_AV1: > - trace_v4l2_ctrl_av1_sequence(run->av1.seq); > - trace_v4l2_ctrl_av1_frame(run->av1.frame); > - trace_v4l2_ctrl_av1_film_grain(run->av1.grain); > - trace_v4l2_ctrl_av1_tile_group_entry(run->av1.tge); > + trace_v4l2_ctrl_av1_sequence(fh->tgid, fh->fd, run->av1.seq); > + trace_v4l2_ctrl_av1_frame(fh->tgid, fh->fd, run->av1.frame); > + trace_v4l2_ctrl_av1_film_grain(fh->tgid, fh->fd, run->av1.grain); > + trace_v4l2_ctrl_av1_tile_group_entry(fh->tgid, fh->fd, run->av1.tge); > break; > } > } > diff --git a/include/trace/events/v4l2_requests.h b/include/trace/events/v4l2_requests.h > index 34f4a74df5ea..ab6718f40e28 100644 > --- a/include/trace/events/v4l2_requests.h > +++ b/include/trace/events/v4l2_requests.h > @@ -10,12 +10,18 @@ > > /* AV1 controls */ > DECLARE_EVENT_CLASS(v4l2_ctrl_av1_seq_tmpl, > - TP_PROTO(const struct v4l2_ctrl_av1_sequence *s), > - TP_ARGS(s), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_sequence, s)), > - TP_fast_assign(__entry->s = *s;), > - TP_printk("flags = %s, seq_profile = %u, order_hint_bits = %u, bit_depth = %u, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_sequence *s), > + TP_ARGS(tgid, fd, s), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_av1_sequence, s)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->s = *s;), > + TP_printk("tgid = %u, fd = %u, " > + "flags = %s, seq_profile = %u, order_hint_bits = %u, bit_depth = %u, " > "max_frame_width_minus_1 = %u, max_frame_height_minus_1 = %u", > + __entry->tgid, __entry->fd, > __print_flags(__entry->s.flags, "|", > {V4L2_AV1_SEQUENCE_FLAG_STILL_PICTURE, "STILL_PICTURE"}, > {V4L2_AV1_SEQUENCE_FLAG_USE_128X128_SUPERBLOCK, "USE_128X128_SUPERBLOCK"}, > @@ -46,11 +52,17 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_seq_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_ctrl_av1_tge_tmpl, > - TP_PROTO(const struct v4l2_ctrl_av1_tile_group_entry *t), > - TP_ARGS(t), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_tile_group_entry, t)), > - TP_fast_assign(__entry->t = *t;), > - TP_printk("tile_offset = %u, tile_size = %u, tile_row = %u, tile_col = %u", > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_tile_group_entry *t), > + TP_ARGS(tgid, fd, t), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_av1_tile_group_entry, t)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->t = *t;), > + TP_printk("tgid = %u, fd = %u, " > + "tile_offset = %u, tile_size = %u, tile_row = %u, tile_col = %u", > + __entry->tgid, __entry->fd, > __entry->t.tile_offset, > __entry->t.tile_size, > __entry->t.tile_row, > @@ -59,11 +71,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_tge_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_ctrl_av1_frame_tmpl, > - TP_PROTO(const struct v4l2_ctrl_av1_frame *f), > - TP_ARGS(f), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_frame, f)), > - TP_fast_assign(__entry->f = *f;), > - TP_printk("tile_info.flags = %s, tile_info.context_update_tile_id = %u, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_frame *f), > + TP_ARGS(tgid, fd, f), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_av1_frame, f)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->f = *f;), > + TP_printk("tgid = %u, fd = %u, " > + "tile_info.flags = %s, tile_info.context_update_tile_id = %u, " > "tile_info.tile_cols = %u, tile_info.tile_rows = %u, " > "tile_info.mi_col_starts = %s, tile_info.mi_row_starts = %s, " > "tile_info.width_in_sbs_minus_1 = %s, tile_info.height_in_sbs_minus_1 = %s, " > @@ -87,6 +104,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_frame_tmpl, > "render_width_minus_1 = %u, render_height_minus_1 = %u, current_frame_id = %u, " > "buffer_removal_time = %s, order_hints = %s, reference_frame_ts = %s, " > "ref_frame_idx = %s, refresh_frame_flags = %u", > + __entry->tgid, __entry->fd, > __print_flags(__entry->f.tile_info.flags, "|", > {V4L2_AV1_TILE_INFO_FLAG_UNIFORM_TILE_SPACING, "UNIFORM_TILE_SPACING"}), > __entry->f.tile_info.context_update_tile_id, > @@ -222,11 +240,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_frame_tmpl, > > > DECLARE_EVENT_CLASS(v4l2_ctrl_av1_film_grain_tmpl, > - TP_PROTO(const struct v4l2_ctrl_av1_film_grain *f), > - TP_ARGS(f), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_av1_film_grain, f)), > - TP_fast_assign(__entry->f = *f;), > - TP_printk("flags = %s, cr_mult = %u, grain_seed = %u, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_film_grain *f), > + TP_ARGS(tgid, fd, f), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_av1_film_grain, f)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->f = *f;), > + TP_printk("tgid = %u, fd = %u, " > + "flags = %s, cr_mult = %u, grain_seed = %u, " > "film_grain_params_ref_idx = %u, num_y_points = %u, point_y_value = %s, " > "point_y_scaling = %s, num_cb_points = %u, point_cb_value = %s, " > "point_cb_scaling = %s, num_cr_points = %u, point_cr_value = %s, " > @@ -235,6 +258,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_film_grain_tmpl, > "ar_coeffs_cr_plus_128 = %s, ar_coeff_shift_minus_6 = %u, " > "grain_scale_shift = %u, cb_mult = %u, cb_luma_mult = %u, cr_luma_mult = %u, " > "cb_offset = %u, cr_offset = %u", > + __entry->tgid, __entry->fd, > __print_flags(__entry->f.flags, "|", > {V4L2_AV1_FILM_GRAIN_FLAG_APPLY_GRAIN, "APPLY_GRAIN"}, > {V4L2_AV1_FILM_GRAIN_FLAG_UPDATE_GRAIN, "UPDATE_GRAIN"}, > @@ -287,31 +311,32 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_av1_film_grain_tmpl, > ) > > DEFINE_EVENT(v4l2_ctrl_av1_seq_tmpl, v4l2_ctrl_av1_sequence, > - TP_PROTO(const struct v4l2_ctrl_av1_sequence *s), > - TP_ARGS(s) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_sequence *s), > + TP_ARGS(tgid, fd, s) > ); > > DEFINE_EVENT(v4l2_ctrl_av1_frame_tmpl, v4l2_ctrl_av1_frame, > - TP_PROTO(const struct v4l2_ctrl_av1_frame *f), > - TP_ARGS(f) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_frame *f), > + TP_ARGS(tgid, fd, f) > ); > > DEFINE_EVENT(v4l2_ctrl_av1_tge_tmpl, v4l2_ctrl_av1_tile_group_entry, > - TP_PROTO(const struct v4l2_ctrl_av1_tile_group_entry *t), > - TP_ARGS(t) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_tile_group_entry *t), > + TP_ARGS(tgid, fd, t) > ); > > DEFINE_EVENT(v4l2_ctrl_av1_film_grain_tmpl, v4l2_ctrl_av1_film_grain, > - TP_PROTO(const struct v4l2_ctrl_av1_film_grain *f), > - TP_ARGS(f) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_av1_film_grain *f), > + TP_ARGS(tgid, fd, f) > ); > > /* FWHT controls */ > > DECLARE_EVENT_CLASS(v4l2_ctrl_fwht_params_tmpl, > - TP_PROTO(const struct v4l2_ctrl_fwht_params *p), > - TP_ARGS(p), > - TP_STRUCT__entry( > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_fwht_params *p), > + TP_ARGS(tgid, fd, p), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > __field(u64, backward_ref_ts) > __field(u32, version) > __field(u32, width) > @@ -322,7 +347,8 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_fwht_params_tmpl, > __field(u32, ycbcr_enc) > __field(u32, quantization) > ), > - TP_fast_assign( > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > __entry->backward_ref_ts = p->backward_ref_ts; > __entry->version = p->version; > __entry->width = p->width; > @@ -333,7 +359,8 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_fwht_params_tmpl, > __entry->ycbcr_enc = p->ycbcr_enc; > __entry->quantization = p->quantization; > ), > - TP_printk("backward_ref_ts = %llu, " > + TP_printk("tgid = %u, fd = %u, " > + "backward_ref_ts = %llu, " > "version = %u, " > "width = %u, " > "height = %u, " > @@ -342,6 +369,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_fwht_params_tmpl, > "xfer_func = %u, " > "ycbcr_enc = %u, " > "quantization = %u", > + __entry->tgid, __entry->fd, > __entry->backward_ref_ts, __entry->version, __entry->width, __entry->height, > __print_flags(__entry->flags, "|", > {V4L2_FWHT_FL_IS_INTERLACED, "IS_INTERLACED"}, > @@ -361,18 +389,23 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_fwht_params_tmpl, > ); > > DEFINE_EVENT(v4l2_ctrl_fwht_params_tmpl, v4l2_ctrl_fwht_params, > - TP_PROTO(const struct v4l2_ctrl_fwht_params *p), > - TP_ARGS(p) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_fwht_params *p), > + TP_ARGS(tgid, fd, p) > ); > > /* H264 controls */ > > DECLARE_EVENT_CLASS(v4l2_ctrl_h264_sps_tmpl, > - TP_PROTO(const struct v4l2_ctrl_h264_sps *s), > - TP_ARGS(s), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_sps, s)), > - TP_fast_assign(__entry->s = *s), > - TP_printk("profile_idc = %u, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_sps *s), > + TP_ARGS(tgid, fd, s), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_h264_sps, s)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->s = *s), > + TP_printk("tgid = %u, fd = %u, " > + "profile_idc = %u, " > "constraint_set_flags = %s, " > "level_idc = %u, " > "seq_parameter_set_id = %u, " > @@ -390,6 +423,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_sps_tmpl, > "pic_width_in_mbs_minus1 = %u, " > "pic_height_in_map_units_minus1 = %u, " > "flags = %s", > + __entry->tgid, __entry->fd, > __entry->s.profile_idc, > __print_flags(__entry->s.constraint_set_flags, "|", > {V4L2_H264_SPS_CONSTRAINT_SET0_FLAG, "CONSTRAINT_SET0_FLAG"}, > @@ -427,11 +461,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_sps_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pps_tmpl, > - TP_PROTO(const struct v4l2_ctrl_h264_pps *p), > - TP_ARGS(p), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_pps, p)), > - TP_fast_assign(__entry->p = *p), > - TP_printk("pic_parameter_set_id = %u, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_pps *p), > + TP_ARGS(tgid, fd, p), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_h264_pps, p)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->p = *p), > + TP_printk("tgid = %u, fd = %u, " > + "pic_parameter_set_id = %u, " > "seq_parameter_set_id = %u, " > "num_slice_groups_minus1 = %u, " > "num_ref_idx_l0_default_active_minus1 = %u, " > @@ -442,6 +481,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pps_tmpl, > "chroma_qp_index_offset = %d, " > "second_chroma_qp_index_offset = %d, " > "flags = %s", > + __entry->tgid, __entry->fd, > __entry->p.pic_parameter_set_id, > __entry->p.seq_parameter_set_id, > __entry->p.num_slice_groups_minus1, > @@ -465,11 +505,17 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pps_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_ctrl_h264_scaling_matrix_tmpl, > - TP_PROTO(const struct v4l2_ctrl_h264_scaling_matrix *s), > - TP_ARGS(s), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_scaling_matrix, s)), > - TP_fast_assign(__entry->s = *s), > - TP_printk("scaling_list_4x4 = {%s}, scaling_list_8x8 = {%s}", > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_scaling_matrix *s), > + TP_ARGS(tgid, fd, s), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_h264_scaling_matrix, s)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->s = *s), > + TP_printk("tgid = %u, fd = %u, " > + "scaling_list_4x4 = {%s}, scaling_list_8x8 = {%s}", > + __entry->tgid, __entry->fd, > __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, > __entry->s.scaling_list_4x4, > sizeof(__entry->s.scaling_list_4x4), > @@ -482,11 +528,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_scaling_matrix_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pred_weights_tmpl, > - TP_PROTO(const struct v4l2_ctrl_h264_pred_weights *p), > - TP_ARGS(p), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_pred_weights, p)), > - TP_fast_assign(__entry->p = *p), > - TP_printk("luma_log2_weight_denom = %u, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_pred_weights *p), > + TP_ARGS(tgid, fd, p), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_h264_pred_weights, p)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->p = *p), > + TP_printk("tgid = %u, fd = %u, " > + "luma_log2_weight_denom = %u, " > "chroma_log2_weight_denom = %u, " > "weight_factor[0].luma_weight = %s, " > "weight_factor[0].luma_offset = %s, " > @@ -496,6 +547,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pred_weights_tmpl, > "weight_factor[1].luma_offset = %s, " > "weight_factor[1].chroma_weight = {%s}, " > "weight_factor[1].chroma_offset = {%s}", > + __entry->tgid, __entry->fd, > __entry->p.luma_log2_weight_denom, > __entry->p.chroma_log2_weight_denom, > __print_array(__entry->p.weight_factors[0].luma_weight, > @@ -530,11 +582,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_pred_weights_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_ctrl_h264_slice_params_tmpl, > - TP_PROTO(const struct v4l2_ctrl_h264_slice_params *s), > - TP_ARGS(s), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_slice_params, s)), > - TP_fast_assign(__entry->s = *s), > - TP_printk("header_bit_size = %u, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_slice_params *s), > + TP_ARGS(tgid, fd, s), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_h264_slice_params, s)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->s = *s), > + TP_printk("tgid = %u, fd = %u, " > + "header_bit_size = %u, " > "first_mb_in_slice = %u, " > "slice_type = %s, " > "colour_plane_id = %u, " > @@ -548,6 +605,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_slice_params_tmpl, > "num_ref_idx_l0_active_minus1 = %u, " > "num_ref_idx_l1_active_minus1 = %u, " > "flags = %s", > + __entry->tgid, __entry->fd, > __entry->s.header_bit_size, > __entry->s.first_mb_in_slice, > __print_symbolic(__entry->s.slice_type, > @@ -573,12 +631,18 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_slice_params_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_h264_reference_tmpl, > - TP_PROTO(const struct v4l2_h264_reference *r, int i), > - TP_ARGS(r, i), > - TP_STRUCT__entry(__field_struct(struct v4l2_h264_reference, r) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_h264_reference *r, int i), > + TP_ARGS(tgid, fd, r, i), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_h264_reference, r) > __field(int, i)), > - TP_fast_assign(__entry->r = *r; __entry->i = i;), > - TP_printk("[%d]: fields = %s, index = %u", > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->r = *r; __entry->i = i;), > + TP_printk("tgid = %u, fd = %u, " > + "[%d]: fields = %s, index = %u", > + __entry->tgid, __entry->fd, > __entry->i, > __print_flags(__entry->r.fields, "|", > {V4L2_H264_TOP_FIELD_REF, "TOP_FIELD_REF"}, > @@ -589,11 +653,16 @@ DECLARE_EVENT_CLASS(v4l2_h264_reference_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_ctrl_h264_decode_params_tmpl, > - TP_PROTO(const struct v4l2_ctrl_h264_decode_params *d), > - TP_ARGS(d), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_h264_decode_params, d)), > - TP_fast_assign(__entry->d = *d), > - TP_printk("nal_ref_idc = %u, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_decode_params *d), > + TP_ARGS(tgid, fd, d), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_h264_decode_params, d)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->d = *d), > + TP_printk("tgid = %u, fd = %u, " > + "nal_ref_idc = %u, " > "frame_num = %u, " > "top_field_order_cnt = %d, " > "bottom_field_order_cnt = %d, " > @@ -606,6 +675,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_decode_params_tmpl, > "pic_order_cnt_bit_size = %u, " > "slice_group_change_cycle = %u, " > "flags = %s", > + __entry->tgid, __entry->fd, > __entry->d.nal_ref_idc, > __entry->d.frame_num, > __entry->d.top_field_order_cnt, > @@ -628,13 +698,19 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_h264_decode_params_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_h264_dpb_entry_tmpl, > - TP_PROTO(const struct v4l2_h264_dpb_entry *e, int i), > - TP_ARGS(e, i), > - TP_STRUCT__entry(__field_struct(struct v4l2_h264_dpb_entry, e) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_h264_dpb_entry *e, int i), > + TP_ARGS(tgid, fd, e, i), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_h264_dpb_entry, e) > __field(int, i)), > - TP_fast_assign(__entry->e = *e; __entry->i = i;), > - TP_printk("[%d]: reference_ts = %llu, pic_num = %u, frame_num = %u, fields = %s " > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->e = *e; __entry->i = i;), > + TP_printk("tgid = %u, fd = %u, " > + "[%d]: reference_ts = %llu, pic_num = %u, frame_num = %u, fields = %s, " > "top_field_order_cnt = %d, bottom_field_order_cnt = %d, flags = %s", > + __entry->tgid, __entry->fd, > __entry->i, > __entry->e.reference_ts, > __entry->e.pic_num, > @@ -654,58 +730,63 @@ DECLARE_EVENT_CLASS(v4l2_h264_dpb_entry_tmpl, > ); > > DEFINE_EVENT(v4l2_ctrl_h264_sps_tmpl, v4l2_ctrl_h264_sps, > - TP_PROTO(const struct v4l2_ctrl_h264_sps *s), > - TP_ARGS(s) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_sps *s), > + TP_ARGS(tgid, fd, s) > ); > > DEFINE_EVENT(v4l2_ctrl_h264_pps_tmpl, v4l2_ctrl_h264_pps, > - TP_PROTO(const struct v4l2_ctrl_h264_pps *p), > - TP_ARGS(p) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_pps *p), > + TP_ARGS(tgid, fd, p) > ); > > DEFINE_EVENT(v4l2_ctrl_h264_scaling_matrix_tmpl, v4l2_ctrl_h264_scaling_matrix, > - TP_PROTO(const struct v4l2_ctrl_h264_scaling_matrix *s), > - TP_ARGS(s) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_scaling_matrix *s), > + TP_ARGS(tgid, fd, s) > ); > > DEFINE_EVENT(v4l2_ctrl_h264_pred_weights_tmpl, v4l2_ctrl_h264_pred_weights, > - TP_PROTO(const struct v4l2_ctrl_h264_pred_weights *p), > - TP_ARGS(p) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_pred_weights *p), > + TP_ARGS(tgid, fd, p) > ); > > DEFINE_EVENT(v4l2_ctrl_h264_slice_params_tmpl, v4l2_ctrl_h264_slice_params, > - TP_PROTO(const struct v4l2_ctrl_h264_slice_params *s), > - TP_ARGS(s) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_slice_params *s), > + TP_ARGS(tgid, fd, s) > ); > > DEFINE_EVENT(v4l2_h264_reference_tmpl, v4l2_h264_ref_pic_list0, > - TP_PROTO(const struct v4l2_h264_reference *r, int i), > - TP_ARGS(r, i) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_h264_reference *r, int i), > + TP_ARGS(tgid, fd, r, i) > ); > > DEFINE_EVENT(v4l2_h264_reference_tmpl, v4l2_h264_ref_pic_list1, > - TP_PROTO(const struct v4l2_h264_reference *r, int i), > - TP_ARGS(r, i) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_h264_reference *r, int i), > + TP_ARGS(tgid, fd, r, i) > ); > > DEFINE_EVENT(v4l2_ctrl_h264_decode_params_tmpl, v4l2_ctrl_h264_decode_params, > - TP_PROTO(const struct v4l2_ctrl_h264_decode_params *d), > - TP_ARGS(d) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_h264_decode_params *d), > + TP_ARGS(tgid, fd, d) > ); > > DEFINE_EVENT(v4l2_h264_dpb_entry_tmpl, v4l2_h264_dpb_entry, > - TP_PROTO(const struct v4l2_h264_dpb_entry *e, int i), > - TP_ARGS(e, i) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_h264_dpb_entry *e, int i), > + TP_ARGS(tgid, fd, e, i) > ); > > /* HEVC controls */ > > DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_sps_tmpl, > - TP_PROTO(const struct v4l2_ctrl_hevc_sps *s), > - TP_ARGS(s), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_sps, s)), > - TP_fast_assign(__entry->s = *s), > - TP_printk("video_parameter_set_id = %u, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_sps *s), > + TP_ARGS(tgid, fd, s), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_hevc_sps, s)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->s = *s), > + TP_printk("tgid = %u, fd = %u, " > + "video_parameter_set_id = %u, " > "seq_parameter_set_id = %u, " > "pic_width_in_luma_samples = %u, " > "pic_height_in_luma_samples = %u, " > @@ -730,6 +811,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_sps_tmpl, > "chroma_format_idc = %u, " > "sps_max_sub_layers_minus1 = %u, " > "flags = %s", > + __entry->tgid, __entry->fd, > __entry->s.video_parameter_set_id, > __entry->s.seq_parameter_set_id, > __entry->s.pic_width_in_luma_samples, > @@ -770,11 +852,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_sps_tmpl, > > > DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_pps_tmpl, > - TP_PROTO(const struct v4l2_ctrl_hevc_pps *p), > - TP_ARGS(p), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_pps, p)), > - TP_fast_assign(__entry->p = *p), > - TP_printk("pic_parameter_set_id = %u, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_pps *p), > + TP_ARGS(tgid, fd, p), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_hevc_pps, p)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->p = *p), > + TP_printk("tgid = %u, fd = %u, " > + "pic_parameter_set_id = %u, " > "num_extra_slice_header_bits = %u, " > "num_ref_idx_l0_default_active_minus1 = %u, " > "num_ref_idx_l1_default_active_minus1 = %u, " > @@ -790,6 +877,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_pps_tmpl, > "pps_tc_offset_div2 = %d, " > "log2_parallel_merge_level_minus2 = %u, " > "flags = %s", > + __entry->tgid, __entry->fd, > __entry->p.pic_parameter_set_id, > __entry->p.num_extra_slice_header_bits, > __entry->p.num_ref_idx_l0_default_active_minus1, > @@ -837,11 +925,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_pps_tmpl, > > > DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_slice_params_tmpl, > - TP_PROTO(const struct v4l2_ctrl_hevc_slice_params *s), > - TP_ARGS(s), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_slice_params, s)), > - TP_fast_assign(__entry->s = *s), > - TP_printk("bit_size = %u, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_slice_params *s), > + TP_ARGS(tgid, fd, s), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_hevc_slice_params, s)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->s = *s), > + TP_printk("tgid = %u, fd = %u, " > + "bit_size = %u, " > "data_byte_offset = %u, " > "num_entry_point_offsets = %u, " > "nal_unit_type = %u, " > @@ -868,6 +961,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_slice_params_tmpl, > "short_term_ref_pic_set_size = %u, " > "long_term_ref_pic_set_size = %u, " > "flags = %s", > + __entry->tgid, __entry->fd, > __entry->s.bit_size, > __entry->s.data_byte_offset, > __entry->s.num_entry_point_offsets, > @@ -914,11 +1008,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_slice_params_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_hevc_pred_weight_table_tmpl, > - TP_PROTO(const struct v4l2_hevc_pred_weight_table *p), > - TP_ARGS(p), > - TP_STRUCT__entry(__field_struct(struct v4l2_hevc_pred_weight_table, p)), > - TP_fast_assign(__entry->p = *p), > - TP_printk("delta_luma_weight_l0 = %s, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_hevc_pred_weight_table *p), > + TP_ARGS(tgid, fd, p), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_hevc_pred_weight_table, p)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->p = *p), > + TP_printk("tgid = %u, fd = %u, " > + "delta_luma_weight_l0 = %s, " > "luma_offset_l0 = %s, " > "delta_chroma_weight_l0 = {%s}, " > "chroma_offset_l0 = {%s}, " > @@ -928,6 +1027,7 @@ DECLARE_EVENT_CLASS(v4l2_hevc_pred_weight_table_tmpl, > "chroma_offset_l1 = {%s}, " > "luma_log2_weight_denom = %d, " > "delta_chroma_log2_weight_denom = %d", > + __entry->tgid, __entry->fd, > __print_array(__entry->p.delta_luma_weight_l0, > ARRAY_SIZE(__entry->p.delta_luma_weight_l0), > sizeof(__entry->p.delta_luma_weight_l0[0])), > @@ -962,16 +1062,22 @@ DECLARE_EVENT_CLASS(v4l2_hevc_pred_weight_table_tmpl, > )) > > DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_scaling_matrix_tmpl, > - TP_PROTO(const struct v4l2_ctrl_hevc_scaling_matrix *s), > - TP_ARGS(s), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_scaling_matrix, s)), > - TP_fast_assign(__entry->s = *s), > - TP_printk("scaling_list_4x4 = {%s}, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_scaling_matrix *s), > + TP_ARGS(tgid, fd, s), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_hevc_scaling_matrix, s)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->s = *s), > + TP_printk("tgid = %u, fd = %u, " > + "scaling_list_4x4 = {%s}, " > "scaling_list_8x8 = {%s}, " > "scaling_list_16x16 = {%s}, " > "scaling_list_32x32 = {%s}, " > "scaling_list_dc_coef_16x16 = %s, " > "scaling_list_dc_coef_32x32 = %s", > + __entry->tgid, __entry->fd, > __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, > __entry->s.scaling_list_4x4, > sizeof(__entry->s.scaling_list_4x4), > @@ -997,11 +1103,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_scaling_matrix_tmpl, > )) > > DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_decode_params_tmpl, > - TP_PROTO(const struct v4l2_ctrl_hevc_decode_params *d), > - TP_ARGS(d), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_decode_params, d)), > - TP_fast_assign(__entry->d = *d), > - TP_printk("pic_order_cnt_val = %d, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_decode_params *d), > + TP_ARGS(tgid, fd, d), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_hevc_decode_params, d)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->d = *d), > + TP_printk("tgid = %u, fd = %u, " > + "pic_order_cnt_val = %d, " > "short_term_ref_pic_set_size = %u, " > "long_term_ref_pic_set_size = %u, " > "num_active_dpb_entries = %u, " > @@ -1012,6 +1123,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_decode_params_tmpl, > "poc_st_curr_after = %s, " > "poc_lt_curr = %s, " > "flags = %s", > + __entry->tgid, __entry->fd, > __entry->d.pic_order_cnt_val, > __entry->d.short_term_ref_pic_set_size, > __entry->d.long_term_ref_pic_set_size, > @@ -1036,12 +1148,18 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_decode_params_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_ext_sps_lt_rps_tmpl, > - TP_PROTO(const struct v4l2_ctrl_hevc_ext_sps_lt_rps *lt), > - TP_ARGS(lt), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_ext_sps_lt_rps, lt)), > - TP_fast_assign(__entry->lt = *lt), > - TP_printk("flags = %s, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_ext_sps_lt_rps *lt), > + TP_ARGS(tgid, fd, lt), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_hevc_ext_sps_lt_rps, lt)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->lt = *lt), > + TP_printk("tgid = %u, fd = %u, " > + "flags = %s, " > "lt_ref_pic_poc_lsb_sps = %x", > + __entry->tgid, __entry->fd, > __print_flags(__entry->lt.flags, "|", > {V4L2_HEVC_EXT_SPS_LT_RPS_FLAG_USED_LT, "USED_LT"} > ), > @@ -1050,11 +1168,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_ext_sps_lt_rps_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_ext_sps_st_rps_tmpl, > - TP_PROTO(const struct v4l2_ctrl_hevc_ext_sps_st_rps *st), > - TP_ARGS(st), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_hevc_ext_sps_st_rps, st)), > - TP_fast_assign(__entry->st = *st), > - TP_printk("flags = %s, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_ext_sps_st_rps *st), > + TP_ARGS(tgid, fd, st), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_hevc_ext_sps_st_rps, st)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->st = *st), > + TP_printk("tgid = %u, fd = %u, " > + "flags = %s, " > "delta_idx_minus1 = %u, " > "delta_rps_sign = %u, " > "abs_delta_rps_minus1 = %u, " > @@ -1064,6 +1187,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_ext_sps_st_rps_tmpl, > "use_delta_flag = %08x, " > "delta_poc_s0_minus1 = %s, " > "delta_poc_s1_minus1 = %s", > + __entry->tgid, __entry->fd, > __print_flags(__entry->st.flags, "|", > {V4L2_HEVC_EXT_SPS_ST_RPS_FLAG_INTER_REF_PIC_SET_PRED, "INTER_REF_PIC_SET_PRED"} > ), > @@ -1084,14 +1208,20 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_hevc_ext_sps_st_rps_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_hevc_dpb_entry_tmpl, > - TP_PROTO(const struct v4l2_hevc_dpb_entry *e), > - TP_ARGS(e), > - TP_STRUCT__entry(__field_struct(struct v4l2_hevc_dpb_entry, e)), > - TP_fast_assign(__entry->e = *e), > - TP_printk("timestamp = %llu, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_hevc_dpb_entry *e), > + TP_ARGS(tgid, fd, e), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_hevc_dpb_entry, e)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->e = *e), > + TP_printk("tgid = %u, fd = %u, " > + "timestamp = %llu, " > "flags = %s, " > "field_pic = %u, " > "pic_order_cnt_val = %d", > + __entry->tgid, __entry->fd, > __entry->e.timestamp, > __print_flags(__entry->e.flags, "|", > {V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE, "LONG_TERM_REFERENCE"} > @@ -1101,59 +1231,65 @@ DECLARE_EVENT_CLASS(v4l2_hevc_dpb_entry_tmpl, > )) > > DEFINE_EVENT(v4l2_ctrl_hevc_sps_tmpl, v4l2_ctrl_hevc_sps, > - TP_PROTO(const struct v4l2_ctrl_hevc_sps *s), > - TP_ARGS(s) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_sps *s), > + TP_ARGS(tgid, fd, s) > ); > > DEFINE_EVENT(v4l2_ctrl_hevc_pps_tmpl, v4l2_ctrl_hevc_pps, > - TP_PROTO(const struct v4l2_ctrl_hevc_pps *p), > - TP_ARGS(p) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_pps *p), > + TP_ARGS(tgid, fd, p) > ); > > DEFINE_EVENT(v4l2_ctrl_hevc_slice_params_tmpl, v4l2_ctrl_hevc_slice_params, > - TP_PROTO(const struct v4l2_ctrl_hevc_slice_params *s), > - TP_ARGS(s) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_slice_params *s), > + TP_ARGS(tgid, fd, s) > ); > > DEFINE_EVENT(v4l2_hevc_pred_weight_table_tmpl, v4l2_hevc_pred_weight_table, > - TP_PROTO(const struct v4l2_hevc_pred_weight_table *p), > - TP_ARGS(p) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_hevc_pred_weight_table *p), > + TP_ARGS(tgid, fd, p) > ); > > DEFINE_EVENT(v4l2_ctrl_hevc_scaling_matrix_tmpl, v4l2_ctrl_hevc_scaling_matrix, > - TP_PROTO(const struct v4l2_ctrl_hevc_scaling_matrix *s), > - TP_ARGS(s) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_scaling_matrix *s), > + TP_ARGS(tgid, fd, s) > ); > > DEFINE_EVENT(v4l2_ctrl_hevc_decode_params_tmpl, v4l2_ctrl_hevc_decode_params, > - TP_PROTO(const struct v4l2_ctrl_hevc_decode_params *d), > - TP_ARGS(d) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_decode_params *d), > + TP_ARGS(tgid, fd, d) > ); > > DEFINE_EVENT(v4l2_ctrl_hevc_ext_sps_lt_rps_tmpl, v4l2_ctrl_hevc_ext_sps_lt_rps, > - TP_PROTO(const struct v4l2_ctrl_hevc_ext_sps_lt_rps *lt), > - TP_ARGS(lt) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_ext_sps_lt_rps *lt), > + TP_ARGS(tgid, fd, lt) > ); > > DEFINE_EVENT(v4l2_ctrl_hevc_ext_sps_st_rps_tmpl, v4l2_ctrl_hevc_ext_sps_st_rps, > - TP_PROTO(const struct v4l2_ctrl_hevc_ext_sps_st_rps *st), > - TP_ARGS(st) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_hevc_ext_sps_st_rps *st), > + TP_ARGS(tgid, fd, st) > ); > > DEFINE_EVENT(v4l2_hevc_dpb_entry_tmpl, v4l2_hevc_dpb_entry, > - TP_PROTO(const struct v4l2_hevc_dpb_entry *e), > - TP_ARGS(e) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_hevc_dpb_entry *e), > + TP_ARGS(tgid, fd, e) > ); > > /* MPEG2 controls */ > > DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_seq_tmpl, > - TP_PROTO(const struct v4l2_ctrl_mpeg2_sequence *s), > - TP_ARGS(s), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_mpeg2_sequence, s)), > - TP_fast_assign(__entry->s = *s;), > - TP_printk("horizontal_size = %u, vertical_size = %u, vbv_buffer_size = %u, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_mpeg2_sequence *s), > + TP_ARGS(tgid, fd, s), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_mpeg2_sequence, s)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->s = *s;), > + TP_printk("tgid = %u, fd = %u, " > + "horizontal_size = %u, vertical_size = %u, vbv_buffer_size = %u, " > "profile_and_level_indication = %u, chroma_format = %u, flags = %s", > + __entry->tgid, __entry->fd, > __entry->s.horizontal_size, > __entry->s.vertical_size, > __entry->s.vbv_buffer_size, > @@ -1165,12 +1301,18 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_seq_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_pic_tmpl, > - TP_PROTO(const struct v4l2_ctrl_mpeg2_picture *p), > - TP_ARGS(p), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_mpeg2_picture, p)), > - TP_fast_assign(__entry->p = *p;), > - TP_printk("backward_ref_ts = %llu, forward_ref_ts = %llu, flags = %s, f_code = {%s}, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_mpeg2_picture *p), > + TP_ARGS(tgid, fd, p), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_mpeg2_picture, p)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->p = *p;), > + TP_printk("tgid = %u, fd = %u, " > + "backward_ref_ts = %llu, forward_ref_ts = %llu, flags = %s, f_code = {%s}, " > "picture_coding_type = %u, picture_structure = %u, intra_dc_precision = %u", > + __entry->tgid, __entry->fd, > __entry->p.backward_ref_ts, > __entry->p.forward_ref_ts, > __print_flags(__entry->p.flags, "|", > @@ -1193,12 +1335,18 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_pic_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_quant_tmpl, > - TP_PROTO(const struct v4l2_ctrl_mpeg2_quantisation *q), > - TP_ARGS(q), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_mpeg2_quantisation, q)), > - TP_fast_assign(__entry->q = *q;), > - TP_printk("intra_quantiser_matrix = %s, non_intra_quantiser_matrix = %s, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_mpeg2_quantisation *q), > + TP_ARGS(tgid, fd, q), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_mpeg2_quantisation, q)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->q = *q;), > + TP_printk("tgid = %u, fd = %u, " > + "intra_quantiser_matrix = %s, non_intra_quantiser_matrix = %s, " > "chroma_intra_quantiser_matrix = %s, chroma_non_intra_quantiser_matrix = %s", > + __entry->tgid, __entry->fd, > __print_array(__entry->q.intra_quantiser_matrix, > ARRAY_SIZE(__entry->q.intra_quantiser_matrix), > sizeof(__entry->q.intra_quantiser_matrix[0])), > @@ -1215,31 +1363,37 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_quant_tmpl, > ) > > DEFINE_EVENT(v4l2_ctrl_mpeg2_seq_tmpl, v4l2_ctrl_mpeg2_sequence, > - TP_PROTO(const struct v4l2_ctrl_mpeg2_sequence *s), > - TP_ARGS(s) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_mpeg2_sequence *s), > + TP_ARGS(tgid, fd, s) > ); > > DEFINE_EVENT(v4l2_ctrl_mpeg2_pic_tmpl, v4l2_ctrl_mpeg2_picture, > - TP_PROTO(const struct v4l2_ctrl_mpeg2_picture *p), > - TP_ARGS(p) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_mpeg2_picture *p), > + TP_ARGS(tgid, fd, p) > ); > > DEFINE_EVENT(v4l2_ctrl_mpeg2_quant_tmpl, v4l2_ctrl_mpeg2_quantisation, > - TP_PROTO(const struct v4l2_ctrl_mpeg2_quantisation *q), > - TP_ARGS(q) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_mpeg2_quantisation *q), > + TP_ARGS(tgid, fd, q) > ); > > /* VP8 controls */ > > DECLARE_EVENT_CLASS(v4l2_ctrl_vp8_entropy_tmpl, > - TP_PROTO(const struct v4l2_ctrl_vp8_frame *f), > - TP_ARGS(f), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp8_frame, f)), > - TP_fast_assign(__entry->f = *f;), > - TP_printk("entropy.coeff_probs = {%s}, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp8_frame *f), > + TP_ARGS(tgid, fd, f), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_vp8_frame, f)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->f = *f;), > + TP_printk("tgid = %u, fd = %u, " > + "entropy.coeff_probs = {%s}, " > "entropy.y_mode_probs = %s, " > "entropy.uv_mode_probs = %s, " > "entropy.mv_probs = {%s}", > + __entry->tgid, __entry->fd, > __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, > __entry->f.entropy.coeff_probs, > sizeof(__entry->f.entropy.coeff_probs), > @@ -1258,11 +1412,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp8_entropy_tmpl, > ) > > DECLARE_EVENT_CLASS(v4l2_ctrl_vp8_frame_tmpl, > - TP_PROTO(const struct v4l2_ctrl_vp8_frame *f), > - TP_ARGS(f), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp8_frame, f)), > - TP_fast_assign(__entry->f = *f;), > - TP_printk("segment.quant_update = %s, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp8_frame *f), > + TP_ARGS(tgid, fd, f), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_vp8_frame, f)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->f = *f;), > + TP_printk("tgid = %u, fd = %u, " > + "segment.quant_update = %s, " > "segment.lf_update = %s, " > "segment.segment_probs = %s, " > "segment.flags = %s, " > @@ -1297,6 +1456,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp8_frame_tmpl, > "golden_frame_ts = %llu, " > "alt_frame_ts = %llu, " > "flags = %s", > + __entry->tgid, __entry->fd, > __print_array(__entry->f.segment.quant_update, > ARRAY_SIZE(__entry->f.segment.quant_update), > sizeof(__entry->f.segment.quant_update[0])), > @@ -1361,23 +1521,28 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp8_frame_tmpl, > ); > > DEFINE_EVENT(v4l2_ctrl_vp8_frame_tmpl, v4l2_ctrl_vp8_frame, > - TP_PROTO(const struct v4l2_ctrl_vp8_frame *f), > - TP_ARGS(f) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp8_frame *f), > + TP_ARGS(tgid, fd, f) > ); > > DEFINE_EVENT(v4l2_ctrl_vp8_entropy_tmpl, v4l2_ctrl_vp8_entropy, > - TP_PROTO(const struct v4l2_ctrl_vp8_frame *f), > - TP_ARGS(f) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp8_frame *f), > + TP_ARGS(tgid, fd, f) > ); > > /* VP9 controls */ > > DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_frame_tmpl, > - TP_PROTO(const struct v4l2_ctrl_vp9_frame *f), > - TP_ARGS(f), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp9_frame, f)), > - TP_fast_assign(__entry->f = *f;), > - TP_printk("lf.ref_deltas = %s, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp9_frame *f), > + TP_ARGS(tgid, fd, f), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_vp9_frame, f)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->f = *f;), > + TP_printk("tgid = %u, fd = %u, " > + "lf.ref_deltas = %s, " > "lf.mode_deltas = %s, " > "lf.level = %u, " > "lf.sharpness = %u, " > @@ -1410,6 +1575,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_frame_tmpl, > "tile_cols_log2 = %u, " > "tile_rows_log_2 = %u, " > "reference_mode = %s", > + __entry->tgid, __entry->fd, > __print_array(__entry->f.lf.ref_deltas, > ARRAY_SIZE(__entry->f.lf.ref_deltas), > sizeof(__entry->f.lf.ref_deltas[0])), > @@ -1490,11 +1656,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_frame_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_compressed_hdr_tmpl, > - TP_PROTO(const struct v4l2_ctrl_vp9_compressed_hdr *h), > - TP_ARGS(h), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp9_compressed_hdr, h)), > - TP_fast_assign(__entry->h = *h;), > - TP_printk("tx_mode = %s, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp9_compressed_hdr *h), > + TP_ARGS(tgid, fd, h), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_vp9_compressed_hdr, h)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->h = *h;), > + TP_printk("tgid = %u, fd = %u, " > + "tx_mode = %s, " > "tx8 = {%s}, " > "tx16 = {%s}, " > "tx32 = {%s}, " > @@ -1508,6 +1679,7 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_compressed_hdr_tmpl, > "y_mode = {%s}, " > "uv_mode = {%s}, " > "partition = {%s}", > + __entry->tgid, __entry->fd, > __print_symbolic(__entry->h.tx_mode, > {V4L2_VP9_TX_MODE_ONLY_4X4, "TX_MODE_ONLY_4X4"}, > {V4L2_VP9_TX_MODE_ALLOW_8X8, "TX_MODE_ALLOW_8X8"}, > @@ -1566,11 +1738,17 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_compressed_hdr_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_compressed_coef_tmpl, > - TP_PROTO(const struct v4l2_ctrl_vp9_compressed_hdr *h), > - TP_ARGS(h), > - TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_vp9_compressed_hdr, h)), > - TP_fast_assign(__entry->h = *h;), > - TP_printk("coef = {%s}", > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp9_compressed_hdr *h), > + TP_ARGS(tgid, fd, h), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_ctrl_vp9_compressed_hdr, h)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->h = *h;), > + TP_printk("tgid = %u, fd = %u, " > + "coef = {%s}", > + __entry->tgid, __entry->fd, > __print_hex_dump("", DUMP_PREFIX_NONE, 32, 1, > __entry->h.coef, > sizeof(__entry->h.coef), > @@ -1579,11 +1757,16 @@ DECLARE_EVENT_CLASS(v4l2_ctrl_vp9_compressed_coef_tmpl, > ); > > DECLARE_EVENT_CLASS(v4l2_vp9_mv_probs_tmpl, > - TP_PROTO(const struct v4l2_vp9_mv_probs *p), > - TP_ARGS(p), > - TP_STRUCT__entry(__field_struct(struct v4l2_vp9_mv_probs, p)), > - TP_fast_assign(__entry->p = *p;), > - TP_printk("joint = %s, " > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_vp9_mv_probs *p), > + TP_ARGS(tgid, fd, p), > + TP_STRUCT__entry(__field(u32, tgid) > + __field(u32, fd) > + __field_struct(struct v4l2_vp9_mv_probs, p)), > + TP_fast_assign(__entry->tgid = tgid; > + __entry->fd = fd; > + __entry->p = *p;), > + TP_printk("tgid = %u, fd = %u, " > + "joint = %s, " > "sign = %s, " > "classes = {%s}, " > "class0_bit = %s, " > @@ -1592,6 +1775,7 @@ DECLARE_EVENT_CLASS(v4l2_vp9_mv_probs_tmpl, > "fr = {%s}, " > "class0_hp = %s, " > "hp = %s", > + __entry->tgid, __entry->fd, > __print_array(__entry->p.joint, > ARRAY_SIZE(__entry->p.joint), > sizeof(__entry->p.joint[0])), > @@ -1627,24 +1811,24 @@ DECLARE_EVENT_CLASS(v4l2_vp9_mv_probs_tmpl, > ); > > DEFINE_EVENT(v4l2_ctrl_vp9_frame_tmpl, v4l2_ctrl_vp9_frame, > - TP_PROTO(const struct v4l2_ctrl_vp9_frame *f), > - TP_ARGS(f) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp9_frame *f), > + TP_ARGS(tgid, fd, f) > ); > > DEFINE_EVENT(v4l2_ctrl_vp9_compressed_hdr_tmpl, v4l2_ctrl_vp9_compressed_hdr, > - TP_PROTO(const struct v4l2_ctrl_vp9_compressed_hdr *h), > - TP_ARGS(h) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp9_compressed_hdr *h), > + TP_ARGS(tgid, fd, h) > ); > > DEFINE_EVENT(v4l2_ctrl_vp9_compressed_coef_tmpl, v4l2_ctrl_vp9_compressed_coeff, > - TP_PROTO(const struct v4l2_ctrl_vp9_compressed_hdr *h), > - TP_ARGS(h) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_ctrl_vp9_compressed_hdr *h), > + TP_ARGS(tgid, fd, h) > ); > > > DEFINE_EVENT(v4l2_vp9_mv_probs_tmpl, v4l2_vp9_mv_probs, > - TP_PROTO(const struct v4l2_vp9_mv_probs *p), > - TP_ARGS(p) > + TP_PROTO(u32 tgid, u32 fd, const struct v4l2_vp9_mv_probs *p), > + TP_ARGS(tgid, fd, p) > ); > > #endif /* if !defined(_TRACE_V4L2_REQUESTS_H_) || defined(TRACE_HEADER_MULTI_READ) */ [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 05/11] media: Add missing types to v4l2_ctrl_ptr 2026-02-12 16:23 [PATCH 00/11] v4l2: Add tracing for stateless codecs Detlev Casanova ` (2 preceding siblings ...) 2026-02-12 16:23 ` [PATCH 04/11] media: Add tgid and fd to the v4l2-requests trace fields Detlev Casanova @ 2026-02-12 16:23 ` Detlev Casanova 2026-04-28 19:33 ` Nicolas Dufresne 2026-02-12 16:23 ` [PATCH 06/11] media: Trace the stateless controls when set in v4l2-ctrls-core.c Detlev Casanova ` (7 subsequent siblings) 11 siblings, 1 reply; 20+ messages in thread From: Detlev Casanova @ 2026-02-12 16:23 UTC (permalink / raw) To: linux-kernel Cc: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Detlev Casanova, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel The v4l2_ctrl_ptr union contains pointers for all control types, but v4l2_ctrl_hevc_decode_params and v4l2_ctrl_hevc_scaling_matrix are missing. Add them. Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> --- include/media/v4l2-ctrls.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index 327976b14d50..a2b4c96a9a6f 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -49,6 +49,8 @@ struct video_device; * @p_hevc_sps: Pointer to an HEVC sequence parameter set structure. * @p_hevc_pps: Pointer to an HEVC picture parameter set structure. * @p_hevc_slice_params: Pointer to an HEVC slice parameters structure. + * @p_hevc_decode_params: Pointer to an HEVC decode parameters structure. + * @p_hevc_scaling_matrix Pointer to an HEVC scaling matrix structure. * @p_hdr10_cll: Pointer to an HDR10 Content Light Level structure. * @p_hdr10_mastering: Pointer to an HDR10 Mastering Display structure. * @p_area: Pointer to an area. @@ -81,6 +83,8 @@ union v4l2_ctrl_ptr { struct v4l2_ctrl_hevc_sps *p_hevc_sps; struct v4l2_ctrl_hevc_pps *p_hevc_pps; struct v4l2_ctrl_hevc_slice_params *p_hevc_slice_params; + struct v4l2_ctrl_hevc_decode_params *p_hevc_decode_params; + struct v4l2_ctrl_hevc_scaling_matrix *p_hevc_scaling_matrix; struct v4l2_ctrl_vp9_compressed_hdr *p_vp9_compressed_hdr_probs; struct v4l2_ctrl_vp9_frame *p_vp9_frame; struct v4l2_ctrl_hdr10_cll_info *p_hdr10_cll; -- 2.53.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 05/11] media: Add missing types to v4l2_ctrl_ptr 2026-02-12 16:23 ` [PATCH 05/11] media: Add missing types to v4l2_ctrl_ptr Detlev Casanova @ 2026-04-28 19:33 ` Nicolas Dufresne 0 siblings, 0 replies; 20+ messages in thread From: Nicolas Dufresne @ 2026-04-28 19:33 UTC (permalink / raw) To: Detlev Casanova, linux-kernel Cc: Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel [-- Attachment #1: Type: text/plain, Size: 1781 bytes --] Le jeudi 12 février 2026 à 11:23 -0500, Detlev Casanova a écrit : > The v4l2_ctrl_ptr union contains pointers for all control types, but > v4l2_ctrl_hevc_decode_params and v4l2_ctrl_hevc_scaling_matrix are missing. > > Add them. > > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> > --- > include/media/v4l2-ctrls.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h > index 327976b14d50..a2b4c96a9a6f 100644 > --- a/include/media/v4l2-ctrls.h > +++ b/include/media/v4l2-ctrls.h > @@ -49,6 +49,8 @@ struct video_device; > * @p_hevc_sps: Pointer to an HEVC sequence parameter > set structure. > * @p_hevc_pps: Pointer to an HEVC picture parameter > set structure. > * @p_hevc_slice_params: Pointer to an HEVC slice parameters > structure. > + * @p_hevc_decode_params: Pointer to an HEVC decode parameters > structure. > + * @p_hevc_scaling_matrix Pointer to an HEVC scaling matrix structure. > * @p_hdr10_cll: Pointer to an HDR10 Content Light Level > structure. > * @p_hdr10_mastering: Pointer to an HDR10 Mastering Display > structure. > * @p_area: Pointer to an area. > @@ -81,6 +83,8 @@ union v4l2_ctrl_ptr { > struct v4l2_ctrl_hevc_sps *p_hevc_sps; > struct v4l2_ctrl_hevc_pps *p_hevc_pps; > struct v4l2_ctrl_hevc_slice_params *p_hevc_slice_params; > + struct v4l2_ctrl_hevc_decode_params *p_hevc_decode_params; > + struct v4l2_ctrl_hevc_scaling_matrix *p_hevc_scaling_matrix; > struct v4l2_ctrl_vp9_compressed_hdr *p_vp9_compressed_hdr_probs; > struct v4l2_ctrl_vp9_frame *p_vp9_frame; > struct v4l2_ctrl_hdr10_cll_info *p_hdr10_cll; [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 06/11] media: Trace the stateless controls when set in v4l2-ctrls-core.c 2026-02-12 16:23 [PATCH 00/11] v4l2: Add tracing for stateless codecs Detlev Casanova ` (3 preceding siblings ...) 2026-02-12 16:23 ` [PATCH 05/11] media: Add missing types to v4l2_ctrl_ptr Detlev Casanova @ 2026-02-12 16:23 ` Detlev Casanova 2026-04-28 19:37 ` Nicolas Dufresne 2026-02-12 16:23 ` [PATCH 07/11] media: Add stream on/off traces and run them in the ioctl Detlev Casanova ` (6 subsequent siblings) 11 siblings, 1 reply; 20+ messages in thread From: Detlev Casanova @ 2026-02-12 16:23 UTC (permalink / raw) To: linux-kernel Cc: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Detlev Casanova, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel Also remove the trace from visl as the generic v4l2-requests traces can now be used instead. It allows all stateless drivers to inherit traceability, with just a small overhead when disabled in userspace. Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> --- drivers/media/test-drivers/visl/visl-dec.c | 74 ------------- drivers/media/v4l2-core/v4l2-ctrls-api.c | 10 ++ drivers/media/v4l2-core/v4l2-ctrls-core.c | 114 +++++++++++++++++++++ include/media/v4l2-ctrls.h | 15 +++ 4 files changed, 139 insertions(+), 74 deletions(-) diff --git a/drivers/media/test-drivers/visl/visl-dec.c b/drivers/media/test-drivers/visl/visl-dec.c index fc216da17048..9517830fb3e8 100644 --- a/drivers/media/test-drivers/visl/visl-dec.c +++ b/drivers/media/test-drivers/visl/visl-dec.c @@ -12,7 +12,6 @@ #include <linux/workqueue.h> #include <media/v4l2-mem2mem.h> #include <media/tpg/v4l2-tpg.h> -#include <trace/events/v4l2_requests.h> #define LAST_BUF_IDX (V4L2_AV1_REF_LAST_FRAME - V4L2_AV1_REF_LAST_FRAME) #define LAST2_BUF_IDX (V4L2_AV1_REF_LAST2_FRAME - V4L2_AV1_REF_LAST_FRAME) @@ -486,78 +485,6 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct visl_run *run) } } -static void visl_trace_ctrls(struct visl_ctx *ctx, struct visl_run *run) -{ - int i; - struct v4l2_fh *fh = &ctx->fh; - - switch (ctx->current_codec) { - default: - case VISL_CODEC_NONE: - break; - case VISL_CODEC_FWHT: - trace_v4l2_ctrl_fwht_params(fh->tgid, fh->fd, run->fwht.params); - break; - case VISL_CODEC_MPEG2: - trace_v4l2_ctrl_mpeg2_sequence(fh->tgid, fh->fd, run->mpeg2.seq); - trace_v4l2_ctrl_mpeg2_picture(fh->tgid, fh->fd, run->mpeg2.pic); - trace_v4l2_ctrl_mpeg2_quantisation(fh->tgid, fh->fd, run->mpeg2.quant); - break; - case VISL_CODEC_VP8: - trace_v4l2_ctrl_vp8_frame(fh->tgid, fh->fd, run->vp8.frame); - trace_v4l2_ctrl_vp8_entropy(fh->tgid, fh->fd, run->vp8.frame); - break; - case VISL_CODEC_VP9: - trace_v4l2_ctrl_vp9_frame(fh->tgid, fh->fd, run->vp9.frame); - trace_v4l2_ctrl_vp9_compressed_hdr(fh->tgid, fh->fd, run->vp9.probs); - trace_v4l2_ctrl_vp9_compressed_coeff(fh->tgid, fh->fd, run->vp9.probs); - trace_v4l2_vp9_mv_probs(fh->tgid, fh->fd, &run->vp9.probs->mv); - break; - case VISL_CODEC_H264: - trace_v4l2_ctrl_h264_sps(fh->tgid, fh->fd, run->h264.sps); - trace_v4l2_ctrl_h264_pps(fh->tgid, fh->fd, run->h264.pps); - trace_v4l2_ctrl_h264_scaling_matrix(fh->tgid, fh->fd, run->h264.sm); - trace_v4l2_ctrl_h264_slice_params(fh->tgid, fh->fd, run->h264.spram); - - for (i = 0; i < ARRAY_SIZE(run->h264.spram->ref_pic_list0); i++) - trace_v4l2_h264_ref_pic_list0(fh->tgid, fh->fd, - &run->h264.spram->ref_pic_list0[i], i); - for (i = 0; i < ARRAY_SIZE(run->h264.spram->ref_pic_list0); i++) - trace_v4l2_h264_ref_pic_list1(fh->tgid, fh->fd, - &run->h264.spram->ref_pic_list1[i], i); - - trace_v4l2_ctrl_h264_decode_params(fh->tgid, fh->fd, run->h264.dpram); - - for (i = 0; i < ARRAY_SIZE(run->h264.dpram->dpb); i++) - trace_v4l2_h264_dpb_entry(fh->tgid, fh->fd, &run->h264.dpram->dpb[i], i); - - trace_v4l2_ctrl_h264_pred_weights(fh->tgid, fh->fd, run->h264.pwht); - break; - case VISL_CODEC_HEVC: - trace_v4l2_ctrl_hevc_sps(fh->tgid, fh->fd, run->hevc.sps); - trace_v4l2_ctrl_hevc_pps(fh->tgid, fh->fd, run->hevc.pps); - trace_v4l2_ctrl_hevc_slice_params(fh->tgid, fh->fd, run->hevc.spram); - trace_v4l2_ctrl_hevc_scaling_matrix(fh->tgid, fh->fd, run->hevc.sm); - trace_v4l2_ctrl_hevc_decode_params(fh->tgid, fh->fd, run->hevc.dpram); - - for (i = 0; i < ARRAY_SIZE(run->hevc.dpram->dpb); i++) - trace_v4l2_hevc_dpb_entry(fh->tgid, fh->fd, &run->hevc.dpram->dpb[i]); - - - trace_v4l2_hevc_pred_weight_table(fh->tgid, fh->fd, - &run->hevc.spram->pred_weight_table); - trace_v4l2_ctrl_hevc_ext_sps_lt_rps(fh->tgid, fh->fd, run->hevc.rps_lt); - trace_v4l2_ctrl_hevc_ext_sps_st_rps(fh->tgid, fh->fd, run->hevc.rps_st); - break; - case VISL_CODEC_AV1: - trace_v4l2_ctrl_av1_sequence(fh->tgid, fh->fd, run->av1.seq); - trace_v4l2_ctrl_av1_frame(fh->tgid, fh->fd, run->av1.frame); - trace_v4l2_ctrl_av1_film_grain(fh->tgid, fh->fd, run->av1.grain); - trace_v4l2_ctrl_av1_tile_group_entry(fh->tgid, fh->fd, run->av1.tge); - break; - } -} - void visl_device_run(void *priv) { struct visl_ctx *ctx = priv; @@ -634,7 +561,6 @@ void visl_device_run(void *priv) run.dst->sequence, run.dst->vb2_buf.timestamp); visl_tpg_fill(ctx, &run); - visl_trace_ctrls(ctx, &run); if (bitstream_trace_frame_start > -1 && run.dst->sequence >= bitstream_trace_frame_start && diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-core/v4l2-ctrls-api.c index 0078a04c5445..8a814eec7a30 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-api.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-api.c @@ -524,6 +524,12 @@ int v4l2_g_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct video_device *vdev, } EXPORT_SYMBOL(v4l2_g_ext_ctrls); +static void trace_ext_ctrl(struct v4l2_fh *fh, const struct v4l2_ctrl *ctrl) +{ + if (ctrl->type_ops->trace) + ctrl->type_ops->trace(fh, ctrl, ctrl->p_cur); +} + /* Validate a new control */ static int validate_new(const struct v4l2_ctrl *ctrl, union v4l2_ctrl_ptr p_new) { @@ -713,6 +719,10 @@ int try_set_ext_ctrls_common(struct v4l2_fh *fh, idx = helpers[idx].next; } while (!ret && idx); } + + if (set) + trace_ext_ctrl(fh, master); + v4l2_ctrl_unlock(master); } diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2-core/v4l2-ctrls-core.c index 79a157975f70..6165e36d8879 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c @@ -10,8 +10,11 @@ #include <linux/slab.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-event.h> +#include <media/v4l2-fh.h> #include <media/v4l2-fwnode.h> +#include <trace/events/v4l2_requests.h> + #include "v4l2-ctrls-priv.h" static const union v4l2_ctrl_ptr ptr_null; @@ -1462,12 +1465,123 @@ int v4l2_ctrl_type_op_validate(const struct v4l2_ctrl *ctrl, } EXPORT_SYMBOL(v4l2_ctrl_type_op_validate); +void v4l2_ctrl_type_op_trace(const struct v4l2_fh *fh, + const struct v4l2_ctrl *ctrl, union v4l2_ctrl_ptr ptr) +{ + int i = 0; + + switch ((u32)ctrl->type) { + case V4L2_CTRL_TYPE_FWHT_PARAMS: + trace_v4l2_ctrl_fwht_params(fh->tgid, fh->fd, ptr.p_fwht_params); + break; + case V4L2_CTRL_TYPE_MPEG2_SEQUENCE: + trace_v4l2_ctrl_mpeg2_sequence(fh->tgid, fh->fd, ptr.p_mpeg2_sequence); + break; + case V4L2_CTRL_TYPE_MPEG2_PICTURE: + trace_v4l2_ctrl_mpeg2_picture(fh->tgid, fh->fd, ptr.p_mpeg2_picture); + break; + case V4L2_CTRL_TYPE_MPEG2_QUANTISATION: + trace_v4l2_ctrl_mpeg2_quantisation(fh->tgid, fh->fd, ptr.p_mpeg2_quantisation); + break; + case V4L2_CTRL_TYPE_VP8_FRAME: + trace_v4l2_ctrl_vp8_frame(fh->tgid, fh->fd, ptr.p_vp8_frame); + trace_v4l2_ctrl_vp8_entropy(fh->tgid, fh->fd, ptr.p_vp8_frame); + break; + case V4L2_CTRL_TYPE_VP9_FRAME: + trace_v4l2_ctrl_vp9_frame(fh->tgid, fh->fd, ptr.p_vp9_frame); + break; + case V4L2_CTRL_TYPE_VP9_COMPRESSED_HDR: + trace_v4l2_ctrl_vp9_compressed_hdr(fh->tgid, fh->fd, + ptr.p_vp9_compressed_hdr_probs); + trace_v4l2_ctrl_vp9_compressed_coeff(fh->tgid, fh->fd, + ptr.p_vp9_compressed_hdr_probs); + trace_v4l2_vp9_mv_probs(fh->tgid, fh->fd, &ptr.p_vp9_compressed_hdr_probs->mv); + break; + case V4L2_CTRL_TYPE_H264_SPS: + trace_v4l2_ctrl_h264_sps(fh->tgid, fh->fd, ptr.p_h264_sps); + break; + case V4L2_CTRL_TYPE_H264_PPS: + trace_v4l2_ctrl_h264_pps(fh->tgid, fh->fd, ptr.p_h264_pps); + break; + case V4L2_CTRL_TYPE_H264_SCALING_MATRIX: + trace_v4l2_ctrl_h264_scaling_matrix(fh->tgid, fh->fd, ptr.p_h264_scaling_matrix); + break; + case V4L2_CTRL_TYPE_H264_SLICE_PARAMS: + { + struct v4l2_ctrl_h264_slice_params *sp = ptr.p_h264_slice_params; + + trace_v4l2_ctrl_h264_slice_params(fh->tgid, fh->fd, sp); + + for (i = 0; i < ARRAY_SIZE(sp->ref_pic_list0); i++) + trace_v4l2_h264_ref_pic_list0(fh->tgid, fh->fd, &sp->ref_pic_list0[i], i); + for (i = 0; i < ARRAY_SIZE(sp->ref_pic_list1); i++) + trace_v4l2_h264_ref_pic_list1(fh->tgid, fh->fd, &sp->ref_pic_list1[i], i); + + break; + } + case V4L2_CTRL_TYPE_H264_DECODE_PARAMS: + { + struct v4l2_ctrl_h264_decode_params *dp = ptr.p_h264_decode_params; + + trace_v4l2_ctrl_h264_decode_params(fh->tgid, fh->fd, dp); + + for (i = 0; i < ARRAY_SIZE(dp->dpb); i++) + trace_v4l2_h264_dpb_entry(fh->tgid, fh->fd, &dp->dpb[i], i); + + break; + } + case V4L2_CTRL_TYPE_H264_PRED_WEIGHTS: + trace_v4l2_ctrl_h264_pred_weights(fh->tgid, fh->fd, ptr.p_h264_pred_weights); + break; + case V4L2_CTRL_TYPE_HEVC_SPS: + trace_v4l2_ctrl_hevc_sps(fh->tgid, fh->fd, ptr.p_hevc_sps); + break; + case V4L2_CTRL_TYPE_HEVC_PPS: + trace_v4l2_ctrl_hevc_pps(fh->tgid, fh->fd, ptr.p_hevc_pps); + break; + case V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS: + trace_v4l2_ctrl_hevc_slice_params(fh->tgid, fh->fd, ptr.p_hevc_slice_params); + trace_v4l2_hevc_pred_weight_table(fh->tgid, fh->fd, + &ptr.p_hevc_slice_params->pred_weight_table); + break; + case V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX: + trace_v4l2_ctrl_hevc_scaling_matrix(fh->tgid, fh->fd, ptr.p_hevc_scaling_matrix); + break; + case V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS: + { + struct v4l2_ctrl_hevc_decode_params *dp = ptr.p_hevc_decode_params; + + trace_v4l2_ctrl_hevc_decode_params(fh->tgid, fh->fd, dp); + + for (i = 0; i < ARRAY_SIZE(dp->dpb); i++) + trace_v4l2_hevc_dpb_entry(fh->tgid, fh->fd, &dp->dpb[i]); + + break; + } + case V4L2_CTRL_TYPE_AV1_SEQUENCE: + trace_v4l2_ctrl_av1_sequence(fh->tgid, fh->fd, ptr.p_av1_sequence); + break; + case V4L2_CTRL_TYPE_AV1_FRAME: + trace_v4l2_ctrl_av1_frame(fh->tgid, fh->fd, ptr.p_av1_frame); + break; + case V4L2_CTRL_TYPE_AV1_FILM_GRAIN: + trace_v4l2_ctrl_av1_film_grain(fh->tgid, fh->fd, ptr.p_av1_film_grain); + break; + case V4L2_CTRL_TYPE_AV1_TILE_GROUP_ENTRY: + trace_v4l2_ctrl_av1_tile_group_entry(fh->tgid, fh->fd, ptr.p_av1_tile_group_entry); + break; + } + +} +EXPORT_SYMBOL(v4l2_ctrl_type_op_trace); + static const struct v4l2_ctrl_type_ops std_type_ops = { .equal = v4l2_ctrl_type_op_equal, .init = v4l2_ctrl_type_op_init, .minimum = v4l2_ctrl_type_op_minimum, .maximum = v4l2_ctrl_type_op_maximum, .log = v4l2_ctrl_type_op_log, + .trace = v4l2_ctrl_type_op_trace, .validate = v4l2_ctrl_type_op_validate, }; diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index a2b4c96a9a6f..57c4bb999b7b 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -140,6 +140,7 @@ struct v4l2_ctrl_ops { * @minimum: set the value to the minimum value of the control. * @maximum: set the value to the maximum value of the control. * @log: log the value. + * @trace: trace the value of the control with Ftrace. * @validate: validate the value for ctrl->new_elems array elements. * Return 0 on success and a negative value otherwise. */ @@ -153,6 +154,8 @@ struct v4l2_ctrl_type_ops { void (*maximum)(const struct v4l2_ctrl *ctrl, u32 idx, union v4l2_ctrl_ptr ptr); void (*log)(const struct v4l2_ctrl *ctrl); + void (*trace)(const struct v4l2_fh *fh, + const struct v4l2_ctrl *ctrl, union v4l2_ctrl_ptr ptr); int (*validate)(const struct v4l2_ctrl *ctrl, union v4l2_ctrl_ptr ptr); }; @@ -1627,6 +1630,18 @@ void v4l2_ctrl_type_op_init(const struct v4l2_ctrl *ctrl, u32 from_idx, */ void v4l2_ctrl_type_op_log(const struct v4l2_ctrl *ctrl); +/** + * v4l2_ctrl_type_op_trace - Default v4l2_ctrl_type_ops trace callback. + * + * @fh: The v4l2_fh of the current context. + * @ctrl: The v4l2_ctrl pointer. + * @ptr: The v4l2 control value. + * + * Return: void + */ +void v4l2_ctrl_type_op_trace(const struct v4l2_fh *fh, + const struct v4l2_ctrl *ctrl, union v4l2_ctrl_ptr ptr); + /** * v4l2_ctrl_type_op_validate - Default v4l2_ctrl_type_ops validate callback. * -- 2.53.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 06/11] media: Trace the stateless controls when set in v4l2-ctrls-core.c 2026-02-12 16:23 ` [PATCH 06/11] media: Trace the stateless controls when set in v4l2-ctrls-core.c Detlev Casanova @ 2026-04-28 19:37 ` Nicolas Dufresne 0 siblings, 0 replies; 20+ messages in thread From: Nicolas Dufresne @ 2026-04-28 19:37 UTC (permalink / raw) To: Detlev Casanova, linux-kernel Cc: Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel [-- Attachment #1: Type: text/plain, Size: 13188 bytes --] Le jeudi 12 février 2026 à 11:23 -0500, Detlev Casanova a écrit : > Also remove the trace from visl as the generic v4l2-requests traces can > now be used instead. > > It allows all stateless drivers to inherit traceability, with just a small > overhead when disabled in userspace. > > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> > --- > drivers/media/test-drivers/visl/visl-dec.c | 74 ------------- > drivers/media/v4l2-core/v4l2-ctrls-api.c | 10 ++ > drivers/media/v4l2-core/v4l2-ctrls-core.c | 114 +++++++++++++++++++++ > include/media/v4l2-ctrls.h | 15 +++ > 4 files changed, 139 insertions(+), 74 deletions(-) > > diff --git a/drivers/media/test-drivers/visl/visl-dec.c b/drivers/media/test-drivers/visl/visl-dec.c > index fc216da17048..9517830fb3e8 100644 > --- a/drivers/media/test-drivers/visl/visl-dec.c > +++ b/drivers/media/test-drivers/visl/visl-dec.c > @@ -12,7 +12,6 @@ > #include <linux/workqueue.h> > #include <media/v4l2-mem2mem.h> > #include <media/tpg/v4l2-tpg.h> > -#include <trace/events/v4l2_requests.h> > > #define LAST_BUF_IDX (V4L2_AV1_REF_LAST_FRAME - V4L2_AV1_REF_LAST_FRAME) > #define LAST2_BUF_IDX (V4L2_AV1_REF_LAST2_FRAME - V4L2_AV1_REF_LAST_FRAME) > @@ -486,78 +485,6 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct visl_run *run) > } > } > > -static void visl_trace_ctrls(struct visl_ctx *ctx, struct visl_run *run) > -{ > - int i; > - struct v4l2_fh *fh = &ctx->fh; > - > - switch (ctx->current_codec) { > - default: > - case VISL_CODEC_NONE: > - break; > - case VISL_CODEC_FWHT: > - trace_v4l2_ctrl_fwht_params(fh->tgid, fh->fd, run->fwht.params); > - break; > - case VISL_CODEC_MPEG2: > - trace_v4l2_ctrl_mpeg2_sequence(fh->tgid, fh->fd, run->mpeg2.seq); > - trace_v4l2_ctrl_mpeg2_picture(fh->tgid, fh->fd, run->mpeg2.pic); > - trace_v4l2_ctrl_mpeg2_quantisation(fh->tgid, fh->fd, run->mpeg2.quant); > - break; > - case VISL_CODEC_VP8: > - trace_v4l2_ctrl_vp8_frame(fh->tgid, fh->fd, run->vp8.frame); > - trace_v4l2_ctrl_vp8_entropy(fh->tgid, fh->fd, run->vp8.frame); > - break; > - case VISL_CODEC_VP9: > - trace_v4l2_ctrl_vp9_frame(fh->tgid, fh->fd, run->vp9.frame); > - trace_v4l2_ctrl_vp9_compressed_hdr(fh->tgid, fh->fd, run->vp9.probs); > - trace_v4l2_ctrl_vp9_compressed_coeff(fh->tgid, fh->fd, run->vp9.probs); > - trace_v4l2_vp9_mv_probs(fh->tgid, fh->fd, &run->vp9.probs->mv); > - break; > - case VISL_CODEC_H264: > - trace_v4l2_ctrl_h264_sps(fh->tgid, fh->fd, run->h264.sps); > - trace_v4l2_ctrl_h264_pps(fh->tgid, fh->fd, run->h264.pps); > - trace_v4l2_ctrl_h264_scaling_matrix(fh->tgid, fh->fd, run->h264.sm); > - trace_v4l2_ctrl_h264_slice_params(fh->tgid, fh->fd, run->h264.spram); > - > - for (i = 0; i < ARRAY_SIZE(run->h264.spram->ref_pic_list0); i++) > - trace_v4l2_h264_ref_pic_list0(fh->tgid, fh->fd, > - &run->h264.spram->ref_pic_list0[i], i); > - for (i = 0; i < ARRAY_SIZE(run->h264.spram->ref_pic_list0); i++) > - trace_v4l2_h264_ref_pic_list1(fh->tgid, fh->fd, > - &run->h264.spram->ref_pic_list1[i], i); > - > - trace_v4l2_ctrl_h264_decode_params(fh->tgid, fh->fd, run->h264.dpram); > - > - for (i = 0; i < ARRAY_SIZE(run->h264.dpram->dpb); i++) > - trace_v4l2_h264_dpb_entry(fh->tgid, fh->fd, &run->h264.dpram->dpb[i], i); > - > - trace_v4l2_ctrl_h264_pred_weights(fh->tgid, fh->fd, run->h264.pwht); > - break; > - case VISL_CODEC_HEVC: > - trace_v4l2_ctrl_hevc_sps(fh->tgid, fh->fd, run->hevc.sps); > - trace_v4l2_ctrl_hevc_pps(fh->tgid, fh->fd, run->hevc.pps); > - trace_v4l2_ctrl_hevc_slice_params(fh->tgid, fh->fd, run->hevc.spram); > - trace_v4l2_ctrl_hevc_scaling_matrix(fh->tgid, fh->fd, run->hevc.sm); > - trace_v4l2_ctrl_hevc_decode_params(fh->tgid, fh->fd, run->hevc.dpram); > - > - for (i = 0; i < ARRAY_SIZE(run->hevc.dpram->dpb); i++) > - trace_v4l2_hevc_dpb_entry(fh->tgid, fh->fd, &run->hevc.dpram->dpb[i]); > - > - > - trace_v4l2_hevc_pred_weight_table(fh->tgid, fh->fd, > - &run->hevc.spram->pred_weight_table); > - trace_v4l2_ctrl_hevc_ext_sps_lt_rps(fh->tgid, fh->fd, run->hevc.rps_lt); > - trace_v4l2_ctrl_hevc_ext_sps_st_rps(fh->tgid, fh->fd, run->hevc.rps_st); > - break; > - case VISL_CODEC_AV1: > - trace_v4l2_ctrl_av1_sequence(fh->tgid, fh->fd, run->av1.seq); > - trace_v4l2_ctrl_av1_frame(fh->tgid, fh->fd, run->av1.frame); > - trace_v4l2_ctrl_av1_film_grain(fh->tgid, fh->fd, run->av1.grain); > - trace_v4l2_ctrl_av1_tile_group_entry(fh->tgid, fh->fd, run->av1.tge); > - break; > - } > -} > - > void visl_device_run(void *priv) > { > struct visl_ctx *ctx = priv; > @@ -634,7 +561,6 @@ void visl_device_run(void *priv) > run.dst->sequence, run.dst->vb2_buf.timestamp); > > visl_tpg_fill(ctx, &run); > - visl_trace_ctrls(ctx, &run); > > if (bitstream_trace_frame_start > -1 && > run.dst->sequence >= bitstream_trace_frame_start && > diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-core/v4l2-ctrls-api.c > index 0078a04c5445..8a814eec7a30 100644 > --- a/drivers/media/v4l2-core/v4l2-ctrls-api.c > +++ b/drivers/media/v4l2-core/v4l2-ctrls-api.c > @@ -524,6 +524,12 @@ int v4l2_g_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct video_device *vdev, > } > EXPORT_SYMBOL(v4l2_g_ext_ctrls); > > +static void trace_ext_ctrl(struct v4l2_fh *fh, const struct v4l2_ctrl *ctrl) > +{ > + if (ctrl->type_ops->trace) > + ctrl->type_ops->trace(fh, ctrl, ctrl->p_cur); > +} > + > /* Validate a new control */ > static int validate_new(const struct v4l2_ctrl *ctrl, union v4l2_ctrl_ptr p_new) > { > @@ -713,6 +719,10 @@ int try_set_ext_ctrls_common(struct v4l2_fh *fh, > idx = helpers[idx].next; > } while (!ret && idx); > } > + > + if (set) > + trace_ext_ctrl(fh, master); > + > v4l2_ctrl_unlock(master); > } > > diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2-core/v4l2-ctrls-core.c > index 79a157975f70..6165e36d8879 100644 > --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c > +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c > @@ -10,8 +10,11 @@ > #include <linux/slab.h> > #include <media/v4l2-ctrls.h> > #include <media/v4l2-event.h> > +#include <media/v4l2-fh.h> > #include <media/v4l2-fwnode.h> > > +#include <trace/events/v4l2_requests.h> > + > #include "v4l2-ctrls-priv.h" > > static const union v4l2_ctrl_ptr ptr_null; > @@ -1462,12 +1465,123 @@ int v4l2_ctrl_type_op_validate(const struct v4l2_ctrl *ctrl, > } > EXPORT_SYMBOL(v4l2_ctrl_type_op_validate); > > +void v4l2_ctrl_type_op_trace(const struct v4l2_fh *fh, > + const struct v4l2_ctrl *ctrl, union v4l2_ctrl_ptr ptr) > +{ > + int i = 0; > + > + switch ((u32)ctrl->type) { > + case V4L2_CTRL_TYPE_FWHT_PARAMS: > + trace_v4l2_ctrl_fwht_params(fh->tgid, fh->fd, ptr.p_fwht_params); > + break; > + case V4L2_CTRL_TYPE_MPEG2_SEQUENCE: > + trace_v4l2_ctrl_mpeg2_sequence(fh->tgid, fh->fd, ptr.p_mpeg2_sequence); > + break; > + case V4L2_CTRL_TYPE_MPEG2_PICTURE: > + trace_v4l2_ctrl_mpeg2_picture(fh->tgid, fh->fd, ptr.p_mpeg2_picture); > + break; > + case V4L2_CTRL_TYPE_MPEG2_QUANTISATION: > + trace_v4l2_ctrl_mpeg2_quantisation(fh->tgid, fh->fd, ptr.p_mpeg2_quantisation); > + break; > + case V4L2_CTRL_TYPE_VP8_FRAME: > + trace_v4l2_ctrl_vp8_frame(fh->tgid, fh->fd, ptr.p_vp8_frame); > + trace_v4l2_ctrl_vp8_entropy(fh->tgid, fh->fd, ptr.p_vp8_frame); > + break; > + case V4L2_CTRL_TYPE_VP9_FRAME: > + trace_v4l2_ctrl_vp9_frame(fh->tgid, fh->fd, ptr.p_vp9_frame); > + break; > + case V4L2_CTRL_TYPE_VP9_COMPRESSED_HDR: > + trace_v4l2_ctrl_vp9_compressed_hdr(fh->tgid, fh->fd, > + ptr.p_vp9_compressed_hdr_probs); > + trace_v4l2_ctrl_vp9_compressed_coeff(fh->tgid, fh->fd, > + ptr.p_vp9_compressed_hdr_probs); > + trace_v4l2_vp9_mv_probs(fh->tgid, fh->fd, &ptr.p_vp9_compressed_hdr_probs->mv); > + break; > + case V4L2_CTRL_TYPE_H264_SPS: > + trace_v4l2_ctrl_h264_sps(fh->tgid, fh->fd, ptr.p_h264_sps); > + break; > + case V4L2_CTRL_TYPE_H264_PPS: > + trace_v4l2_ctrl_h264_pps(fh->tgid, fh->fd, ptr.p_h264_pps); > + break; > + case V4L2_CTRL_TYPE_H264_SCALING_MATRIX: > + trace_v4l2_ctrl_h264_scaling_matrix(fh->tgid, fh->fd, ptr.p_h264_scaling_matrix); > + break; > + case V4L2_CTRL_TYPE_H264_SLICE_PARAMS: > + { > + struct v4l2_ctrl_h264_slice_params *sp = ptr.p_h264_slice_params; > + > + trace_v4l2_ctrl_h264_slice_params(fh->tgid, fh->fd, sp); > + > + for (i = 0; i < ARRAY_SIZE(sp->ref_pic_list0); i++) > + trace_v4l2_h264_ref_pic_list0(fh->tgid, fh->fd, &sp->ref_pic_list0[i], i); > + for (i = 0; i < ARRAY_SIZE(sp->ref_pic_list1); i++) > + trace_v4l2_h264_ref_pic_list1(fh->tgid, fh->fd, &sp->ref_pic_list1[i], i); > + > + break; > + } > + case V4L2_CTRL_TYPE_H264_DECODE_PARAMS: > + { > + struct v4l2_ctrl_h264_decode_params *dp = ptr.p_h264_decode_params; > + > + trace_v4l2_ctrl_h264_decode_params(fh->tgid, fh->fd, dp); > + > + for (i = 0; i < ARRAY_SIZE(dp->dpb); i++) > + trace_v4l2_h264_dpb_entry(fh->tgid, fh->fd, &dp->dpb[i], i); > + > + break; > + } > + case V4L2_CTRL_TYPE_H264_PRED_WEIGHTS: > + trace_v4l2_ctrl_h264_pred_weights(fh->tgid, fh->fd, ptr.p_h264_pred_weights); > + break; > + case V4L2_CTRL_TYPE_HEVC_SPS: > + trace_v4l2_ctrl_hevc_sps(fh->tgid, fh->fd, ptr.p_hevc_sps); > + break; > + case V4L2_CTRL_TYPE_HEVC_PPS: > + trace_v4l2_ctrl_hevc_pps(fh->tgid, fh->fd, ptr.p_hevc_pps); > + break; > + case V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS: > + trace_v4l2_ctrl_hevc_slice_params(fh->tgid, fh->fd, ptr.p_hevc_slice_params); > + trace_v4l2_hevc_pred_weight_table(fh->tgid, fh->fd, > + &ptr.p_hevc_slice_params->pred_weight_table); > + break; > + case V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX: > + trace_v4l2_ctrl_hevc_scaling_matrix(fh->tgid, fh->fd, ptr.p_hevc_scaling_matrix); > + break; > + case V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS: > + { > + struct v4l2_ctrl_hevc_decode_params *dp = ptr.p_hevc_decode_params; > + > + trace_v4l2_ctrl_hevc_decode_params(fh->tgid, fh->fd, dp); > + > + for (i = 0; i < ARRAY_SIZE(dp->dpb); i++) > + trace_v4l2_hevc_dpb_entry(fh->tgid, fh->fd, &dp->dpb[i]); > + > + break; > + } > + case V4L2_CTRL_TYPE_AV1_SEQUENCE: > + trace_v4l2_ctrl_av1_sequence(fh->tgid, fh->fd, ptr.p_av1_sequence); > + break; > + case V4L2_CTRL_TYPE_AV1_FRAME: > + trace_v4l2_ctrl_av1_frame(fh->tgid, fh->fd, ptr.p_av1_frame); > + break; > + case V4L2_CTRL_TYPE_AV1_FILM_GRAIN: > + trace_v4l2_ctrl_av1_film_grain(fh->tgid, fh->fd, ptr.p_av1_film_grain); > + break; > + case V4L2_CTRL_TYPE_AV1_TILE_GROUP_ENTRY: > + trace_v4l2_ctrl_av1_tile_group_entry(fh->tgid, fh->fd, ptr.p_av1_tile_group_entry); > + break; Some controls are pretty generic, so what about these, the non compound ? Nicolas > + } > + > +} > +EXPORT_SYMBOL(v4l2_ctrl_type_op_trace); > + > static const struct v4l2_ctrl_type_ops std_type_ops = { > .equal = v4l2_ctrl_type_op_equal, > .init = v4l2_ctrl_type_op_init, > .minimum = v4l2_ctrl_type_op_minimum, > .maximum = v4l2_ctrl_type_op_maximum, > .log = v4l2_ctrl_type_op_log, > + .trace = v4l2_ctrl_type_op_trace, > .validate = v4l2_ctrl_type_op_validate, > }; > > diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h > index a2b4c96a9a6f..57c4bb999b7b 100644 > --- a/include/media/v4l2-ctrls.h > +++ b/include/media/v4l2-ctrls.h > @@ -140,6 +140,7 @@ struct v4l2_ctrl_ops { > * @minimum: set the value to the minimum value of the control. > * @maximum: set the value to the maximum value of the control. > * @log: log the value. > + * @trace: trace the value of the control with Ftrace. > * @validate: validate the value for ctrl->new_elems array elements. > * Return 0 on success and a negative value otherwise. > */ > @@ -153,6 +154,8 @@ struct v4l2_ctrl_type_ops { > void (*maximum)(const struct v4l2_ctrl *ctrl, u32 idx, > union v4l2_ctrl_ptr ptr); > void (*log)(const struct v4l2_ctrl *ctrl); > + void (*trace)(const struct v4l2_fh *fh, > + const struct v4l2_ctrl *ctrl, union v4l2_ctrl_ptr ptr); > int (*validate)(const struct v4l2_ctrl *ctrl, union v4l2_ctrl_ptr ptr); > }; > > @@ -1627,6 +1630,18 @@ void v4l2_ctrl_type_op_init(const struct v4l2_ctrl *ctrl, u32 from_idx, > */ > void v4l2_ctrl_type_op_log(const struct v4l2_ctrl *ctrl); > > +/** > + * v4l2_ctrl_type_op_trace - Default v4l2_ctrl_type_ops trace callback. > + * > + * @fh: The v4l2_fh of the current context. > + * @ctrl: The v4l2_ctrl pointer. > + * @ptr: The v4l2 control value. > + * > + * Return: void > + */ > +void v4l2_ctrl_type_op_trace(const struct v4l2_fh *fh, > + const struct v4l2_ctrl *ctrl, union v4l2_ctrl_ptr ptr); > + > /** > * v4l2_ctrl_type_op_validate - Default v4l2_ctrl_type_ops validate callback. > * [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 07/11] media: Add stream on/off traces and run them in the ioctl 2026-02-12 16:23 [PATCH 00/11] v4l2: Add tracing for stateless codecs Detlev Casanova ` (4 preceding siblings ...) 2026-02-12 16:23 ` [PATCH 06/11] media: Trace the stateless controls when set in v4l2-ctrls-core.c Detlev Casanova @ 2026-02-12 16:23 ` Detlev Casanova 2026-02-12 16:23 ` [PATCH 08/11] media: Add HW run/done trace events Detlev Casanova ` (5 subsequent siblings) 11 siblings, 0 replies; 20+ messages in thread From: Detlev Casanova @ 2026-02-12 16:23 UTC (permalink / raw) To: linux-kernel Cc: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Detlev Casanova, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel This will automatically add stream on/off tracing for all v4l2 drivers. Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> --- drivers/media/v4l2-core/v4l2-ioctl.c | 20 ++++++++++++++++++-- include/trace/events/v4l2.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index a3b6df0571d6..fd5193fc722e 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1963,13 +1963,29 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, struct file *file, static int v4l_streamon(const struct v4l2_ioctl_ops *ops, struct file *file, void *arg) { - return ops->vidioc_streamon(file, NULL, *(unsigned int *)arg); + struct v4l2_fh *fh = file_to_v4l2_fh(file); + int err; + + err = ops->vidioc_streamon(file, NULL, *(unsigned int *)arg); + + if (!err) + trace_v4l2_streamon(fh->tgid, fh->fd); + + return err; } static int v4l_streamoff(const struct v4l2_ioctl_ops *ops, struct file *file, void *arg) { - return ops->vidioc_streamoff(file, NULL, *(unsigned int *)arg); + struct v4l2_fh *fh = file_to_v4l2_fh(file); + int err; + + err = ops->vidioc_streamoff(file, NULL, *(unsigned int *)arg); + + if (!err) + trace_v4l2_streamoff(fh->tgid, fh->fd); + + return err; } static int v4l_g_tuner(const struct v4l2_ioctl_ops *ops, struct file *file, diff --git a/include/trace/events/v4l2.h b/include/trace/events/v4l2.h index 248bc09bfc99..bec310eaedc7 100644 --- a/include/trace/events/v4l2.h +++ b/include/trace/events/v4l2.h @@ -262,6 +262,34 @@ DEFINE_EVENT(vb2_v4l2_event_class, vb2_v4l2_qbuf, TP_ARGS(q, vb) ); +DECLARE_EVENT_CLASS(v4l2_stream_class, + TP_PROTO(u32 tgid, u32 fd), + TP_ARGS(tgid, fd), + + TP_STRUCT__entry( + __field(u32, tgid) + __field(u32, fd) + ), + + TP_fast_assign( + __entry->tgid = tgid; + __entry->fd = fd; + ), + + TP_printk("tgid = %u, fd = %u", + __entry->tgid, __entry->fd) +); + +DEFINE_EVENT(v4l2_stream_class, v4l2_streamon, + TP_PROTO(u32 tgid, u32 fd), + TP_ARGS(tgid, fd) +); + +DEFINE_EVENT(v4l2_stream_class, v4l2_streamoff, + TP_PROTO(u32 tgid, u32 fd), + TP_ARGS(tgid, fd) +); + #endif /* if !defined(_TRACE_V4L2_H) || defined(TRACE_HEADER_MULTI_READ) */ /* This part must be outside protection */ -- 2.53.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 08/11] media: Add HW run/done trace events 2026-02-12 16:23 [PATCH 00/11] v4l2: Add tracing for stateless codecs Detlev Casanova ` (5 preceding siblings ...) 2026-02-12 16:23 ` [PATCH 07/11] media: Add stream on/off traces and run them in the ioctl Detlev Casanova @ 2026-02-12 16:23 ` Detlev Casanova 2026-02-12 16:23 ` [PATCH 09/11] media: hantro: Add v4l2_hw run/done traces Detlev Casanova ` (4 subsequent siblings) 11 siblings, 0 replies; 20+ messages in thread From: Detlev Casanova @ 2026-02-12 16:23 UTC (permalink / raw) To: linux-kernel Cc: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Detlev Casanova, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel The events can be fired by drivers when the hardware is run and when it is done. That can be used by userspace tracers to see HW performance and usage. The hw_done event allows setting the number of clock cycles the HW needed to do the work, to help tools evaluate performances. Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> --- drivers/media/v4l2-core/v4l2-trace.c | 3 +++ include/trace/events/v4l2.h | 30 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-trace.c b/drivers/media/v4l2-core/v4l2-trace.c index 9ce54c1968ef..2fbc05dde346 100644 --- a/drivers/media/v4l2-core/v4l2-trace.c +++ b/drivers/media/v4l2-core/v4l2-trace.c @@ -12,6 +12,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_v4l2_buf_queue); EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_v4l2_dqbuf); EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_v4l2_qbuf); +EXPORT_TRACEPOINT_SYMBOL_GPL(v4l2_hw_run); +EXPORT_TRACEPOINT_SYMBOL_GPL(v4l2_hw_done); + /* Export AV1 controls */ EXPORT_TRACEPOINT_SYMBOL_GPL(v4l2_ctrl_av1_sequence); EXPORT_TRACEPOINT_SYMBOL_GPL(v4l2_ctrl_av1_frame); diff --git a/include/trace/events/v4l2.h b/include/trace/events/v4l2.h index bec310eaedc7..4a9dcdbea22b 100644 --- a/include/trace/events/v4l2.h +++ b/include/trace/events/v4l2.h @@ -290,6 +290,36 @@ DEFINE_EVENT(v4l2_stream_class, v4l2_streamoff, TP_ARGS(tgid, fd) ); +DEFINE_EVENT(v4l2_stream_class, v4l2_hw_run, + TP_PROTO(u32 tgid, u32 fd), + TP_ARGS(tgid, fd) +); + +DECLARE_EVENT_CLASS(v4l2_hw_done_class, + TP_PROTO(u32 tgid, u32 fd, u32 hw_cycles), + TP_ARGS(tgid, fd, hw_cycles), + + TP_STRUCT__entry( + __field(u32, tgid) + __field(u32, fd) + __field(u32, hw_cycles) + ), + + TP_fast_assign( + __entry->tgid = tgid; + __entry->fd = fd; + __entry->hw_cycles = hw_cycles; + ), + + TP_printk("tgid = %u, fd = %u, hw_cycles = %u", + __entry->tgid, __entry->fd, __entry->hw_cycles) +); + +DEFINE_EVENT(v4l2_hw_done_class, v4l2_hw_done, + TP_PROTO(u32 tgid, u32 fd, u32 hw_cycles), + TP_ARGS(tgid, fd, hw_cycles) +); + #endif /* if !defined(_TRACE_V4L2_H) || defined(TRACE_HEADER_MULTI_READ) */ /* This part must be outside protection */ -- 2.53.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 09/11] media: hantro: Add v4l2_hw run/done traces 2026-02-12 16:23 [PATCH 00/11] v4l2: Add tracing for stateless codecs Detlev Casanova ` (6 preceding siblings ...) 2026-02-12 16:23 ` [PATCH 08/11] media: Add HW run/done trace events Detlev Casanova @ 2026-02-12 16:23 ` Detlev Casanova 2026-02-12 16:23 ` [PATCH 10/11] media: v4l2: Add callback for show_fdinfo Detlev Casanova ` (3 subsequent siblings) 11 siblings, 0 replies; 20+ messages in thread From: Detlev Casanova @ 2026-02-12 16:23 UTC (permalink / raw) To: linux-kernel Cc: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Detlev Casanova, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel Add the trace calls as well as retrieving the number of clock cycles for the rockchip_vpu core. Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> --- drivers/media/platform/verisilicon/hantro.h | 1 + drivers/media/platform/verisilicon/hantro_drv.c | 10 ++++++++++ .../media/platform/verisilicon/rockchip_vpu981_regs.h | 1 + drivers/media/platform/verisilicon/rockchip_vpu_hw.c | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/drivers/media/platform/verisilicon/hantro.h b/drivers/media/platform/verisilicon/hantro.h index 0353de154a1e..d5cddc783688 100644 --- a/drivers/media/platform/verisilicon/hantro.h +++ b/drivers/media/platform/verisilicon/hantro.h @@ -253,6 +253,7 @@ struct hantro_ctx { u32 sequence_cap; u32 sequence_out; + u32 hw_cycles; const struct hantro_fmt *vpu_src_fmt; struct v4l2_pix_format_mplane src_fmt; diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index 94f58f4e4a4e..8dd26ca32459 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -25,6 +25,8 @@ #include <media/videobuf2-core.h> #include <media/videobuf2-vmalloc.h> +#include <trace/events/v4l2.h> + #include "hantro_v4l2.h" #include "hantro.h" #include "hantro_hw.h" @@ -103,6 +105,9 @@ void hantro_irq_done(struct hantro_dev *vpu, struct hantro_ctx *ctx = v4l2_m2m_get_curr_priv(vpu->m2m_dev); + if (ctx) + trace_v4l2_hw_done(ctx->fh.tgid, ctx->fh.fd, ctx->hw_cycles); + /* * If cancel_delayed_work returns false * the timeout expired. The watchdog is running, @@ -125,6 +130,9 @@ void hantro_watchdog(struct work_struct *work) ctx = v4l2_m2m_get_curr_priv(vpu->m2m_dev); if (ctx) { vpu_err("frame processing timed out!\n"); + + trace_v4l2_hw_done(ctx->fh.tgid, ctx->fh.fd, ctx->hw_cycles); + if (ctx->codec_ops->reset) ctx->codec_ops->reset(ctx); hantro_job_finish(vpu, ctx, VB2_BUF_STATE_ERROR); @@ -189,6 +197,8 @@ static void device_run(void *priv) if (ctx->codec_ops->run(ctx)) goto err_cancel_job; + trace_v4l2_hw_run(ctx->fh.tgid, ctx->fh.fd); + return; err_cancel_job: diff --git a/drivers/media/platform/verisilicon/rockchip_vpu981_regs.h b/drivers/media/platform/verisilicon/rockchip_vpu981_regs.h index e4008da64f19..96b85470208b 100644 --- a/drivers/media/platform/verisilicon/rockchip_vpu981_regs.h +++ b/drivers/media/platform/verisilicon/rockchip_vpu981_regs.h @@ -451,6 +451,7 @@ #define av1_pp0_dup_ver AV1_DEC_REG(394, 16, 0xff) #define av1_pp0_dup_hor AV1_DEC_REG(394, 24, 0xff) +#define AV1_CYCLE_COUNT (AV1_SWREG(63)) #define AV1_TILE_OUT_LU (AV1_SWREG(65)) #define AV1_REFERENCE_Y(i) (AV1_SWREG(67) + ((i) * 0x8)) #define AV1_SEGMENTATION (AV1_SWREG(81)) diff --git a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c index 02673be9878e..f959151b6645 100644 --- a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c +++ b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c @@ -424,6 +424,8 @@ static irqreturn_t rk3588_vpu981_irq(int irq, void *dev_id) { struct hantro_dev *vpu = dev_id; enum vb2_buffer_state state; + struct hantro_ctx *ctx = + v4l2_m2m_get_curr_priv(vpu->m2m_dev); u32 status; status = vdpu_read(vpu, AV1_REG_INTERRUPT); @@ -433,6 +435,8 @@ static irqreturn_t rk3588_vpu981_irq(int irq, void *dev_id) vdpu_write(vpu, 0, AV1_REG_INTERRUPT); vdpu_write(vpu, AV1_REG_CONFIG_DEC_CLK_GATE_E, AV1_REG_CONFIG); + ctx->hw_cycles = vdpu_read(vpu, AV1_CYCLE_COUNT); + hantro_irq_done(vpu, state); return IRQ_HANDLED; -- 2.53.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 10/11] media: v4l2: Add callback for show_fdinfo 2026-02-12 16:23 [PATCH 00/11] v4l2: Add tracing for stateless codecs Detlev Casanova ` (7 preceding siblings ...) 2026-02-12 16:23 ` [PATCH 09/11] media: hantro: Add v4l2_hw run/done traces Detlev Casanova @ 2026-02-12 16:23 ` Detlev Casanova 2026-02-12 16:23 ` [PATCH 11/11] media: hantro: Add fdinfo callback Detlev Casanova ` (2 subsequent siblings) 11 siblings, 0 replies; 20+ messages in thread From: Detlev Casanova @ 2026-02-12 16:23 UTC (permalink / raw) To: linux-kernel Cc: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Detlev Casanova, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel Allow v4l2 drivers to add information in the fdinfo file matching the opened /dev/videoX file. Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> --- drivers/media/v4l2-core/v4l2-dev.c | 10 ++++++++++ include/media/v4l2-dev.h | 1 + 2 files changed, 11 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c index 10a126e50c1c..29c04f5f4c59 100644 --- a/drivers/media/v4l2-core/v4l2-dev.c +++ b/drivers/media/v4l2-core/v4l2-dev.c @@ -481,6 +481,15 @@ static int v4l2_release(struct inode *inode, struct file *filp) return ret; } +/* Override for the show_fdinfo function */ +static void v4l2_show_fdinfo(struct seq_file *m, struct file *filp) +{ + struct video_device *vdev = video_devdata(filp); + + if (vdev->fops->show_fdinfo) + vdev->fops->show_fdinfo(m, filp); +} + static const struct file_operations v4l2_fops = { .owner = THIS_MODULE, .read = v4l2_read, @@ -494,6 +503,7 @@ static const struct file_operations v4l2_fops = { #endif .release = v4l2_release, .poll = v4l2_poll, + .show_fdinfo = v4l2_show_fdinfo, }; /** diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index 2e0f6d2e6a78..1635ab186f21 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h @@ -212,6 +212,7 @@ struct v4l2_file_operations { int (*mmap) (struct file *, struct vm_area_struct *); int (*open) (struct file *); int (*release) (struct file *); + void (*show_fdinfo)(struct seq_file *, struct file *); }; /* -- 2.53.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 11/11] media: hantro: Add fdinfo callback 2026-02-12 16:23 [PATCH 00/11] v4l2: Add tracing for stateless codecs Detlev Casanova ` (8 preceding siblings ...) 2026-02-12 16:23 ` [PATCH 10/11] media: v4l2: Add callback for show_fdinfo Detlev Casanova @ 2026-02-12 16:23 ` Detlev Casanova 2026-04-28 19:41 ` Nicolas Dufresne 2026-04-28 19:52 ` [PATCH 00/11] v4l2: Add tracing for stateless codecs Nicolas Dufresne [not found] ` <20260212162328.192217-2-detlev.casanova@collabora.com> 11 siblings, 1 reply; 20+ messages in thread From: Detlev Casanova @ 2026-02-12 16:23 UTC (permalink / raw) To: linux-kernel Cc: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Detlev Casanova, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel The fdinfo shows the number of buffers in each queue and the total amount of video buffer memory. Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> --- drivers/media/platform/verisilicon/hantro.h | 1 + drivers/media/platform/verisilicon/hantro_drv.c | 15 +++++++++++++++ drivers/media/platform/verisilicon/hantro_v4l2.c | 10 +++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/verisilicon/hantro.h b/drivers/media/platform/verisilicon/hantro.h index d5cddc783688..9e9fc0658586 100644 --- a/drivers/media/platform/verisilicon/hantro.h +++ b/drivers/media/platform/verisilicon/hantro.h @@ -268,6 +268,7 @@ struct hantro_ctx { const struct hantro_codec_ops *codec_ops; struct hantro_postproc_ctx postproc; bool need_postproc; + u64 stats_buf_memory; /* Specific for particular codec modes. */ union { diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index 8dd26ca32459..86d316a8a3e8 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -17,6 +17,7 @@ #include <linux/platform_device.h> #include <linux/pm.h> #include <linux/pm_runtime.h> +#include <linux/seq_file.h> #include <linux/slab.h> #include <linux/videodev2.h> #include <linux/workqueue.h> @@ -711,6 +712,19 @@ static int hantro_release(struct file *filp) return 0; } +static void hantro_show_fdinfo(struct seq_file *m, struct file *filp) +{ + struct hantro_ctx *ctx = + container_of(filp->private_data, struct hantro_ctx, fh); + + struct vb2_queue *src_q = v4l2_m2m_get_src_vq(ctx->fh.m2m_ctx); + struct vb2_queue *dst_q = v4l2_m2m_get_dst_vq(ctx->fh.m2m_ctx); + + seq_printf(m, "src-queued-count: %04u\n", src_q->queued_count); + seq_printf(m, "dst-queued-count: %04u\n", dst_q->queued_count); + seq_printf(m, "buf-size: %llu\n", ctx->stats_buf_memory); +} + static const struct v4l2_file_operations hantro_fops = { .owner = THIS_MODULE, .open = hantro_open, @@ -718,6 +732,7 @@ static const struct v4l2_file_operations hantro_fops = { .poll = v4l2_m2m_fop_poll, .unlocked_ioctl = video_ioctl2, .mmap = v4l2_m2m_fop_mmap, + .show_fdinfo = hantro_show_fdinfo, }; static const struct of_device_id of_hantro_match[] = { diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c index fcf3bd9bcda2..6d129613ea3d 100644 --- a/drivers/media/platform/verisilicon/hantro_v4l2.c +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c @@ -820,18 +820,26 @@ hantro_queue_setup(struct vb2_queue *vq, unsigned int *num_buffers, return -EINVAL; } + ctx->stats_buf_memory = 0; + if (*num_planes) { if (*num_planes != pixfmt->num_planes) return -EINVAL; - for (i = 0; i < pixfmt->num_planes; ++i) + for (i = 0; i < pixfmt->num_planes; ++i) { if (sizes[i] < pixfmt->plane_fmt[i].sizeimage) return -EINVAL; + ctx->stats_buf_memory += pixfmt->plane_fmt[i].sizeimage; + } + + ctx->stats_buf_memory *= *num_buffers; + return 0; } *num_planes = pixfmt->num_planes; for (i = 0; i < pixfmt->num_planes; ++i) sizes[i] = pixfmt->plane_fmt[i].sizeimage; + return 0; } -- 2.53.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 11/11] media: hantro: Add fdinfo callback 2026-02-12 16:23 ` [PATCH 11/11] media: hantro: Add fdinfo callback Detlev Casanova @ 2026-04-28 19:41 ` Nicolas Dufresne 0 siblings, 0 replies; 20+ messages in thread From: Nicolas Dufresne @ 2026-04-28 19:41 UTC (permalink / raw) To: Detlev Casanova, linux-kernel Cc: Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel [-- Attachment #1: Type: text/plain, Size: 4001 bytes --] Le jeudi 12 février 2026 à 11:23 -0500, Detlev Casanova a écrit : > The fdinfo shows the number of buffers in each queue and the total amount > of video buffer memory. > > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> Notice that the FD info is not linked with all the ftrace work, and could have been kept separate. I think overall that this fdinfo implementation is a bit limited, and lack helpers or introducing of common statistics that would be opted in by other drivers. I would hold on that until we have a bigger and robust plan. Nicolas > --- > drivers/media/platform/verisilicon/hantro.h | 1 + > drivers/media/platform/verisilicon/hantro_drv.c | 15 +++++++++++++++ > drivers/media/platform/verisilicon/hantro_v4l2.c | 10 +++++++++- > 3 files changed, 25 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/verisilicon/hantro.h > b/drivers/media/platform/verisilicon/hantro.h > index d5cddc783688..9e9fc0658586 100644 > --- a/drivers/media/platform/verisilicon/hantro.h > +++ b/drivers/media/platform/verisilicon/hantro.h > @@ -268,6 +268,7 @@ struct hantro_ctx { > const struct hantro_codec_ops *codec_ops; > struct hantro_postproc_ctx postproc; > bool need_postproc; > + u64 stats_buf_memory; > > /* Specific for particular codec modes. */ > union { > diff --git a/drivers/media/platform/verisilicon/hantro_drv.c > b/drivers/media/platform/verisilicon/hantro_drv.c > index 8dd26ca32459..86d316a8a3e8 100644 > --- a/drivers/media/platform/verisilicon/hantro_drv.c > +++ b/drivers/media/platform/verisilicon/hantro_drv.c > @@ -17,6 +17,7 @@ > #include <linux/platform_device.h> > #include <linux/pm.h> > #include <linux/pm_runtime.h> > +#include <linux/seq_file.h> > #include <linux/slab.h> > #include <linux/videodev2.h> > #include <linux/workqueue.h> > @@ -711,6 +712,19 @@ static int hantro_release(struct file *filp) > return 0; > } > > +static void hantro_show_fdinfo(struct seq_file *m, struct file *filp) > +{ > + struct hantro_ctx *ctx = > + container_of(filp->private_data, struct hantro_ctx, fh); > + > + struct vb2_queue *src_q = v4l2_m2m_get_src_vq(ctx->fh.m2m_ctx); > + struct vb2_queue *dst_q = v4l2_m2m_get_dst_vq(ctx->fh.m2m_ctx); > + > + seq_printf(m, "src-queued-count: %04u\n", src_q->queued_count); > + seq_printf(m, "dst-queued-count: %04u\n", dst_q->queued_count); > + seq_printf(m, "buf-size: %llu\n", ctx->stats_buf_memory); > +} > + > static const struct v4l2_file_operations hantro_fops = { > .owner = THIS_MODULE, > .open = hantro_open, > @@ -718,6 +732,7 @@ static const struct v4l2_file_operations hantro_fops = { > .poll = v4l2_m2m_fop_poll, > .unlocked_ioctl = video_ioctl2, > .mmap = v4l2_m2m_fop_mmap, > + .show_fdinfo = hantro_show_fdinfo, > }; > > static const struct of_device_id of_hantro_match[] = { > diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c > b/drivers/media/platform/verisilicon/hantro_v4l2.c > index fcf3bd9bcda2..6d129613ea3d 100644 > --- a/drivers/media/platform/verisilicon/hantro_v4l2.c > +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c > @@ -820,18 +820,26 @@ hantro_queue_setup(struct vb2_queue *vq, unsigned int > *num_buffers, > return -EINVAL; > } > > + ctx->stats_buf_memory = 0; > + > if (*num_planes) { > if (*num_planes != pixfmt->num_planes) > return -EINVAL; > - for (i = 0; i < pixfmt->num_planes; ++i) > + for (i = 0; i < pixfmt->num_planes; ++i) { > if (sizes[i] < pixfmt->plane_fmt[i].sizeimage) > return -EINVAL; > + ctx->stats_buf_memory += pixfmt- > >plane_fmt[i].sizeimage; > + } > + > + ctx->stats_buf_memory *= *num_buffers; > + > return 0; > } > > *num_planes = pixfmt->num_planes; > for (i = 0; i < pixfmt->num_planes; ++i) > sizes[i] = pixfmt->plane_fmt[i].sizeimage; > + > return 0; > } > [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 00/11] v4l2: Add tracing for stateless codecs 2026-02-12 16:23 [PATCH 00/11] v4l2: Add tracing for stateless codecs Detlev Casanova ` (9 preceding siblings ...) 2026-02-12 16:23 ` [PATCH 11/11] media: hantro: Add fdinfo callback Detlev Casanova @ 2026-04-28 19:52 ` Nicolas Dufresne 2026-05-01 18:07 ` Detlev Casanova [not found] ` <20260212162328.192217-2-detlev.casanova@collabora.com> 11 siblings, 1 reply; 20+ messages in thread From: Nicolas Dufresne @ 2026-04-28 19:52 UTC (permalink / raw) To: Detlev Casanova, linux-kernel Cc: Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel [-- Attachment #1: Type: text/plain, Size: 5527 bytes --] Le jeudi 12 février 2026 à 11:23 -0500, Detlev Casanova a écrit : > Hi ! > > This patchset aims to improve codec event tracing in v4l2. > > The traces added in visl by Daniel Almeida are moved to the global trace > events and slightly reworked to be printed in a more consistent format. > > To each trace are also added a tgid and fd fields, helping userspace track > different decoding sessions (contexts) based on the given file descriptor > used by the given process id. > > Also for better tracking, stream on and stream off events are added as > well as HW run and HW done events to track decoder core usage. > > Finally, add a show_fdinfo callback on video device files, allowing drivers > to expose usage information. > Currently only used for frame buffer memory usage. > > The main focus is to be able to generate perfetto traces to show VPU usage, > a perfetto producer using this can be found at [1]. > > [1]: > https://gitlab.collabora.com/detlev/hantro-perf/-/tree/hantro-improved-info I would recommend renaming this repo, as its not really evolving toward something truly hantro specific anymore, same goes for the code below appart from the run/done traces and the fdinfo that has to be opted in. There is effectively a bit of an overlap with the v4l2-tracer, but there is also advantages having it in the kernel, as you source all the event, for the entire system, in one place, so I'm fine with that. Considering the possible large overhead of the full trace, I'd like to see the ability to filter what we want to trace, with some level of granularity. Maybe we only need decode_params for specific use case to be debugged, and don't care about large scaling list/matrix ? I would also like to see some Documentation on the tracing, so that its usage is not only explained in a tool. To Hans, there is nice tools idea in there, the perfetto producer is simply C++, and the v4l2top utility is Rust. Would you see these as tools v4l2-utils ? For the rust part, we can either leave the build independent, and cargo would be used to build and run, or we can implement a meson wrapper around cargo. But I don't believe its a good idea to use native rustc support in meson for that one because of the large number of third party crate needed. I like the direction, hope the feedback suite you well. Nicolas > > Detlev Casanova (11): > media: Move visl traces to v4l2-core > media: Reformat v4l2-requests trace event printk > media: Add tgid and fd fields in v4l2_fh struct > media: Add tgid and fd to the v4l2-requests trace fields > media: Add missing types to v4l2_ctrl_ptr > media: Trace the stateless controls when set in v4l2-ctrls-core.c > media: Add stream on/off traces and run them in the ioctl > media: Add HW run/done trace events > media: hantro: Add v4l2_hw run/done traces > media: v4l2: Add callback for show_fdinfo > media: hantro: Add fdinfo callback > > drivers/media/platform/verisilicon/hantro.h | 2 + > .../media/platform/verisilicon/hantro_drv.c | 25 + > .../media/platform/verisilicon/hantro_v4l2.c | 10 +- > .../verisilicon/rockchip_vpu981_regs.h | 1 + > .../platform/verisilicon/rockchip_vpu_hw.c | 4 + > drivers/media/test-drivers/visl/Makefile | 2 +- > drivers/media/test-drivers/visl/visl-dec.c | 76 - > .../media/test-drivers/visl/visl-trace-av1.h | 314 --- > .../media/test-drivers/visl/visl-trace-fwht.h | 66 - > .../media/test-drivers/visl/visl-trace-h264.h | 349 ---- > .../media/test-drivers/visl/visl-trace-hevc.h | 464 ----- > .../test-drivers/visl/visl-trace-mpeg2.h | 99 - > .../test-drivers/visl/visl-trace-points.c | 11 - > .../media/test-drivers/visl/visl-trace-vp8.h | 156 -- > .../media/test-drivers/visl/visl-trace-vp9.h | 292 --- > drivers/media/v4l2-core/v4l2-ctrls-api.c | 10 + > drivers/media/v4l2-core/v4l2-ctrls-core.c | 114 + > drivers/media/v4l2-core/v4l2-dev.c | 10 + > drivers/media/v4l2-core/v4l2-fh.c | 1 + > drivers/media/v4l2-core/v4l2-ioctl.c | 37 +- > drivers/media/v4l2-core/v4l2-trace.c | 48 + > include/media/v4l2-ctrls.h | 19 + > include/media/v4l2-dev.h | 1 + > include/media/v4l2-fh.h | 4 + > include/trace/events/v4l2.h | 58 + > include/trace/events/v4l2_requests.h | 1836 +++++++++++++++++ > 26 files changed, 2178 insertions(+), 1831 deletions(-) > delete mode 100644 drivers/media/test-drivers/visl/visl-trace-av1.h > delete mode 100644 drivers/media/test-drivers/visl/visl-trace-fwht.h > delete mode 100644 drivers/media/test-drivers/visl/visl-trace-h264.h > delete mode 100644 drivers/media/test-drivers/visl/visl-trace-hevc.h > delete mode 100644 drivers/media/test-drivers/visl/visl-trace-mpeg2.h > delete mode 100644 drivers/media/test-drivers/visl/visl-trace-points.c > delete mode 100644 drivers/media/test-drivers/visl/visl-trace-vp8.h > delete mode 100644 drivers/media/test-drivers/visl/visl-trace-vp9.h > create mode 100644 include/trace/events/v4l2_requests.h [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 00/11] v4l2: Add tracing for stateless codecs 2026-04-28 19:52 ` [PATCH 00/11] v4l2: Add tracing for stateless codecs Nicolas Dufresne @ 2026-05-01 18:07 ` Detlev Casanova 0 siblings, 0 replies; 20+ messages in thread From: Detlev Casanova @ 2026-05-01 18:07 UTC (permalink / raw) To: Nicolas Dufresne, linux-kernel Cc: Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Steven Rostedt, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel Hi Nicolas, On 4/28/26 15:52, Nicolas Dufresne wrote: > Le jeudi 12 février 2026 à 11:23 -0500, Detlev Casanova a écrit : >> Hi ! >> >> This patchset aims to improve codec event tracing in v4l2. >> >> The traces added in visl by Daniel Almeida are moved to the global trace >> events and slightly reworked to be printed in a more consistent format. >> >> To each trace are also added a tgid and fd fields, helping userspace track >> different decoding sessions (contexts) based on the given file descriptor >> used by the given process id. >> >> Also for better tracking, stream on and stream off events are added as >> well as HW run and HW done events to track decoder core usage. >> >> Finally, add a show_fdinfo callback on video device files, allowing drivers >> to expose usage information. >> Currently only used for frame buffer memory usage. >> >> The main focus is to be able to generate perfetto traces to show VPU usage, >> a perfetto producer using this can be found at [1]. >> >> [1]: >> https://gitlab.collabora.com/detlev/hantro-perf/-/tree/hantro-improved-info > I would recommend renaming this repo, as its not really evolving toward > something truly hantro specific anymore, same goes for the code below appart > from the run/done traces and the fdinfo that has to be opted in. Yes, hantro was the first focus, but I've also been integrating rkvdec into this. > > There is effectively a bit of an overlap with the v4l2-tracer, but there is also > advantages having it in the kernel, as you source all the event, for the entire > system, in one place, so I'm fine with that. Considering the possible large > overhead of the full trace, I'd like to see the ability to filter what we want > to trace, with some level of granularity. Tracing is by default disable and and has a really small performance footprint when disabled. On the userspace side, each trace events can be enabled separately and even filtered (although I'm not sure filtering is good for performance, has it has to match each event with a regex). > Maybe we only need decode_params for > specific use case to be debugged, and don't care about large scaling list/matrix > ? I would also like to see some Documentation on the tracing, so that its usage > is not only explained in a tool. Agreed. > To Hans, there is nice tools idea in there, the perfetto producer is simply C++, > and the v4l2top utility is Rust. Would you see these as tools v4l2-utils ? For > the rust part, we can either leave the build independent, and cargo would be > used to build and run, or we can implement a meson wrapper around cargo. But I > don't believe its a good idea to use native rustc support in meson for that one > because of the large number of third party crate needed. > > I like the direction, hope the feedback suite you well. > > Nicolas > >> Detlev Casanova (11): >> media: Move visl traces to v4l2-core >> media: Reformat v4l2-requests trace event printk >> media: Add tgid and fd fields in v4l2_fh struct >> media: Add tgid and fd to the v4l2-requests trace fields >> media: Add missing types to v4l2_ctrl_ptr >> media: Trace the stateless controls when set in v4l2-ctrls-core.c >> media: Add stream on/off traces and run them in the ioctl >> media: Add HW run/done trace events >> media: hantro: Add v4l2_hw run/done traces >> media: v4l2: Add callback for show_fdinfo >> media: hantro: Add fdinfo callback >> >> drivers/media/platform/verisilicon/hantro.h | 2 + >> .../media/platform/verisilicon/hantro_drv.c | 25 + >> .../media/platform/verisilicon/hantro_v4l2.c | 10 +- >> .../verisilicon/rockchip_vpu981_regs.h | 1 + >> .../platform/verisilicon/rockchip_vpu_hw.c | 4 + >> drivers/media/test-drivers/visl/Makefile | 2 +- >> drivers/media/test-drivers/visl/visl-dec.c | 76 - >> .../media/test-drivers/visl/visl-trace-av1.h | 314 --- >> .../media/test-drivers/visl/visl-trace-fwht.h | 66 - >> .../media/test-drivers/visl/visl-trace-h264.h | 349 ---- >> .../media/test-drivers/visl/visl-trace-hevc.h | 464 ----- >> .../test-drivers/visl/visl-trace-mpeg2.h | 99 - >> .../test-drivers/visl/visl-trace-points.c | 11 - >> .../media/test-drivers/visl/visl-trace-vp8.h | 156 -- >> .../media/test-drivers/visl/visl-trace-vp9.h | 292 --- >> drivers/media/v4l2-core/v4l2-ctrls-api.c | 10 + >> drivers/media/v4l2-core/v4l2-ctrls-core.c | 114 + >> drivers/media/v4l2-core/v4l2-dev.c | 10 + >> drivers/media/v4l2-core/v4l2-fh.c | 1 + >> drivers/media/v4l2-core/v4l2-ioctl.c | 37 +- >> drivers/media/v4l2-core/v4l2-trace.c | 48 + >> include/media/v4l2-ctrls.h | 19 + >> include/media/v4l2-dev.h | 1 + >> include/media/v4l2-fh.h | 4 + >> include/trace/events/v4l2.h | 58 + >> include/trace/events/v4l2_requests.h | 1836 +++++++++++++++++ >> 26 files changed, 2178 insertions(+), 1831 deletions(-) >> delete mode 100644 drivers/media/test-drivers/visl/visl-trace-av1.h >> delete mode 100644 drivers/media/test-drivers/visl/visl-trace-fwht.h >> delete mode 100644 drivers/media/test-drivers/visl/visl-trace-h264.h >> delete mode 100644 drivers/media/test-drivers/visl/visl-trace-hevc.h >> delete mode 100644 drivers/media/test-drivers/visl/visl-trace-mpeg2.h >> delete mode 100644 drivers/media/test-drivers/visl/visl-trace-points.c >> delete mode 100644 drivers/media/test-drivers/visl/visl-trace-vp8.h >> delete mode 100644 drivers/media/test-drivers/visl/visl-trace-vp9.h >> create mode 100644 include/trace/events/v4l2_requests.h ^ permalink raw reply [flat|nested] 20+ messages in thread
[parent not found: <20260212162328.192217-2-detlev.casanova@collabora.com>]
* Re: [PATCH 01/11] media: Move visl traces to v4l2-core [not found] ` <20260212162328.192217-2-detlev.casanova@collabora.com> @ 2026-05-01 19:07 ` Steven Rostedt 0 siblings, 0 replies; 20+ messages in thread From: Steven Rostedt @ 2026-05-01 19:07 UTC (permalink / raw) To: Detlev Casanova Cc: linux-kernel, Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Daniel Almeida, Masami Hiramatsu, Mathieu Desnoyers, Hans Verkuil, Laurent Pinchart, Ricardo Ribalda, Yunke Cao, Sakari Ailus, Pavan Bobba, James Cowgill, Ma Ke, Jacopo Mondi, Daniel Scally, linux-media, linux-rockchip, linux-arm-kernel, linux-trace-kernel, kernel Sorry, I didn't look at these patches at the time they were posted, but when I saw you reply recently with: "On the userspace side, each trace events can be enabled separately and even filtered (although I'm not sure filtering is good for performance, has it has to match each event with a regex)." I had to see what you meant by regex, because no tracer should be using regex for filtering. On Thu, 12 Feb 2026 11:23:18 -0500 Detlev Casanova <detlev.casanova@collabora.com> wrote: > + > +DECLARE_EVENT_CLASS(v4l2_ctrl_mpeg2_seq_tmpl, > + TP_PROTO(const struct v4l2_ctrl_mpeg2_sequence *s), > + TP_ARGS(s), > + TP_STRUCT__entry(__field_struct(struct v4l2_ctrl_mpeg2_sequence, s)), > + TP_fast_assign(__entry->s = *s;), What the heck! You are copying an entire structure onto the ring buffer to print just a portion of it? This is really a waste of ring buffer, and also prevents you from doing any real filtering. You do realize that you can filter on fields (if they are defined as normal fields). For example, # cd /sys/kernel/tracing # echo 'height > 20 && width > 30' > events/visl_fwht_controls/v4l2_ctrl_fwht_params/filter # echo 1 > events/visl_fwht_controls/v4l2_ctrl_fwht_params/enable And that will only trace that event where the height field is greater than 20 and the width field is greater than 30. It's converted into a fast array to do the filtering. No regex involved. Also, there's a library to read the raw events from the ring buffers where you can do filtering on the read side too: https://trace-cmd.org/Documentation/libtracefs/ https://trace-cmd.org/Documentation/libtraceevent/ -- Steve > + TP_printk("\nhorizontal_size %u\nvertical_size %u\nvbv_buffer_size %u\n" > + "profile_and_level_indication %u\nchroma_format %u\nflags %s\n", > + __entry->s.horizontal_size, > + __entry->s.vertical_size, > + __entry->s.vbv_buffer_size, > + __entry->s.profile_and_level_indication, > + __entry->s.chroma_format, > + __print_flags(__entry->s.flags, "|", > + {V4L2_MPEG2_SEQ_FLAG_PROGRESSIVE, "PROGRESSIVE"}) > + ) > +); > + ^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2026-05-01 19:08 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-12 16:23 [PATCH 00/11] v4l2: Add tracing for stateless codecs Detlev Casanova
2026-02-12 16:23 ` [PATCH 02/11] media: Reformat v4l2-requests trace event printk Detlev Casanova
2026-04-28 19:28 ` Nicolas Dufresne
2026-02-12 16:23 ` [PATCH 03/11] media: Add tgid and fd fields in v4l2_fh struct Detlev Casanova
2026-04-28 19:31 ` Nicolas Dufresne
2026-02-12 16:23 ` [PATCH 04/11] media: Add tgid and fd to the v4l2-requests trace fields Detlev Casanova
2026-04-28 19:32 ` Nicolas Dufresne
2026-02-12 16:23 ` [PATCH 05/11] media: Add missing types to v4l2_ctrl_ptr Detlev Casanova
2026-04-28 19:33 ` Nicolas Dufresne
2026-02-12 16:23 ` [PATCH 06/11] media: Trace the stateless controls when set in v4l2-ctrls-core.c Detlev Casanova
2026-04-28 19:37 ` Nicolas Dufresne
2026-02-12 16:23 ` [PATCH 07/11] media: Add stream on/off traces and run them in the ioctl Detlev Casanova
2026-02-12 16:23 ` [PATCH 08/11] media: Add HW run/done trace events Detlev Casanova
2026-02-12 16:23 ` [PATCH 09/11] media: hantro: Add v4l2_hw run/done traces Detlev Casanova
2026-02-12 16:23 ` [PATCH 10/11] media: v4l2: Add callback for show_fdinfo Detlev Casanova
2026-02-12 16:23 ` [PATCH 11/11] media: hantro: Add fdinfo callback Detlev Casanova
2026-04-28 19:41 ` Nicolas Dufresne
2026-04-28 19:52 ` [PATCH 00/11] v4l2: Add tracing for stateless codecs Nicolas Dufresne
2026-05-01 18:07 ` Detlev Casanova
[not found] ` <20260212162328.192217-2-detlev.casanova@collabora.com>
2026-05-01 19:07 ` [PATCH 01/11] media: Move visl traces to v4l2-core Steven Rostedt
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox