实现 timer_create timer_settime fchdir系统调用.

Author: xiaoyi1212

assets/initramfs.img

@@ -19,148 +19,154 @@
 #define SYSCALL_MPROTECT 10
 #define SYSCALL_MUNMAP   11
 /* #define SYSCALL_BRK  12  brk 系统调用不实现*/
-#define SYSCALL_SIGACTION     13
-#define SYSCALL_RT_SIGMASK    14
-#define SYSCALL_SIGRET        15
-#define SYSCALL_IOCTL         16
-#define SYSCALL_PREAD         17
-#define SYSCALL_PWRITE        18
-#define SYSCALL_READV         19
-#define SYSCALL_WRITEV        20
-#define SYSCALL_ACCESS        21
-#define SYSCALL_PIPE          22
-#define SYSCALL_SELECT        23
-#define SYSCALL_YIELD         24
-#define SYSCALL_MREMAP        25
-#define SYSCALL_MINCORE       27
-#define SYSCALL_MADVISE       28
-#define SYSCALL_DUP           32
-#define SYSCALL_DUP2          33
-#define SYSCALL_NANO_SLEEP    35
-#define SYSCALL_SETITIMER     38
-#define SYSCALL_GETPID        39
-#define SYSCALL_SENDFILE      40
-#define SYSCALL_SOCKET        41
-#define SYSCALL_CONNECT       42
-#define SYSCALL_ACCEPT        43
-#define SYSCALL_SENDTO        44
-#define SYSCALL_RECVFROM      45
-#define SYSCALL_SENDMSG       46
-#define SYSCALL_RECVMSG       47
-#define SYSCALL_SHUTDOWN      48
-#define SYSCALL_BIND          49
-#define SYSCALL_LISTEN        50
-#define SYSCALL_GETSOCKNAME   51
-#define SYSCALL_GETPEERNAME   52
-#define SYSCALL_SOCKETPAIR    53
-#define SYSCALL_SETSOCKOPT    54
-#define SYSCALL_GETSOCKOPT    55
-#define SYSCALL_CLONE         56
-#define SYSCALL_FORK          57
-#define SYSCALL_VFORK         58
-#define SYSCALL_EXECVE        59
-#define SYSCALL_EXIT          60
-#define SYSCALL_WAITPID       61
-#define SYSCALL_KILL          62
-#define SYSCALL_UNAME         63
-#define SYSCALL_FSYNC         74
-#define SYSCALL_FDATASYNC     75
-#define SYSCALL_FCNTL         72
-#define SYSCALL_FTRUNCATE     77
-#define SYSCALL_GETCWD        79
-#define SYSCALL_CHDIR         80
-#define SYSCALL_RENAME        82
-#define SYSCALL_MKDIR         83
-#define SYSCALL_RMDIR         84
-#define SYSCALL_LINK          86
-#define SYSCALL_UNLINK        87
-#define SYSCALL_SYMLINK       88
-#define SYSCALL_READLINK      89
-#define SYSCALL_CHMOD         90
-#define SYSCALL_FCHMOD        91
-#define SYSCALL_CHOWN         92
-#define SYSCALL_FCHOWN        93
-#define SYSCALL_LCHOWN        94
-#define SYSCALL_UMASK         95
-#define SYSCALL_GETRLIMIT     97
-#define SYSCALL_GETRUSAGE     98
-#define SYSCALL_SYSINFO       99
-#define SYSCALL_TIMES         100
-#define SYSCALL_GETUID        102
-#define SYSCALL_SYSLOG        103
-#define SYSCALL_GETGID        104
-#define SYSCALL_GETSID        124
-#define SYSCALL_CAPGET        125
-#define SYSCALL_CAPSET        126
-#define SYSCALL_SETUID        105
-#define SYSCALL_SETGID        106
-#define SYSCALL_GETEUID       107
-#define SYSCALL_GETEGID       108
-#define SYSCALL_SETPGID       109
-#define SYSCALL_GETPPID       110
-#define SYSCALL_SETSID        112
-#define SYSCALL_GETGROUPS     115
-#define SYSCALL_SETRESUID     117
-#define SYSCALL_GETRESUID     118
-#define SYSCALL_SETRESGID     119
-#define SYSCALL_GETRESGID     120
-#define SYSCALL_GETPGID       121
-#define SYSCALL_SIGPENDING    127
-#define SYSCALL_SIGTIMEDWAIT  128
-#define SYSCALL_SIGQUEUEINFO  129
-#define SYSCALL_SIGSUSPEND    130
-#define SYSCALL_SIGALTSTACK   131
-#define SYSCALL_MKNOD         133
-#define SYSCALL_STATFS        137
-#define SYSCALL_SETPRIORITY   141
-#define SYSCALL_PRCTL         157
-#define SYSCALL_ARCH_PRCTL    158
-#define SYSCALL_PIVOT_ROOT    155
-#define SYSCALL_SETRLIMIT     160
-#define SYSCALL_CHROOT        161
-#define SYSCALL_SYNC          162
-#define SYSCALL_MOUNT         165
-#define SYSCALL_UMOUNT2       166
-#define SYSCALL_REBOOT        169
-#define SYSCALL_GET_TID       186
-#define SYSCALL_LGETXATTR     192
-#define SYSCALL_LLISTXATTR    195
-#define SYSCALL_S_AFFINITY    203
-#define SYSCALL_G_AFFINITY    204
-#define SYSCALL_FUTEX         202
-#define SYSCALL_GETDENTS64    217
-#define SYSCALL_SETID_ADDR    218
-#define SYSCALL_FADVISE64     221
-#define SYSCALL_EXIT_GROUP    231
-#define SYSCALL_C_SETTIME     227
-#define SYSCALL_C_GETTIME     228
-#define SYSCALL_C_GETRES      229
-#define SYSCALL_C_NANOSLEEP   230
-#define SYSCALL_OPENAT        257
-#define SYSCALL_MKDIRAT       258
-#define SYSCALL_FCHOWNAT      260
-#define SYSCALL_FUTIMESAT     261
-#define SYSCALL_NEWFSTATAT    262
-#define SYSCALL_UNLINKAT      263
-#define SYSCALL_FACCESSAT     269
-#define SYSCALL_FCHMODAT      268
-#define SYSCALL_PSELECT6      270
-#define SYSCALL_EPOLL_WAIT    232
-#define SYSCALL_EPOLL_CTL     233
-#define SYSCALL_UTIMENSAT     280
-#define SYSCALL_EPOLL_PWAIT   281
-#define SYSCALL_ACCEPT4       288
-#define SYSCALL_EVENTFD2      290
-#define SYSCALL_EPOLL_CREATE1 291
-#define SYSCALL_DUP3          292
-#define SYSCALL_PIPE2         293
-#define SYSCALL_PRLIMIT64     302
-#define SYSCALL_GETRANDOM     318
-#define SYSCALL_MEMFD_CREATE  319
-#define SYSCALL_CP_F_RANGE    326
-#define SYSCALL_STATX         332
-#define SYSCALL_FSOPEN        430
-#define SYSCALL_FACCESSAT2    439
+#define SYSCALL_SIGACTION        13
+#define SYSCALL_RT_SIGMASK       14
+#define SYSCALL_SIGRET           15
+#define SYSCALL_IOCTL            16
+#define SYSCALL_PREAD            17
+#define SYSCALL_PWRITE           18
+#define SYSCALL_READV            19
+#define SYSCALL_WRITEV           20
+#define SYSCALL_ACCESS           21
+#define SYSCALL_PIPE             22
+#define SYSCALL_SELECT           23
+#define SYSCALL_YIELD            24
+#define SYSCALL_MREMAP           25
+#define SYSCALL_MINCORE          27
+#define SYSCALL_MADVISE          28
+#define SYSCALL_DUP              32
+#define SYSCALL_DUP2             33
+#define SYSCALL_NANO_SLEEP       35
+#define SYSCALL_SETITIMER        38
+#define SYSCALL_GETPID           39
+#define SYSCALL_SENDFILE         40
+#define SYSCALL_SOCKET           41
+#define SYSCALL_CONNECT          42
+#define SYSCALL_ACCEPT           43
+#define SYSCALL_SENDTO           44
+#define SYSCALL_RECVFROM         45
+#define SYSCALL_SENDMSG          46
+#define SYSCALL_RECVMSG          47
+#define SYSCALL_SHUTDOWN         48
+#define SYSCALL_BIND             49
+#define SYSCALL_LISTEN           50
+#define SYSCALL_GETSOCKNAME      51
+#define SYSCALL_GETPEERNAME      52
+#define SYSCALL_SOCKETPAIR       53
+#define SYSCALL_SETSOCKOPT       54
+#define SYSCALL_GETSOCKOPT       55
+#define SYSCALL_CLONE            56
+#define SYSCALL_FORK             57
+#define SYSCALL_VFORK            58
+#define SYSCALL_EXECVE           59
+#define SYSCALL_EXIT             60
+#define SYSCALL_WAITPID          61
+#define SYSCALL_KILL             62
+#define SYSCALL_UNAME            63
+#define SYSCALL_FSYNC            74
+#define SYSCALL_FDATASYNC        75
+#define SYSCALL_FCNTL            72
+#define SYSCALL_FTRUNCATE        77
+#define SYSCALL_GETCWD           79
+#define SYSCALL_CHDIR            80
+#define SYSCALL_FCHDIR           81
+#define SYSCALL_RENAME           82
+#define SYSCALL_MKDIR            83
+#define SYSCALL_RMDIR            84
+#define SYSCALL_LINK             86
+#define SYSCALL_UNLINK           87
+#define SYSCALL_SYMLINK          88
+#define SYSCALL_READLINK         89
+#define SYSCALL_CHMOD            90
+#define SYSCALL_FCHMOD           91
+#define SYSCALL_CHOWN            92
+#define SYSCALL_FCHOWN           93
+#define SYSCALL_LCHOWN           94
+#define SYSCALL_UMASK            95
+#define SYSCALL_GETRLIMIT        97
+#define SYSCALL_GETRUSAGE        98
+#define SYSCALL_SYSINFO          99
+#define SYSCALL_TIMES            100
+#define SYSCALL_GETUID           102
+#define SYSCALL_SYSLOG           103
+#define SYSCALL_GETGID           104
+#define SYSCALL_GETSID           124
+#define SYSCALL_CAPGET           125
+#define SYSCALL_CAPSET           126
+#define SYSCALL_SETUID           105
+#define SYSCALL_SETGID           106
+#define SYSCALL_GETEUID          107
+#define SYSCALL_GETEGID          108
+#define SYSCALL_SETPGID          109
+#define SYSCALL_GETPPID          110
+#define SYSCALL_SETSID           112
+#define SYSCALL_GETGROUPS        115
+#define SYSCALL_SETRESUID        117
+#define SYSCALL_GETRESUID        118
+#define SYSCALL_SETRESGID        119
+#define SYSCALL_GETRESGID        120
+#define SYSCALL_GETPGID          121
+#define SYSCALL_SIGPENDING       127
+#define SYSCALL_SIGTIMEDWAIT     128
+#define SYSCALL_SIGQUEUEINFO     129
+#define SYSCALL_SIGSUSPEND       130
+#define SYSCALL_SIGALTSTACK      131
+#define SYSCALL_MKNOD            133
+#define SYSCALL_STATFS           137
+#define SYSCALL_SETPRIORITY      141
+#define SYSCALL_PRCTL            157
+#define SYSCALL_ARCH_PRCTL       158
+#define SYSCALL_PIVOT_ROOT       155
+#define SYSCALL_SETRLIMIT        160
+#define SYSCALL_CHROOT           161
+#define SYSCALL_SYNC             162
+#define SYSCALL_MOUNT            165
+#define SYSCALL_UMOUNT2          166
+#define SYSCALL_REBOOT           169
+#define SYSCALL_GET_TID          186
+#define SYSCALL_LGETXATTR        192
+#define SYSCALL_LLISTXATTR       195
+#define SYSCALL_S_AFFINITY       203
+#define SYSCALL_G_AFFINITY       204
+#define SYSCALL_FUTEX            202
+#define SYSCALL_GETDENTS64       217
+#define SYSCALL_SETID_ADDR       218
+#define SYSCALL_FADVISE64        221
+#define SYSCALL_TIMER_CREATE     222
+#define SYSCALL_TIMER_SETTIME    223
+#define SYSCALL_TIMER_GETTIME    224
+#define SYSCALL_TIMER_GETOVERRUN 225
+#define SYSCALL_TIMER_DELETE     226
+#define SYSCALL_C_SETTIME        227
+#define SYSCALL_C_GETTIME        228
+#define SYSCALL_C_GETRES         229
+#define SYSCALL_C_NANOSLEEP      230
+#define SYSCALL_EXIT_GROUP       231
+#define SYSCALL_OPENAT           257
+#define SYSCALL_MKDIRAT          258
+#define SYSCALL_FCHOWNAT         260
+#define SYSCALL_FUTIMESAT        261
+#define SYSCALL_NEWFSTATAT       262
+#define SYSCALL_UNLINKAT         263
+#define SYSCALL_FACCESSAT        269
+#define SYSCALL_FCHMODAT         268
+#define SYSCALL_PSELECT6         270
+#define SYSCALL_EPOLL_WAIT       232
+#define SYSCALL_EPOLL_CTL        233
+#define SYSCALL_UTIMENSAT        280
+#define SYSCALL_EPOLL_PWAIT      281
+#define SYSCALL_ACCEPT4          288
+#define SYSCALL_EVENTFD2         290
+#define SYSCALL_EPOLL_CREATE1    291
+#define SYSCALL_DUP3             292
+#define SYSCALL_PIPE2            293
+#define SYSCALL_PRLIMIT64        302
+#define SYSCALL_GETRANDOM        318
+#define SYSCALL_MEMFD_CREATE     319
+#define SYSCALL_CP_F_RANGE       326
+#define SYSCALL_STATX            332
+#define SYSCALL_FSOPEN           430
+#define SYSCALL_FACCESSAT2       439
 
 #define MAX_SYSCALLS 550
 

src/arch/x86_64/include/nr.h

@@ -9,14 +9,14 @@
 #include "task/task.h"
 #include "term/klog.h"
 
-syscall_(arch_prctl, uint64_t code, uint64_t addr); // prsys_x64.c
-syscall_(sched_getaffinity, pid_t pid, size_t cpusetsize, unsigned long *mask); // prsys.c
+syscall_(arch_prctl, uint64_t code, uint64_t addr);                                // prsys_x64.c
+syscall_(sched_getaffinity, pid_t pid, size_t cpusetsize, unsigned long *mask);    // prsys.c
 syscall_(lgetxattr, const char *path, const char *name, void *value, size_t size); // fssys.c
-syscall_(llistxattr, const char *path, char *list, size_t size); // fssys.c
-syscall_(setuid, int uid); // prsys.c
-syscall_(setgid, int gid); // prsys.c
-syscall_(setpriority, int which, int who, int niceval); // prsys.c
-syscall_(membarrier, int cmd, int flags, int cpu_id); // prsys.c
+syscall_(llistxattr, const char *path, char *list, size_t size);                   // fssys.c
+syscall_(setuid, int uid);                                                         // prsys.c
+syscall_(setgid, int gid);                                                         // prsys.c
+syscall_(setpriority, int which, int who, int niceval);                            // prsys.c
+syscall_(membarrier, int cmd, int flags, int cpu_id);                              // prsys.c
 
 __attribute__((naked)) void asm_syscall_handle() {
     __asm__ volatile(".intel_syntax noprefix\n\t"
@@ -260,6 +260,9 @@ syscall_t syscall_handlers[MAX_SYSCALLS] = {
     [SYSCALL_EVENTFD2]      = (syscall_t)syscall_eventfd2,
     [SYSCALL_FTRUNCATE]     = (syscall_t)syscall_ftruncate,
     [SYSCALL_MEMFD_CREATE]  = (syscall_t)syscall_memfd_create,
+    [SYSCALL_TIMER_CREATE]  = (syscall_t)syscall_timer_create,
+    [SYSCALL_TIMER_SETTIME] = (syscall_t)syscall_timer_settime,
+    [SYSCALL_FCHDIR]        = (syscall_t)syscall_fchdir,
 };
 
 USED void syscall_handler(struct syscall_regs *regs, uint64_t user_regs) { // syscall 指令处理
@@ -287,7 +290,8 @@ USED void syscall_handler(struct syscall_regs *regs, uint64_t user_regs) { // sy
         logkf(
             "Syscall(%d) cannot implemented. proc=%s pid=%d\n",
             syscall_id,
-            current && current->process && current->process->name ? current->process->name : "<none>",
+            current && current->process && current->process->name ? current->process->name
+                                                                  : "<none>",
             current && current->process ? current->process->pid : -1
         );
         regs->rax = -ENOSYS;