X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-abi.c;h=058c022e9988da3064d14fcd2f8ab73f7f9aa422;hb=a4550c96fcf5939a607efcd1c01e93f7dcbb6610;hp=aab2caca467f15eadcfb916858931b134daad6d5;hpb=e026f97d2e8e4cf3813ca2569e73d04c45ef6ce7;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index aab2caca..058c022e 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -51,7 +51,13 @@
  */
 
 static struct proc_dir_entry *lttng_proc_dentry;
-static const struct file_operations lttng_fops;
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+static const struct proc_ops lttng_proc_ops;
+#else
+static const struct file_operations lttng_proc_ops;
+#endif
+
 static const struct file_operations lttng_session_fops;
 static const struct file_operations lttng_channel_fops;
 static const struct file_operations lttng_metadata_fops;
@@ -353,13 +359,22 @@ long lttng_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	}
 }
 
-static const struct file_operations lttng_fops = {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+static const struct proc_ops lttng_proc_ops = {
+	.proc_ioctl = lttng_ioctl,
+#ifdef CONFIG_COMPAT
+	.proc_compat_ioctl = lttng_ioctl,
+#endif /* CONFIG_COMPAT */
+};
+#else
+static const struct file_operations lttng_proc_ops = {
 	.owner = THIS_MODULE,
 	.unlocked_ioctl = lttng_ioctl,
 #ifdef CONFIG_COMPAT
 	.compat_ioctl = lttng_ioctl,
-#endif
+#endif /* CONFIG_COMPAT */
 };
+#endif
 
 static
 int lttng_abi_create_channel(struct file *session_file,
@@ -470,6 +485,23 @@ int lttng_abi_session_set_name(struct lttng_session *session,
 	return 0;
 }
 
+static
+int lttng_abi_session_set_creation_time(struct lttng_session *session,
+		struct lttng_kernel_session_creation_time *time)
+{
+	size_t len;
+
+	len = strnlen(time->iso8601, LTTNG_KERNEL_SESSION_CREATION_TIME_ISO8601_LEN);
+
+	if (len == LTTNG_KERNEL_SESSION_CREATION_TIME_ISO8601_LEN) {
+		/* Time is too long/malformed */
+		return -EINVAL;
+	}
+
+	strcpy(session->creation_time, time->iso8601);
+	return 0;
+}
+
 /**
  *	lttng_session_ioctl - lttng session fd ioctl
  *
@@ -497,13 +529,12 @@ static
 long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
 	struct lttng_session *session = file->private_data;
+	struct lttng_kernel_channel chan_param;
+	struct lttng_kernel_old_channel old_chan_param;
 
 	switch (cmd) {
 	case LTTNG_KERNEL_OLD_CHANNEL:
 	{
-		struct lttng_kernel_channel chan_param;
-		struct lttng_kernel_old_channel old_chan_param;
-
 		if (copy_from_user(&old_chan_param,
 				(struct lttng_kernel_old_channel __user *) arg,
 				sizeof(struct lttng_kernel_old_channel)))
@@ -520,8 +551,6 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	}
 	case LTTNG_KERNEL_CHANNEL:
 	{
-		struct lttng_kernel_channel chan_param;
-
 		if (copy_from_user(&chan_param,
 				(struct lttng_kernel_channel __user *) arg,
 				sizeof(struct lttng_kernel_channel)))
@@ -541,9 +570,6 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		return lttng_session_disable(session);
 	case LTTNG_KERNEL_OLD_METADATA:
 	{
-		struct lttng_kernel_channel chan_param;
-		struct lttng_kernel_old_channel old_chan_param;
-
 		if (copy_from_user(&old_chan_param,
 				(struct lttng_kernel_old_channel __user *) arg,
 				sizeof(struct lttng_kernel_old_channel)))
@@ -560,8 +586,6 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	}
 	case LTTNG_KERNEL_METADATA:
 	{
-		struct lttng_kernel_channel chan_param;
-
 		if (copy_from_user(&chan_param,
 					(struct lttng_kernel_channel __user *) arg,
 					sizeof(struct lttng_kernel_channel)))
@@ -589,6 +613,16 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 			return -EFAULT;
 		return lttng_abi_session_set_name(session, &name);
 	}
+	case LTTNG_KERNEL_SESSION_SET_CREATION_TIME:
+	{
+		struct lttng_kernel_session_creation_time time;
+
+		if (copy_from_user(&time,
+				(struct lttng_kernel_session_creation_time __user *) arg,
+				sizeof(struct lttng_kernel_session_creation_time)))
+			return -EFAULT;
+		return lttng_abi_session_set_creation_time(session, &time);
+	}
 	default:
 		return -ENOIOCTLCMD;
 	}
@@ -1510,6 +1544,9 @@ long lttng_event_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 				(struct lttng_kernel_event_callsite __user *) arg);
 		case LTTNG_TYPE_ENABLER:
 			return -EINVAL;
+		default:
+			WARN_ON_ONCE(1);
+			return -ENOSYS;
 		}
 	default:
 		return -ENOIOCTLCMD;
@@ -1804,7 +1841,7 @@ int __init lttng_abi_init(void)
 	}
 
 	lttng_proc_dentry = proc_create_data("lttng", S_IRUSR | S_IWUSR, NULL,
-					&lttng_fops, NULL);
+					&lttng_proc_ops, NULL);
 
 	if (!lttng_proc_dentry) {
 		printk(KERN_ERR "Error creating LTTng control file\n");