Skip to contentSkip to conversation

perf tools: Add missing swap for cgroup events

PATCH Applied Namhyung Kim 3 participants 3 messages Nov 2, 2020 – Nov 3, 2020 perf events

lore
Share & tools
lore

Namhyung Kim

author maintainer
#0 lore raw

PATCH 1/1 perf tools: Add missing swap for cgroup events

It was missed to add a swap function for PERF_RECORD_CGROUP.

Fixes ba78c1c5461c ("perf tools: Basic support for CGROUP event")
---
 tools/perf/util/session.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
tools/perf/util/session.c +13 -0
index 7a5f03764702..c44c8e8c09c6 100644
@@ -710,6 +710,18 @@ static void perf_event__namespaces_swap(union perf_event *event,
 		swap_sample_id_all(event, &event->namespaces.link_info[i]);
 }
 
+static void perf_event__cgroup_swap(union perf_event *event, bool sample_id_all)
+{
+	event->cgroup.id = bswap_64(event->cgroup.id);
+
+	if (sample_id_all) {
+		void *data = &event->cgroup.path;
+
+		data += PERF_ALIGN(strlen(data) + 1, sizeof(u64));
+		swap_sample_id_all(event, data);
+	}
+}
+
 static u8 revbyte(u8 b)
 {
 	int rev = (b >> 4) | ((b & 0xf) << 4);
@@ -952,6 +964,7 @@ static perf_event__swap_op perf_event__swap_ops[] = {
 	[PERF_RECORD_SWITCH]		  = perf_event__switch_swap,
 	[PERF_RECORD_SWITCH_CPU_WIDE]	  = perf_event__switch_swap,
 	[PERF_RECORD_NAMESPACES]	  = perf_event__namespaces_swap,
+	[PERF_RECORD_CGROUP]		  = perf_event__cgroup_swap,
 	[PERF_RECORD_TEXT_POKE]		  = perf_event__text_poke_swap,
 	[PERF_RECORD_HEADER_ATTR]	  = perf_event__hdr_attr_swap,
 	[PERF_RECORD_HEADER_EVENT_TYPE]	  = perf_event__event_type_swap,
Signature · 1 line
2.29.1.341.ge80a0c044ae-goog
Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · Namhyung Kim

It was missed to add a swap function for PERF_RECORD_CGROUP.

Fixes ba78c1c5461c ("perf tools: Basic support for CGROUP event")

thanks,
jirka

Quoted 39 lines
---
 tools/perf/util/session.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
tools/perf/util/session.c +13 -0
index 7a5f03764702..c44c8e8c09c6 100644
@@ -710,6 +710,18 @@ static void perf_event__namespaces_swap(union perf_event *event,
 		swap_sample_id_all(event, &event->namespaces.link_info[i]);
 }
 
+static void perf_event__cgroup_swap(union perf_event *event, bool sample_id_all)
+{
+	event->cgroup.id = bswap_64(event->cgroup.id);
+
+	if (sample_id_all) {
+		void *data = &event->cgroup.path;
+
+		data += PERF_ALIGN(strlen(data) + 1, sizeof(u64));
+		swap_sample_id_all(event, data);
+	}
+}
+
 static u8 revbyte(u8 b)
 {
 	int rev = (b >> 4) | ((b & 0xf) << 4);
@@ -952,6 +964,7 @@ static perf_event__swap_op perf_event__swap_ops[] = {
 	[PERF_RECORD_SWITCH]		  = perf_event__switch_swap,
 	[PERF_RECORD_SWITCH_CPU_WIDE]	  = perf_event__switch_swap,
 	[PERF_RECORD_NAMESPACES]	  = perf_event__namespaces_swap,
+	[PERF_RECORD_CGROUP]		  = perf_event__cgroup_swap,
 	[PERF_RECORD_TEXT_POKE]		  = perf_event__text_poke_swap,
 	[PERF_RECORD_HEADER_ATTR]	  = perf_event__hdr_attr_swap,
 	[PERF_RECORD_HEADER_EVENT_TYPE]	  = perf_event__event_type_swap,
Signature · 1 line
2.29.1.341.ge80a0c044ae-goog
maintainer Applied
#2 lore raw

Em Mon, Nov 02, 2020 at 06:49:56PM +0100, Jiri Olsa escreveu:

Quoted 6 lines · Namhyung Kim
Quoted 3 lines

It was missed to add a swap function for PERF_RECORD_CGROUP.

Fixes ba78c1c5461c ("perf tools: Basic support for CGROUP event")

Thanks, applied.

- Arnaldo

Quoted 43 lines

thanks,
jirka

Quoted 39 lines
---
 tools/perf/util/session.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
tools/perf/util/session.c +13 -0
index 7a5f03764702..c44c8e8c09c6 100644
@@ -710,6 +710,18 @@ static void perf_event__namespaces_swap(union perf_event *event,
 		swap_sample_id_all(event, &event->namespaces.link_info[i]);
 }
 
+static void perf_event__cgroup_swap(union perf_event *event, bool sample_id_all)
+{
+	event->cgroup.id = bswap_64(event->cgroup.id);
+
+	if (sample_id_all) {
+		void *data = &event->cgroup.path;
+
+		data += PERF_ALIGN(strlen(data) + 1, sizeof(u64));
+		swap_sample_id_all(event, data);
+	}
+}
+
 static u8 revbyte(u8 b)
 {
 	int rev = (b >> 4) | ((b & 0xf) << 4);
@@ -952,6 +964,7 @@ static perf_event__swap_op perf_event__swap_ops[] = {
 	[PERF_RECORD_SWITCH]		  = perf_event__switch_swap,
 	[PERF_RECORD_SWITCH_CPU_WIDE]	  = perf_event__switch_swap,
 	[PERF_RECORD_NAMESPACES]	  = perf_event__namespaces_swap,
+	[PERF_RECORD_CGROUP]		  = perf_event__cgroup_swap,
 	[PERF_RECORD_TEXT_POKE]		  = perf_event__text_poke_swap,
 	[PERF_RECORD_HEADER_ATTR]	  = perf_event__hdr_attr_swap,
 	[PERF_RECORD_HEADER_EVENT_TYPE]	  = perf_event__event_type_swap,
Signature · 1 line
2.29.1.341.ge80a0c044ae-goog
Signature · 1 line
- Arnaldo