Skip to contentSkip to conversation

Move libkmod ifdef to beginning of file

RFC PATCH New Michael Jeanson 3 participants 7 messages Feb 12, 2016 – Mar 17, 2016 3 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

RFC PATCH 2/5 Move libkmod ifdef to beginning of file

This will be useful to add the libkmod implementation of the modprobe_remove_lttng() function in a single ifdef.

---
 src/bin/lttng-sessiond/modprobe.c | 150 +++++++++++++++++++-------------------
 1 file changed, 75 insertions(+), 75 deletions(-)
src/bin/lttng-sessiond/modprobe.c +75 -75
index 81ce810..6f9a997 100644
@@ -90,81 +90,6 @@ static struct kern_modules_param *probes;
 static int nr_probes;
 static int probes_capacity;
 
-static void modprobe_remove_lttng(const struct kern_modules_param *modules,
-		int entries, int required)
-{
-	int ret = 0, i;
-	char modprobe[256];
-
-	for (i = entries - 1; i >= 0; i--) {
-		ret = snprintf(modprobe, sizeof(modprobe),
-				"/sbin/modprobe -r -q %s",
-				modules[i].name);
-		if (ret < 0) {
-			PERROR("snprintf modprobe -r");
-			return;
-		}
-		modprobe[sizeof(modprobe) - 1] = '\0';
-		ret = system(modprobe);
-		if (ret == -1) {
-			ERR("Unable to launch modprobe -r for module %s",
-					modules[i].name);
-		} else if (required && WEXITSTATUS(ret) != 0) {
-			ERR("Unable to remove module %s",
-					modules[i].name);
-		} else {
-			DBG("Modprobe removal successful %s",
-					modules[i].name);
-		}
-	}
-}
-
-/*
- * Remove control kernel module(s) in reverse load order.
- */
-void modprobe_remove_lttng_control(void)
-{
-	modprobe_remove_lttng(kern_modules_control_core,
-			      ARRAY_SIZE(kern_modules_control_core),
-			      LTTNG_MOD_REQUIRED);
-}
-
-static void free_probes(void)
-{
-	int i;
-
-	if (!probes) {
-		return;
-	}
-	for (i = 0; i < nr_probes; ++i) {
-		free(probes[i].name);
-	}
-	free(probes);
-	probes = NULL;
-	nr_probes = 0;
-}
-
-/*
- * Remove data kernel modules in reverse load order.
- */
-void modprobe_remove_lttng_data(void)
-{
-	if (!probes) {
-		return;
-	}
-	modprobe_remove_lttng(probes, nr_probes, LTTNG_MOD_OPTIONAL);
-	free_probes();
-}
-
-/*
- * Remove all kernel modules in reverse order.
- */
-void modprobe_remove_lttng_all(void)
-{
-	modprobe_remove_lttng_data();
-	modprobe_remove_lttng_control();
-}
-
 #if HAVE_KMOD
 #include <libkmod.h>
 static void log_kmod(void *data, int priority, const char *file, int line,
@@ -280,6 +205,81 @@ error:
 
 #endif /* HAVE_KMOD */
 
+static void modprobe_remove_lttng(const struct kern_modules_param *modules,
+		int entries, int required)
+{
+	int ret = 0, i;
+	char modprobe[256];
+
+	for (i = entries - 1; i >= 0; i--) {
+		ret = snprintf(modprobe, sizeof(modprobe),
+				"/sbin/modprobe -r -q %s",
+				modules[i].name);
+		if (ret < 0) {
+			PERROR("snprintf modprobe -r");
+			return;
+		}
+		modprobe[sizeof(modprobe) - 1] = '\0';
+		ret = system(modprobe);
+		if (ret == -1) {
+			ERR("Unable to launch modprobe -r for module %s",
+					modules[i].name);
+		} else if (required && WEXITSTATUS(ret) != 0) {
+			ERR("Unable to remove module %s",
+					modules[i].name);
+		} else {
+			DBG("Modprobe removal successful %s",
+					modules[i].name);
+		}
+	}
+}
+
+/*
+ * Remove control kernel module(s) in reverse load order.
+ */
+void modprobe_remove_lttng_control(void)
+{
+	modprobe_remove_lttng(kern_modules_control_core,
+			      ARRAY_SIZE(kern_modules_control_core),
+			      LTTNG_MOD_REQUIRED);
+}
+
+static void free_probes(void)
+{
+	int i;
+
+	if (!probes) {
+		return;
+	}
+	for (i = 0; i < nr_probes; ++i) {
+		free(probes[i].name);
+	}
+	free(probes);
+	probes = NULL;
+	nr_probes = 0;
+}
+
+/*
+ * Remove data kernel modules in reverse load order.
+ */
+void modprobe_remove_lttng_data(void)
+{
+	if (!probes) {
+		return;
+	}
+	modprobe_remove_lttng(probes, nr_probes, LTTNG_MOD_OPTIONAL);
+	free_probes();
+}
+
+/*
+ * Remove all kernel modules in reverse order.
+ */
+void modprobe_remove_lttng_all(void)
+{
+	modprobe_remove_lttng_data();
+	modprobe_remove_lttng_control();
+}
+
 /*
  * Load control kernel module(s).
  */
Signature · 1 line
2.7.0
#2 lore raw

RFC PATCH 3/5 Add libkmod rmmod support

In reply to a message not in the archive

We previously had support to load modules with libkmod but we always unload modules by calling the modprobe binary.

This patch adds the libkmod module unloading which is faster and gives us better error handling. This implementation also graciously handles builtin lttng kernel modules.

---
 src/bin/lttng-sessiond/modprobe.c | 104 ++++++++++++++++++++++++++++++++++----
 1 file changed, 95 insertions(+), 9 deletions(-)
src/bin/lttng-sessiond/modprobe.c +95 -9
index 6f9a997..90fec71 100644
@@ -92,6 +92,7 @@ static int probes_capacity;
 
 #if HAVE_KMOD
 #include <libkmod.h>
+
 static void log_kmod(void *data, int priority, const char *file, int line,
 		const char *fn, const char *format, va_list args)
 {
@@ -104,21 +105,39 @@ static void log_kmod(void *data, int priority, const char *file, int line,
 	DBG("libkmod: %s", str);
 	free(str);
 }
-static int modprobe_lttng(struct kern_modules_param *modules,
-		int entries, int required)
+
+static int setup_kmod_ctx(struct kmod_ctx **ctx)
 {
-	int ret = 0, i;
-	struct kmod_ctx *ctx;
+	int ret = 0;
 
-	ctx = kmod_new(NULL, NULL);
+	*ctx = kmod_new(NULL, NULL);
 	if (!ctx) {
 		PERROR("Unable to create kmod library context");
 		ret = -ENOMEM;
 		goto error;
 	}
 
-	kmod_set_log_fn(ctx, log_kmod, NULL);
-	kmod_load_resources(ctx);
+	kmod_set_log_fn(*ctx, log_kmod, NULL);
+	ret = kmod_load_resources(*ctx);
+	if (ret < 0) {
+		ERR("Failed to load kmod library resources");
+		goto error;
+	}
+
+error:
+	return ret;
+}
+
+static int modprobe_lttng(struct kern_modules_param *modules,
+		int entries, int required)
+{
+	int ret = 0, i;
+	struct kmod_ctx *ctx;
+
+	ret = setup_kmod_ctx(&ctx);
+	if (ret < 0) {
+		goto error;
+	}
 
 	for (i = 0; i < entries; i++) {
 		struct kmod_module *mod = NULL;
@@ -155,6 +174,73 @@ error:
 	return ret;
 }
 
+static int rmmod_recurse(struct kmod_module *mod) {
+	int ret = 0;
+	struct kmod_list *deps, *itr;
+
+	if (kmod_module_get_initstate(mod) == KMOD_MODULE_BUILTIN) {
+		DBG("Module %s is builtin", kmod_module_get_name(mod));
+		return ret;
+	}
+
+	ret = kmod_module_remove_module(mod, 0);
+
+	deps = kmod_module_get_dependencies(mod);
+	if (deps != NULL) {
+		kmod_list_foreach(itr, deps) {
+			struct kmod_module *dep = kmod_module_get_module(itr);
+			if (kmod_module_get_refcnt(dep) == 0) {
+				DBG("Recursive remove module %s",
+						kmod_module_get_name(dep));
+				rmmod_recurse(dep);
+			}
+			kmod_module_unref(dep);
+		}
+		kmod_module_unref_list(deps);
+	}
+
+	return ret;
+}
+
+static void modprobe_remove_lttng(const struct kern_modules_param *modules,
+		int entries, int required)
+{
+	int ret = 0, i;
+	struct kmod_ctx *ctx;
+
+	ret = setup_kmod_ctx(&ctx);
+	if (ret < 0) {
+		goto error;
+	}
+
+	for (i = entries - 1; i >= 0; i--) {
+		struct kmod_module *mod = NULL;
+
+		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);
+			goto error;
+		}
+
+		ret = rmmod_recurse(mod);
+		if (ret == -EEXIST) {
+			DBG("Module %s is not in kernel.", modules[i].name);
+		} else if (required && ret < 0) {
+			ERR("Unable to remove module %s", modules[i].name);
+		} else {
+			DBG("Modprobe removal successful %s",
+				modules[i].name);
+		}
+
+		kmod_module_unref(mod);
+	}
+
+error:
+	if (ctx) {
+		kmod_unref(ctx);
+	}
+}
+
 #else /* HAVE_KMOD */
 
 static int modprobe_lttng(struct kern_modules_param *modules,
@@ -203,8 +289,6 @@ error:
 	return ret;
 }
 
-#endif /* HAVE_KMOD */
-
 static void modprobe_remove_lttng(const struct kern_modules_param *modules,
 		int entries, int required)
 {
@@ -234,6 +318,8 @@ static void modprobe_remove_lttng(const struct kern_modules_param *modules,
 	}
 }
 
+#endif /* HAVE_KMOD */
+
 /*
  * Remove control kernel module(s) in reverse load order.
  */
Signature · 1 line
2.7.0
#3 lore raw

RFC PATCH 4/5 Add comments to kmod functions

In reply to a message not in the archive
---
 src/bin/lttng-sessiond/modprobe.c | 52 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
src/bin/lttng-sessiond/modprobe.c +52 -0
index 90fec71..3e41f5c 100644
@@ -16,6 +16,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/**
+ * @file modprobe.c
+ *
+ * @brief modprobe related functions.
+ *
+ */
+
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <stdio.h>
@@ -93,6 +100,9 @@ static int probes_capacity;
 #if HAVE_KMOD
 #include <libkmod.h>
 
+/**
+ * @brief Logging function for libkmod integration.
+ */
 static void log_kmod(void *data, int priority, const char *file, int line,
 		const char *fn, const char *format, va_list args)
 {
@@ -106,6 +116,15 @@ static void log_kmod(void *data, int priority, const char *file, int line,
 	free(str);
 }
 
+/**
+ * @brief Setup the libkmod context.
+ *
+ * Create the context, add a custom logging function and preload the
+ * ressources for faster operation.
+ *
+ * @returns	\c 0 on success
+ * 		\c < 0 on error
+ */
 static int setup_kmod_ctx(struct kmod_ctx **ctx)
 {
 	int ret = 0;
@@ -128,6 +147,19 @@ error:
 	return ret;
 }
 
+/**
+ * @brief Loads the kernel modules in \p modules
+ *
+ * @param modules	List of modules to load
+ * @param entries	Number of modules in the list
+ * @param required	Are the modules required or optionnal
+ *
+ * If the modules are required, we will return with error after the
+ * first failed module load, otherwise we continue loading.
+ *
+ * @returns		\c 0 on success
+ * 			\c < 0 on error
+ */
 static int modprobe_lttng(struct kern_modules_param *modules,
 		int entries, int required)
 {
@@ -174,6 +206,18 @@ error:
 	return ret;
 }
 
+/**
+ * @brief Recursively unload modules.
+ *
+ * This function implements the same modules unloading behavior as
+ * 'modprobe -r' or rmmod, it will recursevily go trought the \p module
+ * dependencies and unload modules with a refcount of 0.
+ *
+ * @param mod		The module to unload
+ *
+ * @returns		\c 0 on success
+ * 			\c < 0 on error
+ */
 static int rmmod_recurse(struct kmod_module *mod) {
 	int ret = 0;
 	struct kmod_list *deps, *itr;
@@ -202,6 +246,14 @@ static int rmmod_recurse(struct kmod_module *mod) {
 	return ret;
 }
 
+/**
+ * @brief Unloads the kernel modules in \p modules
+ *
+ * @param modules	List of modules to unload
+ * @param entries	Number of modules in the list
+ * @param required	Are the modules required or optionnal
+ *
+ */
 static void modprobe_remove_lttng(const struct kern_modules_param *modules,
 		int entries, int required)
 {
Signature · 1 line
2.7.0
#4 lore raw

RFC PATCH 5/5 Add builtin modules support to kmod modprobe

In reply to a message not in the archive

Report success when loading a module that is builtin the kernel.

---
 src/bin/lttng-sessiond/modprobe.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
src/bin/lttng-sessiond/modprobe.c +5 -2
index 3e41f5c..ca0467e 100644
@@ -180,9 +180,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);
Signature · 1 line
2.7.0
#5 lore raw

Re: [RFC PATCH lttng-tools 1/5] Drop optionnal control modules load and unload

In reply to a message not in the archive
Quoted 1 line · ----- On Feb 12, 2016, at 4:31 PM, Michael Jeanson [email protected] wrote:

The optionnal control modules are loaded and unloaded trought modules

optionnal -> optional
trough -> through

Thanks,

Mathieu

Quoted 68 lines

dependencies by modprobe or libkmod. Trying to load them manually leads to spurious log messages and slows down the sessiond startup.

---
src/bin/lttng-sessiond/modprobe.c | 18 ------------------

1 file changed, 18 deletions(-)
src/bin/lttng-sessiond/modprobe.c +0 -13
index 2c527dc..81ce810 100644
@@ -33,8 +33,6 @@
 
 /* LTTng kernel tracer mandatory core modules list */
 struct kern_modules_param kern_modules_control_core[] = {
-	{ "lttng-tracer" },	/* MUST be loaded first so keep at top */
-	{ "lttng-lib-ring-buffer" },
 	{ "lttng-ring-buffer-client-discard" },
 	{ "lttng-ring-buffer-client-overwrite" },
 	{ "lttng-ring-buffer-metadata-client" },
@@ -43,14 +41,6 @@ struct kern_modules_param kern_modules_control_core[] = {
 	{ "lttng-ring-buffer-metadata-mmap-client" },
 };
 
-/* LTTng kernel tracer optional base modules list */
-struct kern_modules_param kern_modules_control_opt[] = {
-	{ "lttng-types" },
-	{ "lttng-ftrace" },
-	{ "lttng-kprobes" },
-	{ "lttng-kretprobes" },
-};
-
 /* LTTng kernel tracer probe modules list */
 struct kern_modules_param kern_modules_probes_default[] = {
 	{ "lttng-probe-asoc" },
@@ -134,9 +124,6 @@ static void modprobe_remove_lttng(const struct
 kern_modules_param *modules,
 */
 void modprobe_remove_lttng_control(void)
 {
-	modprobe_remove_lttng(kern_modules_control_opt,
-			      ARRAY_SIZE(kern_modules_control_opt),
-			      LTTNG_MOD_OPTIONAL);
 	modprobe_remove_lttng(kern_modules_control_core,
 			      ARRAY_SIZE(kern_modules_control_core),
			      LTTNG_MOD_REQUIRED);
src/bin/lttng-sessiond/modprobe.c +0 -6
@@ -303,11 +290,6 @@ int modprobe_lttng_control(void)
 	ret = modprobe_lttng(kern_modules_control_core,
 			     ARRAY_SIZE(kern_modules_control_core),
 			     LTTNG_MOD_REQUIRED);
-	if (ret != 0)
-		return ret;
-	ret = modprobe_lttng(kern_modules_control_opt,
-			     ARRAY_SIZE(kern_modules_control_opt),
-			     LTTNG_MOD_OPTIONAL);
 	return ret;
 }
 
--

2.7.0

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

A message that is not in the archive (sent off-list or not yet received): [email protected]

#7 lore raw

Re: [RFC PATCH lttng-tools 1/5] Drop optionnal control modules load and unload

Fixed in git, I'll wait for more feedback on the patchset before sending a V2.

Thanks,

Michael

Quoted 7 lines · ----- On Feb 12, 2016, at 4:40 PM, Mathieu Desnoyers…

optionnal -> optional
trough -> through

Thanks,

Mathieu

A message that is not in the archive (sent off-list or not yet received): [email protected]

#9 lore raw

Re: [RFC PATCH lttng-tools 5/5] Add builtin modules support to kmod modprobe

All merged in master. I have fixed the typo Mathieu commented on and a couple of others.

Thanks!
Jérémie

Quoted 29 lines · Michael Jeanson

Report success when loading a module that is builtin the kernel.

---
 src/bin/lttng-sessiond/modprobe.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
src/bin/lttng-sessiond/modprobe.c +5 -3
index 3e41f5c..ca0467e 100644
@@ -180,9 +180,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);
--

2.7.0

Signature · 7 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev