perfmon: properly unmap mmapped pages

[vpp.git] / src / plugins / perfmon / perfmon.c

diff --git a/src/plugins/perfmon/perfmon.c b/src/plugins/perfmon/perfmon.c
index f9402f8..799659d 100644 (file)
--- a/src/plugins/perfmon/perfmon.c
+++ b/src/plugins/perfmon/perfmon.c
@@ -70,7 +70,7 @@ perfmon_reset (vlib_main_t *vm)
       vec_free (tr->node_stats);
       for (int j = 0; j < PERF_MAX_EVENTS; j++)
        if (tr->mmap_pages[j])
-         munmap (tr->mmap_pages, page_size);
+         munmap (tr->mmap_pages[j], page_size);
     }
   vec_free (pm->thread_runtimes);
 
@@ -97,7 +97,7 @@ perfmon_set (vlib_main_t *vm, perfmon_bundle_t *b)
   s = b->src;
   ASSERT (b->n_events);
 
-  if (b->type == PERFMON_BUNDLE_TYPE_NODE)
+  if (b->active_type == PERFMON_BUNDLE_TYPE_NODE)
     is_node = 1;
 
   if (s->instances_by_type == 0)
@@ -193,6 +193,7 @@ perfmon_set (vlib_main_t *vm, perfmon_bundle_t *b)
        {
          perfmon_thread_runtime_t *rt;
          rt = vec_elt_at_index (pm->thread_runtimes, i);
+         rt->bundle = b;
          rt->n_events = b->n_events;
          rt->n_nodes = n_nodes;
          vec_validate_aligned (rt->node_stats, n_nodes - 1,
@@ -235,11 +236,20 @@ perfmon_start (vlib_main_t *vm, perfmon_bundle_t *b)
          return clib_error_return_unix (0, "ioctl(PERF_EVENT_IOC_ENABLE)");
        }
     }
-  if (pm->active_bundle->type == PERFMON_BUNDLE_TYPE_NODE)
+  if (b->active_type == PERFMON_BUNDLE_TYPE_NODE)
     {
+
+      vlib_node_function_t *funcs[PERFMON_OFFSET_TYPE_MAX];
+#define _(type, pfunc) funcs[type] = pfunc;
+
+      foreach_permon_offset_type
+#undef _
+
+       ASSERT (funcs[b->offset_type]);
+
       for (int i = 0; i < vlib_get_n_threads (); i++)
        vlib_node_set_dispatch_wrapper (vlib_get_main_by_index (i),
-                                       perfmon_dispatch_wrapper);
+                                       funcs[b->offset_type]);
     }
 
   pm->sample_time = vlib_time_now (vm);
@@ -257,7 +267,7 @@ perfmon_stop (vlib_main_t *vm)
   if (pm->is_running != 1)
     return clib_error_return (0, "not running");
 
-  if (pm->active_bundle->type == PERFMON_BUNDLE_TYPE_NODE)
+  if (pm->active_bundle->active_type == PERFMON_BUNDLE_TYPE_NODE)
     {
       for (int i = 0; i < vlib_get_n_threads (); i++)
        vlib_node_set_dispatch_wrapper (vlib_get_main_by_index (i), 0);
@@ -278,6 +288,21 @@ perfmon_stop (vlib_main_t *vm)
   return 0;
 }
 
+static_always_inline u8
+is_bundle_supported (perfmon_bundle_t *b)
+{
+  perfmon_cpu_supports_t *supports = b->cpu_supports;
+
+  if (!b->cpu_supports)
+    return 1;
+
+  for (int i = 0; i < b->n_cpu_supports; ++i)
+    if (supports[i].cpu_supports ())
+      return 1;
+
+  return 0;
+}
+
 static clib_error_t *
 perfmon_init (vlib_main_t *vm)
 {
@@ -310,6 +335,14 @@ perfmon_init (vlib_main_t *vm)
     {
       clib_error_t *err;
       uword *p;
+
+      if (!is_bundle_supported (b))
+       {
+         log_warn ("skipping bundle '%s' - not supported", b->name);
+         b = b->next;
+         continue;
+       }
+
       if (hash_get_mem (pm->bundle_by_name, b->name) != 0)
        clib_panic ("duplicate bundle name '%s'", b->name);