X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmodprobe.c;h=66e80e75b26dbc1b5ae8bfa4e122c37136ceadfa;hp=3e41f5c1b6539a9eaa3af8706700c074c473c2b9;hb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;hpb=d11b2027e5df11fa8af3e59995ed1eae13152d77

diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
index 3e41f5c1b..66e80e75b 100644
--- a/src/bin/lttng-sessiond/modprobe.c
+++ b/src/bin/lttng-sessiond/modprobe.c
@@ -1,19 +1,9 @@
 /*
- * Copyright (C) 2011 - David Goulet <dgoulet@efficios.com>
- *               2014 - Jan Glauber <jan.glauber@gmail.com>
+ * Copyright (C) 2011 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2014 Jan Glauber <jan.glauber@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**
@@ -34,6 +24,7 @@
 
 #include "modprobe.h"
 #include "kern-modules.h"
+#include "lttng-sessiond.h"
 
 #define LTTNG_MOD_REQUIRED	1
 #define LTTNG_MOD_OPTIONAL	0
@@ -57,6 +48,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" },
@@ -69,6 +61,7 @@ struct kern_modules_param kern_modules_probes_default[] = {
 	{ "lttng-probe-napi" },
 	{ "lttng-probe-net" },
 	{ "lttng-probe-power" },
+	{ "lttng-probe-preemptirq" },
 	{ "lttng-probe-printk" },
 	{ "lttng-probe-random" },
 	{ "lttng-probe-rcu" },
@@ -180,9 +173,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 +190,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 +265,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 +335,7 @@ static int modprobe_lttng(struct kern_modules_param *modules,
 			}
 		} else {
 			DBG("Modprobe successfully %s", modules[i].name);
+			modules[i].loaded = true;
 		}
 	}
 
@@ -348,6 +350,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 +560,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 +595,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) {