mirror of
https://github.com/versity/scoutfs.git
synced 2026-01-05 03:44:05 +00:00
Remove homebrew tracing
Happily, it turns out that there are crash extensions for extracting trace messages from crash dumps. That's good enough for us. Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
@@ -4,29 +4,6 @@
|
||||
/* XXX I have no idea how these are chosen. */
|
||||
#define SCOUTFS_IOCTL_MAGIC 's'
|
||||
|
||||
struct scoutfs_ioctl_buf {
|
||||
__u64 ptr;
|
||||
__s32 len;
|
||||
} __packed;
|
||||
|
||||
/*
|
||||
* Fills the buffer with a packed array of format strings. Trace records
|
||||
* refer to the format strings in the buffer by their byte offset.
|
||||
*/
|
||||
#define SCOUTFS_IOC_GET_TRACE_FORMATS _IOW(SCOUTFS_IOCTL_MAGIC, 1, \
|
||||
struct scoutfs_ioctl_buf)
|
||||
|
||||
struct scoutfs_trace_record {
|
||||
__u16 format_off;
|
||||
__u8 nr;
|
||||
__u8 data[0];
|
||||
} __packed;
|
||||
/*
|
||||
* Fills the buffer with trace records.
|
||||
*/
|
||||
#define SCOUTFS_IOC_GET_TRACE_RECORDS _IOW(SCOUTFS_IOCTL_MAGIC, 2, \
|
||||
struct scoutfs_ioctl_buf)
|
||||
|
||||
struct scoutfs_ioctl_ino_seq {
|
||||
__u64 ino;
|
||||
__u64 seq;
|
||||
@@ -36,14 +13,15 @@ struct scoutfs_ioctl_inodes_since {
|
||||
__u64 first_ino;
|
||||
__u64 last_ino;
|
||||
__u64 seq;
|
||||
struct scoutfs_ioctl_buf results;
|
||||
__u64 buf_ptr;
|
||||
__u32 buf_len;
|
||||
} __packed;
|
||||
|
||||
/*
|
||||
* Adds entries to the user's buffer for each inode whose sequence
|
||||
* number is greater than or equal to the given seq.
|
||||
*/
|
||||
#define SCOUTFS_IOC_INODES_SINCE _IOW(SCOUTFS_IOCTL_MAGIC, 3, \
|
||||
#define SCOUTFS_IOC_INODES_SINCE _IOW(SCOUTFS_IOCTL_MAGIC, 1, \
|
||||
struct scoutfs_ioctl_inodes_since)
|
||||
|
||||
#endif
|
||||
|
||||
@@ -61,8 +61,8 @@ static int since_cmd(int argc, char **argv)
|
||||
args.first_ino = nrs[0];
|
||||
args.last_ino = nrs[1];
|
||||
args.seq = nrs[2];
|
||||
args.results.ptr = (intptr_t)ptr;
|
||||
args.results.len = len;
|
||||
args.buf_ptr = (intptr_t)ptr;
|
||||
args.buf_len = len;
|
||||
|
||||
ret = ioctl(fd, SCOUTFS_IOC_INODES_SINCE, &args);
|
||||
if (ret < 0) {
|
||||
|
||||
@@ -1,231 +0,0 @@
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "sparse.h"
|
||||
#include "util.h"
|
||||
#include "ioctl.h"
|
||||
#include "cmd.h"
|
||||
|
||||
static int ibuf_ioctl(int fd, int cmd, struct scoutfs_ioctl_buf *ibuf)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ibuf->ptr = 0;
|
||||
ret = 1024 * 1024;
|
||||
do {
|
||||
ibuf->len = ret;
|
||||
if (ibuf->ptr)
|
||||
free((void *)(intptr_t)ibuf->ptr);
|
||||
ibuf->ptr = (intptr_t)malloc(ibuf->len);
|
||||
if (!ibuf->ptr) {
|
||||
ret = -errno;
|
||||
fprintf(stderr, "allocate %d bytes failed: %s (%d)\n",
|
||||
ibuf->len, strerror(errno), errno);
|
||||
break;
|
||||
}
|
||||
|
||||
ret = ioctl(fd, cmd, ibuf);
|
||||
if (ret < 0) {
|
||||
ret = -errno;
|
||||
fprintf(stderr, "ioctl cmd %u failed: %s (%d)\n",
|
||||
cmd, strerror(errno), errno);
|
||||
break;
|
||||
}
|
||||
} while (ret > ibuf->len);
|
||||
|
||||
if (ret >= 0) {
|
||||
ibuf->len = ret;
|
||||
ret = 0;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ibuf_read(char *path, struct scoutfs_ioctl_buf *ibuf)
|
||||
{
|
||||
struct stat st;
|
||||
ssize_t bytes;
|
||||
int fd;
|
||||
int ret;
|
||||
|
||||
if (stat(path, &st)) {
|
||||
ret = -errno;
|
||||
fprintf(stderr, "stat %s failed: %s (%d)\n",
|
||||
path, strerror(errno), errno);
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (!S_ISREG(st.st_mode)) {
|
||||
fprintf(stderr, "%s must be a regular file\n", path);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
fd = open(path, O_RDONLY);
|
||||
if (fd < 0) {
|
||||
ret = -errno;
|
||||
fprintf(stderr, "failed to open '%s': %s (%d)\n",
|
||||
path, strerror(errno), errno);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ibuf->len = st.st_size;
|
||||
|
||||
ibuf->ptr = (intptr_t)malloc(ibuf->len);
|
||||
if (!ibuf->ptr) {
|
||||
ret = -errno;
|
||||
fprintf(stderr, "allocate %d bytes failed: %s (%d)\n",
|
||||
ibuf->len, strerror(errno), errno);
|
||||
return ret;
|
||||
}
|
||||
|
||||
bytes = read(fd, (void *)(intptr_t)ibuf->ptr, ibuf->len);
|
||||
if (bytes != ibuf->len) {
|
||||
if (bytes < 0)
|
||||
ret = -errno;
|
||||
else
|
||||
ret = -EIO;
|
||||
fprintf(stderr, "read %d bytes from %s returned %zd: %s (%d)\n",
|
||||
ibuf->len, path, bytes, strerror(errno), errno);
|
||||
} else {
|
||||
ret = 0;
|
||||
}
|
||||
|
||||
close(fd);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int decode_u64_bytes(struct scoutfs_trace_record *rec, u64 *args)
|
||||
{
|
||||
u8 *data;
|
||||
int shift;
|
||||
u64 val;
|
||||
int i;
|
||||
|
||||
data = rec->data;
|
||||
for (i = 0; i < rec->nr; i++) {
|
||||
val = 0;
|
||||
shift = 0;
|
||||
for (;;) {
|
||||
val |= (u64)(*data & 127) << shift;
|
||||
|
||||
if (!((*(data++)) & 128))
|
||||
break;
|
||||
|
||||
shift += 7;
|
||||
}
|
||||
|
||||
args[i] = val;
|
||||
}
|
||||
|
||||
return data - rec->data;
|
||||
}
|
||||
|
||||
/* MY EYES */
|
||||
static void printf_nr_args(char *fmt, int nr, u64 *args)
|
||||
{
|
||||
switch(nr) {
|
||||
case 0: printf(fmt); break;
|
||||
case 1: printf(fmt, args[0]); break;
|
||||
case 2: printf(fmt, args[0], args[1]); break;
|
||||
case 3: printf(fmt, args[0], args[1], args[2]); break;
|
||||
case 4: printf(fmt, args[0], args[1], args[2], args[3]); break;
|
||||
case 5: printf(fmt, args[0], args[1], args[2], args[3], args[4]); break;
|
||||
case 6: printf(fmt, args[0], args[1], args[2], args[3], args[4],
|
||||
args[5]); break;
|
||||
case 7: printf(fmt, args[0], args[1], args[2], args[3], args[4],
|
||||
args[5], args[6]); break;
|
||||
case 8: printf(fmt, args[0], args[1], args[2], args[3], args[4],
|
||||
args[5], args[6], args[7]); break;
|
||||
case 9: printf(fmt, args[0], args[1], args[2], args[3], args[4],
|
||||
args[5], args[6], args[7], args[8]); break;
|
||||
case 10: printf(fmt, args[0], args[1], args[2], args[3], args[4],
|
||||
args[5], args[6], args[7], args[8], args[9]); break;
|
||||
case 11: printf(fmt, args[0], args[1], args[2], args[3], args[4],
|
||||
args[5], args[6], args[7], args[8], args[9],
|
||||
args[10]); break;
|
||||
case 12: printf(fmt, args[0], args[1], args[2], args[3], args[4],
|
||||
args[5], args[6], args[7], args[8], args[9],
|
||||
args[10], args[11]); break;
|
||||
case 13: printf(fmt, args[0], args[1], args[2], args[3], args[4],
|
||||
args[5], args[6], args[7], args[8], args[9],
|
||||
args[10], args[11], args[12]); break;
|
||||
case 14: printf(fmt, args[0], args[1], args[2], args[3], args[4],
|
||||
args[5], args[6], args[7], args[8], args[9],
|
||||
args[10], args[11], args[12], args[13]); break;
|
||||
case 15: printf(fmt, args[0], args[1], args[2], args[3], args[4],
|
||||
args[5], args[6], args[7], args[8], args[9],
|
||||
args[10], args[11], args[12], args[13], args[14]); break;
|
||||
case 16: printf(fmt, args[0], args[1], args[2], args[3], args[4],
|
||||
args[5], args[6], args[7], args[8], args[9],
|
||||
args[10], args[11], args[12], args[13], args[14],
|
||||
args[15]); break;
|
||||
default:
|
||||
printf("(too many args: fmt '%s' nr %d)\n", fmt, nr);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static int trace_cmd(int argc, char **argv)
|
||||
{
|
||||
char *path = "/sys/kernel/debug/scoutfs/trace";
|
||||
struct scoutfs_ioctl_buf fmts = {0,};
|
||||
struct scoutfs_ioctl_buf recs = {0,};
|
||||
struct scoutfs_trace_record *rec;
|
||||
u64 args[32]; /* absurdly huge */
|
||||
int off;
|
||||
int ret;
|
||||
int fd;
|
||||
|
||||
if (argc == 0) {
|
||||
fd = open(path, O_RDONLY);
|
||||
if (fd < 0) {
|
||||
ret = -errno;
|
||||
fprintf(stderr, "failed to open '%s': %s (%d)\n",
|
||||
path, strerror(errno), errno);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* fd on debugfs file pins formats that live in module */
|
||||
ret = ibuf_ioctl(fd, SCOUTFS_IOC_GET_TRACE_FORMATS, &fmts) ?:
|
||||
ibuf_ioctl(fd, SCOUTFS_IOC_GET_TRACE_RECORDS, &recs);
|
||||
close(fd);
|
||||
} else {
|
||||
if (argc != 2) {
|
||||
fprintf(stderr, "specify trace and record files\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
ret = ibuf_read(argv[0], &fmts) ?:
|
||||
ibuf_read(argv[1], &recs);
|
||||
}
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
for (off = 0; off < recs.len; ) {
|
||||
rec = (void *)(intptr_t)(recs.ptr + off);
|
||||
off += sizeof(*rec) + decode_u64_bytes(rec, args);
|
||||
|
||||
printf_nr_args((char *)fmts.ptr + rec->format_off,
|
||||
rec->nr, args);
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
out:
|
||||
if (fmts.ptr)
|
||||
free((void *)(intptr_t)fmts.ptr);
|
||||
if (recs.ptr)
|
||||
free((void *)(intptr_t)recs.ptr);
|
||||
return ret;
|
||||
};
|
||||
|
||||
static void __attribute__((constructor)) trace_ctor(void)
|
||||
{
|
||||
cmd_register("trace", "[fmt file] [record file]",
|
||||
"print scoutfs kernel traces", trace_cmd);
|
||||
}
|
||||
Reference in New Issue
Block a user