#include <linux/module.h>
#include <linux/debugfs.h>
+#include <linux/proc_fs.h>
#include <linux/anon_inodes.h>
#include <linux/file.h>
#include <linux/uaccess.h>
*/
static struct dentry *lttng_dentry;
+static struct proc_dir_entry *lttng_proc_dentry;
static const struct file_operations lttng_fops;
static const struct file_operations lttng_session_fops;
static const struct file_operations lttng_channel_fops;
static const struct file_operations lttng_metadata_fops;
static const struct file_operations lttng_event_fops;
+/*
+ * Teardown management: opened file descriptors keep a refcount on the module,
+ * so it can only exit when all file descriptors are closed.
+ */
+
enum channel_type {
PER_CPU_CHANNEL,
METADATA_CHANNEL,
context_param.u.perf_counter.config,
context_param.u.perf_counter.name,
ctx);
- case LTTNG_KERNEL_CONTEXT_COMM:
- return lttng_add_comm_to_ctx(ctx);
+ case LTTNG_KERNEL_CONTEXT_PROCNAME:
+ return lttng_add_procname_to_ctx(ctx);
default:
return -EINVAL;
}
case LTTNG_KERNEL_WAIT_QUIESCENT:
synchronize_trace();
return 0;
+ case LTTNG_KERNEL_CALIBRATE:
+ {
+ struct lttng_kernel_calibrate __user *ucalibrate =
+ (struct lttng_kernel_calibrate __user *) arg;
+ struct lttng_kernel_calibrate calibrate;
+ int ret;
+
+ if (copy_from_user(&calibrate, ucalibrate, sizeof(calibrate)))
+ return -EFAULT;
+ ret = lttng_calibrate(&calibrate);
+ if (copy_to_user(ucalibrate, &calibrate, sizeof(calibrate)))
+ return -EFAULT;
+ return ret;
+ }
default:
return -ENOIOCTLCMD;
}
}
static const struct file_operations lttng_fops = {
+ .owner = THIS_MODULE,
.unlocked_ioctl = lttng_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = lttng_ioctl,
.name = "lttng_metadata",
};
struct ltt_event *event;
- int ret;
/*
* We tolerate no failure path after event creation. It will stay
* invariant for the rest of the session.
*/
- event = ltt_event_create(channel, &metadata_params, NULL);
+ event = ltt_event_create(channel, &metadata_params, NULL, NULL);
if (!event) {
- ret = -EINVAL;
goto create_error;
}
return;
enum channel_type channel_type)
{
struct ltt_session *session = session_file->private_data;
- const struct file_operations *fops;
+ const struct file_operations *fops = NULL;
const char *transport_name;
struct ltt_channel *chan;
struct file *chan_file;
ret = chan_fd;
goto fd_error;
}
+ switch (channel_type) {
+ case PER_CPU_CHANNEL:
+ fops = <tng_channel_fops;
+ break;
+ case METADATA_CHANNEL:
+ fops = <tng_metadata_fops;
+ break;
+ }
+
chan_file = anon_inode_getfile("[lttng_channel]",
- <tng_channel_fops,
+ fops,
NULL, O_RDWR);
if (IS_ERR(chan_file)) {
ret = PTR_ERR(chan_file);
} else {
return -EINVAL;
}
- fops = <tng_channel_fops;
break;
case METADATA_CHANNEL:
if (chan_param.output == LTTNG_KERNEL_SPLICE)
transport_name = "relay-metadata-mmap";
else
return -EINVAL;
- fops = <tng_metadata_fops;
break;
default:
transport_name = "<unknown>";
}
static const struct file_operations lttng_session_fops = {
+ .owner = THIS_MODULE,
.release = lttng_session_release,
.unlocked_ioctl = lttng_session_ioctl,
#ifdef CONFIG_COMPAT
return -EFAULT;
event_param.name[LTTNG_SYM_NAME_LEN - 1] = '\0';
switch (event_param.instrumentation) {
+ case LTTNG_KERNEL_KRETPROBE:
+ event_param.u.kretprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+ break;
case LTTNG_KERNEL_KPROBE:
event_param.u.kprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
break;
default:
break;
}
- event_fd = get_unused_fd();
- if (event_fd < 0) {
- ret = event_fd;
- goto fd_error;
- }
- event_file = anon_inode_getfile("[lttng_event]",
- <tng_event_fops,
- NULL, O_RDWR);
- if (IS_ERR(event_file)) {
- ret = PTR_ERR(event_file);
- goto file_error;
- }
- /*
- * We tolerate no failure path after event creation. It will stay
- * invariant for the rest of the session.
- */
- event = ltt_event_create(channel, &event_param, NULL);
- if (!event) {
- ret = -EINVAL;
- goto event_error;
+ switch (event_param.instrumentation) {
+ default:
+ event_fd = get_unused_fd();
+ if (event_fd < 0) {
+ ret = event_fd;
+ goto fd_error;
+ }
+ event_file = anon_inode_getfile("[lttng_event]",
+ <tng_event_fops,
+ NULL, O_RDWR);
+ if (IS_ERR(event_file)) {
+ ret = PTR_ERR(event_file);
+ goto file_error;
+ }
+ /*
+ * We tolerate no failure path after event creation. It
+ * will stay invariant for the rest of the session.
+ */
+ event = ltt_event_create(channel, &event_param, NULL, NULL);
+ if (!event) {
+ ret = -EINVAL;
+ goto event_error;
+ }
+ event_file->private_data = event;
+ fd_install(event_fd, event_file);
+ /* The event holds a reference on the channel */
+ atomic_long_inc(&channel_file->f_count);
+ break;
+ case LTTNG_KERNEL_SYSCALL:
+ /*
+ * Only all-syscall tracing supported for now.
+ */
+ if (event_param.name[0] != '\0')
+ return -EINVAL;
+ ret = lttng_syscalls_register(channel, NULL);
+ if (ret)
+ goto fd_error;
+ event_fd = 0;
+ break;
}
- event_file->private_data = event;
- fd_install(event_fd, event_file);
- /* The event holds a reference on the channel */
- atomic_long_inc(&channel_file->f_count);
return event_fd;
event_error:
return POLLERR;
if (channel->ops->is_finalized(channel->chan))
return POLLHUP;
- else
+ if (channel->ops->buffer_has_read_closed_stream(channel->chan))
return POLLIN | POLLRDNORM;
+ return 0;
}
return mask;
}
static const struct file_operations lttng_channel_fops = {
+ .owner = THIS_MODULE,
.release = lttng_channel_release,
.poll = lttng_channel_poll,
.unlocked_ioctl = lttng_channel_ioctl,
};
static const struct file_operations lttng_metadata_fops = {
+ .owner = THIS_MODULE,
.release = lttng_channel_release,
.unlocked_ioctl = lttng_metadata_ioctl,
#ifdef CONFIG_COMPAT
/* TODO: filter control ioctl */
static const struct file_operations lttng_event_fops = {
+ .owner = THIS_MODULE,
.release = lttng_event_release,
.unlocked_ioctl = lttng_event_ioctl,
#ifdef CONFIG_COMPAT
wrapper_vmalloc_sync_all();
lttng_dentry = debugfs_create_file("lttng", S_IWUSR, NULL, NULL,
- <tng_fops);
- if (IS_ERR(lttng_dentry) || !lttng_dentry) {
+ <tng_fops);
+ if (IS_ERR(lttng_dentry))
+ lttng_dentry = NULL;
+
+ lttng_proc_dentry = proc_create_data("lttng", S_IWUSR, NULL,
+ <tng_fops, NULL);
+
+ if (!lttng_dentry && !lttng_proc_dentry) {
printk(KERN_ERR "Error creating LTTng control file\n");
ret = -ENOMEM;
goto error;
void __exit ltt_debugfs_abi_exit(void)
{
- debugfs_remove(lttng_dentry);
+ if (lttng_dentry)
+ debugfs_remove(lttng_dentry);
+ if (lttng_proc_dentry)
+ remove_proc_entry("lttng", NULL);
}
projects / lttng-modules.git / blobdiff