X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;h=0272d9b9331c6750c276993b14552bbeb6e565f2;hb=a834901f2890deadb815d7f9e3ab79c3ba673994;hp=ea5ab9dc4ed3ce29cd3dad50b1cc16c4bc32167a;hpb=6a359b8a40062865e081cd959ecbef934c761861;p=lttng-ust.git

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index ea5ab9dc..0272d9b9 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -16,17 +16,18 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
-#include <byteswap.h>
 #include <stdint.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 
 #include <lttng/ust-config.h>
 #include <lttng/ust-ctl.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-events.h>
+#include <lttng/ust-endian.h>
 #include <usterr-signal-safe.h>
 #include <ust-comm.h>
 #include <helper.h>
@@ -37,6 +38,11 @@
 #include "../liblttng-ust/lttng-rb-clients.h"
 #include "../liblttng-ust/clock.h"
 #include "../liblttng-ust/getenv.h"
+#include "../liblttng-ust/lttng-tracer-core.h"
+
+#include "../libcounter/shm.h"
+#include "../libcounter/smp.h"
+#include "../libcounter/counter.h"
 
 /*
  * Number of milliseconds to retry before failing metadata writes on
@@ -68,6 +74,24 @@ struct ustctl_consumer_stream {
 	uint64_t memory_map_size;
 };
 
+#define USTCTL_COUNTER_ATTR_DIMENSION_MAX 8
+struct ustctl_counter_attr {
+	enum ustctl_counter_arithmetic arithmetic;
+	enum ustctl_counter_bitness bitness;
+	uint32_t nr_dimensions;
+	int64_t global_sum_step;
+	struct ustctl_counter_dimension dimensions[USTCTL_COUNTER_ATTR_DIMENSION_MAX];
+};
+
+/*
+ * Counter representation within daemon.
+ */
+struct ustctl_daemon_counter {
+	struct lib_counter *counter;
+	const struct lttng_counter_ops *ops;
+	struct ustctl_counter_attr *attr;	/* initial attributes */
+};
+
 extern void lttng_ring_buffer_client_overwrite_init(void);
 extern void lttng_ring_buffer_client_overwrite_rt_init(void);
 extern void lttng_ring_buffer_client_discard_init(void);
@@ -78,6 +102,14 @@ extern void lttng_ring_buffer_client_overwrite_rt_exit(void);
 extern void lttng_ring_buffer_client_discard_exit(void);
 extern void lttng_ring_buffer_client_discard_rt_exit(void);
 extern void lttng_ring_buffer_metadata_client_exit(void);
+LTTNG_HIDDEN
+extern void lttng_counter_client_percpu_32_modular_init(void);
+LTTNG_HIDDEN
+extern void lttng_counter_client_percpu_32_modular_exit(void);
+LTTNG_HIDDEN
+extern void lttng_counter_client_percpu_64_modular_init(void);
+LTTNG_HIDDEN
+extern void lttng_counter_client_percpu_64_modular_exit(void);
 
 int ustctl_release_handle(int sock, int handle)
 {
@@ -111,8 +143,10 @@ int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
 				ret = -errno;
 				return ret;
 			}
+			data->u.channel.wakeup_fd = -1;
 		}
 		free(data->u.channel.data);
+		data->u.channel.data = NULL;
 		break;
 	case LTTNG_UST_OBJECT_TYPE_STREAM:
 		if (data->u.stream.shm_fd >= 0) {
@@ -121,6 +155,7 @@ int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
 				ret = -errno;
 				return ret;
 			}
+			data->u.stream.shm_fd = -1;
 		}
 		if (data->u.stream.wakeup_fd >= 0) {
 			ret = close(data->u.stream.wakeup_fd);
@@ -128,10 +163,37 @@ int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
 				ret = -errno;
 				return ret;
 			}
+			data->u.stream.wakeup_fd = -1;
 		}
 		break;
 	case LTTNG_UST_OBJECT_TYPE_EVENT:
 	case LTTNG_UST_OBJECT_TYPE_CONTEXT:
+	case LTTNG_UST_OBJECT_TYPE_EVENT_NOTIFIER_GROUP:
+	case LTTNG_UST_OBJECT_TYPE_EVENT_NOTIFIER:
+		break;
+	case LTTNG_UST_OBJECT_TYPE_COUNTER:
+		free(data->u.counter.data);
+		data->u.counter.data = NULL;
+		break;
+	case LTTNG_UST_OBJECT_TYPE_COUNTER_GLOBAL:
+		if (data->u.counter_global.shm_fd >= 0) {
+			ret = close(data->u.counter_global.shm_fd);
+			if (ret < 0) {
+				ret = -errno;
+				return ret;
+			}
+			data->u.counter_global.shm_fd = -1;
+		}
+		break;
+	case LTTNG_UST_OBJECT_TYPE_COUNTER_CPU:
+		if (data->u.counter_cpu.shm_fd >= 0) {
+			ret = close(data->u.counter_cpu.shm_fd);
+			if (ret < 0) {
+				ret = -errno;
+				return ret;
+			}
+			data->u.counter_cpu.shm_fd = -1;
+		}
 		break;
 	default:
 		assert(0);
@@ -328,6 +390,37 @@ int ustctl_set_filter(int sock, struct lttng_ust_filter_bytecode *bytecode,
 	return ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
 }
 
+int ustctl_set_capture(int sock, struct lttng_ust_capture_bytecode *bytecode,
+		struct lttng_ust_object_data *obj_data)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret;
+
+	if (!obj_data)
+		return -EINVAL;
+
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = obj_data->handle;
+	lum.cmd = LTTNG_UST_CAPTURE;
+	lum.u.capture.data_size = bytecode->len;
+	lum.u.capture.reloc_offset = bytecode->reloc_offset;
+	lum.u.capture.seqnum = bytecode->seqnum;
+
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret)
+		return ret;
+	/* send var len bytecode */
+	ret = ustcomm_send_unix_sock(sock, bytecode->data,
+				bytecode->len);
+	if (ret < 0) {
+		return ret;
+	}
+	if (ret != bytecode->len)
+		return -EINVAL;
+	return ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+}
+
 int ustctl_set_exclusion(int sock, struct lttng_ust_event_exclusion *exclusion,
 		struct lttng_ust_object_data *obj_data)
 {
@@ -418,6 +511,106 @@ int ustctl_stop_session(int sock, int handle)
 	return ustctl_disable(sock, &obj);
 }
 
+int ustctl_create_event_notifier_group(int sock, int pipe_fd,
+		struct lttng_ust_object_data **_event_notifier_group_data)
+{
+	struct lttng_ust_object_data *event_notifier_group_data;
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	ssize_t len;
+	int ret;
+
+	if (!_event_notifier_group_data)
+		return -EINVAL;
+
+	event_notifier_group_data = zmalloc(sizeof(*event_notifier_group_data));
+	if (!event_notifier_group_data)
+		return -ENOMEM;
+
+	event_notifier_group_data->type = LTTNG_UST_OBJECT_TYPE_EVENT_NOTIFIER_GROUP;
+
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = LTTNG_UST_ROOT_HANDLE;
+	lum.cmd = LTTNG_UST_EVENT_NOTIFIER_GROUP_CREATE;
+
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret)
+		goto error;
+
+	/* Send event_notifier notification pipe. */
+	len = ustcomm_send_fds_unix_sock(sock, &pipe_fd, 1);
+	if (len <= 0) {
+		ret = len;
+		goto error;
+	}
+
+	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+	if (ret)
+		goto error;
+
+	event_notifier_group_data->handle = lur.ret_val;
+	DBG("received event_notifier group handle %d", event_notifier_group_data->handle);
+
+	*_event_notifier_group_data = event_notifier_group_data;
+
+	ret = 0;
+	goto end;
+error:
+	free(event_notifier_group_data);
+
+end:
+	return ret;
+}
+
+int ustctl_create_event_notifier(int sock, struct lttng_ust_event_notifier *event_notifier,
+		struct lttng_ust_object_data *event_notifier_group,
+		struct lttng_ust_object_data **_event_notifier_data)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	struct lttng_ust_object_data *event_notifier_data;
+	ssize_t len;
+	int ret;
+
+	if (!event_notifier_group || !_event_notifier_data)
+		return -EINVAL;
+
+	event_notifier_data = zmalloc(sizeof(*event_notifier_data));
+	if (!event_notifier_data)
+		return -ENOMEM;
+
+	event_notifier_data->type = LTTNG_UST_OBJECT_TYPE_EVENT_NOTIFIER;
+
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = event_notifier_group->handle;
+	lum.cmd = LTTNG_UST_EVENT_NOTIFIER_CREATE;
+	lum.u.event_notifier.len = sizeof(*event_notifier);
+
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret) {
+		free(event_notifier_data);
+		return ret;
+	}
+	/* Send struct lttng_ust_event_notifier */
+	len = ustcomm_send_unix_sock(sock, event_notifier, sizeof(*event_notifier));
+	if (len != sizeof(*event_notifier)) {
+		if (len < 0)
+			return len;
+		else
+			return -EIO;
+	}
+	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+	if (ret) {
+		free(event_notifier_data);
+		return ret;
+	}
+	event_notifier_data->handle = lur.ret_val;
+	DBG("received event_notifier handle %u", event_notifier_data->handle);
+	*_event_notifier_data = event_notifier_data;
+
+	return ret;
+}
+
 int ustctl_tracepoint_list(int sock)
 {
 	struct ustcomm_ust_msg lum;
@@ -980,6 +1173,44 @@ int ustctl_duplicate_ust_object_data(struct lttng_ust_object_data **dest,
 		goto error_type;
 	}
 
+	case LTTNG_UST_OBJECT_TYPE_COUNTER:
+	{
+		obj->u.counter.data = zmalloc(obj->size);
+		if (!obj->u.counter.data) {
+			ret = -ENOMEM;
+			goto error_type;
+		}
+		memcpy(obj->u.counter.data, src->u.counter.data, obj->size);
+		break;
+	}
+
+	case LTTNG_UST_OBJECT_TYPE_COUNTER_GLOBAL:
+	{
+		if (src->u.counter_global.shm_fd >= 0) {
+			obj->u.counter_global.shm_fd =
+				dup(src->u.counter_global.shm_fd);
+			if (obj->u.counter_global.shm_fd < 0) {
+				ret = errno;
+				goto error_type;
+			}
+		}
+		break;
+	}
+
+	case LTTNG_UST_OBJECT_TYPE_COUNTER_CPU:
+	{
+		obj->u.counter_cpu.cpu_nr = src->u.counter_cpu.cpu_nr;
+		if (src->u.counter_cpu.shm_fd >= 0) {
+			obj->u.counter_cpu.shm_fd =
+				dup(src->u.counter_cpu.shm_fd);
+			if (obj->u.counter_cpu.shm_fd < 0) {
+				ret = errno;
+				goto error_type;
+			}
+		}
+		break;
+	}
+
 	default:
 		ret = -EINVAL;
 		goto error_type;
@@ -1453,7 +1684,7 @@ int ustctl_get_padded_subbuf_size(struct ustctl_consumer_stream *stream,
 	chan = consumer_chan->chan->chan;
 	*len = lib_ring_buffer_get_read_data_size(&chan->backend.config, buf,
 		consumer_chan->chan->handle);
-	*len = PAGE_ALIGN(*len);
+	*len = LTTNG_UST_PAGE_ALIGN(*len);
 	return 0;
 }
 
@@ -1793,6 +2024,104 @@ int ustctl_has_perf_counters(void)
 
 #endif
 
+#ifdef __linux__
+/*
+ * Override application pid/uid/gid with unix socket credentials. If
+ * the application announced a pid matching our view, it means it is
+ * within the same pid namespace, so expose the ppid provided by the
+ * application.
+ */
+static
+int get_cred(int sock,
+	const struct ustctl_reg_msg *reg_msg,
+	uint32_t *pid,
+	uint32_t *ppid,
+	uint32_t *uid,
+	uint32_t *gid)
+{
+	struct ucred ucred;
+	socklen_t ucred_len = sizeof(struct ucred);
+	int ret;
+
+	ret = getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &ucred_len);
+	if (ret) {
+		return -LTTNG_UST_ERR_PEERCRED;
+	}
+	DBG("Unix socket peercred [ pid: %u, uid: %u, gid: %u ], "
+		"application registered claiming [ pid: %u, ppid: %u, uid: %u, gid: %u ]",
+		ucred.pid, ucred.uid, ucred.gid,
+		reg_msg->pid, reg_msg->ppid, reg_msg->uid, reg_msg->gid);
+	if (!ucred.pid) {
+		ERR("Unix socket credential pid=0. Refusing application in distinct, non-nested pid namespace.");
+		return -LTTNG_UST_ERR_PEERCRED_PID;
+	}
+	*pid = ucred.pid;
+	*uid = ucred.uid;
+	*gid = ucred.gid;
+	if (ucred.pid == reg_msg->pid) {
+		*ppid = reg_msg->ppid;
+	} else {
+		*ppid = 0;
+	}
+	return 0;
+}
+#elif defined(__FreeBSD__)
+#include <sys/ucred.h>
+
+/*
+ * Override application uid/gid with unix socket credentials. Use the
+ * first group of the cr_groups.
+ * Use the pid and ppid provided by the application on registration.
+ */
+static
+int get_cred(int sock,
+	const struct ustctl_reg_msg *reg_msg,
+	uint32_t *pid,
+	uint32_t *ppid,
+	uint32_t *uid,
+	uint32_t *gid)
+{
+	struct xucred xucred;
+	socklen_t xucred_len = sizeof(struct xucred);
+	int ret;
+
+	ret = getsockopt(sock, SOL_SOCKET, LOCAL_PEERCRED, &xucred, &xucred_len);
+	if (ret) {
+		return -LTTNG_UST_ERR_PEERCRED;
+	}
+	if (xucred.cr_version != XUCRED_VERSION || xucred.cr_ngroups < 1) {
+		return -LTTNG_UST_ERR_PEERCRED;
+	}
+	DBG("Unix socket peercred [ uid: %u, gid: %u ], "
+		"application registered claiming [ pid: %d, ppid: %d, uid: %u, gid: %u ]",
+		xucred.uid, xucred.cr_groups[0],
+		reg_msg->pid, reg_msg->ppid, reg_msg->uid, reg_msg->gid);
+	*pid = reg_msg->pid;
+	*ppid = reg_msg->ppid;
+	*uid = xucred.uid;
+	*gid = xucred.cr_groups[0];
+	return 0;
+}
+#else
+#warning "Using insecure fallback: trusting user id provided by registered applications. Please consider implementing use of unix socket credentials on your platform."
+static
+int get_cred(int sock,
+	const struct ustctl_reg_msg *reg_msg,
+	uint32_t *pid,
+	uint32_t *ppid,
+	uint32_t *uid,
+	uint32_t *gid)
+{
+	DBG("Application registered claiming [ pid: %u, ppid: %d, uid: %u, gid: %u ]",
+		reg_msg->pid, reg_msg->ppid, reg_msg->uid, reg_msg->gid);
+	*pid = reg_msg->pid;
+	*ppid = reg_msg->ppid;
+	*uid = reg_msg->uid;
+	*gid = reg_msg->gid;
+	return 0;
+}
+#endif
+
 /*
  * Returns 0 on success, negative error value on error.
  */
@@ -1843,10 +2172,6 @@ int ustctl_recv_reg_msg(int sock,
 	}
 	*major = reg_msg.major;
 	*minor = reg_msg.minor;
-	*pid = reg_msg.pid;
-	*ppid = reg_msg.ppid;
-	*uid = reg_msg.uid;
-	*gid = reg_msg.gid;
 	*bits_per_long = reg_msg.bits_per_long;
 	*uint8_t_alignment = reg_msg.uint8_t_alignment;
 	*uint16_t_alignment = reg_msg.uint16_t_alignment;
@@ -1858,8 +2183,7 @@ int ustctl_recv_reg_msg(int sock,
 			reg_msg.major > LTTNG_UST_ABI_MAJOR_VERSION) {
 		return -LTTNG_UST_ERR_UNSUP_MAJOR;
 	}
-
-	return 0;
+	return get_cred(sock, &reg_msg, pid, ppid, uid, gid);
 }
 
 int ustctl_recv_notify(int sock, enum ustctl_notify_cmd *notify_cmd)
@@ -2236,6 +2560,373 @@ int ustctl_regenerate_statedump(int sock, int handle)
 	return 0;
 }
 
+/* counter operations */
+
+int ustctl_get_nr_cpu_per_counter(void)
+{
+	return lttng_counter_num_possible_cpus();
+}
+
+struct ustctl_daemon_counter *
+	ustctl_create_counter(size_t nr_dimensions,
+		const struct ustctl_counter_dimension *dimensions,
+		int64_t global_sum_step,
+		int global_counter_fd,
+		int nr_counter_cpu_fds,
+		const int *counter_cpu_fds,
+		enum ustctl_counter_bitness bitness,
+		enum ustctl_counter_arithmetic arithmetic,
+		uint32_t alloc_flags)
+{
+	const char *transport_name;
+	struct ustctl_daemon_counter *counter;
+	struct lttng_counter_transport *transport;
+	struct lttng_counter_dimension ust_dim[LTTNG_COUNTER_DIMENSION_MAX];
+	size_t i;
+
+	if (nr_dimensions > LTTNG_COUNTER_DIMENSION_MAX)
+		return NULL;
+	/* Currently, only per-cpu allocation is supported. */
+	switch (alloc_flags) {
+	case USTCTL_COUNTER_ALLOC_PER_CPU:
+		break;
+
+	case USTCTL_COUNTER_ALLOC_PER_CPU | USTCTL_COUNTER_ALLOC_GLOBAL:
+	case USTCTL_COUNTER_ALLOC_GLOBAL:
+	default:
+		return NULL;
+	}
+	switch (bitness) {
+	case USTCTL_COUNTER_BITNESS_32:
+		switch (arithmetic) {
+		case USTCTL_COUNTER_ARITHMETIC_MODULAR:
+			transport_name = "counter-per-cpu-32-modular";
+			break;
+		case USTCTL_COUNTER_ARITHMETIC_SATURATION:
+			transport_name = "counter-per-cpu-32-saturation";
+			break;
+		default:
+			return NULL;
+		}
+		break;
+	case USTCTL_COUNTER_BITNESS_64:
+		switch (arithmetic) {
+		case USTCTL_COUNTER_ARITHMETIC_MODULAR:
+			transport_name = "counter-per-cpu-64-modular";
+			break;
+		case USTCTL_COUNTER_ARITHMETIC_SATURATION:
+			transport_name = "counter-per-cpu-64-saturation";
+			break;
+		default:
+			return NULL;
+		}
+		break;
+	default:
+		return NULL;
+	}
+
+	transport = lttng_counter_transport_find(transport_name);
+	if (!transport) {
+		DBG("LTTng transport %s not found\n",
+			transport_name);
+		return NULL;
+	}
+
+	counter = zmalloc(sizeof(*counter));
+	if (!counter)
+		return NULL;
+	counter->attr = zmalloc(sizeof(*counter->attr));
+	if (!counter->attr)
+		goto free_counter;
+	counter->attr->bitness = bitness;
+	counter->attr->arithmetic = arithmetic;
+	counter->attr->nr_dimensions = nr_dimensions;
+	counter->attr->global_sum_step = global_sum_step;
+	for (i = 0; i < nr_dimensions; i++)
+		counter->attr->dimensions[i] = dimensions[i];
+
+	for (i = 0; i < nr_dimensions; i++) {
+		ust_dim[i].size = dimensions[i].size;
+		ust_dim[i].underflow_index = dimensions[i].underflow_index;
+		ust_dim[i].overflow_index = dimensions[i].overflow_index;
+		ust_dim[i].has_underflow = dimensions[i].has_underflow;
+		ust_dim[i].has_overflow = dimensions[i].has_overflow;
+	}
+	counter->counter = transport->ops.counter_create(nr_dimensions,
+		ust_dim, global_sum_step, global_counter_fd,
+		nr_counter_cpu_fds, counter_cpu_fds, true);
+	if (!counter->counter)
+		goto free_attr;
+	counter->ops = &transport->ops;
+	return counter;
+
+free_attr:
+	free(counter->attr);
+free_counter:
+	free(counter);
+	return NULL;
+}
+
+int ustctl_create_counter_data(struct ustctl_daemon_counter *counter,
+		struct lttng_ust_object_data **_counter_data)
+{
+	struct lttng_ust_object_data *counter_data;
+	struct lttng_ust_counter_conf counter_conf = {0};
+	size_t i;
+	int ret;
+
+	switch (counter->attr->arithmetic) {
+	case USTCTL_COUNTER_ARITHMETIC_MODULAR:
+		counter_conf.arithmetic = LTTNG_UST_COUNTER_ARITHMETIC_MODULAR;
+		break;
+	case USTCTL_COUNTER_ARITHMETIC_SATURATION:
+		counter_conf.arithmetic = LTTNG_UST_COUNTER_ARITHMETIC_SATURATION;
+		break;
+	default:
+		return -EINVAL;
+	}
+	switch (counter->attr->bitness) {
+	case USTCTL_COUNTER_BITNESS_32:
+		counter_conf.bitness = LTTNG_UST_COUNTER_BITNESS_32;
+		break;
+	case USTCTL_COUNTER_BITNESS_64:
+		counter_conf.bitness = LTTNG_UST_COUNTER_BITNESS_64;
+		break;
+	default:
+		return -EINVAL;
+	}
+	counter_conf.number_dimensions = counter->attr->nr_dimensions;
+	counter_conf.global_sum_step = counter->attr->global_sum_step;
+	for (i = 0; i < counter->attr->nr_dimensions; i++) {
+		counter_conf.dimensions[i].size = counter->attr->dimensions[i].size;
+		counter_conf.dimensions[i].underflow_index = counter->attr->dimensions[i].underflow_index;
+		counter_conf.dimensions[i].overflow_index = counter->attr->dimensions[i].overflow_index;
+		counter_conf.dimensions[i].has_underflow = counter->attr->dimensions[i].has_underflow;
+		counter_conf.dimensions[i].has_overflow = counter->attr->dimensions[i].has_overflow;
+	}
+
+	counter_data = zmalloc(sizeof(*counter_data));
+	if (!counter_data) {
+		ret = -ENOMEM;
+		goto error_alloc;
+	}
+	counter_data->type = LTTNG_UST_OBJECT_TYPE_COUNTER;
+	counter_data->handle = -1;
+
+	counter_data->size = sizeof(counter_conf);
+	counter_data->u.counter.data = zmalloc(sizeof(counter_conf));
+	if (!counter_data->u.counter.data) {
+		ret = -ENOMEM;
+		goto error_alloc_data;
+	}
+
+	memcpy(counter_data->u.counter.data, &counter_conf, sizeof(counter_conf));
+	*_counter_data = counter_data;
+
+	return 0;
+
+error_alloc_data:
+	free(counter_data);
+error_alloc:
+	return ret;
+}
+
+int ustctl_create_counter_global_data(struct ustctl_daemon_counter *counter,
+		struct lttng_ust_object_data **_counter_global_data)
+{
+	struct lttng_ust_object_data *counter_global_data;
+	int ret, fd;
+	size_t len;
+
+	if (lttng_counter_get_global_shm(counter->counter, &fd, &len))
+		return -EINVAL;
+	counter_global_data = zmalloc(sizeof(*counter_global_data));
+	if (!counter_global_data) {
+		ret = -ENOMEM;
+		goto error_alloc;
+	}
+	counter_global_data->type = LTTNG_UST_OBJECT_TYPE_COUNTER_GLOBAL;
+	counter_global_data->handle = -1;
+	counter_global_data->size = len;
+	counter_global_data->u.counter_global.shm_fd = fd;
+	*_counter_global_data = counter_global_data;
+	return 0;
+
+error_alloc:
+	return ret;
+}
+
+int ustctl_create_counter_cpu_data(struct ustctl_daemon_counter *counter, int cpu,
+		struct lttng_ust_object_data **_counter_cpu_data)
+{
+	struct lttng_ust_object_data *counter_cpu_data;
+	int ret, fd;
+	size_t len;
+
+	if (lttng_counter_get_cpu_shm(counter->counter, cpu, &fd, &len))
+		return -EINVAL;
+	counter_cpu_data = zmalloc(sizeof(*counter_cpu_data));
+	if (!counter_cpu_data) {
+		ret = -ENOMEM;
+		goto error_alloc;
+	}
+	counter_cpu_data->type = LTTNG_UST_OBJECT_TYPE_COUNTER_CPU;
+	counter_cpu_data->handle = -1;
+	counter_cpu_data->size = len;
+	counter_cpu_data->u.counter_cpu.shm_fd = fd;
+	counter_cpu_data->u.counter_cpu.cpu_nr = cpu;
+	*_counter_cpu_data = counter_cpu_data;
+	return 0;
+
+error_alloc:
+	return ret;
+}
+
+void ustctl_destroy_counter(struct ustctl_daemon_counter *counter)
+{
+	counter->ops->counter_destroy(counter->counter);
+	free(counter->attr);
+	free(counter);
+}
+
+int ustctl_send_counter_data_to_ust(int sock, int parent_handle,
+		struct lttng_ust_object_data *counter_data)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret;
+	size_t size;
+	ssize_t len;
+
+	if (!counter_data)
+		return -EINVAL;
+
+	size = counter_data->size;
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = parent_handle;
+	lum.cmd = LTTNG_UST_COUNTER;
+	lum.u.counter.len = size;
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret)
+		return ret;
+
+	/* Send counter data */
+	len = ustcomm_send_unix_sock(sock, counter_data->u.counter.data, size);
+	if (len != size) {
+		if (len < 0)
+			return len;
+		else
+			return -EIO;
+	}
+
+	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+	if (!ret) {
+		counter_data->handle = lur.ret_val;
+	}
+	return ret;
+}
+
+int ustctl_send_counter_global_data_to_ust(int sock,
+		struct lttng_ust_object_data *counter_data,
+		struct lttng_ust_object_data *counter_global_data)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret, shm_fd[1];
+	size_t size;
+	ssize_t len;
+
+	if (!counter_data || !counter_global_data)
+		return -EINVAL;
+
+	size = counter_global_data->size;
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = counter_data->handle;	/* parent handle */
+	lum.cmd = LTTNG_UST_COUNTER_GLOBAL;
+	lum.u.counter_global.len = size;
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret)
+		return ret;
+
+	shm_fd[0] = counter_global_data->u.counter_global.shm_fd;
+	len = ustcomm_send_fds_unix_sock(sock, shm_fd, 1);
+	if (len <= 0) {
+		if (len < 0)
+			return len;
+		else
+			return -EIO;
+	}
+
+	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+	if (!ret) {
+		counter_global_data->handle = lur.ret_val;
+	}
+	return ret;
+}
+
+int ustctl_send_counter_cpu_data_to_ust(int sock,
+		struct lttng_ust_object_data *counter_data,
+		struct lttng_ust_object_data *counter_cpu_data)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret, shm_fd[1];
+	size_t size;
+	ssize_t len;
+
+	if (!counter_data || !counter_cpu_data)
+		return -EINVAL;
+
+	size = counter_cpu_data->size;
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = counter_data->handle;	/* parent handle */
+	lum.cmd = LTTNG_UST_COUNTER_CPU;
+	lum.u.counter_cpu.len = size;
+	lum.u.counter_cpu.cpu_nr = counter_cpu_data->u.counter_cpu.cpu_nr;
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret)
+		return ret;
+
+	shm_fd[0] = counter_cpu_data->u.counter_global.shm_fd;
+	len = ustcomm_send_fds_unix_sock(sock, shm_fd, 1);
+	if (len <= 0) {
+		if (len < 0)
+			return len;
+		else
+			return -EIO;
+	}
+
+	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+	if (!ret) {
+		counter_cpu_data->handle = lur.ret_val;
+	}
+	return ret;
+}
+
+int ustctl_counter_read(struct ustctl_daemon_counter *counter,
+		const size_t *dimension_indexes,
+		int cpu, int64_t *value,
+		bool *overflow, bool *underflow)
+{
+	return counter->ops->counter_read(counter->counter, dimension_indexes, cpu,
+			value, overflow, underflow);
+}
+
+int ustctl_counter_aggregate(struct ustctl_daemon_counter *counter,
+		const size_t *dimension_indexes,
+		int64_t *value,
+		bool *overflow, bool *underflow)
+{
+	return counter->ops->counter_aggregate(counter->counter, dimension_indexes,
+			value, overflow, underflow);
+}
+
+int ustctl_counter_clear(struct ustctl_daemon_counter *counter,
+		const size_t *dimension_indexes)
+{
+	return counter->ops->counter_clear(counter->counter, dimension_indexes);
+}
+
 static __attribute__((constructor))
 void ustctl_init(void)
 {
@@ -2247,6 +2938,8 @@ void ustctl_init(void)
 	lttng_ring_buffer_client_overwrite_rt_init();
 	lttng_ring_buffer_client_discard_init();
 	lttng_ring_buffer_client_discard_rt_init();
+	lttng_counter_client_percpu_32_modular_init();
+	lttng_counter_client_percpu_64_modular_init();
 	lib_ringbuffer_signal_init();
 }
 
@@ -2258,4 +2951,6 @@ void ustctl_exit(void)
 	lttng_ring_buffer_client_overwrite_rt_exit();
 	lttng_ring_buffer_client_overwrite_exit();
 	lttng_ring_buffer_metadata_client_exit();
+	lttng_counter_client_percpu_32_modular_exit();
+	lttng_counter_client_percpu_64_modular_exit();
 }