-/*
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
+ *
* lttng.c
*
* LTTng logger ABI
*
* Copyright (C) 2008-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <linux/module.h>
#include <linux/proc_fs.h>
#include <linux/slab.h>
#include <linux/mm.h>
-#include <wrapper/vmalloc.h>
+#include <linux/miscdevice.h>
#include <lttng-events.h>
#define TP_MODULE_NOAUTOLOAD
.write = lttng_logger_write,
};
+/*
+ * Linux 5.6 introduced a separate proc_ops struct for /proc operations
+ * to decouple it from the vfs.
+ */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+static const struct proc_ops lttng_logger_proc_ops = {
+ .proc_write = lttng_logger_write,
+};
+#else
+#define lttng_logger_proc_ops lttng_logger_operations
+#endif
+
+static struct miscdevice logger_dev = {
+ .minor = MISC_DYNAMIC_MINOR,
+ .name = "lttng-logger",
+ .mode = 0666,
+ .fops = <tng_logger_operations
+};
+
int __init lttng_logger_init(void)
{
int ret = 0;
- wrapper_vmalloc_sync_all();
+ /* /dev/lttng-logger */
+ ret = misc_register(&logger_dev);
+ if (ret) {
+ printk(KERN_ERR "Error creating LTTng logger device\n");
+ goto error;
+ }
+
+ /* /proc/lttng-logger */
lttng_logger_dentry = proc_create_data(LTTNG_LOGGER_FILE,
S_IRUGO | S_IWUGO, NULL,
- <tng_logger_operations, NULL);
+ <tng_logger_proc_ops, NULL);
if (!lttng_logger_dentry) {
- printk(KERN_ERR "Error creating LTTng logger file\n");
+ printk(KERN_ERR "Error creating LTTng logger proc file\n");
ret = -ENOMEM;
- goto error;
+ goto error_proc;
}
+
+ /* Init */
ret = __lttng_events_init__lttng();
if (ret)
goto error_events;
error_events:
remove_proc_entry("lttng-logger", NULL);
+error_proc:
+ misc_deregister(&logger_dev);
error:
return ret;
}
__lttng_events_exit__lttng();
if (lttng_logger_dentry)
remove_proc_entry("lttng-logger", NULL);
+ misc_deregister(&logger_dev);
}