Skip to contentSkip to conversation

kernel-shark: Do not change the PLUGIN_UNTOUCHED bit flag when filtering

PATCH In review Yordan Karadzhov (VMware) 2 participants 2 messages May 28, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel-shark: Do not change the PLUGIN_UNTOUCHED bit flag when filtering

The "visible" field of the entry has one special bit flag, that helps the GUI to display the original tracing data (as recorded) regardless of the possible modifications made by the plugins. This bit flag must be preserved when applying or removing filters.

---
 kernel-shark/src/libkshark.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
kernel-shark/src/libkshark.c +7 -3
index 0905359..52aacd3 100644
@@ -489,6 +489,11 @@ static inline void unset_event_filter_flag(struct kshark_context *kshark_ctx,
 	e->visible &= ~event_mask;
 }
 
+static void set_all_visible(uint16_t *v) {
+	/*  Keep the original value of the PLUGIN_UNTOUCHED bit flag. */
+	*v |= 0xFF & ~KS_PLUGIN_UNTOUCHED_MASK;
+}
+
 /**
  * @brief This function loops over the array of entries specified by "data"
  *	  and "n_entries" and sets the "visible" fields of each entry
@@ -525,7 +530,7 @@ void kshark_filter_entries(struct kshark_context *kshark_ctx,
 	/* Apply only the Id filters. */
 	for (i = 0; i < n_entries; ++i) {
 		/* Start with and entry which is visible everywhere. */
-		data[i]->visible = 0xFF;
+		set_all_visible(&data[i]->visible);
 
 		/* Apply event filtering. */
 		if (!kshark_show_event(kshark_ctx, data[i]->event_id))
@@ -555,9 +560,8 @@ void kshark_clear_all_filters(struct kshark_context *kshark_ctx,
 			      size_t n_entries)
 {
 	int i;
-
 	for (i = 0; i < n_entries; ++i)
-		data[i]->visible = 0xFF;
+		set_all_visible(&data[i]->visible);
 }
 
 static void kshark_set_entry_values(struct kshark_context *kshark_ctx,
Signature · 1 line
2.25.1
#1 lore raw
Quoted 15 lines · On Thu, 28 May 2020 14:19:17 +0300 "Yordan Karadzhov (VMware)"…

The "visible" field of the entry has one special bit flag, that helps the GUI to display the original tracing data (as recorded) regardless of the possible modifications made by the plugins. This bit flag must be preserved when applying or removing filters.

---
 kernel-shark/src/libkshark.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
kernel-shark/src/libkshark.c +0 -0
index 0905359..52aacd3 100644

kernel-shark/src/libkshark.c static inline void unset_event_filter_flag(struct kshark_context *kshark_ctx, · line 494

Quoted 6 lines
kernel-shark/src/libkshark.c +3 -0
@@ -489,6 +489,11 @@ static inline void unset_event_filter_flag(struct kshark_context *kshark_ctx,
 	e->visible &= ~event_mask;
 }
 
+static void set_all_visible(uint16_t *v) {
+	/*  Keep the original value of the PLUGIN_UNTOUCHED bit flag. */
+	*v |= 0xFF & ~KS_PLUGIN_UNTOUCHED_MASK;

This patch is fine as is, but we really should add a KS_PLUGIN_MASK that encompasses all bits, and replace the 0xFF with that.

-- Steve

Quoted 3 lines
kernel-shark/src/libkshark.c +2 -0
+}
+