X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttng-syscalls.c;h=2ddc9d1227c862305036344a607946aabdbc2de4;hb=33a39a3cd074931ab3a2eaff6eb8807091cf8172;hp=622da6e206a5c683a5c1b006387789c46ac0126e;hpb=2f25059db8c710589000120cfeea0983491b5547;p=lttng-modules.git

diff --git a/lttng-syscalls.c b/lttng-syscalls.c
index 622da6e2..2ddc9d12 100644
--- a/lttng-syscalls.c
+++ b/lttng-syscalls.c
@@ -29,11 +29,14 @@
 #include <linux/in6.h>
 #include <linux/seq_file.h>
 #include <linux/stringify.h>
+#include <linux/file.h>
+#include <linux/anon_inodes.h>
 #include <asm/ptrace.h>
 #include <asm/syscall.h>
 
 #include "lib/bitfield.h"
 #include "wrapper/tracepoint.h"
+#include "wrapper/file.h"
 #include "lttng-events.h"
 
 #ifndef CONFIG_COMPAT
@@ -663,7 +666,10 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
 	}
 }
 
-/* noinline to diminish caller stack size */
+/*
+ * noinline to diminish caller stack size.
+ * Should be called with sessions lock held.
+ */
 static
 int fill_table(const struct trace_syscall_entry *table, size_t table_len,
 	struct lttng_event **chan_table, struct lttng_channel *chan,
@@ -712,9 +718,9 @@ int fill_table(const struct trace_syscall_entry *table, size_t table_len,
 		strncat(ev.name, desc->name,
 			LTTNG_KERNEL_SYM_NAME_LEN - strlen(ev.name) - 1);
 		ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
-		ev.instrumentation = LTTNG_KERNEL_NOOP;
-		chan_table[i] = lttng_event_create(chan, &ev, filter,
-						desc);
+		ev.instrumentation = LTTNG_KERNEL_SYSCALL;
+		chan_table[i] = _lttng_event_create(chan, &ev, filter,
+						desc, ev.instrumentation);
 		WARN_ON_ONCE(!chan_table[i]);
 		if (IS_ERR(chan_table[i])) {
 			/*
@@ -729,6 +735,9 @@ int fill_table(const struct trace_syscall_entry *table, size_t table_len,
 	return 0;
 }
 
+/*
+ * Should be called with sessions lock held.
+ */
 int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
 {
 	struct lttng_kernel_event ev;
@@ -776,9 +785,10 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
 		memset(&ev, 0, sizeof(ev));
 		strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN);
 		ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
-		ev.instrumentation = LTTNG_KERNEL_NOOP;
-		chan->sc_unknown = lttng_event_create(chan, &ev, filter,
-						    desc);
+		ev.instrumentation = LTTNG_KERNEL_SYSCALL;
+		chan->sc_unknown = _lttng_event_create(chan, &ev, filter,
+						desc,
+						ev.instrumentation);
 		WARN_ON_ONCE(!chan->sc_unknown);
 		if (IS_ERR(chan->sc_unknown)) {
 			return PTR_ERR(chan->sc_unknown);
@@ -792,9 +802,10 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
 		memset(&ev, 0, sizeof(ev));
 		strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN);
 		ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
-		ev.instrumentation = LTTNG_KERNEL_NOOP;
-		chan->sc_compat_unknown = lttng_event_create(chan, &ev, filter,
-							   desc);
+		ev.instrumentation = LTTNG_KERNEL_SYSCALL;
+		chan->sc_compat_unknown = _lttng_event_create(chan, &ev, filter,
+						desc,
+						ev.instrumentation);
 		WARN_ON_ONCE(!chan->sc_unknown);
 		if (IS_ERR(chan->sc_compat_unknown)) {
 			return PTR_ERR(chan->sc_compat_unknown);
@@ -808,9 +819,10 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
 		memset(&ev, 0, sizeof(ev));
 		strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN);
 		ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
-		ev.instrumentation = LTTNG_KERNEL_NOOP;
-		chan->compat_sc_exit_unknown = lttng_event_create(chan, &ev,
-						filter, desc);
+		ev.instrumentation = LTTNG_KERNEL_SYSCALL;
+		chan->compat_sc_exit_unknown = _lttng_event_create(chan, &ev,
+						filter, desc,
+						ev.instrumentation);
 		WARN_ON_ONCE(!chan->compat_sc_exit_unknown);
 		if (IS_ERR(chan->compat_sc_exit_unknown)) {
 			return PTR_ERR(chan->compat_sc_exit_unknown);
@@ -824,9 +836,9 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
 		memset(&ev, 0, sizeof(ev));
 		strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN);
 		ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
-		ev.instrumentation = LTTNG_KERNEL_NOOP;
-		chan->sc_exit_unknown = lttng_event_create(chan, &ev, filter,
-						 desc);
+		ev.instrumentation = LTTNG_KERNEL_SYSCALL;
+		chan->sc_exit_unknown = _lttng_event_create(chan, &ev, filter,
+						desc, ev.instrumentation);
 		WARN_ON_ONCE(!chan->sc_exit_unknown);
 		if (IS_ERR(chan->sc_exit_unknown)) {
 			return PTR_ERR(chan->sc_exit_unknown);
@@ -1261,3 +1273,39 @@ long lttng_channel_syscall_mask(struct lttng_channel *channel,
 	kfree(tmp_mask);
 	return ret;
 }
+
+int lttng_abi_syscall_list(void)
+{
+	struct file *syscall_list_file;
+	int file_fd, ret;
+
+	file_fd = lttng_get_unused_fd();
+	if (file_fd < 0) {
+		ret = file_fd;
+		goto fd_error;
+	}
+
+	syscall_list_file = anon_inode_getfile("[lttng_syscall_list]",
+					  &lttng_syscall_list_fops,
+					  NULL, O_RDWR);
+	if (IS_ERR(syscall_list_file)) {
+		ret = PTR_ERR(syscall_list_file);
+		goto file_error;
+	}
+	ret = lttng_syscall_list_fops.open(NULL, syscall_list_file);
+	if (ret < 0)
+		goto open_error;
+	fd_install(file_fd, syscall_list_file);
+	if (file_fd < 0) {
+		ret = file_fd;
+		goto fd_error;
+	}
+	return file_fd;
+
+open_error:
+	fput(syscall_list_file);
+file_error:
+	put_unused_fd(file_fd);
+fd_error:
+	return ret;
+}