centralize sessiond config option handling

[lttng-tools.git] / src / bin / lttng-sessiond / modprobe.c

diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
index 3e41f5c1b6539a9eaa3af8706700c074c473c2b9..75d6387c6fbe6b6c887d2117ee8c62ac6a242199 100644 (file)
--- a/src/bin/lttng-sessiond/modprobe.c
+++ b/src/bin/lttng-sessiond/modprobe.c
@@ -34,6 +34,7 @@
 
 #include "modprobe.h"
 #include "kern-modules.h"
+#include "lttng-sessiond.h"
 
 #define LTTNG_MOD_REQUIRED     1
 #define LTTNG_MOD_OPTIONAL     0
@@ -57,6 +58,7 @@ struct kern_modules_param kern_modules_probes_default[] = {
        { "lttng-probe-ext3" },
        { "lttng-probe-ext4" },
        { "lttng-probe-gpio" },
+       { "lttng-probe-i2c" },
        { "lttng-probe-irq" },
        { "lttng-probe-jbd" },
        { "lttng-probe-jbd2" },
@@ -180,9 +182,12 @@ static int modprobe_lttng(struct kern_modules_param *modules,
                        goto error;
                }
 
-               ret = kmod_module_probe_insert_module(mod, KMOD_PROBE_IGNORE_LOADED,
+               ret = kmod_module_probe_insert_module(mod, 0,
                                NULL, NULL, NULL, NULL);
-               if (ret < 0) {
+               if (ret == -EEXIST) {
+                       DBG("Module %s is already loaded", modules[i].name);
+                       ret = 0;
+               } else if (ret < 0) {
                        if (required) {
                                ERR("Unable to load required module %s",
                                                modules[i].name);
@@ -194,6 +199,7 @@ static int modprobe_lttng(struct kern_modules_param *modules,
                        }
                } else {
                        DBG("Modprobe successfully %s", modules[i].name);
+                       modules[i].loaded = true;
                }
 
                kmod_module_unref(mod);
@@ -268,6 +274,10 @@ static void modprobe_remove_lttng(const struct kern_modules_param *modules,
        for (i = entries - 1; i >= 0; i--) {
                struct kmod_module *mod = NULL;
 
+               if (!modules[i].loaded) {
+                       continue;
+               }
+
                ret = kmod_module_new_from_name(ctx, modules[i].name, &mod);
                if (ret < 0) {
                        PERROR("Failed to create kmod module for %s", modules[i].name);
@@ -334,6 +344,7 @@ static int modprobe_lttng(struct kern_modules_param *modules,
                        }
                } else {
                        DBG("Modprobe successfully %s", modules[i].name);
+                       modules[i].loaded = true;
                }
        }
 
@@ -348,6 +359,9 @@ static void modprobe_remove_lttng(const struct kern_modules_param *modules,
        char modprobe[256];
 
        for (i = entries - 1; i >= 0; i--) {
+               if (!modules[i].loaded) {
+                       continue;
+               }
                ret = snprintf(modprobe, sizeof(modprobe),
                                "/sbin/modprobe -r -q %s",
                                modules[i].name);
@@ -555,12 +569,7 @@ int modprobe_lttng_data(void)
         * Base probes: either from command line option, environment
         * variable or default list.
         */
-       if (kmod_probes_list) {
-               list = kmod_probes_list;
-       } else {
-               list = utils_get_kmod_probes_list();
-       }
-
+       list = config.kmod_probes_list.value;
        if (list) {
                /* User-specified probes. */
                ret = append_list_to_probes(list);
@@ -595,12 +604,7 @@ int modprobe_lttng_data(void)
        /*
         * Extra modules? Append them to current probes list.
         */
-       if (kmod_extra_probes_list) {
-               list = kmod_extra_probes_list;
-       } else {
-               list = utils_get_extra_kmod_probes_list();
-       }
-
+       list = config.kmod_extra_probes_list.value;
        if (list) {
                ret = append_list_to_probes(list);
                if (ret) {