@@ -386,10 +386,8 @@ static long splice_data(struct tracecmd_recorder *recorder)
ret = splice(recorder->brass[0], NULL, recorder->fd, NULL,
read, recorder->fd_flags);
if (ret < 0) {
- if (errno != EAGAIN && errno != EINTR) {
- warning("recorder error in splice output");
- return -1;
- }
+ if (errno != EAGAIN && errno != EINTR)
+ return ret;
return total_read;
} else
update_fd(recorder, ret);
@@ -2654,12 +2654,61 @@ static int open_vsock(unsigned int cid, unsigned int port)
return sd;
}
+
+static int try_splice_read_vsock(void)
+{
+ int ret, sd, brass[2];
+
+ sd = socket(AF_VSOCK, SOCK_STREAM, 0);
+ if (sd < 0)
+ return sd;
+
+ ret = pipe(brass);
+ if (ret < 0)
+ goto out_close_sd;
+
+ /*
+ * On kernels that don't support splice reading from vsockets
+ * this will fail with EINVAL, or ENOTCONN otherwise.
+ * Technically, it should never succeed but if it does, claim splice
+ * reading is supported.
+ */
+ ret = splice(sd, NULL, brass[1], NULL, 10, 0);
+ if (ret < 0)
+ ret = errno != EINVAL;
+ else
+ ret = 1;
+
+ close(brass[0]);
+ close(brass[1]);
+out_close_sd:
+ close(sd);
+ return ret;
+}
+
+static bool can_splice_read_vsock(void)
+{
+ static bool initialized, res;
+
+ if (initialized)
+ return res;
+
+ res = try_splice_read_vsock() > 0;
+ initialized = true;
+ return res;
+}
+
#else
static inline int open_vsock(unsigned int cid, unsigned int port)
{
die("vsock is not supported");
return -1;
}
+
+static bool can_splice_read_vsock(void)
+{
+ return false;
+}
#endif
static int do_accept(int sd)
@@ -2864,13 +2913,16 @@ create_recorder_instance(struct buffer_instance *instance, const char *file, int
if (is_guest(instance)) {
int fd;
+ unsigned int flags;
fd = open_vsock(instance->cid, instance->client_ports[cpu]);
if (fd < 0)
die("Failed to connect to agent");
- return tracecmd_create_recorder_virt(
- file, cpu, recorder_flags | TRACECMD_RECORD_NOSPLICE, fd);
+ flags = recorder_flags;
+ if (!can_splice_read_vsock())
+ flags |= TRACECMD_RECORD_NOSPLICE;
+ return tracecmd_create_recorder_virt(file, cpu, flags, fd);
}
if (brass)
Detect if splice(2) reading is supported for vsockets (Linux 4.20 and later) and use it, or fallback to read/write-ing otherwise. Signed-off-by: Slavomir Kaslev <kaslevs@vmware.com> --- lib/trace-cmd/trace-recorder.c | 6 ++-- tracecmd/trace-record.c | 56 ++++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 6 deletions(-)