Commit 6ac73820 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf trace: Add augmenter for clock_gettime's rqtp timespec arg 



One more before going the BTF way:

  # perf trace -e /home/acme/git/perf/tools/perf/examples/bpf/augmented_raw_syscalls.o,*nanosleep
         ? pool-gsd-smart/2893  ... [continued]: clock_nanosleep())    = 0
         ? gpm/1042  ... [continued]: clock_nanosleep())    = 0
     1.232 pool-gsd-smart/2893 clock_nanosleep(rqtp: { .tv_sec: 1, .tv_nsec: 0 }, rmtp: 0x7f64d7ffec50) ...
     1.232 pool-gsd-smart/2893  ... [continued]: clock_nanosleep())    = 0
   327.329 gpm/1042 clock_nanosleep(rqtp: { .tv_sec: 2, .tv_nsec: 0 }, rmtp: 0x7ffddfd1cf20) ...
  1002.482 pool-gsd-smart/2893 clock_nanosleep(rqtp: { .tv_sec: 1, .tv_nsec: 0 }, rmtp: 0x7f64d7ffec50) = 0
   327.329 gpm/1042  ... [continued]: clock_nanosleep())    = 0
  2003.947 pool-gsd-smart/2893 clock_nanosleep(rqtp: { .tv_sec: 1, .tv_nsec: 0 }, rmtp: 0x7f64d7ffec50) ...
  2003.947 pool-gsd-smart/2893  ... [continued]: clock_nanosleep())    = 0
  2327.858 gpm/1042 clock_nanosleep(rqtp: { .tv_sec: 2, .tv_nsec: 0 }, rmtp: 0x7ffddfd1cf20) ...
         ? crond/1384  ... [continued]: clock_nanosleep())    = 0
  3005.382 pool-gsd-smart/2893 clock_nanosleep(rqtp: { .tv_sec: 1, .tv_nsec: 0 }, rmtp: 0x7f64d7ffec50) ...
  3005.382 pool-gsd-smart/2893  ... [continued]: clock_nanosleep())    = 0
  3675.633 crond/1384 clock_nanosleep(rqtp: { .tv_sec: 60, .tv_nsec: 0 }, rmtp: 0x7ffcc02b66b0) ...
^C#

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 44a037f5

tools/perf/builtin-trace.c

+2 −0
Original line number Diff line number Diff line
@@ -924,6 +924,8 @@ static struct syscall_fmt syscall_fmts[] = { 
	  .arg = { [0] = { .scnprintf = SCA_PTR, /* brk */ }, }, },

	{ .name     = "clock_gettime",

	  .arg = { [0] = STRARRAY(clk_id, clockid), }, },

	{ .name	    = "clock_nanosleep",

	  .arg = { [2] = { .scnprintf = SCA_TIMESPEC,  /* rqtp */ }, }, },

	{ .name	    = "clone",	    .errpid = true, .nr_args = 5,

	  .arg = { [0] = { .name = "flags",	    .scnprintf = SCA_CLONE_FLAGS, },

		   [1] = { .name = "child_stack",   .scnprintf = SCA_HEX, },

tools/perf/examples/bpf/augmented_raw_syscalls.c

+28 −0
Original line number Diff line number Diff line
@@ -21,6 +21,13 @@ 
// FIXME: These should come from system headers

typedef char bool;

typedef int pid_t;

typedef long long int __s64;

typedef __s64 time64_t;



struct timespec64 {

	time64_t	tv_sec;

	long int	tv_nsec;

};



/* bpf-output associated map */

struct __augmented_syscalls__ {
@@ -337,6 +344,27 @@ int sys_enter_perf_event_open(struct syscall_enter_args *args) 
	return 1; /* Failure: don't filter */

}



SEC("!syscalls:sys_enter_clock_nanosleep")

int sys_enter_clock_nanosleep(struct syscall_enter_args *args)

{

	struct augmented_args_payload *augmented_args = augmented_args_payload();

	const void *rqtp_arg = (const void *)args->args[2];

	unsigned int len = sizeof(augmented_args->args);

	__u32 size = sizeof(struct timespec64);



        if (augmented_args == NULL)

		goto failure;



	if (size > sizeof(augmented_args->__data))

                goto failure;



	bpf_probe_read(&augmented_args->__data, size, rqtp_arg);



	return augmented__output(args, augmented_args, len + size);

failure:

	return 1; /* Failure: don't filter */

}



static pid_t getpid(void)

{

	return bpf_get_current_pid_tgid();

tools/perf/trace/beauty/Build

+1 −0
Original line number Diff line number Diff line
@@ -17,4 +17,5 @@ perf-y += sockaddr.o 
perf-y += socket.o

perf-y += statx.o

perf-y += sync_file_range.o

perf-y += timespec.o

perf-y += tracepoints/

tools/perf/trace/beauty/beauty.h

+3 −0
Original line number Diff line number Diff line
@@ -244,6 +244,9 @@ size_t syscall_arg__scnprintf_statx_mask(char *bf, size_t size, struct syscall_a 
size_t syscall_arg__scnprintf_sync_file_range_flags(char *bf, size_t size, struct syscall_arg *arg);

#define SCA_SYNC_FILE_RANGE_FLAGS syscall_arg__scnprintf_sync_file_range_flags



size_t syscall_arg__scnprintf_timespec(char *bf, size_t size, struct syscall_arg *arg);

#define SCA_TIMESPEC syscall_arg__scnprintf_timespec



size_t open__scnprintf_flags(unsigned long flags, char *bf, size_t size, bool show_prefix);



void syscall_arg__set_ret_scnprintf(struct syscall_arg *arg,

tools/perf/trace/beauty/timespec.c

0 → 100644
+21 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: LGPL-2.1

// Copyright (C) 2022, Red Hat Inc, Arnaldo Carvalho de Melo <acme@redhat.com>



#include "trace/beauty/beauty.h"

#include <inttypes.h>

#include <time.h>



static size_t syscall_arg__scnprintf_augmented_timespec(struct syscall_arg *arg, char *bf, size_t size)

{

	struct timespec *ts = (struct timespec *)arg->augmented.args;



	return scnprintf(bf, size, "{ .tv_sec: %" PRIu64 ", .tv_nsec: %" PRIu64 " }", ts->tv_sec, ts->tv_nsec);

}



size_t syscall_arg__scnprintf_timespec(char *bf, size_t size, struct syscall_arg *arg)

{

	if (arg->augmented.args)

		return syscall_arg__scnprintf_augmented_timespec(arg, bf, size);



	return scnprintf(bf, size, "%#lx", arg->val);

}