sys_tee
Hi,
Here follows an implementation of sys_tee. It works a little differently that one might expect from the name (hence it might need a change). Basically what it does is duplicate one pipe to another - not by copying the contents, but merely linking it. sys_tee doesn't consume the input pipe, so you are free to read the same data from that as you just teed to the output pipe.
So to implement an efficient tee, one would do something like:
/*
* Duplicate stdin to stdout
*/
len = tee(STDIN_FILENO, STDOUT_FILENO, INT_MAX, SPLICE_F_NONBLOCK);
/*
* Splice stdin to file
*/
splice(STDIN_FILENO, file_fd, len, 0);and none of that data would touch user space. I'm attaching a sample ktee.c implementation as a reference. The "meat" of that file is the two lines I showed above.
Patch applies on top of current splice branch, it wont apply to 2.6.17-rc1.
------
Basically an in-kernel implementation of tee, which uses splice and the pipe buffers as an intelligent way to pass data around by reference.
Where the user space tee consumes the input and produces a stdout and file output, this syscall merely duplicates the data inside a pipe to another pipe. No data is copied, the output just grabs a reference to the input pipe data.
---
arch/i386/kernel/syscall_table.S | 1 arch/ia64/kernel/entry.S | 1 arch/powerpc/kernel/systbl.S | 1 fs/pipe.c | 7 + fs/splice.c | 186 ++++++++++++++++++++++++++++++++++++++ include/asm-i386/unistd.h | 3 - include/asm-ia64/unistd.h | 3 - include/asm-powerpc/unistd.h | 3 - include/asm-x86_64/unistd.h | 4 + include/linux/pipe_fs_i.h | 1 include/linux/syscalls.h | 1 11 files changed, 207 insertions(+), 4 deletions(-)
3c81754e333add4bd05ffb015ad8960006757b6e
arch/i386/kernel/syscall_table.S +1 -0
@@ -314,3 +314,4 @@ ENTRY(sys_call_table) .long sys_get_robust_list .long sys_splice .long sys_sync_file_range + .long sys_tee /* 315 */
arch/ia64/kernel/entry.S +1 -0
@@ -1606,5 +1606,6 @@ sys_call_table: data8 sys_ni_syscall // 1295 reserved for ppoll data8 sys_unshare data8 sys_splice + data8 sys_tee .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
arch/powerpc/kernel/systbl.S +1 -0
@@ -323,3 +323,4 @@ COMPAT_SYS(pselect6) COMPAT_SYS(ppoll) SYSCALL(unshare) SYSCALL(splice) +SYSCALL(tee)
fs/pipe.c +7 -0
@@ -131,12 +131,19 @@ static int anon_pipe_buf_steal(struct pireturn 0 ; } +static void anon_pipe_buf_get (struct pipe_inode_info *info, +struct pipe_buffer *buf) +{ +page_cache_get (buf->page); +} +static struct pipe_buf_operations anon_pipe_buf_ops = { .can_merge =1 , .map = anon_pipe_buf_map, .unmap = anon_pipe_buf_unmap, .release = anon_pipe_buf_release, .steal = anon_pipe_buf_steal, + .get = anon_pipe_buf_get, }; static ssize_t
fs/splice.c +186 -0
205 lines not on this page · raw message
include/asm-i386/unistd.h +2 -1
@@ -320,8 +320,9 @@ #define __NR_set_robust_list 311#define __NR_get_robust_list 312#define __NR_splice 313#define __NR_sync_file_range 314 +#define __NR_tee 315 -#define NR_syscalls 315 +#define NR_syscalls 316/* * user-visible error numbers are in the range -1 - -128: see
include/asm-ia64/unistd.h +2 -1
@@ -286,12 +286,13 @@ #define __NR_faccessat 1293/* 1294, 1295 reserved for pselect/ppoll */ #define __NR_unshare 1296#define __NR_splice 1297 +#define __NR_tee 1298#ifdef __KERNEL__#include <linux/config.h> -#define NR_syscalls 274/* length of syscall table */ +#define NR_syscalls 275/* length of syscall table */ #define __ARCH_WANT_SYS_RT_SIGACTION
include/asm-powerpc/unistd.h +2 -1
@@ -302,8 +302,9 @@ #define __NR_pselect6 280#define __NR_ppoll 281#define __NR_unshare 282#define __NR_splice 283 +#define __NR_tee 284 -#define __NR_syscalls 284 +#define __NR_syscalls 285#ifdef __KERNEL__#define __NR__exit __NR_exit
include/asm-x86_64/unistd.h +3 -1
@@ -611,8 +611,10 @@ #define __NR_get_robust_list 274 __SYSCALL(__NR_get_robust_list, sys_get_robust_list)#define __NR_splice 275 __SYSCALL(__NR_splice, sys_splice) +#define __NR_tee 276 +__SYSCALL(__NR_tee, sys_tee) -#define __NR_syscall_max __NR_splice +#define __NR_syscall_max __NR_tee#ifndef __NO_STUBS
include/linux/pipe_fs_i.h +1 -0
@@ -21,6 +21,7 @@ struct pipe_buf_operations {void (*unmap)(struct pipe_inode_info *,struct pipe_buffer *);void (*release)(struct pipe_inode_info *,struct pipe_buffer *);int (*steal)(struct pipe_inode_info *,struct pipe_buffer *); +void (*get)(struct pipe_inode_info *,struct pipe_buffer *); };struct pipe_inode_info {
include/linux/syscalls.h +1 -0
@@ -576,5 +576,6 @@ asmlinkage long sys_splice(int fd_in, loasmlinkage long sys_sync_file_range (int fd,loff_t offset,loff_t nbytes,int flags); +asmlinkage long sys_tee (int fdin,int fdout,size_t len,unsigned int flags);#endif
Signature · 5 lines
1.3.0.rc1.g384e -- Jens Axboe
/*
* A tee implementation using sys_tee.
*/
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
#include <assert.h>
#include <limits.h>
#if defined(__i386__)
#define __NR_splice 313
#define __NR_tee 315
#elif defined(__x86_64__)
#define __NR_splice 275
#define __NR_tee 276
#elif defined(__powerpc__) || defined(__powerpc64__)
#define __NR_splice 283
#define __NR_tee 284
#else
#error unsupported arch
#endif
#define SPLICE_F_NONBLOCK (0x02)
static inline int splice(int fdin, loff_t *off_in, int fdout, loff_t *off_out,
size_t len, unsigned int flags)
{
return syscall(__NR_splice, fdin, off_in, fdout, off_out, len, flags);
}static inline int tee(int fdin, int fdout, size_t len, unsigned int flags)
{
return syscall(__NR_tee, fdin, fdout, len, flags);
}static int error(const char *n)
{
perror(n);
return -1;
}static int do_splice(int infd, int outfd, unsigned int len, char *msg)
{
while (len) {
int written = splice(infd, NULL, outfd, NULL, len, 0);
if (written <= 0)
return error(msg);
len -= written;
}
return 0;
}int main(int argc, char *argv[])
{
struct stat sb;
int fd;
if (argc < 2) {
fprintf(stderr, "%s: outfile\n", argv[0]);
return 1;
}
if (fstat(STDIN_FILENO, &sb) < 0)
return error("stat");
if (!S_ISFIFO(sb.st_mode)) {
fprintf(stderr, "stdout must be a pipe\n");
return 1;
}
fd = open(argv[1], O_WRONLY | O_CREAT | O_TRUNC, 0644);
if (fd < 0)
return error("open output");
do {
int tee_len = tee(STDIN_FILENO, STDOUT_FILENO, INT_MAX, SPLICE_F_NONBLOCK);
if (tee_len < 0) {
if (errno == EAGAIN) {
usleep(1000);
continue;
}
return error("tee");
} else if (!tee_len)
break;
/*
* Send output to file, also consumes input pipe.
*/
if (do_splice(STDIN_FILENO, fd, tee_len, "splice-file"))
break;
} while (1);
return 0;
}Quoted 10 lines
Here follows an implementation of
sys_tee. It works a little differently that one might expect from the name (hence it might need a change).So to implement an efficient tee, one would do something like:
/* * Duplicate stdin to stdout */ len = tee(STDIN_FILENO, STDOUT_FILENO, INT_MAX, SPLICE_F_NONBLOCK);
Creating new syscalls (and therefore library calls) always has potential of conflicting with user functions. Maybe new sys-lib-calls should show up as kernel_* under userspace.
Jan Engelhardt