X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fkernel-ctl%2Fkernel-ctl.c;h=ff85b2c9b57420aeaff42adffe463309e04a5ec5;hb=9074be22cad1e15ff91ac1147158ce93a33f29ad;hp=1df6849a9c06e721f27897f86639d43b0cc83a73;hpb=d01c0e5606d656a1118348f693b3593554b1e58f;p=lttng-tools.git diff --git a/src/common/kernel-ctl/kernel-ctl.c b/src/common/kernel-ctl/kernel-ctl.c index 1df6849a9..ff85b2c9b 100644 --- a/src/common/kernel-ctl/kernel-ctl.c +++ b/src/common/kernel-ctl/kernel-ctl.c @@ -1,29 +1,20 @@ /* - * Copyright (C) 2011 - Julien Desfossez - * Mathieu Desnoyers - * 2016 - Jérémie Galarneau + * Copyright (C) 2011 Julien Desfossez + * Copyright (C) 2011 Mathieu Desnoyers + * Copyright (C) 2016 Jérémie Galarneau * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 only, - * as published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "lttng/tracker.h" #define _LGPL_SOURCE #define __USE_LINUX_IOCTL_DEFS #include #include #include #include -#include +#include #include #include #include @@ -31,16 +22,18 @@ #include "kernel-ctl.h" #include "kernel-ioctl.h" -#define LTTNG_IOCTL_CHECK(fildes, request, ...) ({ \ - int ret = ioctl(fildes, request, ##__VA_ARGS__);\ - assert(ret <= 0); \ - !ret ? 0 : -errno; \ -}) +#define LTTNG_IOCTL_CHECK(fildes, request, ...) \ + ({ \ + int _ioctl_ret = ioctl(fildes, request, ##__VA_ARGS__); \ + assert(_ioctl_ret <= 0); \ + !_ioctl_ret ? 0 : -errno; \ + }) -#define LTTNG_IOCTL_NO_CHECK(fildes, request, ...) ({ \ - int ret = ioctl(fildes, request, ##__VA_ARGS__);\ - ret >= 0 ? ret : -errno; \ -}) +#define LTTNG_IOCTL_NO_CHECK(fildes, request, ...) \ + ({ \ + int _ioctl_ret = ioctl(fildes, request, ##__VA_ARGS__); \ + _ioctl_ret >= 0 ? _ioctl_ret : -errno; \ + }) /* * This flag indicates which version of the kernel ABI to use. The old @@ -231,32 +224,32 @@ int kernctl_list_tracker_pids(int fd) } static enum lttng_kernel_tracker_type get_kernel_tracker_type( - enum lttng_tracker_type type) + enum lttng_process_attr process_attr) { - switch (type) { - case LTTNG_TRACKER_PID: + switch (process_attr) { + case LTTNG_PROCESS_ATTR_PROCESS_ID: return LTTNG_KERNEL_TRACKER_PID; - case LTTNG_TRACKER_VPID: + case LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID: return LTTNG_KERNEL_TRACKER_VPID; - case LTTNG_TRACKER_UID: + case LTTNG_PROCESS_ATTR_USER_ID: return LTTNG_KERNEL_TRACKER_UID; - case LTTNG_TRACKER_VUID: + case LTTNG_PROCESS_ATTR_VIRTUAL_USER_ID: return LTTNG_KERNEL_TRACKER_VUID; - case LTTNG_TRACKER_GID: + case LTTNG_PROCESS_ATTR_GROUP_ID: return LTTNG_KERNEL_TRACKER_GID; - case LTTNG_TRACKER_VGID: + case LTTNG_PROCESS_ATTR_VIRTUAL_GROUP_ID: return LTTNG_KERNEL_TRACKER_VGID; default: return LTTNG_KERNEL_TRACKER_UNKNOWN; } } -int kernctl_track_id(int fd, enum lttng_tracker_type tracker_type, int id) +int kernctl_track_id(int fd, enum lttng_process_attr process_attr, int id) { struct lttng_kernel_tracker_args args; args.id = id; - args.type = get_kernel_tracker_type(tracker_type); + args.type = get_kernel_tracker_type(process_attr); if (args.type == LTTNG_KERNEL_TRACKER_UNKNOWN) { errno = EINVAL; return -1; @@ -264,12 +257,12 @@ int kernctl_track_id(int fd, enum lttng_tracker_type tracker_type, int id) return LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_SESSION_TRACK_ID, &args); } -int kernctl_untrack_id(int fd, enum lttng_tracker_type tracker_type, int id) +int kernctl_untrack_id(int fd, enum lttng_process_attr process_attr, int id) { struct lttng_kernel_tracker_args args; args.id = id; - args.type = get_kernel_tracker_type(tracker_type); + args.type = get_kernel_tracker_type(process_attr); if (args.type == LTTNG_KERNEL_TRACKER_UNKNOWN) { errno = EINVAL; return -1; @@ -277,12 +270,12 @@ int kernctl_untrack_id(int fd, enum lttng_tracker_type tracker_type, int id) return LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_SESSION_UNTRACK_ID, &args); } -int kernctl_list_tracker_ids(int fd, enum lttng_tracker_type tracker_type) +int kernctl_list_tracker_ids(int fd, enum lttng_process_attr process_attr) { struct lttng_kernel_tracker_args args; args.id = -1; - args.type = get_kernel_tracker_type(tracker_type); + args.type = get_kernel_tracker_type(process_attr); if (args.type == LTTNG_KERNEL_TRACKER_UNKNOWN) { errno = EINVAL; return -1; @@ -427,7 +420,69 @@ int kernctl_stop_session(int fd) LTTNG_KERNEL_SESSION_STOP); } -int kernctl_filter(int fd, struct lttng_filter_bytecode *filter) +int kernctl_create_event_notifier_group(int fd) +{ + return LTTNG_IOCTL_NO_CHECK(fd, + LTTNG_KERNEL_EVENT_NOTIFIER_GROUP_CREATE); +} + +int kernctl_create_event_notifier_group_notification_fd(int group_fd) +{ + return LTTNG_IOCTL_NO_CHECK(group_fd, + LTTNG_KERNEL_EVENT_NOTIFIER_GROUP_NOTIFICATION_FD); +} + +int kernctl_create_event_notifier_group_error_counter(int group_fd, + const struct lttng_kernel_counter_conf *error_counter_conf) +{ + return LTTNG_IOCTL_NO_CHECK(group_fd, LTTNG_KERNEL_COUNTER, + error_counter_conf); +} + +int kernctl_counter_get_aggregate_value(int counter_fd, + struct lttng_kernel_counter_aggregate *value) +{ + return LTTNG_IOCTL_NO_CHECK(counter_fd, LTTNG_KERNEL_COUNTER_AGGREGATE, + value); +} + +int kernctl_counter_clear(int counter_fd, + struct lttng_kernel_counter_clear *clear) +{ + return LTTNG_IOCTL_NO_CHECK(counter_fd, LTTNG_KERNEL_COUNTER_CLEAR, + clear); +} + +int kernctl_create_event_notifier(int group_fd, + const struct lttng_kernel_event_notifier *event_notifier) +{ + return LTTNG_IOCTL_NO_CHECK(group_fd, + LTTNG_KERNEL_EVENT_NOTIFIER_CREATE, event_notifier); +} + +int kernctl_capture(int fd, const struct lttng_bytecode *capture) +{ + int ret; + struct lttng_kernel_capture_bytecode *kb; + + /* Translate bytecode to kernel bytecode. */ + kb = zmalloc(sizeof(*kb) + capture->len); + if (!kb) { + ret = -ENOMEM; + goto end; + } + + kb->len = capture->len; + kb->reloc_offset = capture->reloc_table_offset; + kb->seqnum = capture->seqnum; + memcpy(kb->data, capture->data, capture->len); + ret = LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_CAPTURE, kb); + free(kb); +end: + return ret; +} + +int kernctl_filter(int fd, const struct lttng_bytecode *filter) { struct lttng_kernel_filter_bytecode *kb; uint32_t len; @@ -519,6 +574,13 @@ int kernctl_buffer_clear(int fd) return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_CLEAR); } +int kernctl_get_next_subbuf_metadata_check(int fd, bool *consistent) +{ + return LTTNG_IOCTL_NO_CHECK(fd, + RING_RING_BUFFER_GET_NEXT_SUBBUF_METADATA_CHECK, + consistent); +} + /* returns the version of the metadata. */ int kernctl_get_metadata_version(int fd, uint64_t *version) {