Fix: Update lttng-modules load list

Observed issue
==============

When starting a root sessiond, after stopping it there would still be
lttng-modules modules loaded in the kernel.

```
$ lsmod | grep lttng || echo "nothing"
nothing

$ lttng-sessiond -b

$ killall lttng-sessiond

$ lsmod | grep lttng || echo "nothing"
lttng_statedump       757760  0
lttng_wrapper          16384  1 lttng_statedump
lttng_uprobes          12288  0
lttng_clock            12288  0
lttng_kprobes          12288  0
lttng_lib_ring_buffer    90112  0
lttng_kretprobes       12288  0
```

Cause
=====

Not all modules are listed in the core/data modules in `modprobe.cpp`.

Solution
========

Add missing modules.

Known drawbacks
===============

None.

Change-Id: I28525c55eadb95467f77ffac0b9152ac8576e0fc
Signed-off-by: Kienan Stewart <kstewart@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/modprobe.cpp b/src/bin/lttng-sessiond/modprobe.cpp
index fd72f7ee94fd253080d1c1a65d4667cc7b93595b..046a156165a6084582f00bdf8afc26fe3d0de0cf 100644 (file)
--- a/src/bin/lttng-sessiond/modprobe.cpp
+++ b/src/bin/lttng-sessiond/modprobe.cpp
@@ -28,22 +28,37 @@
 /* LTTng kernel tracer mandatory core modules list */
 struct kern_modules_param kern_modules_control_core[] = {
        {
-               .name = (char *) "lttng-wrapper",
-               .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_REQUIRED,
+               .name = (char *) "lttng_wrapper",
+               .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_OPTIONAL,
                .loaded = false,
        },
        {
-               .name = (char *) "lttng-statedump",
-               .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_REQUIRED,
+               .name = (char *) "lttng_statedump",
+               .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_OPTIONAL,
                .loaded = false,
        },
        {
-               .name = (char *) "lttng-clock",
-               .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_REQUIRED,
+               .name = (char *) "lttng_uprobes",
+               .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_OPTIONAL,
+               .loaded = false,
+       },
+       {
+               .name = (char *) "lttng_kprobes",
+               .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_OPTIONAL,
+               .loaded = false,
+       },
+       {
+               .name = (char *) "lttng_kretprobes",
+               .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_OPTIONAL,
+               .loaded = false,
+       },
+       {
+               .name = (char *) "lttng_clock",
+               .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_OPTIONAL,
                .loaded = false,
        },
        {
-               .name = (char *) "lttng-lib-ring-buffer",
+               .name = (char *) "lttng_lib_ring_buffer",
                .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_REQUIRED,
                .loaded = false,
        },