X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-abi.c;h=4df3d673b18c0d84e4d80047fdf096ed52a81350;hb=d1f652f8d4f6d1de8f6d32ae8711d6469c38892c;hp=cc8f1838360faf8e60d7a369fe28924bad0ceb7c;hpb=1c88f269135ba48b0adb8a8a1f8b32e8b3c4cbb9;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index cc8f1838..4df3d673 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -236,6 +236,44 @@ long lttng_abi_add_context(struct file *file,
 	case LTTNG_KERNEL_CONTEXT_CALLSTACK_KERNEL:
 	case LTTNG_KERNEL_CONTEXT_CALLSTACK_USER:
 		return lttng_add_callstack_to_ctx(ctx, context_param->ctx);
+	case LTTNG_KERNEL_CONTEXT_CGROUP_NS:
+		return lttng_add_cgroup_ns_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_IPC_NS:
+		return lttng_add_ipc_ns_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_MNT_NS:
+		return lttng_add_mnt_ns_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_NET_NS:
+		return lttng_add_net_ns_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_PID_NS:
+		return lttng_add_pid_ns_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_USER_NS:
+		return lttng_add_user_ns_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_UTS_NS:
+		return lttng_add_uts_ns_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_UID:
+		return lttng_add_uid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_EUID:
+		return lttng_add_euid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_SUID:
+		return lttng_add_suid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_GID:
+		return lttng_add_gid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_EGID:
+		return lttng_add_egid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_SGID:
+		return lttng_add_sgid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VUID:
+		return lttng_add_vuid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VEUID:
+		return lttng_add_veuid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VSUID:
+		return lttng_add_vsuid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VGID:
+		return lttng_add_vgid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VEGID:
+		return lttng_add_vegid_to_ctx(ctx);
+	case LTTNG_KERNEL_CONTEXT_VSGID:
+		return lttng_add_vsgid_to_ctx(ctx);
 	default:
 		return -EINVAL;
 	}
@@ -487,6 +525,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
  *
@@ -504,9 +563,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.
  */
@@ -514,13 +577,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)))
@@ -537,8 +599,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)))
@@ -558,9 +618,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)))
@@ -577,8 +634,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)))
@@ -587,11 +642,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:
@@ -1537,6 +1635,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;