ID tracker: implement vpid/uid/vuid/gid/vgid trackers

[deliverable/lttng-modules.git] / lttng-abi.c

diff --git a/lttng-abi.c b/lttng-abi.c
index c14cc82b2baca8aa6e2012a6f46d8079fa58f2ec..18b115079138806001ef658ed2911cf718a0dde4 100644 (file)
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -55,6 +55,7 @@
 #include <lttng-abi-old.h>
 #include <lttng-events.h>
 #include <lttng-tracer.h>
+#include <lttng-tp-mempool.h>
 #include <lib/ringbuffer/frontend_types.h>
 
 /*
@@ -462,6 +463,27 @@ fd_error:
        return ret;
 }
 
+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
  *
@@ -479,9 +501,13 @@ fd_error:
  *     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.
  */
@@ -562,13 +588,58 @@ 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:
+               return lttng_session_statedump(session);
        default:
                return -ENOIOCTLCMD;
        }
@@ -681,6 +752,7 @@ long lttng_metadata_ring_buffer_ioctl(struct file *filp,
                 */
                return -ENOSYS;
        }
+       case RING_BUFFER_FLUSH_EMPTY:   /* Fall-through. */
        case RING_BUFFER_FLUSH:
        {
                struct lttng_metadata_stream *stream = filp->private_data;
@@ -757,6 +829,28 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
                 */
                return -ENOSYS;
        }
+       case RING_BUFFER_FLUSH_EMPTY:   /* Fall-through. */
+       case RING_BUFFER_FLUSH:
+       {
+               struct lttng_metadata_stream *stream = filp->private_data;
+               struct lib_ring_buffer *buf = stream->priv;
+               struct channel *chan = buf->backend.chan;
+
+               /*
+                * Before doing the actual ring buffer flush, write up to one
+                * packet of metadata in the ring buffer.
+                */
+               ret = lttng_metadata_output_channel(stream, chan);
+               if (ret < 0)
+                       goto err;
+               break;
+       }
+       case RING_BUFFER_GET_METADATA_VERSION:
+       {
+               struct lttng_metadata_stream *stream = filp->private_data;
+
+               return put_u64(stream->version, arg);
+       }
        default:
                break;
        }
@@ -774,12 +868,6 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
                                cmd, arg);
                break;
        }
-       case RING_BUFFER_GET_METADATA_VERSION:
-       {
-               struct lttng_metadata_stream *stream = filp->private_data;
-
-               return put_u64(stream->version, arg);
-       }
        default:
                break;
        }
@@ -957,8 +1045,11 @@ int lttng_abi_open_metadata_stream(struct file *channel_file)
                goto notransport;
        }
 
-       if (!lttng_kref_get(&session->metadata_cache->refcount))
+       if (!lttng_kref_get(&session->metadata_cache->refcount)) {
+               ret = -EOVERFLOW;
                goto kref_error;
+       }
+
        ret = lttng_abi_create_stream_fd(channel_file, stream_priv,
                        &lttng_metadata_ring_buffer_file_operations);
        if (ret < 0)
@@ -1700,6 +1791,12 @@ int __init lttng_abi_init(void)
 
        wrapper_vmalloc_sync_all();
        lttng_clock_ref();
+
+       ret = lttng_tp_mempool_init();
+       if (ret) {
+               goto error;
+       }
+
        lttng_proc_dentry = proc_create_data("lttng", S_IRUSR | S_IWUSR, NULL,
                                        &lttng_fops, NULL);
        
@@ -1712,6 +1809,7 @@ int __init lttng_abi_init(void)
        return 0;
 
 error:
+       lttng_tp_mempool_destroy();
        lttng_clock_unref();
        return ret;
 }
@@ -1719,6 +1817,7 @@ error:
 /* No __exit annotation because used by init error path too. */
 void lttng_abi_exit(void)
 {
+       lttng_tp_mempool_destroy();
        lttng_clock_unref();
        if (lttng_proc_dentry)
                remove_proc_entry("lttng", NULL);