intel_rdt: Added oprion to disable IPC monitoring

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 892fd55c81a1eb25feac04a8f515cf83b664ee66..0e0aaa74db5801cfb26d08a025651887f68ce6d6 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -835,6 +835,7 @@
 #</Plugin>
 
 #<Plugin "intel_rdt">
+#  MonIPCEnabled true
 #  Cores "0-2"
 #  Processes "sshd"
 #</Plugin>

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index d3c412dcb809ee82c0b2d2e5c8355aae6105fb46..8821d008a8a9fed213892c2e78cd13031ad38263 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -3970,6 +3970,7 @@ Please refer to I<contrib/systemd.collectd.service> file for more details.
 B<Synopsis:>
 
   <Plugin "intel_rdt">
+    MonIPCEnabled true
     Cores "0-2" "3,4,6" "8-10,15"
     Processes "sshd,qemu-system-x86" "bash"
   </Plugin>
@@ -3985,6 +3986,11 @@ For milliseconds divide the time by 1000 for example if the desired interval
 is 50ms, set interval to 0.05. Due to limited capacity of counters it is not
 recommended to set interval higher than 1 sec.
 
+=item B<MonIPCEnabled> B<true>|B<false>
+
+Determines whether or not to enable IPC monitoring. If set to B<true> (the
+default), IPC monitoring statistics will be collected by intel_rdt plugin.
+
 =item B<Cores> I<cores groups>
 
 Monitoring of the events can be configured for group of cores

diff --git a/src/intel_rdt.c b/src/intel_rdt.c
index 945d51d50bedf4b3ee7d480b037a6c05e1c0565a..09019ce485812f08e80c485eced336874ce9a8e8 100644 (file)
--- a/src/intel_rdt.c
+++ b/src/intel_rdt.c
@@ -75,6 +75,7 @@ typedef struct rdt_name_group_s rdt_name_group_t;
 #endif /* LIBPQOS2 */
 
 struct rdt_ctx_s {
+  bool mon_ipc_enabled;
   core_groups_list_t cores;
   enum pqos_mon_event events[RDT_MAX_CORES];
   struct pqos_mon_data *pcgroups[RDT_MAX_CORES];
@@ -197,6 +198,8 @@ static void rdt_dump_cgroups(void) {
 
   if (g_rdt == NULL)
     return;
+  if (g_rdt->cores.num_cgroups == 0)
+    return;
 
   DEBUG(RDT_PLUGIN ": Core Groups Dump");
   DEBUG(RDT_PLUGIN ":  groups count: %" PRIsz, g_rdt->cores.num_cgroups);
@@ -226,6 +229,8 @@ static void rdt_dump_ngroups(void) {
 
   if (g_rdt == NULL)
     return;
+  if (g_rdt->num_ngroups == 0)
+    return;
 
   DEBUG(RDT_PLUGIN ": Process Names Groups Dump");
   DEBUG(RDT_PLUGIN ":  groups count: %" PRIsz, g_rdt->num_ngroups);
@@ -522,6 +527,44 @@ static void rdt_free_ngroups(rdt_ctx_t *rdt) {
   rdt->num_ngroups = 0;
 }
 
+/*
+ * NAME
+ *   rdt_config_events
+ *
+ * DESCRIPTION
+ *   Configure available monitoring events
+ *
+ * PARAMETERS
+ *   `rdt`       Pointer to rdt context
+ *
+ * RETURN VALUE
+ *  0 on success. Negative number on error.
+ */
+static int rdt_config_events(rdt_ctx_t *rdt) {
+  enum pqos_mon_event events = 0;
+
+  /* Get all available events on this platform */
+  for (unsigned i = 0; i < rdt->cap_mon->u.mon->num_events; i++)
+    events |= rdt->cap_mon->u.mon->events[i].type;
+
+  events &= ~(PQOS_PERF_EVENT_LLC_MISS);
+
+  /* IPC monitoring is disabled */
+  if (!rdt->mon_ipc_enabled)
+    events &= ~(PQOS_PERF_EVENT_IPC);
+
+  DEBUG(RDT_PLUGIN ": Available events to monitor: %#x", events);
+
+  for (size_t i = 0; i < rdt->cores.num_cgroups; i++) {
+    rdt->events[i] = events;
+  }
+#ifdef LIBPQOS2
+  for (size_t i = 0; i < rdt->num_ngroups; i++) {
+    rdt->ngroups[i].events = events;
+  }
+#endif /* LIBPQOS2 */
+  return 0;
+}
 /*
  * NAME
  *   rdt_config_ngroups
@@ -538,7 +581,6 @@ static void rdt_free_ngroups(rdt_ctx_t *rdt) {
  */
 static int rdt_config_ngroups(rdt_ctx_t *rdt, const oconfig_item_t *item) {
   int n = 0;
-  enum pqos_mon_event events = 0;
 
   if (item == NULL) {
     DEBUG(RDT_PLUGIN ": ngroups_config: Invalid argument.");
@@ -586,14 +628,6 @@ static int rdt_config_ngroups(rdt_ctx_t *rdt, const oconfig_item_t *item) {
     return -EINVAL;
   }
 
-  /* Get all available events on this platform */
-  for (unsigned i = 0; i < rdt->cap_mon->u.mon->num_events; i++)
-    events |= rdt->cap_mon->u.mon->events[i].type;
-
-  events &= ~(PQOS_PERF_EVENT_LLC_MISS);
-
-  DEBUG(RDT_PLUGIN ": Available events to monitor: %#x", events);
-
   rdt->num_ngroups = n;
   for (int i = 0; i < n; i++) {
     for (int j = 0; j < i; j++) {
@@ -606,7 +640,6 @@ static int rdt_config_ngroups(rdt_ctx_t *rdt, const oconfig_item_t *item) {
       }
     }
 
-    rdt->ngroups[i].events = events;
     rdt->pngroups[i] = calloc(1, sizeof(*rdt->pngroups[i]));
     if (rdt->pngroups[i] == NULL) {
       rdt_free_ngroups(rdt);
@@ -970,7 +1003,6 @@ static int rdt_is_core_id_valid(unsigned int core_id) {
 
 static int rdt_config_cgroups(oconfig_item_t *item) {
   size_t n = 0;
-  enum pqos_mon_event events = 0;
 
   if (config_cores_parse(item, &g_rdt->cores) < 0) {
     rdt_free_cgroups();
@@ -1005,15 +1037,8 @@ static int rdt_config_cgroups(oconfig_item_t *item) {
          ": No core groups configured. Default core groups created.");
   }
 
-  /* Get all available events on this platform */
-  for (unsigned int i = 0; i < g_rdt->cap_mon->u.mon->num_events; i++)
-    events |= g_rdt->cap_mon->u.mon->events[i].type;
-
-  events &= ~(PQOS_PERF_EVENT_LLC_MISS);
-
   DEBUG(RDT_PLUGIN ": Number of cores in the system: %u",
         g_rdt->pqos_cpu->num_cores);
-  DEBUG(RDT_PLUGIN ": Available events to monitor: %#x", events);
 
   g_rdt->cores.num_cgroups = n;
   for (int i = 0; i < n; i++) {
@@ -1028,7 +1053,6 @@ static int rdt_config_cgroups(oconfig_item_t *item) {
       }
     }
 
-    g_rdt->events[i] = events;
     g_rdt->pcgroups[i] = calloc(1, sizeof(*g_rdt->pcgroups[i]));
     if (g_rdt->pcgroups[i] == NULL) {
       rdt_free_cgroups();
@@ -1058,6 +1082,9 @@ static int rdt_preinit(void) {
     return -ENOMEM;
   }
 
+  /* IPC monitoring is enabled by default */
+  g_rdt->mon_ipc_enabled = 1;
+
   struct pqos_config pqos = {.fd_log = -1,
                              .callback_log = rdt_pqos_log,
                              .context_log = NULL,
@@ -1151,9 +1178,6 @@ static int rdt_config(oconfig_item_t *ci) {
          */
         return 0;
 
-#if COLLECT_DEBUG
-      rdt_dump_cgroups();
-#endif /* COLLECT_DEBUG */
     } else if (strncasecmp("Processes", child->key,
                            (size_t)strlen("Processes")) == 0) {
 #ifdef LIBPQOS2
@@ -1181,19 +1205,27 @@ static int rdt_config(oconfig_item_t *ci) {
          */
         return 0;
 
-#if COLLECT_DEBUG
-      rdt_dump_ngroups();
-#endif /* COLLECT_DEBUG */
 #else  /* !LIBPQOS2 */
       ERROR(RDT_PLUGIN ": Configuration parameter \"%s\" not supported, please "
                        "recompile collectd with libpqos version 2.0 or newer.",
             child->key);
 #endif /* LIBPQOS2 */
+    } else if (strcasecmp("MonIPCEnabled", child->key) == 0) {
+      cf_util_get_boolean(child, &g_rdt->mon_ipc_enabled);
     } else {
       ERROR(RDT_PLUGIN ": Unknown configuration parameter \"%s\".", child->key);
     }
   }
 
+  rdt_config_events(g_rdt);
+
+#if COLLECT_DEBUG
+  rdt_dump_cgroups();
+#ifdef LIBPQOS2
+  rdt_dump_ngroups();
+#endif /* LIBPQOS2 */
+#endif /* COLLECT_DEBUG */
+
   return 0;
 }