Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3b3614a authored by Hari Bathini's avatar Hari Bathini Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add PERF_RECORD_NAMESPACES to include namespaces related info 



Introduce a new option to record PERF_RECORD_NAMESPACES events emitted
by the kernel when fork, clone, setns or unshare are invoked. And update
perf-record documentation with the new option to record namespace
events.

Committer notes:

Combined it with a later patch to allow printing it via 'perf report -D'
and be able to test the feature introduced in this patch. Had to move
here also perf_ns__name(), that was introduced in another later patch.

Also used PRIu64 and PRIx64 to fix the build in some enfironments wrt:

  util/event.c:1129:39: error: format '%lx' expects argument of type 'long unsigned int', but argument 6 has type 'long long unsigned int' [-Werror=format=]
     ret  += fprintf(fp, "%u/%s: %lu/0x%lx%s", idx
                                         ^
Testing it:

  # perf record --namespaces -a
  ^C[ perf record: Woken up 1 times to write data ]
  [ perf record: Captured and wrote 1.083 MB perf.data (423 samples) ]
  #
  # perf report -D
  <SNIP>
  3 2028902078892 0x115140 [0xa0]: PERF_RECORD_NAMESPACES 14783/14783 - nr_namespaces: 7
                [0/net: 3/0xf0000081, 1/uts: 3/0xeffffffe, 2/ipc: 3/0xefffffff, 3/pid: 3/0xeffffffc,
                 4/user: 3/0xeffffffd, 5/mnt: 3/0xf0000000, 6/cgroup: 3/0xeffffffb]

  0x1151e0 [0x30]: event: 9
  .
  . ... raw event: size 48 bytes
  .  0000:  09 00 00 00 02 00 30 00 c4 71 82 68 0c 7f 00 00  ......0..q.h....
  .  0010:  a9 39 00 00 a9 39 00 00 94 28 fe 63 d8 01 00 00  .9...9...(.c....
  .  0020:  03 00 00 00 00 00 00 00 ce c4 02 00 00 00 00 00  ................
  <SNIP>
        NAMESPACES events:          1
  <SNIP>
  #

Signed-off-by: default avatarHari Bathini <hbathini@linux.vnet.ibm.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Aravinda Prasad <aravinda@linux.vnet.ibm.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sargun Dhillon <sargun@sargun.me>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/148891930386.25309.18412039920746995488.stgit@hbathini.in.ibm.com


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

tools/include/uapi/linux/perf_event.h

+31 −1
Original line number Diff line number Diff line
@@ -344,7 +344,8 @@ struct perf_event_attr { 
				use_clockid    :  1, /* use @clockid for time fields */

				context_switch :  1, /* context switch data */

				write_backward :  1, /* Write ring buffer from end to beginning */

				__reserved_1   : 36;

				namespaces     :  1, /* include namespaces data */

				__reserved_1   : 35;



	union {

		__u32		wakeup_events;	  /* wakeup every n events */
@@ -610,6 +611,23 @@ struct perf_event_header { 
	__u16	size;

};



struct perf_ns_link_info {

	__u64	dev;

	__u64	ino;

};



enum {

	NET_NS_INDEX		= 0,

	UTS_NS_INDEX		= 1,

	IPC_NS_INDEX		= 2,

	PID_NS_INDEX		= 3,

	USER_NS_INDEX		= 4,

	MNT_NS_INDEX		= 5,

	CGROUP_NS_INDEX		= 6,



	NR_NAMESPACES,		/* number of available namespaces */

};



enum perf_event_type {



	/*
@@ -862,6 +880,18 @@ enum perf_event_type { 
	 */

	PERF_RECORD_SWITCH_CPU_WIDE		= 15,



	/*

	 * struct {

	 *	struct perf_event_header	header;

	 *	u32				pid;

	 *	u32				tid;

	 *	u64				nr_namespaces;

	 *	{ u64				dev, inode; } [nr_namespaces];

	 *	struct sample_id		sample_id;

	 * };

	 */

	PERF_RECORD_NAMESPACES			= 16,



	PERF_RECORD_MAX,			/* non-ABI */

};

tools/perf/Documentation/perf-record.txt

+3 −0
Original line number Diff line number Diff line
@@ -347,6 +347,9 @@ Enable weightened sampling. An additional weight is recorded per sample and can 
displayed with the weight and local_weight sort keys.  This currently works for TSX

abort events and some memory events in precise mode on modern Intel CPUs.



--namespaces::

Record events of type PERF_RECORD_NAMESPACES.



--transaction::

Record transaction flags for transaction related events.

tools/perf/builtin-annotate.c

+1 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) 
			.comm	= perf_event__process_comm,

			.exit	= perf_event__process_exit,

			.fork	= perf_event__process_fork,

			.namespaces = perf_event__process_namespaces,

			.ordered_events = true,

			.ordering_requires_timestamps = true,

		},

tools/perf/builtin-diff.c

+1 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ static struct perf_tool tool = { 
	.exit	= perf_event__process_exit,

	.fork	= perf_event__process_fork,

	.lost	= perf_event__process_lost,

	.namespaces = perf_event__process_namespaces,

	.ordered_events = true,

	.ordering_requires_timestamps = true,

};

tools/perf/builtin-inject.c

+13 −0
Original line number Diff line number Diff line
@@ -333,6 +333,18 @@ static int perf_event__repipe_comm(struct perf_tool *tool, 
	return err;

}



static int perf_event__repipe_namespaces(struct perf_tool *tool,

					 union perf_event *event,

					 struct perf_sample *sample,

					 struct machine *machine)

{

	int err = perf_event__process_namespaces(tool, event, sample, machine);



	perf_event__repipe(tool, event, sample, machine);



	return err;

}



static int perf_event__repipe_exit(struct perf_tool *tool,

				   union perf_event *event,

				   struct perf_sample *sample,
@@ -660,6 +672,7 @@ static int __cmd_inject(struct perf_inject *inject) 
		session->itrace_synth_opts = &inject->itrace_synth_opts;

		inject->itrace_synth_opts.inject = true;

		inject->tool.comm	    = perf_event__repipe_comm;

		inject->tool.namespaces	    = perf_event__repipe_namespaces;

		inject->tool.exit	    = perf_event__repipe_exit;

		inject->tool.id_index	    = perf_event__repipe_id_index;

		inject->tool.auxtrace_info  = perf_event__process_auxtrace_info;