X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-abi.c;h=9d610e9346f53c3669b5ca2b5c7de46475eed6d0;hb=edfdcb685c3f56dde803244449f79ad7bed03798;hp=5c6f384d8fc62c6b40a229a30d9036a0be9f3f9e;hpb=64c147c07f1361707e182762866524c1c14bb9ad;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index 5c6f384d..9d610e93 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;
@@ -391,13 +397,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,
@@ -525,6 +540,27 @@ int lttng_abi_session_set_creation_time(struct lttng_session *session,
 	return 0;
 }
 
+static
+enum tracker_type get_tracker_type(struct lttng_kernel_tracker_args *tracker)
+{
+	switch (tracker->type) {
+	case LTTNG_KERNEL_TRACKER_PID:
+		return TRACKER_PID;
+	case LTTNG_KERNEL_TRACKER_VPID:
+		return TRACKER_VPID;
+	case LTTNG_KERNEL_TRACKER_UID:
+		return TRACKER_UID;
+	case LTTNG_KERNEL_TRACKER_VUID:
+		return TRACKER_VUID;
+	case LTTNG_KERNEL_TRACKER_GID:
+		return TRACKER_GID;
+	case LTTNG_KERNEL_TRACKER_VGID:
+		return TRACKER_VGID;
+	default:
+		return TRACKER_UNKNOWN;
+	}
+}
+
 /**
  *	lttng_session_ioctl - lttng session fd ioctl
  *
@@ -542,9 +578,13 @@ int lttng_abi_session_set_creation_time(struct lttng_session *session,
  *	LTTNG_KERNEL_METADATA
  *		Returns a LTTng metadata file descriptor
  *	LTTNG_KERNEL_SESSION_TRACK_PID
- *		Add PID to session tracker
+ *		Add PID to session PID tracker
  *	LTTNG_KERNEL_SESSION_UNTRACK_PID
- *		Remove PID from session tracker
+ *		Remove PID from session PID tracker
+ *	LTTNG_KERNEL_SESSION_TRACK_ID
+ *		Add ID to tracker
+ *	LTTNG_KERNEL_SESSION_UNTRACK_ID
+ *		Remove ID from tracker
  *
  * The returned channel will be deleted when its file descriptor is closed.
  */
@@ -617,11 +657,54 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 				METADATA_CHANNEL);
 	}
 	case LTTNG_KERNEL_SESSION_TRACK_PID:
-		return lttng_session_track_pid(session, (int) arg);
+		return lttng_session_track_id(session, TRACKER_PID, (int) arg);
 	case LTTNG_KERNEL_SESSION_UNTRACK_PID:
-		return lttng_session_untrack_pid(session, (int) arg);
+		return lttng_session_untrack_id(session, TRACKER_PID, (int) arg);
+	case LTTNG_KERNEL_SESSION_TRACK_ID:
+	{
+		struct lttng_kernel_tracker_args tracker;
+		enum tracker_type tracker_type;
+
+		if (copy_from_user(&tracker,
+				(struct lttng_kernel_tracker_args __user *) arg,
+				sizeof(struct lttng_kernel_tracker_args)))
+			return -EFAULT;
+		tracker_type = get_tracker_type(&tracker);
+		if (tracker_type == TRACKER_UNKNOWN)
+			return -EINVAL;
+		return lttng_session_track_id(session, tracker_type, tracker.id);
+	}
+	case LTTNG_KERNEL_SESSION_UNTRACK_ID:
+	{
+		struct lttng_kernel_tracker_args tracker;
+		enum tracker_type tracker_type;
+
+		if (copy_from_user(&tracker,
+				(struct lttng_kernel_tracker_args __user *) arg,
+				sizeof(struct lttng_kernel_tracker_args)))
+			return -EFAULT;
+		tracker_type = get_tracker_type(&tracker);
+		if (tracker_type == TRACKER_UNKNOWN)
+			return -EINVAL;
+		return lttng_session_untrack_id(session, tracker_type,
+				tracker.id);
+	}
 	case LTTNG_KERNEL_SESSION_LIST_TRACKER_PIDS:
-		return lttng_session_list_tracker_pids(session);
+		return lttng_session_list_tracker_ids(session, TRACKER_PID);
+	case LTTNG_KERNEL_SESSION_LIST_TRACKER_IDS:
+	{
+		struct lttng_kernel_tracker_args tracker;
+		enum tracker_type tracker_type;
+
+		if (copy_from_user(&tracker,
+				(struct lttng_kernel_tracker_args __user *) arg,
+				sizeof(struct lttng_kernel_tracker_args)))
+			return -EFAULT;
+		tracker_type = get_tracker_type(&tracker);
+		if (tracker_type == TRACKER_UNKNOWN)
+			return -EINVAL;
+		return lttng_session_list_tracker_ids(session, tracker_type);
+	}
 	case LTTNG_KERNEL_SESSION_METADATA_REGEN:
 		return lttng_session_metadata_regenerate(session);
 	case LTTNG_KERNEL_SESSION_STATEDUMP:
@@ -1864,7 +1947,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");