- Y2038 - lists.linaro.org

Re: [Y2038] [PATCH v3 3/3] microblaze: generate uapi header and system call table files

by Firoz Khan

Hi Michal, On Mon, 5 Nov 2018 at 14:46, Michal Simek <monstr(a)monstr.eu> wrote: > > On 26. 10. 18 7:09, Firoz Khan wrote: > > System call table generation script must be run to gener- > > ate unistd_32.h and syscall_table.h files. This patch will > > have changes which will invokes the script. > > > > This patch will generate unistd_32.h and syscall_table.h > > files by the syscall table generation script invoked by > > microblaze/Makefile and the generated files against the > > removed files must be identical. > > > > The generated uapi header file will be included in uapi/- > > asm/unistd.h and generated system call table header file > > will be included by kernel/syscall_table.S file. > > > > Signed-off-by: Firoz Khan <firoz.khan(a)linaro.org> > > --- > > arch/microblaze/Makefile | 3 + > > arch/microblaze/include/asm/Kbuild | 1 + > > arch/microblaze/include/uapi/asm/Kbuild | 1 + > > arch/microblaze/include/uapi/asm/unistd.h | 411 +----------------------------- > > arch/microblaze/kernel/syscall_table.S | 406 +---------------------------- > > 5 files changed, 10 insertions(+), 812 deletions(-) > > > > diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile > > index 4f3ab57..cda5e03 100644 > > --- a/arch/microblaze/Makefile > > +++ b/arch/microblaze/Makefile > > @@ -81,6 +81,9 @@ all: linux.bin > > archclean: > > $(Q)$(MAKE) $(clean)=$(boot) > > > > +archheaders: > > + $(Q)$(MAKE) $(build)=arch/microblaze/kernel/syscalls all > > + > > linux.bin linux.bin.gz linux.bin.ub: vmlinux > > $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ > > > > diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild > > index 569ba9e..96faf91 100644 > > --- a/arch/microblaze/include/asm/Kbuild > > +++ b/arch/microblaze/include/asm/Kbuild > > @@ -31,3 +31,4 @@ generic-y += trace_clock.h > > generic-y += vga.h > > generic-y += word-at-a-time.h > > generic-y += xor.h > > +generic-y += syscall_table.h > > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > > index 2c6a6bf..cda864f 100644 > > --- a/arch/microblaze/include/uapi/asm/Kbuild > > +++ b/arch/microblaze/include/uapi/asm/Kbuild > > @@ -28,3 +28,4 @@ generic-y += termbits.h > > generic-y += termios.h > > generic-y += types.h > > generic-y += ucontext.h > > +generic-y += unistd_32.h > > diff --git a/arch/microblaze/include/uapi/asm/unistd.h b/arch/microblaze/include/uapi/asm/unistd.h > > index ed9c6f5..3f2d7cb 100644 > > --- a/arch/microblaze/include/uapi/asm/unistd.h > > +++ b/arch/microblaze/include/uapi/asm/unistd.h > > @@ -11,415 +11,6 @@ > > #ifndef _UAPI_ASM_MICROBLAZE_UNISTD_H > > #define _UAPI_ASM_MICROBLAZE_UNISTD_H > > > > -#define __NR_restart_syscall 0 /* ok */ > > -#define __NR_exit 1 /* ok */ > > -#define __NR_fork 2 /* not for no MMU - weird */ > > -#define __NR_read 3 /* ok */ > > -#define __NR_write 4 /* ok */ > > -#define __NR_open 5 /* openat */ > > -#define __NR_close 6 /* ok */ > > -#define __NR_waitpid 7 /* waitid */ > > -#define __NR_creat 8 /* openat */ > > -#define __NR_link 9 /* linkat */ > > -#define __NR_unlink 10 /* unlinkat */ > > -#define __NR_execve 11 /* ok */ > > -#define __NR_chdir 12 /* ok */ > > -#define __NR_time 13 /* obsolete -> sys_gettimeofday */ > > -#define __NR_mknod 14 /* mknodat */ > > -#define __NR_chmod 15 /* fchmodat */ > > -#define __NR_lchown 16 /* ok */ > > -#define __NR_break 17 /* don't know */ > > -#define __NR_oldstat 18 /* remove */ > > -#define __NR_lseek 19 /* ok */ > > -#define __NR_getpid 20 /* ok */ > > -#define __NR_mount 21 /* ok */ > > -#define __NR_umount 22 /* ok */ /* use only umount2 */ > > -#define __NR_setuid 23 /* ok */ > > -#define __NR_getuid 24 /* ok */ > > -#define __NR_stime 25 /* obsolete -> sys_settimeofday */ > > -#define __NR_ptrace 26 /* ok */ > > -#define __NR_alarm 27 /* obsolete -> sys_setitimer */ > > -#define __NR_oldfstat 28 /* remove */ > > -#define __NR_pause 29 /* obsolete -> sys_rt_sigtimedwait */ > > -#define __NR_utime 30 /* obsolete -> sys_utimesat */ > > -#define __NR_stty 31 /* remove */ > > -#define __NR_gtty 32 /* remove */ > > -#define __NR_access 33 /* faccessat */ > > -/* can be implemented by sys_setpriority */ > > -#define __NR_nice 34 > > -#define __NR_ftime 35 /* remove */ > > -#define __NR_sync 36 /* ok */ > > -#define __NR_kill 37 /* ok */ > > -#define __NR_rename 38 /* renameat */ > > -#define __NR_mkdir 39 /* mkdirat */ > > -#define __NR_rmdir 40 /* unlinkat */ > > -#define __NR_dup 41 /* ok */ > > -#define __NR_pipe 42 /* ok */ > > -#define __NR_times 43 /* ok */ > > -#define __NR_prof 44 /* remove */ > > -#define __NR_brk 45 /* ok -mmu, nommu specific */ > > -#define __NR_setgid 46 /* ok */ > > -#define __NR_getgid 47 /* ok */ > > -#define __NR_signal 48 /* obsolete -> sys_rt_sigaction */ > > -#define __NR_geteuid 49 /* ok */ > > -#define __NR_getegid 50 /* ok */ > > -#define __NR_acct 51 /* add it and then I can disable it */ > > -#define __NR_umount2 52 /* remove */ > > -#define __NR_lock 53 /* remove */ > > -#define __NR_ioctl 54 /* ok */ > > -#define __NR_fcntl 55 /* ok -> 64bit version*/ > > -#define __NR_mpx 56 /* remove */ > > -#define __NR_setpgid 57 /* ok */ > > -#define __NR_ulimit 58 /* remove */ > > -#define __NR_oldolduname 59 /* remove */ > > -#define __NR_umask 60 /* ok */ > > -#define __NR_chroot 61 /* ok */ > > -#define __NR_ustat 62 /* obsolete -> statfs64 */ > > -#define __NR_dup2 63 /* ok */ > > -#define __NR_getppid 64 /* ok */ > > -#define __NR_getpgrp 65 /* obsolete -> sys_getpgid */ > > -#define __NR_setsid 66 /* ok */ > > -#define __NR_sigaction 67 /* obsolete -> rt_sigaction */ > > -#define __NR_sgetmask 68 /* obsolete -> sys_rt_sigprocmask */ > > -#define __NR_ssetmask 69 /* obsolete ->sys_rt_sigprocmask */ > > -#define __NR_setreuid 70 /* ok */ > > -#define __NR_setregid 71 /* ok */ > > -#define __NR_sigsuspend 72 /* obsolete -> rt_sigsuspend */ > > -#define __NR_sigpending 73 /* obsolete -> sys_rt_sigpending */ > > -#define __NR_sethostname 74 /* ok */ > > -#define __NR_setrlimit 75 /* ok */ > > -#define __NR_getrlimit 76 /* ok Back compatible 2G limited rlimit */ > > -#define __NR_getrusage 77 /* ok */ > > -#define __NR_gettimeofday 78 /* ok */ > > -#define __NR_settimeofday 79 /* ok */ > > -#define __NR_getgroups 80 /* ok */ > > -#define __NR_setgroups 81 /* ok */ > > -#define __NR_select 82 /* obsolete -> sys_pselect6 */ > > -#define __NR_symlink 83 /* symlinkat */ > > -#define __NR_oldlstat 84 /* remove */ > > -#define __NR_readlink 85 /* obsolete -> sys_readlinkat */ > > -#define __NR_uselib 86 /* remove */ > > -#define __NR_swapon 87 /* ok */ > > -#define __NR_reboot 88 /* ok */ > > -#define __NR_readdir 89 /* remove ? */ > > -#define __NR_mmap 90 /* obsolete -> sys_mmap2 */ > > -#define __NR_munmap 91 /* ok - mmu and nommu */ > > -#define __NR_truncate 92 /* ok or truncate64 */ > > -#define __NR_ftruncate 93 /* ok or ftruncate64 */ > > -#define __NR_fchmod 94 /* ok */ > > -#define __NR_fchown 95 /* ok */ > > -#define __NR_getpriority 96 /* ok */ > > -#define __NR_setpriority 97 /* ok */ > > -#define __NR_profil 98 /* remove */ > > -#define __NR_statfs 99 /* ok or statfs64 */ > > -#define __NR_fstatfs 100 /* ok or fstatfs64 */ > > -#define __NR_ioperm 101 /* remove */ > > -#define __NR_socketcall 102 /* remove */ > > -#define __NR_syslog 103 /* ok */ > > -#define __NR_setitimer 104 /* ok */ > > -#define __NR_getitimer 105 /* ok */ > > -#define __NR_stat 106 /* remove */ > > -#define __NR_lstat 107 /* remove */ > > -#define __NR_fstat 108 /* remove */ > > -#define __NR_olduname 109 /* remove */ > > -#define __NR_iopl 110 /* remove */ > > -#define __NR_vhangup 111 /* ok */ > > -#define __NR_idle 112 /* remove */ > > -#define __NR_vm86old 113 /* remove */ > > -#define __NR_wait4 114 /* obsolete -> waitid */ > > -#define __NR_swapoff 115 /* ok */ > > -#define __NR_sysinfo 116 /* ok */ > > -#define __NR_ipc 117 /* remove - direct call */ > > -#define __NR_fsync 118 /* ok */ > > -#define __NR_sigreturn 119 /* obsolete -> sys_rt_sigreturn */ > > -#define __NR_clone 120 /* ok */ > > -#define __NR_setdomainname 121 /* ok */ > > -#define __NR_uname 122 /* remove */ > > -#define __NR_modify_ldt 123 /* remove */ > > -#define __NR_adjtimex 124 /* ok */ > > -#define __NR_mprotect 125 /* remove */ > > -#define __NR_sigprocmask 126 /* obsolete -> sys_rt_sigprocmask */ > > -#define __NR_create_module 127 /* remove */ > > -#define __NR_init_module 128 /* ok */ > > -#define __NR_delete_module 129 /* ok */ > > -#define __NR_get_kernel_syms 130 /* remove */ > > -#define __NR_quotactl 131 /* ok */ > > -#define __NR_getpgid 132 /* ok */ > > -#define __NR_fchdir 133 /* ok */ > > -#define __NR_bdflush 134 /* remove */ > > -#define __NR_sysfs 135 /* needed for busybox */ > > -#define __NR_personality 136 /* ok */ > > -#define __NR_afs_syscall 137 /* Syscall for Andrew File System */ > > -#define __NR_setfsuid 138 /* ok */ > > -#define __NR_setfsgid 139 /* ok */ > > -#define __NR__llseek 140 /* remove only lseek */ > > -#define __NR_getdents 141 /* ok or getdents64 */ > > -#define __NR__newselect 142 /* remove */ > > -#define __NR_flock 143 /* ok */ > > -#define __NR_msync 144 /* remove */ > > -#define __NR_readv 145 /* ok */ > > -#define __NR_writev 146 /* ok */ > > -#define __NR_getsid 147 /* ok */ > > -#define __NR_fdatasync 148 /* ok */ > > -#define __NR__sysctl 149 /* remove */ > > -#define __NR_mlock 150 /* ok - nommu or mmu */ > > -#define __NR_munlock 151 /* ok - nommu or mmu */ > > -#define __NR_mlockall 152 /* ok - nommu or mmu */ > > -#define __NR_munlockall 153 /* ok - nommu or mmu */ > > -#define __NR_sched_setparam 154 /* ok */ > > -#define __NR_sched_getparam 155 /* ok */ > > -#define __NR_sched_setscheduler 156 /* ok */ > > -#define __NR_sched_getscheduler 157 /* ok */ > > -#define __NR_sched_yield 158 /* ok */ > > -#define __NR_sched_get_priority_max 159 /* ok */ > > -#define __NR_sched_get_priority_min 160 /* ok */ > > -#define __NR_sched_rr_get_interval 161 /* ok */ > > -#define __NR_nanosleep 162 /* ok */ > > -#define __NR_mremap 163 /* ok - nommu or mmu */ > > -#define __NR_setresuid 164 /* ok */ > > -#define __NR_getresuid 165 /* ok */ > > -#define __NR_vm86 166 /* remove */ > > -#define __NR_query_module 167 /* ok */ > > -#define __NR_poll 168 /* obsolete -> sys_ppoll */ > > -#define __NR_nfsservctl 169 /* ok */ > > -#define __NR_setresgid 170 /* ok */ > > -#define __NR_getresgid 171 /* ok */ > > -#define __NR_prctl 172 /* ok */ > > -#define __NR_rt_sigreturn 173 /* ok */ > > -#define __NR_rt_sigaction 174 /* ok */ > > -#define __NR_rt_sigprocmask 175 /* ok */ > > -#define __NR_rt_sigpending 176 /* ok */ > > -#define __NR_rt_sigtimedwait 177 /* ok */ > > -#define __NR_rt_sigqueueinfo 178 /* ok */ > > -#define __NR_rt_sigsuspend 179 /* ok */ > > -#define __NR_pread64 180 /* ok */ > > -#define __NR_pwrite64 181 /* ok */ > > -#define __NR_chown 182 /* obsolete -> fchownat */ > > -#define __NR_getcwd 183 /* ok */ > > -#define __NR_capget 184 /* ok */ > > -#define __NR_capset 185 /* ok */ > > -#define __NR_sigaltstack 186 /* remove */ > > -#define __NR_sendfile 187 /* ok -> exist 64bit version*/ > > -#define __NR_getpmsg 188 /* remove */ > > -/* remove - some people actually want streams */ > > -#define __NR_putpmsg 189 > > -/* for noMMU - group with clone -> maybe remove */ > > -#define __NR_vfork 190 > > -#define __NR_ugetrlimit 191 /* remove - SuS compliant getrlimit */ > > -#define __NR_mmap2 192 /* ok */ > > -#define __NR_truncate64 193 /* ok */ > > -#define __NR_ftruncate64 194 /* ok */ > > -#define __NR_stat64 195 /* remove _ARCH_WANT_STAT64 */ > > -#define __NR_lstat64 196 /* remove _ARCH_WANT_STAT64 */ > > -#define __NR_fstat64 197 /* remove _ARCH_WANT_STAT64 */ > > -#define __NR_lchown32 198 /* ok - without 32 */ > > -#define __NR_getuid32 199 /* ok - without 32 */ > > -#define __NR_getgid32 200 /* ok - without 32 */ > > -#define __NR_geteuid32 201 /* ok - without 32 */ > > -#define __NR_getegid32 202 /* ok - without 32 */ > > -#define __NR_setreuid32 203 /* ok - without 32 */ > > -#define __NR_setregid32 204 /* ok - without 32 */ > > -#define __NR_getgroups32 205 /* ok - without 32 */ > > -#define __NR_setgroups32 206 /* ok - without 32 */ > > -#define __NR_fchown32 207 /* ok - without 32 */ > > -#define __NR_setresuid32 208 /* ok - without 32 */ > > -#define __NR_getresuid32 209 /* ok - without 32 */ > > -#define __NR_setresgid32 210 /* ok - without 32 */ > > -#define __NR_getresgid32 211 /* ok - without 32 */ > > -#define __NR_chown32 212 /* ok - without 32 -obsolete -> fchownat */ > > -#define __NR_setuid32 213 /* ok - without 32 */ > > -#define __NR_setgid32 214 /* ok - without 32 */ > > -#define __NR_setfsuid32 215 /* ok - without 32 */ > > -#define __NR_setfsgid32 216 /* ok - without 32 */ > > -#define __NR_pivot_root 217 /* ok */ > > -#define __NR_mincore 218 /* ok */ > > -#define __NR_madvise 219 /* ok */ > > -#define __NR_getdents64 220 /* ok */ > > -#define __NR_fcntl64 221 /* ok */ > > -/* 223 is unused */ > > -#define __NR_gettid 224 /* ok */ > > -#define __NR_readahead 225 /* ok */ > > -#define __NR_setxattr 226 /* ok */ > > -#define __NR_lsetxattr 227 /* ok */ > > -#define __NR_fsetxattr 228 /* ok */ > > -#define __NR_getxattr 229 /* ok */ > > -#define __NR_lgetxattr 230 /* ok */ > > -#define __NR_fgetxattr 231 /* ok */ > > -#define __NR_listxattr 232 /* ok */ > > -#define __NR_llistxattr 233 /* ok */ > > -#define __NR_flistxattr 234 /* ok */ > > -#define __NR_removexattr 235 /* ok */ > > -#define __NR_lremovexattr 236 /* ok */ > > -#define __NR_fremovexattr 237 /* ok */ > > -#define __NR_tkill 238 /* ok */ > > -#define __NR_sendfile64 239 /* ok */ > > -#define __NR_futex 240 /* ok */ > > -#define __NR_sched_setaffinity 241 /* ok */ > > -#define __NR_sched_getaffinity 242 /* ok */ > > -#define __NR_set_thread_area 243 /* remove */ > > -#define __NR_get_thread_area 244 /* remove */ > > -#define __NR_io_setup 245 /* ok */ > > -#define __NR_io_destroy 246 /* ok */ > > -#define __NR_io_getevents 247 /* ok */ > > -#define __NR_io_submit 248 /* ok */ > > -#define __NR_io_cancel 249 /* ok */ > > -#define __NR_fadvise64 250 /* remove -> sys_fadvise64_64 */ > > -/* 251 is available for reuse (was briefly sys_set_zone_reclaim) */ > > -#define __NR_exit_group 252 /* ok */ > > -#define __NR_lookup_dcookie 253 /* ok */ > > -#define __NR_epoll_create 254 /* ok */ > > -#define __NR_epoll_ctl 255 /* ok */ > > -#define __NR_epoll_wait 256 /* obsolete -> sys_epoll_pwait */ > > -#define __NR_remap_file_pages 257 /* only for mmu */ > > -#define __NR_set_tid_address 258 /* ok */ > > -#define __NR_timer_create 259 /* ok */ > > -#define __NR_timer_settime (__NR_timer_create+1) /* 260 */ /* ok */ > > -#define __NR_timer_gettime (__NR_timer_create+2) /* 261 */ /* ok */ > > -#define __NR_timer_getoverrun (__NR_timer_create+3) /* 262 */ /* ok */ > > -#define __NR_timer_delete (__NR_timer_create+4) /* 263 */ /* ok */ > > -#define __NR_clock_settime (__NR_timer_create+5) /* 264 */ /* ok */ > > -#define __NR_clock_gettime (__NR_timer_create+6) /* 265 */ /* ok */ > > -#define __NR_clock_getres (__NR_timer_create+7) /* 266 */ /* ok */ > > -#define __NR_clock_nanosleep (__NR_timer_create+8) /* 267 */ /* ok */ > > -#define __NR_statfs64 268 /* ok */ > > -#define __NR_fstatfs64 269 /* ok */ > > -#define __NR_tgkill 270 /* ok */ > > -#define __NR_utimes 271 /* obsolete -> sys_futimesat */ > > -#define __NR_fadvise64_64 272 /* ok */ > > -#define __NR_vserver 273 /* ok */ > > -#define __NR_mbind 274 /* only for mmu */ > > -#define __NR_get_mempolicy 275 /* only for mmu */ > > -#define __NR_set_mempolicy 276 /* only for mmu */ > > -#define __NR_mq_open 277 /* ok */ > > -#define __NR_mq_unlink (__NR_mq_open+1) /* 278 */ /* ok */ > > -#define __NR_mq_timedsend (__NR_mq_open+2) /* 279 */ /* ok */ > > -#define __NR_mq_timedreceive (__NR_mq_open+3) /* 280 */ /* ok */ > > -#define __NR_mq_notify (__NR_mq_open+4) /* 281 */ /* ok */ > > -#define __NR_mq_getsetattr (__NR_mq_open+5) /* 282 */ /* ok */ > > -#define __NR_kexec_load 283 /* ok */ > > -#define __NR_waitid 284 /* ok */ > > -/* #define __NR_sys_setaltroot 285 */ > > -#define __NR_add_key 286 /* ok */ > > -#define __NR_request_key 287 /* ok */ > > -#define __NR_keyctl 288 /* ok */ > > -#define __NR_ioprio_set 289 /* ok */ > > -#define __NR_ioprio_get 290 /* ok */ > > -#define __NR_inotify_init 291 /* ok */ > > -#define __NR_inotify_add_watch 292 /* ok */ > > -#define __NR_inotify_rm_watch 293 /* ok */ > > -#define __NR_migrate_pages 294 /* mmu */ > > -#define __NR_openat 295 /* ok */ > > -#define __NR_mkdirat 296 /* ok */ > > -#define __NR_mknodat 297 /* ok */ > > -#define __NR_fchownat 298 /* ok */ > > -#define __NR_futimesat 299 /* obsolete -> sys_utimesat */ > > -#define __NR_fstatat64 300 /* stat64 */ > > -#define __NR_unlinkat 301 /* ok */ > > -#define __NR_renameat 302 /* ok */ > > -#define __NR_linkat 303 /* ok */ > > -#define __NR_symlinkat 304 /* ok */ > > -#define __NR_readlinkat 305 /* ok */ > > -#define __NR_fchmodat 306 /* ok */ > > -#define __NR_faccessat 307 /* ok */ > > -#define __NR_pselect6 308 /* ok */ > > -#define __NR_ppoll 309 /* ok */ > > -#define __NR_unshare 310 /* ok */ > > -#define __NR_set_robust_list 311 /* ok */ > > -#define __NR_get_robust_list 312 /* ok */ > > -#define __NR_splice 313 /* ok */ > > -#define __NR_sync_file_range 314 /* ok */ > > -#define __NR_tee 315 /* ok */ > > -#define __NR_vmsplice 316 /* ok */ > > -#define __NR_move_pages 317 /* mmu */ > > -#define __NR_getcpu 318 /* ok */ > > -#define __NR_epoll_pwait 319 /* ok */ > > -#define __NR_utimensat 320 /* ok */ > > -#define __NR_signalfd 321 /* ok */ > > -#define __NR_timerfd_create 322 /* ok */ > > -#define __NR_eventfd 323 /* ok */ > > -#define __NR_fallocate 324 /* ok */ > > -#define __NR_semtimedop 325 /* ok - semaphore group */ > > -#define __NR_timerfd_settime 326 /* ok */ > > -#define __NR_timerfd_gettime 327 /* ok */ > > -/* sysv ipc syscalls */ > > -#define __NR_semctl 328 /* ok */ > > -#define __NR_semget 329 /* ok */ > > -#define __NR_semop 330 /* ok */ > > -#define __NR_msgctl 331 /* ok */ > > -#define __NR_msgget 332 /* ok */ > > -#define __NR_msgrcv 333 /* ok */ > > -#define __NR_msgsnd 334 /* ok */ > > -#define __NR_shmat 335 /* ok */ > > -#define __NR_shmctl 336 /* ok */ > > -#define __NR_shmdt 337 /* ok */ > > -#define __NR_shmget 338 /* ok */ > > - > > - > > -#define __NR_signalfd4 339 /* new */ > > -#define __NR_eventfd2 340 /* new */ > > -#define __NR_epoll_create1 341 /* new */ > > -#define __NR_dup3 342 /* new */ > > -#define __NR_pipe2 343 /* new */ > > -#define __NR_inotify_init1 344 /* new */ > > -#define __NR_socket 345 /* new */ > > -#define __NR_socketpair 346 /* new */ > > -#define __NR_bind 347 /* new */ > > -#define __NR_listen 348 /* new */ > > -#define __NR_accept 349 /* new */ > > -#define __NR_connect 350 /* new */ > > -#define __NR_getsockname 351 /* new */ > > -#define __NR_getpeername 352 /* new */ > > -#define __NR_sendto 353 /* new */ > > -#define __NR_send 354 /* new */ > > -#define __NR_recvfrom 355 /* new */ > > -#define __NR_recv 356 /* new */ > > -#define __NR_setsockopt 357 /* new */ > > -#define __NR_getsockopt 358 /* new */ > > -#define __NR_shutdown 359 /* new */ > > -#define __NR_sendmsg 360 /* new */ > > -#define __NR_recvmsg 361 /* new */ > > -#define __NR_accept4 362 /* new */ > > -#define __NR_preadv 363 /* new */ > > -#define __NR_pwritev 364 /* new */ > > -#define __NR_rt_tgsigqueueinfo 365 /* new */ > > -#define __NR_perf_event_open 366 /* new */ > > -#define __NR_recvmmsg 367 /* new */ > > -#define __NR_fanotify_init 368 > > -#define __NR_fanotify_mark 369 > > -#define __NR_prlimit64 370 > > -#define __NR_name_to_handle_at 371 > > -#define __NR_open_by_handle_at 372 > > -#define __NR_clock_adjtime 373 > > -#define __NR_syncfs 374 > > -#define __NR_setns 375 > > -#define __NR_sendmmsg 376 > > -#define __NR_process_vm_readv 377 > > -#define __NR_process_vm_writev 378 > > -#define __NR_kcmp 379 > > -#define __NR_finit_module 380 > > -#define __NR_sched_setattr 381 > > -#define __NR_sched_getattr 382 > > -#define __NR_renameat2 383 > > -#define __NR_seccomp 384 > > -#define __NR_getrandom 385 > > -#define __NR_memfd_create 386 > > -#define __NR_bpf 387 > > -#define __NR_execveat 388 > > -#define __NR_userfaultfd 389 > > -#define __NR_membarrier 390 > > -#define __NR_mlock2 391 > > -#define __NR_copy_file_range 392 > > -#define __NR_preadv2 393 > > -#define __NR_pwritev2 394 > > -#define __NR_pkey_mprotect 395 > > -#define __NR_pkey_alloc 396 > > -#define __NR_pkey_free 397 > > -#define __NR_statx 398 > > -#define __NR_io_pgetevents 399 > > -#define __NR_rseq 400 > > - > > -#ifdef __KERNEL__ > > -#define __NR_syscalls 401 > > -#endif > > +#include <asm/unistd_32.h> > > > > #endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */ > > diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S > > index 6ab6505..ce00664 100644 > > --- a/arch/microblaze/kernel/syscall_table.S > > +++ b/arch/microblaze/kernel/syscall_table.S > > @@ -1,404 +1,6 @@ > > /* SPDX-License-Identifier: GPL-2.0 */ > > + > > +#define __SYSCALL(nr, entry, nargs) .long entry > > ENTRY(sys_call_table) > > - .long sys_restart_syscall /* 0 - old "setup()" system call, > > - * used for restarting */ > > - .long sys_exit > > - .long sys_fork > > - .long sys_read > > - .long sys_write > > - .long sys_open /* 5 */ > > - .long sys_close > > - .long sys_waitpid > > - .long sys_creat > > - .long sys_link > > - .long sys_unlink /* 10 */ > > - .long sys_execve > > - .long sys_chdir > > - .long sys_time > > - .long sys_mknod > > - .long sys_chmod /* 15 */ > > - .long sys_lchown > > - .long sys_ni_syscall /* old break syscall holder */ > > - .long sys_ni_syscall /* old stat */ > > - .long sys_lseek > > - .long sys_getpid /* 20 */ > > - .long sys_mount > > - .long sys_oldumount > > - .long sys_setuid > > - .long sys_getuid > > - .long sys_stime /* 25 */ > > - .long sys_ptrace > > - .long sys_alarm > > - .long sys_ni_syscall /* oldfstat */ > > - .long sys_pause > > - .long sys_utime /* 30 */ > > - .long sys_ni_syscall /* old stty syscall holder */ > > - .long sys_ni_syscall /* old gtty syscall holder */ > > - .long sys_access > > - .long sys_nice > > - .long sys_ni_syscall /* 35 - old ftime syscall holder */ > > - .long sys_sync > > - .long sys_kill > > - .long sys_rename > > - .long sys_mkdir > > - .long sys_rmdir /* 40 */ > > - .long sys_dup > > - .long sys_pipe > > - .long sys_times > > - .long sys_ni_syscall /* old prof syscall holder */ > > - .long sys_brk /* 45 */ > > - .long sys_setgid > > - .long sys_getgid > > - .long sys_signal > > - .long sys_geteuid > > - .long sys_getegid /* 50 */ > > - .long sys_acct > > - .long sys_umount /* recycled never used phys() */ > > - .long sys_ni_syscall /* old lock syscall holder */ > > - .long sys_ioctl > > - .long sys_fcntl /* 55 */ > > - .long sys_ni_syscall /* old mpx syscall holder */ > > - .long sys_setpgid > > - .long sys_ni_syscall /* old ulimit syscall holder */ > > - .long sys_ni_syscall /* olduname */ > > - .long sys_umask /* 60 */ > > - .long sys_chroot > > - .long sys_ustat > > - .long sys_dup2 > > - .long sys_getppid > > - .long sys_getpgrp /* 65 */ > > - .long sys_setsid > > - .long sys_ni_syscall /* sys_sigaction */ > > - .long sys_sgetmask > > - .long sys_ssetmask > > - .long sys_setreuid /* 70 */ > > - .long sys_setregid > > - .long sys_ni_syscall /* sys_sigsuspend_wrapper */ > > - .long sys_sigpending > > - .long sys_sethostname > > - .long sys_setrlimit /* 75 */ > > - .long sys_ni_syscall /* old_getrlimit */ > > - .long sys_getrusage > > - .long sys_gettimeofday > > - .long sys_settimeofday > > - .long sys_getgroups /* 80 */ > > - .long sys_setgroups > > - .long sys_ni_syscall /* old_select */ > > - .long sys_symlink > > - .long sys_ni_syscall /* oldlstat */ > > - .long sys_readlink /* 85 */ > > - .long sys_uselib > > - .long sys_swapon > > - .long sys_reboot > > - .long sys_ni_syscall /* old_readdir */ > > - .long sys_mmap /* 90 */ /* old_mmap */ > > - .long sys_munmap > > - .long sys_truncate > > - .long sys_ftruncate > > - .long sys_fchmod > > - .long sys_fchown /* 95 */ > > - .long sys_getpriority > > - .long sys_setpriority > > - .long sys_ni_syscall /* old profil syscall holder */ > > - .long sys_statfs > > - .long sys_fstatfs /* 100 */ > > - .long sys_ni_syscall /* ioperm */ > > - .long sys_socketcall > > - .long sys_syslog /* operation with system console */ > > - .long sys_setitimer > > - .long sys_getitimer /* 105 */ > > - .long sys_newstat > > - .long sys_newlstat > > - .long sys_newfstat > > - .long sys_ni_syscall /* uname */ > > - .long sys_ni_syscall /* 110 */ /* iopl */ > > - .long sys_vhangup > > - .long sys_ni_syscall /* old "idle" system call */ > > - .long sys_ni_syscall /* old sys_vm86old */ > > - .long sys_wait4 > > - .long sys_swapoff /* 115 */ > > - .long sys_sysinfo > > - .long sys_ni_syscall /* old sys_ipc */ > > - .long sys_fsync > > - .long sys_ni_syscall /* sys_sigreturn_wrapper */ > > - .long sys_clone /* 120 */ > > - .long sys_setdomainname > > - .long sys_newuname > > - .long sys_ni_syscall /* modify_ldt */ > > - .long sys_adjtimex > > - .long sys_mprotect /* 125: sys_mprotect */ > > - .long sys_sigprocmask > > - .long sys_ni_syscall /* old "create_module" */ > > - .long sys_init_module > > - .long sys_delete_module > > - .long sys_ni_syscall /* 130: old "get_kernel_syms" */ > > - .long sys_quotactl > > - .long sys_getpgid > > - .long sys_fchdir > > - .long sys_bdflush > > - .long sys_sysfs /* 135 */ > > - .long sys_personality > > - .long sys_ni_syscall /* reserved for afs_syscall */ > > - .long sys_setfsuid > > - .long sys_setfsgid > > - .long sys_llseek /* 140 */ > > - .long sys_getdents > > - .long sys_select > > - .long sys_flock > > - .long sys_msync > > - .long sys_readv /* 145 */ > > - .long sys_writev > > - .long sys_getsid > > - .long sys_fdatasync > > - .long sys_sysctl > > - .long sys_mlock /* 150: sys_mlock */ > > - .long sys_munlock > > - .long sys_mlockall > > - .long sys_munlockall > > - .long sys_sched_setparam > > - .long sys_sched_getparam /* 155 */ > > - .long sys_sched_setscheduler > > - .long sys_sched_getscheduler > > - .long sys_sched_yield > > - .long sys_sched_get_priority_max > > - .long sys_sched_get_priority_min /* 160 */ > > - .long sys_sched_rr_get_interval > > - .long sys_nanosleep > > - .long sys_mremap > > - .long sys_setresuid > > - .long sys_getresuid /* 165 */ > > - .long sys_ni_syscall /* sys_vm86 */ > > - .long sys_ni_syscall /* Old sys_query_module */ > > - .long sys_poll > > - .long sys_ni_syscall /* old nfsservctl */ > > - .long sys_setresgid /* 170 */ > > - .long sys_getresgid > > - .long sys_prctl > > - .long sys_rt_sigreturn_wrapper > > - .long sys_rt_sigaction > > - .long sys_rt_sigprocmask /* 175 */ > > - .long sys_rt_sigpending > > - .long sys_rt_sigtimedwait > > - .long sys_rt_sigqueueinfo > > - .long sys_rt_sigsuspend > > - .long sys_pread64 /* 180 */ > > - .long sys_pwrite64 > > - .long sys_chown > > - .long sys_getcwd > > - .long sys_capget > > - .long sys_capset /* 185 */ > > - .long sys_ni_syscall /* sigaltstack */ > > - .long sys_sendfile > > - .long sys_ni_syscall /* reserved for streams1 */ > > - .long sys_ni_syscall /* reserved for streams2 */ > > - .long sys_vfork /* 190 */ > > - .long sys_getrlimit > > - .long sys_mmap2 > > - .long sys_truncate64 > > - .long sys_ftruncate64 > > - .long sys_stat64 /* 195 */ > > - .long sys_lstat64 > > - .long sys_fstat64 > > - .long sys_lchown > > - .long sys_getuid > > - .long sys_getgid /* 200 */ > > - .long sys_geteuid > > - .long sys_getegid > > - .long sys_setreuid > > - .long sys_setregid > > - .long sys_getgroups /* 205 */ > > - .long sys_setgroups > > - .long sys_fchown > > - .long sys_setresuid > > - .long sys_getresuid > > - .long sys_setresgid /* 210 */ > > - .long sys_getresgid > > - .long sys_chown > > - .long sys_setuid > > - .long sys_setgid > > - .long sys_setfsuid /* 215 */ > > - .long sys_setfsgid > > - .long sys_pivot_root > > - .long sys_mincore > > - .long sys_madvise > > - .long sys_getdents64 /* 220 */ > > - .long sys_fcntl64 > > - .long sys_ni_syscall /* reserved for TUX */ > > - .long sys_ni_syscall > > - .long sys_gettid > > - .long sys_readahead /* 225 */ > > - .long sys_setxattr > > - .long sys_lsetxattr > > - .long sys_fsetxattr > > - .long sys_getxattr > > - .long sys_lgetxattr /* 230 */ > > - .long sys_fgetxattr > > - .long sys_listxattr > > - .long sys_llistxattr > > - .long sys_flistxattr > > - .long sys_removexattr /* 235 */ > > - .long sys_lremovexattr > > - .long sys_fremovexattr > > - .long sys_tkill > > - .long sys_sendfile64 > > - .long sys_futex /* 240 */ > > - .long sys_sched_setaffinity > > - .long sys_sched_getaffinity > > - .long sys_ni_syscall /* set_thread_area */ > > - .long sys_ni_syscall /* get_thread_area */ > > - .long sys_io_setup /* 245 */ > > - .long sys_io_destroy > > - .long sys_io_getevents > > - .long sys_io_submit > > - .long sys_io_cancel > > - .long sys_fadvise64 /* 250 */ > > - .long sys_ni_syscall > > - .long sys_exit_group > > - .long sys_lookup_dcookie > > - .long sys_epoll_create > > - .long sys_epoll_ctl /* 255 */ > > - .long sys_epoll_wait > > - .long sys_remap_file_pages > > - .long sys_set_tid_address > > - .long sys_timer_create > > - .long sys_timer_settime /* 260 */ > > - .long sys_timer_gettime > > - .long sys_timer_getoverrun > > - .long sys_timer_delete > > - .long sys_clock_settime > > - .long sys_clock_gettime /* 265 */ > > - .long sys_clock_getres > > - .long sys_clock_nanosleep > > - .long sys_statfs64 > > - .long sys_fstatfs64 > > - .long sys_tgkill /* 270 */ > > - .long sys_utimes > > - .long sys_fadvise64_64 > > - .long sys_ni_syscall /* sys_vserver */ > > - .long sys_mbind > > - .long sys_get_mempolicy > > - .long sys_set_mempolicy > > - .long sys_mq_open > > - .long sys_mq_unlink > > - .long sys_mq_timedsend > > - .long sys_mq_timedreceive /* 280 */ > > - .long sys_mq_notify > > - .long sys_mq_getsetattr > > - .long sys_kexec_load > > - .long sys_waitid > > - .long sys_ni_syscall /* 285 */ /* available */ > > - .long sys_add_key > > - .long sys_request_key > > - .long sys_keyctl > > - .long sys_ioprio_set > > - .long sys_ioprio_get /* 290 */ > > - .long sys_inotify_init > > - .long sys_inotify_add_watch > > - .long sys_inotify_rm_watch > > - .long sys_ni_syscall /* sys_migrate_pages */ > > - .long sys_openat /* 295 */ > > - .long sys_mkdirat > > - .long sys_mknodat > > - .long sys_fchownat > > - .long sys_futimesat > > - .long sys_fstatat64 /* 300 */ > > - .long sys_unlinkat > > - .long sys_renameat > > - .long sys_linkat > > - .long sys_symlinkat > > - .long sys_readlinkat /* 305 */ > > - .long sys_fchmodat > > - .long sys_faccessat > > - .long sys_pselect6 > > - .long sys_ppoll > > - .long sys_unshare /* 310 */ > > - .long sys_set_robust_list > > - .long sys_get_robust_list > > - .long sys_splice > > - .long sys_sync_file_range > > - .long sys_tee /* 315 */ > > - .long sys_vmsplice > > - .long sys_move_pages > > - .long sys_getcpu > > - .long sys_epoll_pwait > > - .long sys_utimensat /* 320 */ > > - .long sys_signalfd > > - .long sys_timerfd_create > > - .long sys_eventfd > > - .long sys_fallocate > > - .long sys_semtimedop /* 325 */ > > - .long sys_timerfd_settime > > - .long sys_timerfd_gettime > > - .long sys_semctl > > - .long sys_semget > > - .long sys_semop /* 330 */ > > - .long sys_msgctl > > - .long sys_msgget > > - .long sys_msgrcv > > - .long sys_msgsnd > > - .long sys_shmat /* 335 */ > > - .long sys_shmctl > > - .long sys_shmdt > > - .long sys_shmget > > - .long sys_signalfd4 /* new syscall */ > > - .long sys_eventfd2 /* 340 */ > > - .long sys_epoll_create1 > > - .long sys_dup3 > > - .long sys_pipe2 > > - .long sys_inotify_init1 > > - .long sys_socket /* 345 */ > > - .long sys_socketpair > > - .long sys_bind > > - .long sys_listen > > - .long sys_accept > > - .long sys_connect /* 350 */ > > - .long sys_getsockname > > - .long sys_getpeername > > - .long sys_sendto > > - .long sys_send > > - .long sys_recvfrom /* 355 */ > > - .long sys_recv > > - .long sys_setsockopt > > - .long sys_getsockopt > > - .long sys_shutdown > > - .long sys_sendmsg /* 360 */ > > - .long sys_recvmsg > > - .long sys_accept4 > > - .long sys_preadv > > - .long sys_pwritev > > - .long sys_rt_tgsigqueueinfo /* 365 */ > > - .long sys_perf_event_open > > - .long sys_recvmmsg > > - .long sys_fanotify_init > > - .long sys_fanotify_mark > > - .long sys_prlimit64 /* 370 */ > > - .long sys_name_to_handle_at > > - .long sys_open_by_handle_at > > - .long sys_clock_adjtime > > - .long sys_syncfs > > - .long sys_setns /* 375 */ > > - .long sys_sendmmsg > > - .long sys_process_vm_readv > > - .long sys_process_vm_writev > > - .long sys_kcmp > > - .long sys_finit_module /* 380 */ > > - .long sys_sched_setattr > > - .long sys_sched_getattr > > - .long sys_renameat2 > > - .long sys_seccomp > > - .long sys_getrandom /* 385 */ > > - .long sys_memfd_create > > - .long sys_bpf > > - .long sys_execveat > > - .long sys_userfaultfd > > - .long sys_membarrier /* 390 */ > > - .long sys_mlock2 > > - .long sys_copy_file_range > > - .long sys_preadv2 > > - .long sys_pwritev2 > > - .long sys_pkey_mprotect /* 395 */ > > - .long sys_pkey_alloc > > - .long sys_pkey_free > > - .long sys_statx > > - .long sys_io_pgetevents > > - .long sys_rseq > > +#include <asm/syscall_table.h> > > +#undef __SYSCALL > > > > I still don't think this is correct. > > I have done these steps > > make mrproper > make ARCH=microblaze headers_install INSTALL_HDR_PATH=/tmp/ && move > Applied 1/3 > make ARCH=microblaze headers_install INSTALL_HDR_PATH=/tmp/ && move > Applied 2/3 > make ARCH=microblaze headers_install INSTALL_HDR_PATH=/tmp/ && move > Applied 3/3 > make ARCH=microblaze headers_install INSTALL_HDR_PATH=/tmp/ && move > > And compare all these versions. Till 2/3 all is fine but when 3/3 is > applied > > include/asm/unistd.h contains > #include <asm/unistd_32.h> > > Then include/asm/unistd_32.h contains > #include <asm-generic/unistd_32.h> > which is different syscalls table. > > I didn't play with it for a long time but removing generic unistd_32.h > is fixing it. Please take a look. Sure, I'll check and update you ASAP. > > diff --git a/arch/microblaze/include/uapi/asm/Kbuild > b/arch/microblaze/include/uapi/asm/Kbuild > index cda864f4b62e..2c6a6bffea32 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -28,4 +28,3 @@ generic-y += termbits.h > generic-y += termios.h > generic-y += types.h > generic-y += ucontext.h > -generic-y += unistd_32.h AFAIK, If I apply the above fix; the generated file - unistd_32.h will get removed. No longer present in arch/microblaze/include/generated/uapi/asm. Thanks Firoz > > Thanks, > Michal > > -- > Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 > w: www.monstr.eu p: +42-0-721842854 > Maintainer of Linux kernel - Xilinx Microblaze > Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs > U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP SoCs > >

7 years, 4 months

2
1
0 0

[PATCH v1 0/4] xtensa: system call table generation support

by Firoz Khan

The purpose of this patch series is, we can easily add/modify/delete system call table support by cha- nging entry in syscall.tbl file instead of manually changing many files. The other goal is to unify the system call table generation support implementation across all the architectures. The system call tables are in different format in all architecture. It will be difficult to manually add, modify or delete the system calls in the resp- ective files manually. To make it easy by keeping a script and which'll generate uapi header file and syscall table file. syscall.tbl contains the list of available system calls along with system call number and correspond- ing entry point. Add a new system call in this arch- itecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. ARM, s390 and x86 architecuture does exist the sim- ilar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, ia64, m68k, microblaze, mips, parisc, powerpc, sh and sparc. Below mentioned git repository contains more details about the workflow. https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work to solve the Y2038 issue. We need to add two dozen of system calls to solve Y2038 issue. So this patch series will help to add new system calls easily by adding new entry in the syscall.tbl. Firoz Khan (4): xtensa: move SYS_XTENSA_* macros to non uapi header xtensa: add __NR_syscalls along with __NR_syscall_count xtensa: add system call table generation support xtensa: generate uapi header and syscall table header files arch/xtensa/Makefile | 3 + arch/xtensa/include/asm/Kbuild | 1 + arch/xtensa/include/asm/unistd.h | 20 + arch/xtensa/include/uapi/asm/Kbuild | 1 + arch/xtensa/include/uapi/asm/unistd.h | 798 +----------------------------- arch/xtensa/kernel/syscall.c | 5 +- arch/xtensa/kernel/syscalls/Makefile | 38 ++ arch/xtensa/kernel/syscalls/syscall.tbl | 374 ++++++++++++++ arch/xtensa/kernel/syscalls/syscallhdr.sh | 36 ++ arch/xtensa/kernel/syscalls/syscalltbl.sh | 32 ++ 10 files changed, 510 insertions(+), 798 deletions(-) create mode 100644 arch/xtensa/kernel/syscalls/Makefile create mode 100644 arch/xtensa/kernel/syscalls/syscall.tbl create mode 100644 arch/xtensa/kernel/syscalls/syscallhdr.sh create mode 100644 arch/xtensa/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 4 months

3
13
0 0

[PATCH v2 0/4] sparc: system call table generation support

by Firoz Khan

The purpose of this patch series is, we can easily add/modify/delete system call table support by cha- nging entry in syscall.tbl file instead of manually changing many files. The other goal is to unify the system call table generation support implementation across all the architectures. The system call tables are in different format in all architecture. It will be difficult to manually add, modify or delete the system calls in the resp- ective files manually. To make it easy by keeping a script and which'll generate uapi header file and syscall table file. syscall.tbl contains the list of available system calls along with system call number and correspond- ing entry point. Add a new system call in this arch- itecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. - Compat entry name, if required. ARM, s390 and x86 architecuture does exist the sim- ilar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, ia64, m68k, microblaze, mips, parisc, powerpc, sh and xtensa. Below mentioned git repository contains more details about the workflow. https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work to solve the Y2038 issue. We need to add two dozen of system calls to solve Y2038 issue. So this patch series will help to add new system calls easily by adding new entry in the syscall.tbl. Changes since v1: - optimized/updated the syscall table generation scripts. - fixed all mixed indentation issues in syscall.tbl. - added "comments" in syscall.tbl. Firoz Khan (4): sparc: move __IGNORE* entries to non uapi header sparc: add __NR_syscalls along with NR_syscalls sparc: add system call table generation support sparc: generate uapi header and system call table files arch/sparc/Makefile | 3 + arch/sparc/include/asm/Kbuild | 4 +- arch/sparc/include/asm/unistd.h | 18 ++ arch/sparc/include/uapi/asm/Kbuild | 2 + arch/sparc/include/uapi/asm/unistd.h | 425 +------------------------------ arch/sparc/kernel/syscalls/Makefile | 55 ++++ arch/sparc/kernel/syscalls/syscall.tbl | 408 +++++++++++++++++++++++++++++ arch/sparc/kernel/syscalls/syscallhdr.sh | 36 +++ arch/sparc/kernel/syscalls/syscalltbl.sh | 36 +++ arch/sparc/kernel/systbls_32.S | 81 +----- arch/sparc/kernel/systbls_64.S | 157 +----------- 11 files changed, 571 insertions(+), 654 deletions(-) create mode 100644 arch/sparc/kernel/syscalls/Makefile create mode 100644 arch/sparc/kernel/syscalls/syscall.tbl create mode 100644 arch/sparc/kernel/syscalls/syscallhdr.sh create mode 100644 arch/sparc/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 5 months

3
9
0 0

[PATCH v2 0/5] alpha: system call table generation support

by Firoz Khan

The purpose of this patch series is, we can easily add/modify/delete system call table support by cha- nging entry in syscall.tbl file instead of manually changing many files. The other goal is to unify the system call table generation support implementation across all the architectures. The system call tables are in different format in all architecture. It will be difficult to manually add, modify or delete the system calls in the resp- ective files manually. To make it easy by keeping a script and which'll generate uapi header file and syscall table file. syscall.tbl contains the list of available system calls along with system call number and correspond- ing entry point. Add a new system call in this arch- itecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. ARM, s390 and x86 architecuture does exist the sim- ilar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for ia64, m68k, microblaze, mips, parisc, powerpc, sh sparc and xtensa. Below mentioned git repository contains more details about the workflow. https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work to solve the Y2038 issue. We need to add two dozen of system calls to solve Y2038 issue. So this patch series will help to add new system calls easily by adding new entry in the syscall.tbl. Changes since v1: - optimized/updated the syscall table generation scripts. - fixed all mixed indentation issues in syscall.tbl. - added "comments" in syscall.tbl. Firoz Khan (5): alpha: move __IGNORE* entries to non uapi header alpha: remove CONFIG_OSF4_COMPAT flag from syscall table alpha: add __NR_syscalls along with NR_SYSCALLS alpha: add system call table generation support alpha: generate uapi header and syscall table header files arch/alpha/Makefile | 3 + arch/alpha/include/asm/Kbuild | 2 +- arch/alpha/include/asm/unistd.h | 23 +- arch/alpha/include/uapi/asm/Kbuild | 1 + arch/alpha/include/uapi/asm/unistd.h | 484 +-------------------------- arch/alpha/kernel/osf_sys.c | 9 +- arch/alpha/kernel/syscalls/Makefile | 38 +++ arch/alpha/kernel/syscalls/syscall.tbl | 453 ++++++++++++++++++++++++++ arch/alpha/kernel/syscalls/syscallhdr.sh | 36 ++ arch/alpha/kernel/syscalls/syscalltbl.sh | 36 ++ arch/alpha/kernel/systbls.S | 542 +------------------------------ 11 files changed, 600 insertions(+), 1027 deletions(-) create mode 100644 arch/alpha/kernel/syscalls/Makefile create mode 100644 arch/alpha/kernel/syscalls/syscall.tbl create mode 100644 arch/alpha/kernel/syscalls/syscallhdr.sh create mode 100644 arch/alpha/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 5 months

2
7
0 0

[PATCH v2 0/3] sh: system call table generation support

by Firoz Khan

The purpose of this patch series is, we can easily add/modify/delete system call table support by cha- nging entry in syscall.tbl file instead of manually changing many files. The other goal is to unify the system call table generation support implementation across all the architectures. The system call tables are in different format in all architecture. It will be difficult to manually add, modify or delete the system calls in the resp- ective files manually. To make it easy by keeping a script and which'll generate uapi header file and syscall table file. syscall.tbl contains the list of available system calls along with system call number and correspond- ing entry point. Add a new system call in this arch- itecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. ARM, s390 and x86 architecuture does exist the sim- ilar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, ia64, m68k, microblaze, mips, parisc, powerpc, sparc, and xtensa. Below mentioned git repository contains more details about the workflow. https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work to solve the Y2038 issue. We need to add two dozen of system calls to solve Y2038 issue. So this patch series will help to add new system calls easily by adding new entry in the syscall.tbl. Changes since v1: - optimized/updated the syscall table generation scripts. - fixed all mixed indentation issues in syscall.tbl. - added "comments" in syscall.tbl. Firoz Khan (3): sh: add __NR_syscalls along with NR_syscalls sh: add system call table generation support sh: generate uapi header and syscall table header files arch/sh/Makefile | 3 + arch/sh/include/asm/Kbuild | 1 + arch/sh/include/asm/unistd.h | 2 + arch/sh/include/uapi/asm/Kbuild | 1 + arch/sh/include/uapi/asm/unistd_32.h | 4 +- arch/sh/include/uapi/asm/unistd_64.h | 4 +- arch/sh/kernel/syscalls/Makefile | 38 ++++ arch/sh/kernel/syscalls/syscall.tbl | 392 ++++++++++++++++++++++++++++++++++ arch/sh/kernel/syscalls/syscallhdr.sh | 36 ++++ arch/sh/kernel/syscalls/syscalltbl.sh | 32 +++ arch/sh/kernel/syscalls_32.S | 387 +-------------------------------- 11 files changed, 514 insertions(+), 386 deletions(-) create mode 100644 arch/sh/kernel/syscalls/Makefile create mode 100644 arch/sh/kernel/syscalls/syscall.tbl create mode 100644 arch/sh/kernel/syscalls/syscallhdr.sh create mode 100644 arch/sh/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 5 months

1
3
0 0

[PATCH v4 0/4] m68k: system call table generation support

by Firoz Khan

The purpose of this patch series is, we can easily add/modify/delete system call table support by changing entry in syscall.tbl file instead of manually changing many files. The other goal is to unify the system call table generation support implementation across all the architectures. The system call tables are in different format in all architecture. It will be difficult to manually add, modify or delete the system calls in the respective files manually. To make it easy by keeping a script and which'll generate uapi header file and syscall table file. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, ia64, microblaze, mips, parisc, powerpc, sh, sparc, and xtensa. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work to solve the Y2038 issue. We need to add two dozen of system calls to solve Y2038 issue. So this patch series will help to add new system calls easily by adding new entry in the syscall.tbl. Firoz Khan (4): m68k: rename system call table file name m68k: add __NR_syscalls along with NR_syscalls m68k: add system call table generation support m68k: generate uapi header and syscall table header files arch/m68k/Makefile | 3 + arch/m68k/include/asm/Kbuild | 1 + arch/m68k/include/asm/unistd.h | 3 +- arch/m68k/include/uapi/asm/Kbuild | 1 + arch/m68k/include/uapi/asm/unistd.h | 385 +----------------------------- arch/m68k/kernel/Makefile | 2 +- arch/m68k/kernel/syscall_table.S | 26 +++ arch/m68k/kernel/syscalls/Makefile | 38 +++ arch/m68k/kernel/syscalls/syscall.tbl | 389 ++++++++++++++++++++++++++++++ arch/m68k/kernel/syscalls/syscallhdr.sh | 36 +++ arch/m68k/kernel/syscalls/syscalltbl.sh | 32 +++ arch/m68k/kernel/syscalltable.S | 403 -------------------------------- 12 files changed, 529 insertions(+), 790 deletions(-) create mode 100644 arch/m68k/kernel/syscall_table.S create mode 100644 arch/m68k/kernel/syscalls/Makefile create mode 100644 arch/m68k/kernel/syscalls/syscall.tbl create mode 100644 arch/m68k/kernel/syscalls/syscallhdr.sh create mode 100644 arch/m68k/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/m68k/kernel/syscalltable.S -- 1.9.1

7 years, 5 months

2
6
0 0

[PATCH v4 0/5] ia64: system call table generation support

by Firoz Khan

The purpose of this patch series is, we can easily add/modify/delete system call table support by changing entry in syscall.tbl file instead of manually changing many files. The other goal is to unify the system call table generation support implementation across all the architectures. The system call tables are in different format in all architecture. It will be difficult to manually add, modify or delete the system calls in the respective files manually. To make it easy by keeping a script and which'll generate uapi header file and syscall table file. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, m68k, microblaze, mips, parisc, powerpc, sh, sparc, and xtensa. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work to solve the Y2038 issue. We need to add two dozen of system calls to solve Y2038 issue. So this patch series will help to add new system calls easily by adding new entry in the syscall.tbl. Firoz Khan (5): ia64: add __NR_old_getpagesize in uapi header file ia64: add __NR_syscalls along with NR_syscalls ia64: add an offset for system call number ia64: add system call table generation support ia64: generate uapi header and system call table files arch/ia64/Makefile | 3 + arch/ia64/include/asm/Kbuild | 1 + arch/ia64/include/asm/unistd.h | 4 +- arch/ia64/include/uapi/asm/Kbuild | 1 + arch/ia64/include/uapi/asm/unistd.h | 332 +------------------------------ arch/ia64/kernel/entry.S | 331 +------------------------------ arch/ia64/kernel/syscalls/Makefile | 40 ++++ arch/ia64/kernel/syscalls/syscall.tbl | 337 ++++++++++++++++++++++++++++++++ arch/ia64/kernel/syscalls/syscallhdr.sh | 36 ++++ arch/ia64/kernel/syscalls/syscalltbl.sh | 32 +++ 10 files changed, 457 insertions(+), 660 deletions(-) create mode 100644 arch/ia64/kernel/syscalls/Makefile create mode 100644 arch/ia64/kernel/syscalls/syscall.tbl create mode 100644 arch/ia64/kernel/syscalls/syscallhdr.sh create mode 100644 arch/ia64/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 5 months

2
7
0 0

[PATCH v6 0/5] parisc: system call table generation support

by Firoz Khan

The purpose of this patch series is, we can easily add/modify/delete system call table support by changing entry in syscall.tbl file instead of manually changing many files. The other goal is to unify the system call table generation support implementation across all the architectures. The system call tables are in different format in all architecture. It will be difficult to manually add, modify or delete the system calls in the respective files manually. To make it easy by keeping a script and which'll generate uapi header file and syscall table file. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. - Compat entry name, if required. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, ia64, m68k, micro- blaze, mips, powerpc, sh, sparc, and xtensa. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work to solve the Y2038 issue. We need to add two dozen of system calls to solve Y2038 issue. So this patch series will help to add new system calls easily by adding new entry in the syscall.tbl. Firoz Khan (5): parisc: move __IGNORE* entries to non uapi header parisc: add __NR_syscalls along with __NR_Linux_syscalls parisc: add system call table generation support parisc: generate uapi header and system call table files parisc: syscalls: ignore nfsservctl for other architectures arch/parisc/Makefile | 4 + arch/parisc/include/asm/Kbuild | 3 + arch/parisc/include/asm/unistd.h | 8 + arch/parisc/include/uapi/asm/Kbuild | 2 + arch/parisc/include/uapi/asm/unistd.h | 382 +------------------------ arch/parisc/kernel/syscall.S | 11 +- arch/parisc/kernel/syscall_table.S | 459 ------------------------------ arch/parisc/kernel/syscalls/Makefile | 57 ++++ arch/parisc/kernel/syscalls/syscall.tbl | 369 ++++++++++++++++++++++++ arch/parisc/kernel/syscalls/syscallhdr.sh | 36 +++ arch/parisc/kernel/syscalls/syscalltbl.sh | 36 +++ scripts/checksyscalls.sh | 1 + 12 files changed, 532 insertions(+), 836 deletions(-) delete mode 100644 arch/parisc/kernel/syscall_table.S create mode 100644 arch/parisc/kernel/syscalls/Makefile create mode 100644 arch/parisc/kernel/syscalls/syscall.tbl create mode 100644 arch/parisc/kernel/syscalls/syscallhdr.sh create mode 100644 arch/parisc/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 5 months

1
5
0 0

[PATCH v3 0/3] microblaze: system call table generation support

by Firoz Khan

The purpose of this patch series is, we can easily add/modify/delete system call table support by changing entry in syscall.tbl file instead of manually changing many files. The other goal is to unify the system call table generation support implementation across all the architectures. The system call tables are in different format in all architecture. It will be difficult to manually add, modify or delete the system calls in the respective files manually. To make it easy by keeping a script and which'll generate uapi header file and syscall table file. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, ia64, m68k, mips, parisc, powerpc, sh, sparc, and xtensa. Below mentioned git repos- itory contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work to solve the Y2038 issue. We need to add two dozen of system calls to solve Y2038 issue. So this patch series will help to add new system calls easily by adding new entry in the syscall.tbl. Firoz Khan (3): microblaze: move __NR_syscalls macro from asm/unistd.h microblaze: add system call table generation support microblaze: generate uapi header and system call table files arch/microblaze/Makefile | 3 + arch/microblaze/include/asm/Kbuild | 1 + arch/microblaze/include/asm/unistd.h | 2 - arch/microblaze/include/uapi/asm/Kbuild | 1 + arch/microblaze/include/uapi/asm/unistd.h | 407 +------------------------ arch/microblaze/kernel/syscall_table.S | 406 +------------------------ arch/microblaze/kernel/syscalls/Makefile | 38 +++ arch/microblaze/kernel/syscalls/syscall.tbl | 410 ++++++++++++++++++++++++++ arch/microblaze/kernel/syscalls/syscallhdr.sh | 36 +++ arch/microblaze/kernel/syscalls/syscalltbl.sh | 32 ++ 10 files changed, 526 insertions(+), 810 deletions(-) create mode 100644 arch/microblaze/kernel/syscalls/Makefile create mode 100644 arch/microblaze/kernel/syscalls/syscall.tbl create mode 100644 arch/microblaze/kernel/syscalls/syscallhdr.sh create mode 100644 arch/microblaze/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 5 months

1
3
0 0

[PATCH v5 0/5] parisc: system call table generation support

by Firoz Khan

The purpose of this patch series is, we can easily add/modify/delete system call table support by changing entry in syscall.tbl file instead of manually changing many files. The other goal is to unify the system call table generation support implementation across all the architectures. The system call tables are in different format in all architecture. It will be difficult to manually add, modify or delete the system calls in the respective files manually. To make it easy by keeping a script and which'll generate uapi header file and syscall table file. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. - Compat entry name, if required. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, microblaze, sparc, m68k, mips, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work for solving the Y2038 issue. We need to add two dozen of system calls to solve Y2038 issue. So this patch series will help to add new system calls easily by adding new entry in the syscall.tbl. Firoz Khan (5): parisc: move __IGNORE* entries to non uapi header parisc: add __NR_syscalls along with __NR_Linux_syscalls parisc: add system call table generation support parisc: uapi header and system call table file generation parisc: syscalls: ignore nfsservctl for other architectures arch/parisc/Makefile | 4 + arch/parisc/include/asm/Kbuild | 3 + arch/parisc/include/asm/unistd.h | 8 + arch/parisc/include/uapi/asm/Kbuild | 2 + arch/parisc/include/uapi/asm/unistd.h | 382 +------------------------ arch/parisc/kernel/syscall.S | 10 +- arch/parisc/kernel/syscall_table.S | 459 ------------------------------ arch/parisc/kernel/syscalls/Makefile | 57 ++++ arch/parisc/kernel/syscalls/syscall.tbl | 369 ++++++++++++++++++++++++ arch/parisc/kernel/syscalls/syscallhdr.sh | 34 +++ arch/parisc/kernel/syscalls/syscalltbl.sh | 36 +++ scripts/checksyscalls.sh | 1 + 12 files changed, 529 insertions(+), 836 deletions(-) delete mode 100644 arch/parisc/kernel/syscall_table.S create mode 100644 arch/parisc/kernel/syscalls/Makefile create mode 100644 arch/parisc/kernel/syscalls/syscall.tbl create mode 100644 arch/parisc/kernel/syscalls/syscallhdr.sh create mode 100644 arch/parisc/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 5 months

2
6
0 0

Re: [Y2038] [PATCH v4 3/6] parisc: add system call table generation support

by Firoz Khan

Hi Eike, On Mon, 15 Oct 2018 at 10:47, Rolf Eike Beer <eike-kernel(a)sf-tec.de> wrote: > > Firoz Khan wrote: > > Hi Rolf, > > > > On Fri, 12 Oct 2018 at 17:37, Rolf Eike Beer <eike-kernel(a)sf-tec.de> wrote: > > > Firoz Khan wrote: > > > > > +prefix="$4" > > > > +offset="$5" > > > > + > > > > +fileguard=_UAPI_ASM_PARISC_`basename "$out" | sed \ > > > > + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ > > > > + -e 's/[^A-Z0-9_]/_/g' -e 's/__/_/g'` > > > > +grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | ( > > > > + echo "#ifndef ${fileguard}" > > > > + echo "#define ${fileguard}" > > > > + echo "" > > > > + > > > > + nxt=0 > > > > + while read nr abi name entry compat ; do > > > > + if [ -z "$offset" ]; then > > > > + echo -e "#define __NR_${prefix}${name}\t$nr" > > > > > > This mixed indentation with both tabs and spaces is a bit messy. > > > > Is this what you suggested? > > - echo -e "#define __NR_${prefix}${name}\t$nr" > > + echo "#define __NR_${prefix}${name} $nr" > > No, this was actually only about the script itself. Looks like your editor has > tab-width 8 and indentation 4 or so. Ok. Something is going bad while creating the patch series. That's why this mixed indentation with both tabs and spaces.Will fix now. It will be ok to have indentation of 4 character? https://github.com/torvalds/linux/blob/master/arch/x86/entry/syscalls/sysca… https://github.com/torvalds/linux/blob/master/arch/arm/tools/syscalltbl.sh Thanks Firoz > > Eike

7 years, 5 months

1
0
0 0

[PATCH v4 0/6] parisc: system call table generation support

by Firoz Khan

The purpose of this patch series is, we can easily add/modify/delete system call table support by changing entry in syscall.tbl file instead of manually changing many files. The other goal is to unify the system call table generation support implementation across all the architectures. The system call tables are in different format in all architecture. It will be difficult to manually add, modify or delete the system calls in the respective files manually. To make it easy by keeping a script and which'll generate uapi header file and syscall table file. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. - Compat entry name, if required. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, microblaze, sparc, m68k, mips, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work for solving the Y2038 issue. We need to add two dozen of system calls to solve Y2038 issue. So this patch series will help to add new system calls easily by adding new entry in the syscall.tbl. Firoz Khan (6): parisc: move __IGNORE* entries to non uapi header parisc: add __NR_Linux_syscalls along with __NR_syscalls parisc: add system call table generation support parisc: uapi header and system call table file generation parisc: wire up rseq system call parisc: syscalls: Ignore nfsservctl for other architectures arch/parisc/Makefile | 4 + arch/parisc/include/asm/Kbuild | 3 + arch/parisc/include/asm/unistd.h | 8 + arch/parisc/include/uapi/asm/Kbuild | 2 + arch/parisc/include/uapi/asm/unistd.h | 382 +------------------------ arch/parisc/kernel/syscall.S | 10 +- arch/parisc/kernel/syscall_table.S | 459 ------------------------------ arch/parisc/kernel/syscalls/Makefile | 55 ++++ arch/parisc/kernel/syscalls/syscall.tbl | 371 ++++++++++++++++++++++++ arch/parisc/kernel/syscalls/syscallhdr.sh | 35 +++ arch/parisc/kernel/syscalls/syscalltbl.sh | 46 +++ scripts/checksyscalls.sh | 1 + 12 files changed, 540 insertions(+), 836 deletions(-) delete mode 100644 arch/parisc/kernel/syscall_table.S create mode 100644 arch/parisc/kernel/syscalls/Makefile create mode 100644 arch/parisc/kernel/syscalls/syscall.tbl create mode 100644 arch/parisc/kernel/syscalls/syscallhdr.sh create mode 100644 arch/parisc/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 5 months

5
20
0 0

[PATCH v3 0/5] System call table generation support

by Firoz Khan

The purpose of this patch series is: 1. We can easily add/modify/delete system call by changing entry in syscall.tbl file. No need to manually edit many files. 2. It is easy to unify the system call implementation across all the architectures. The system call tables are in different format in all architecture and it will be difficult to manually add or modify the system calls in the respective files manually. To make it easy by keeping a script and which'll generate the header file and syscall table file so this change will unify them across all architectures. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. - Compat entry name, if required. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, ia64, sparc, mips, parisc, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work for solving the Y2038 issue. We need to add/change two dozen of system calls to solve Y2038 issue. So this patch series will help to easily modify from existing system call to Y2038 compatible system calls. Firoz Khan (5): m68k: rename system call table file name m68k: replace NR_syscalls macro from asm/unistd.h m68k: add system call table generation support m68k: uapi header and system call table file generation m68k: add __IGNORE* entries in asm/unistd.h arch/m68k/Makefile | 3 + arch/m68k/include/asm/Kbuild | 1 + arch/m68k/include/asm/unistd.h | 10 +- arch/m68k/include/uapi/asm/Kbuild | 1 + arch/m68k/include/uapi/asm/unistd.h | 385 +----------------------------- arch/m68k/kernel/Makefile | 2 +- arch/m68k/kernel/syscall_table.S | 14 ++ arch/m68k/kernel/syscalls/Makefile | 38 +++ arch/m68k/kernel/syscalls/syscall.tbl | 369 +++++++++++++++++++++++++++++ arch/m68k/kernel/syscalls/syscallhdr.sh | 35 +++ arch/m68k/kernel/syscalls/syscalltbl.sh | 34 +++ arch/m68k/kernel/syscalltable.S | 403 -------------------------------- 12 files changed, 505 insertions(+), 790 deletions(-) create mode 100644 arch/m68k/kernel/syscall_table.S create mode 100644 arch/m68k/kernel/syscalls/Makefile create mode 100644 arch/m68k/kernel/syscalls/syscall.tbl create mode 100644 arch/m68k/kernel/syscalls/syscallhdr.sh create mode 100644 arch/m68k/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/m68k/kernel/syscalltable.S -- 1.9.1

7 years, 5 months

3
8
0 0

[PATCH v3 0/7] ia64: system call table generation support

by Firoz Khan

The purpose of this patch series is: 1. We can easily add/modify/delete system call by changing entry in syscall.tbl file. No need to manually edit many files. 2. It is easy to unify the system call implementation across all the architectures. The system call tables are in different format in all architecture and it will be difficult to manually add or modify the system calls in the respective files manually. To make it easy by keeping a script and which'll generate the header file and syscall table file so this change will unify them across all architectures. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. - Compat entry name, if required. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, microblaze, sparc, mips, parisc, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ In v3 patch series, I wired up perf_event_open, seccomp, pkey_ mprotect, pkey_alloc, pkey_free, statx, io_pgetevents and rseq system calls. This require an architecture specific implementation as it not present now. Finally, this is the ground work for solving the Y2038 issue. We need to add/change two dozen of system calls to solve Y2038 issue. So this patch series will help to easily modify from existing system call to Y2038 compatible system calls. Firoz Khan (7): ia64: add __NR_old_getpagesize in uapi/asm/unistd.h ia64: replace NR_syscalls macro from asm/unistd.h ia64: add an offset for system call number ia64: replace the system call table entries from entry.S ia64: add system call table generation support ia64: uapi header and system call table file generation ia64: wire up system calls arch/ia64/Makefile | 3 + arch/ia64/include/asm/Kbuild | 1 + arch/ia64/include/asm/unistd.h | 4 +- arch/ia64/include/uapi/asm/Kbuild | 1 + arch/ia64/include/uapi/asm/unistd.h | 332 +----------------------------- arch/ia64/kernel/entry.S | 333 +----------------------------- arch/ia64/kernel/syscall_table.S | 9 + arch/ia64/kernel/syscalls/Makefile | 39 ++++ arch/ia64/kernel/syscalls/syscall.tbl | 353 ++++++++++++++++++++++++++++++++ arch/ia64/kernel/syscalls/syscallhdr.sh | 35 ++++ arch/ia64/kernel/syscalls/syscalltbl.sh | 37 ++++ 11 files changed, 483 insertions(+), 664 deletions(-) create mode 100644 arch/ia64/kernel/syscall_table.S create mode 100644 arch/ia64/kernel/syscalls/Makefile create mode 100644 arch/ia64/kernel/syscalls/syscall.tbl create mode 100644 arch/ia64/kernel/syscalls/syscallhdr.sh create mode 100644 arch/ia64/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 5 months

4
17
0 0

[PATCH v3 0/6] System call table generation support

by Firoz Khan

The purpose of this patch series is: 1. We can easily add/modify/delete system call by changing entry in syscall.tbl file. No need to manually edit many files. 2. It is easy to unify the system call implementation across all the architectures. The system call tables are in different format in all architecture and it will be difficult to manually add or modify the system calls in the respective files manually. To make it easy by keeping a script and which'll generate the header file and syscall table file so this change will unify them across all architectures. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. - Compat entry name, if required. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, microblaze, sparc, m68k, mips, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Added an ignore entry for nfsservctl in script/checksyscalls.sh. Wired up rseq system call. Finally, this is the ground work for solving the Y2038 issue. We need to add/change two dozen of system calls to solve Y2038 issue. So this patch series will help to easily modify from existing system call to Y2038 compatible system calls. Firoz Khan (6): parisc: move __IGNORE* entries to non uapi header parisc: add __NR_Linux_syscalls along with __NR_syscalls parisc: add system call table generation support parisc: uapi header and system call table file generation parisc: wire up rseq system call parisc: syscalls: Ignore nfsservctl for other architectures arch/parisc/Makefile | 4 + arch/parisc/include/asm/Kbuild | 3 + arch/parisc/include/asm/unistd.h | 8 + arch/parisc/include/uapi/asm/Kbuild | 2 + arch/parisc/include/uapi/asm/unistd.h | 382 +------------------------ arch/parisc/kernel/syscall.S | 12 +- arch/parisc/kernel/syscall_table.S | 459 ------------------------------ arch/parisc/kernel/syscall_table_32.S | 13 + arch/parisc/kernel/syscall_table_64.S | 20 ++ arch/parisc/kernel/syscalls/Makefile | 55 ++++ arch/parisc/kernel/syscalls/syscall.tbl | 353 +++++++++++++++++++++++ arch/parisc/kernel/syscalls/syscallhdr.sh | 35 +++ arch/parisc/kernel/syscalls/syscalltbl.sh | 41 +++ scripts/checksyscalls.sh | 1 + 14 files changed, 545 insertions(+), 843 deletions(-) delete mode 100644 arch/parisc/kernel/syscall_table.S create mode 100644 arch/parisc/kernel/syscall_table_32.S create mode 100644 arch/parisc/kernel/syscall_table_64.S create mode 100644 arch/parisc/kernel/syscalls/Makefile create mode 100644 arch/parisc/kernel/syscalls/syscall.tbl create mode 100644 arch/parisc/kernel/syscalls/syscallhdr.sh create mode 100644 arch/parisc/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 5 months

5
34
0 0

[PATCH v2 0/3] System call table generation support

by Firoz Khan

The purpose of this patch series is: 1. We can easily add/modify/delete system call by changing entry in syscall.tbl file. No need to manually edit many files. 2. It is easy to unify the system call implementation across all the architectures. The system call tables are in different format in all architecture and it will be difficult to manually add or modify the system calls in the respective files manually. To make it easy by keeping a script and which'll generate the header file and syscall table file so this change will unify them across all architectures. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. - Compat entry name, if required. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, ia64, sparc, mips, parisc, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work for solving the Y2038 issue. We need to add/change two dozen of system calls to solve Y2038 issue. So this patch series will help to easily modify from existing system call to Y2038 compatible system calls. Firoz Khan (3): microblaze: replace __NR_syscalls macro from asm/unistd.h microblaze: add system call table generation support microblaze: uapi header and system call table file generation arch/microblaze/Makefile | 3 + arch/microblaze/include/asm/Kbuild | 1 + arch/microblaze/include/asm/unistd.h | 2 - arch/microblaze/include/uapi/asm/Kbuild | 1 + arch/microblaze/include/uapi/asm/unistd.h | 407 +------------------------- arch/microblaze/kernel/syscall_table.S | 406 +------------------------ arch/microblaze/kernel/syscalls/Makefile | 38 +++ arch/microblaze/kernel/syscalls/syscall.tbl | 405 +++++++++++++++++++++++++ arch/microblaze/kernel/syscalls/syscallhdr.sh | 35 +++ arch/microblaze/kernel/syscalls/syscalltbl.sh | 34 +++ 10 files changed, 522 insertions(+), 810 deletions(-) create mode 100644 arch/microblaze/kernel/syscalls/Makefile create mode 100644 arch/microblaze/kernel/syscalls/syscall.tbl create mode 100644 arch/microblaze/kernel/syscalls/syscallhdr.sh create mode 100644 arch/microblaze/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 5 months

2
9
0 0

[PATCH v2 0/5] System call table generation support

by Firoz Khan

The purpose of this patch series is: 1. We can easily add/modify/delete system call by changing entry in syscall.tbl file. No need to manually edit many files. 2. It is easy to unify the system call implementation across all the architectures. The system call tables are in different format in all architecture and it will be difficult to manually add or modify the system calls in the respective files manually. To make it easy by keeping a script and which'll generate the header file and syscall table file so this change will unify them across all architectures. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. - Compat entry name, if required. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, microblaze, sparc, m68k, mips, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Added an extra patch to keep __IGNORE* entries in asm/unistd.h. Finally, this is the ground work for solving the Y2038 issue. We need to add/change two dozen of system calls to solve Y2038 issue. So this patch series will help to easily modify from existing system call to Y2038 compatible system calls. Firoz Khan (5): parisc: move __IGNORE* entries to non uapi header parisc: add __NR_Linux_syscalls macro with __NR_syscalls parisc: add system call table generation support parisc: uapi header and system call table file generation parisc: add __IGNORE* entries in asm/unistd.h arch/parisc/Makefile | 4 + arch/parisc/include/asm/Kbuild | 3 + arch/parisc/include/asm/unistd.h | 9 + arch/parisc/include/uapi/asm/Kbuild | 2 + arch/parisc/include/uapi/asm/unistd.h | 380 +----------------------- arch/parisc/kernel/syscall.S | 12 +- arch/parisc/kernel/syscall_table.S | 459 ----------------------------- arch/parisc/kernel/syscall_table_32.S | 13 + arch/parisc/kernel/syscall_table_64.S | 20 ++ arch/parisc/kernel/syscalls/Makefile | 55 ++++ arch/parisc/kernel/syscalls/syscall_32.tbl | 342 +++++++++++++++++++++ arch/parisc/kernel/syscalls/syscall_64.tbl | 342 +++++++++++++++++++++ arch/parisc/kernel/syscalls/syscallhdr.sh | 35 +++ arch/parisc/kernel/syscalls/syscalltbl.sh | 42 +++ 14 files changed, 877 insertions(+), 841 deletions(-) delete mode 100644 arch/parisc/kernel/syscall_table.S create mode 100644 arch/parisc/kernel/syscall_table_32.S create mode 100644 arch/parisc/kernel/syscall_table_64.S create mode 100644 arch/parisc/kernel/syscalls/Makefile create mode 100644 arch/parisc/kernel/syscalls/syscall_32.tbl create mode 100644 arch/parisc/kernel/syscalls/syscall_64.tbl create mode 100644 arch/parisc/kernel/syscalls/syscallhdr.sh create mode 100644 arch/parisc/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 6 months

2
10
0 0

[PATCH 0/3] System call table generation support

by Firoz Khan

The purpose of this patch series is: 1. We can easily add/modify/delete system call by changing entry in syscall.tbl file. No need to manually edit many files. 2. It is easy to unify the system call implementation across all the architectures. The system call tables are in different format in all architecture and it will be difficult to manually add or modify the system calls manually in the respective files. To make it easy by keeping a script and which'll generate the header file and syscall table file so this change will unify the implementation across all architectures. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, ia64,m68k, mips, parisc, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work for solving the Y2038 issue. We need to add/change two dozen of system calls to solve Y2038 issue. So this patch series will help to easily modify from existing system call to Y2038 compatible system calls. I started working system call table generation on 4.17-rc1. I used marcin's script - https://github.com/hrw/syscalls-table to generate the syscall.tbl file. And this will be the input to the system call table generation script. But there are couple system call got add in the latest rc release. If run Marcin's script on latest release, it will generate a different syscall.tbl. But I still use the old file - syscall.tbl and once all review got over I'll update syscall.tbl alone w.r.to the tip of the kernel. The impact of this is, few of the system call won't work. Firoz Khan (3): microblaze: Replace NR_syscalls macro from asm/unistd.h microblaze: Added system call table generation support microblaze: uapi header and system call table file generation arch/microblaze/Makefile | 3 + arch/microblaze/include/asm/Kbuild | 2 + arch/microblaze/include/asm/unistd.h | 2 - arch/microblaze/include/uapi/asm/Kbuild | 2 + arch/microblaze/include/uapi/asm/unistd.h | 407 +------------------------- arch/microblaze/kernel/syscall_table.S | 406 +------------------------ arch/microblaze/kernel/syscalls/Makefile | 37 +++ arch/microblaze/kernel/syscalls/syscall.tbl | 404 +++++++++++++++++++++++++ arch/microblaze/kernel/syscalls/syscallhdr.sh | 33 +++ arch/microblaze/kernel/syscalls/syscalltbl.sh | 28 ++ 10 files changed, 514 insertions(+), 810 deletions(-) create mode 100644 arch/microblaze/kernel/syscalls/Makefile create mode 100644 arch/microblaze/kernel/syscalls/syscall.tbl create mode 100644 arch/microblaze/kernel/syscalls/syscallhdr.sh create mode 100644 arch/microblaze/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 6 months

3
12
0 0

[PATCH v2 0/7] System call table generation support

by Firoz Khan

The purpose of this patch series is: 1. We can easily add/modify/delete system call by changing entry in syscall.tbl file. No need to manually edit many files. 2. It is easy to unify the system call implementation across all the architectures. The system call tables are in different format in all architecture and it will be difficult to manually add or modify the system calls in the respective files manually. To make it easy by keeping a script and which'll generate the header file and syscall table file so this change will unify them across all architectures. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. - Compat entry name, if required. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, microblaze, sparc, mips, parisc, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Added an extra patch to add __NR_old_getpagesize macro. Added an extra patch to keep __IGNORE* entries in asm/unistd.h. Finally, this is the ground work for solving the Y2038 issue. We need to add/change two dozen of system calls to solve Y2038 issue. So this patch series will help to easily modify from existing system call to Y2038 compatible system calls. Firoz Khan (7): ia64: add __NR_old_getpagesize macro ia64: replace NR_syscalls macro from asm/unistd.h ia64: add an offset for system call number ia64: replace the system call table entries from entry.S ia64: add system call table generation support ia64: uapi header and system call table file generation ia64: add __IGNORE* entries in asm/unistd.h arch/ia64/Makefile | 3 + arch/ia64/include/asm/Kbuild | 1 + arch/ia64/include/asm/unistd.h | 13 +- arch/ia64/include/uapi/asm/Kbuild | 1 + arch/ia64/include/uapi/asm/unistd.h | 334 +------------------------------- arch/ia64/kernel/entry.S | 333 +------------------------------ arch/ia64/kernel/syscall_table.S | 12 ++ arch/ia64/kernel/syscalls/Makefile | 40 ++++ arch/ia64/kernel/syscalls/syscall.tbl | 328 +++++++++++++++++++++++++++++++ arch/ia64/kernel/syscalls/syscallhdr.sh | 35 ++++ arch/ia64/kernel/syscalls/syscalltbl.sh | 34 ++++ 11 files changed, 469 insertions(+), 665 deletions(-) create mode 100644 arch/ia64/kernel/syscall_table.S create mode 100644 arch/ia64/kernel/syscalls/Makefile create mode 100644 arch/ia64/kernel/syscalls/syscall.tbl create mode 100644 arch/ia64/kernel/syscalls/syscallhdr.sh create mode 100644 arch/ia64/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 6 months

3
15
0 0

[RFC] parisc64: change __kernel_suseconds_t to match glibc

by Arnd Bergmann

There are only two 64-bit architecture ports that have a 32-bit suseconds_t: sparc64 and parisc64. I've encountered a number of problems with this, while trying to get a proper 64-bit time_t working on 32-bit architectures. Having a 32-bit suseconds_t combined with a 64-bit time_t means that we get extra padding in data structures that may leak kernel stack data to user space, and it breaks all code that assumes that timespec and timeval have the same layout. While we can't change sparc64, it seems that glibc on parisc64 has always set suseconds_t to 'long', and the current version would give incorrect results for gettimeofday() and many other interfaces: timestamps passed from user space into the kernel result in tv_usec being always zero (the lower bits contain the intended value but are ignored) while data passed from the kernel to user space contains either zeroes or random data in tv_usec. Based on that, it seems best to change the user API in the kernel in an incompatible way to match what glibc expects. Note that the distros I could find (gentoo and debian) all just have 32-bit user space, which does not suffer from this problem. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- arch/parisc/include/uapi/asm/posix_types.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/parisc/include/uapi/asm/posix_types.h b/arch/parisc/include/uapi/asm/posix_types.h index 2785632c85e7..8dce56f5dcee 100644 --- a/arch/parisc/include/uapi/asm/posix_types.h +++ b/arch/parisc/include/uapi/asm/posix_types.h @@ -16,9 +16,6 @@ typedef unsigned short __kernel_mode_t; typedef unsigned short __kernel_ipc_pid_t; #define __kernel_ipc_pid_t __kernel_ipc_pid_t -typedef int __kernel_suseconds_t; -#define __kernel_suseconds_t __kernel_suseconds_t - typedef long long __kernel_off64_t; typedef unsigned long long __kernel_ino64_t; -- 2.18.0

7 years, 6 months

2
3
0 0

[PATCH 0/4] System call table generation support

by Firoz Khan

The purpose of this patch series is: 1. We can easily add/modify/delete system call by changing entry in syscall.tbl file. No need to manually edit many files. 2. It is easy to unify the system call implementation across all the architectures. The system call tables are in different format in all architecture and it will be difficult to manually add or modify the system calls in the respective files manually. To make it easy by keeping a script and which'll generate the header file and syscall table file so this change will unify them across all architectures. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. - Compat entry name, if required. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, m68k, microblaze, mips, parisc, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work for solving the Y2038 issue. We need to add/change two dozen of system calls to solve Y2038 issue. So this patch series will help to easily modify from existing system call to Y2038 compatible system calls. I started working system call table generation on 4.17-rc1. I used marcin's script - https://github.com/hrw/syscalls-table to generate the syscall.tbl file. And this will be the input to the system call table generation script. But there are couple system call got add in the latest rc release. If run Marcin's script on latest release, It will generate a new syscall.tbl. But I still use the old file - syscall.tbl and once all review got over I'll update syscall.tbl alone w.r.to the tip of the kernel. The impact of this thing, few of the system call won't work. Firoz Khan (4): sparc: Move __IGNORE* entries to non uapi header sparc: Replace NR_SYSCALLS macro with __NR_SYSCALLS sparc: Add system call table generation support sparc: uapi header and system call table file generation arch/sparc/Makefile | 3 + arch/sparc/include/asm/Kbuild | 5 +- arch/sparc/include/asm/unistd.h | 27 ++ arch/sparc/include/uapi/asm/Kbuild | 3 + arch/sparc/include/uapi/asm/unistd.h | 434 +----------------------------- arch/sparc/kernel/Makefile | 2 +- arch/sparc/kernel/head_64.S | 2 +- arch/sparc/kernel/syscall_table_32.S | 12 + arch/sparc/kernel/syscall_table_64.S | 22 ++ arch/sparc/kernel/syscalls/Makefile | 50 ++++ arch/sparc/kernel/syscalls/syscall_32.tbl | 365 +++++++++++++++++++++++++ arch/sparc/kernel/syscalls/syscall_64.tbl | 349 ++++++++++++++++++++++++ arch/sparc/kernel/syscalls/syscallhdr.sh | 33 +++ arch/sparc/kernel/syscalls/syscalltbl.sh | 38 +++ arch/sparc/kernel/systbls_32.S | 93 ------- arch/sparc/kernel/systbls_64.S | 176 ------------ 16 files changed, 912 insertions(+), 702 deletions(-) create mode 100644 arch/sparc/kernel/syscall_table_32.S create mode 100644 arch/sparc/kernel/syscall_table_64.S create mode 100644 arch/sparc/kernel/syscalls/Makefile create mode 100644 arch/sparc/kernel/syscalls/syscall_32.tbl create mode 100644 arch/sparc/kernel/syscalls/syscall_64.tbl create mode 100644 arch/sparc/kernel/syscalls/syscallhdr.sh create mode 100644 arch/sparc/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/sparc/kernel/systbls_32.S delete mode 100644 arch/sparc/kernel/systbls_64.S -- 1.9.1

7 years, 6 months

3
15
0 0

[PATCH v2 0/5] System call table generation support

by Firoz Khan

The purpose of this patch series is: 1. We can easily add/modify/delete system call by changing entry in syscall.tbl file. No need to manually edit many files. 2. It is easy to unify the system call implementation across all the architectures. The system call tables are in different format in all architecture and it will be difficult to manually add or modify the system calls in the respective files manually. To make it easy by keeping a script and which'll generate the header file and syscall table file so this change will unify them across all architectures. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. - Compat entry name, if required. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, microblaze, sparc, mips, parisc, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Added an extra patch to keep __IGNORE* entries in asm/unistd.h. Finally, this is the ground work for solving the Y2038 issue. We need to add/change two dozen of system calls to solve Y2038 issue. So this patch series will help to easily modify from existing system call to Y2038 compatible system calls. Firoz Khan (5): m68k: Rename system call table file name m68k: Replace NR_syscalls macro from asm/unistd.h m68k: Added system call table generation support m68k: uapi header and system call table file generation m68k: added __IGNORE* entries in asm/unistd.h arch/m68k/Makefile | 3 + arch/m68k/include/asm/Kbuild | 1 + arch/m68k/include/asm/unistd.h | 10 +- arch/m68k/include/uapi/asm/Kbuild | 1 + arch/m68k/include/uapi/asm/unistd.h | 385 +----------------------------- arch/m68k/kernel/Makefile | 2 +- arch/m68k/kernel/syscall_table.S | 14 ++ arch/m68k/kernel/syscalls/Makefile | 37 +++ arch/m68k/kernel/syscalls/syscall.tbl | 369 +++++++++++++++++++++++++++++ arch/m68k/kernel/syscalls/syscallhdr.sh | 39 ++++ arch/m68k/kernel/syscalls/syscalltbl.sh | 28 +++ arch/m68k/kernel/syscalltable.S | 403 -------------------------------- 12 files changed, 502 insertions(+), 790 deletions(-) create mode 100644 arch/m68k/kernel/syscall_table.S create mode 100644 arch/m68k/kernel/syscalls/Makefile create mode 100644 arch/m68k/kernel/syscalls/syscall.tbl create mode 100644 arch/m68k/kernel/syscalls/syscallhdr.sh create mode 100644 arch/m68k/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/m68k/kernel/syscalltable.S -- 1.9.1

7 years, 6 months

4
18
0 0

[PATCH 0/4] System call table generation support

by Firoz Khan

The purpose of this patch series is: 1. We can easily add/modify/delete system call by changing entry in syscall.tbl file. No need to manually edit many files. 2. It is easy to unify the system call implementation across all the architectures. The system call tables are in different format in all architecture and it will be difficult to manually add or modify the system calls in the respective files manually. To make it easy by keeping a script and which'll generate the header file and syscall table file so this change will unify them across all architectures. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. - Compat entry name, if required. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, m68k, microblaze, ia64, mips, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work for solving the Y2038 issue. We need to add/change two dozen of system calls to solve Y2038 issue. So this patch series will help to easily modify from existing system call to Y2038 compatible system calls. I started working system call table generation on 4.17-rc1. I used marcin's script - https://github.com/hrw/syscalls-table to generate the syscall.tbl file. And this will be the input to the system call table generation script. But there are couple system call got add in the latest rc release. If run Marcin's script on latest release, It will generate a new syscall.tbl. But I still use the old file - syscall.tbl and once all review got over I'll update syscall.tbl alone w.r.to the tip of the kernel. The impact of this thing, few of the system call won't work. Firoz Khan (4): parisc: Move __IGNORE* entries to non uapi header parisc: Replace __NR_Linux_syscalls macro with __NR_syscalls parisc: Add system call table generation support parisc: uapi header and system call table file generation arch/parisc/Makefile | 4 + arch/parisc/include/asm/Kbuild | 3 + arch/parisc/include/asm/unistd.h | 8 + arch/parisc/include/uapi/asm/Kbuild | 2 + arch/parisc/include/uapi/asm/unistd.h | 377 +---------------------- arch/parisc/kernel/syscall.S | 14 +- arch/parisc/kernel/syscall_table.S | 459 ----------------------------- arch/parisc/kernel/syscall_table_32.S | 11 + arch/parisc/kernel/syscall_table_64.S | 19 ++ arch/parisc/kernel/syscalls/Makefile | 52 ++++ arch/parisc/kernel/syscalls/syscall_32.tbl | 358 ++++++++++++++++++++++ arch/parisc/kernel/syscalls/syscall_64.tbl | 357 ++++++++++++++++++++++ arch/parisc/kernel/syscalls/syscallhdr.sh | 38 +++ arch/parisc/kernel/syscalls/syscalltbl.sh | 36 +++ 14 files changed, 896 insertions(+), 842 deletions(-) delete mode 100644 arch/parisc/kernel/syscall_table.S create mode 100644 arch/parisc/kernel/syscall_table_32.S create mode 100644 arch/parisc/kernel/syscall_table_64.S create mode 100644 arch/parisc/kernel/syscalls/Makefile create mode 100644 arch/parisc/kernel/syscalls/syscall_32.tbl create mode 100644 arch/parisc/kernel/syscalls/syscall_64.tbl create mode 100644 arch/parisc/kernel/syscalls/syscallhdr.sh create mode 100644 arch/parisc/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 6 months

2
6
0 0

[PATCH 0/4] System call table generation support

by Firoz Khan

The purpose of this patch series is: 1. We can easily add/modify/delete system call by changing entry in syscall.tbl file. No need to manually edit many files. 2. It is easy to unify the system call implementation across all the architectures. The system call tables are in different format in all architecture and it will be difficult to manually add or modify the system calls manually in the respective files. To make it easy by keeping a script and which'll generate the header file and syscall table file so this change will unify the implementation across all architectures. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, microblaze, ia64, mips, parisc, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work for solving the Y2038 issue. We need to add/change two dozen of system calls to solve Y2038 issue. So this patch series will help to easily modify from existing system call to Y2038 compatible system calls. I started working system call table generation on 4.17-rc1. I used marcin's script - https://github.com/hrw/syscalls-table to generate the syscall.tbl file. And this will be the input to the system call table generation script. But there are couple system call got add in the latest rc release. If run Marcin's script on latest release, it will generate a different syscall.tbl. But I still use the old file - syscall.tbl and once all review got over I'll update syscall.tbl alone w.r.to the tip of the kernel. The impact of this is, few of the system call won't work. Firoz Khan (4): m68k: Rename system call table file name m68k: Replace NR_syscalls macro from asm/unistd.h m68k: Added system call table generation support m68k: uapi header and system call table file generation arch/m68k/68000/entry.S | 4 +- arch/m68k/Makefile | 3 + arch/m68k/coldfire/entry.S | 2 +- arch/m68k/include/asm/Kbuild | 2 + arch/m68k/include/asm/unistd.h | 3 - arch/m68k/include/uapi/asm/Kbuild | 2 + arch/m68k/include/uapi/asm/unistd.h | 385 +----------------------------- arch/m68k/kernel/Makefile | 2 +- arch/m68k/kernel/entry.S | 4 +- arch/m68k/kernel/syscall_table.S | 14 ++ arch/m68k/kernel/syscalls/Makefile | 37 +++ arch/m68k/kernel/syscalls/syscall.tbl | 386 ++++++++++++++++++++++++++++++ arch/m68k/kernel/syscalls/syscallhdr.sh | 33 +++ arch/m68k/kernel/syscalls/syscalltbl.sh | 28 +++ arch/m68k/kernel/syscalltable.S | 403 -------------------------------- 15 files changed, 512 insertions(+), 796 deletions(-) create mode 100644 arch/m68k/kernel/syscall_table.S create mode 100644 arch/m68k/kernel/syscalls/Makefile create mode 100644 arch/m68k/kernel/syscalls/syscall.tbl create mode 100644 arch/m68k/kernel/syscalls/syscallhdr.sh create mode 100644 arch/m68k/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/m68k/kernel/syscalltable.S -- 1.9.1

7 years, 6 months

3
13
0 0

[PATCH 0/3] System call table generation support

by Firoz Khan

The purpose of this patch series is: 1. We can easily add/modify/delete system call by changing entry in syscall.tbl file. No need to manually edit many files. 2. It is easy to unify the system call implementation across all the architectures. The system call tables are in different format in all architecture and it will be difficult to manually add or modify the system calls in the respective files manually. To make it easy by keeping a script and which'll generate the header file and syscall table file so this change will unify them across all architectures. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. - Compat entry name, if required. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, m68k, microblaze, ia64, powerpc, parisc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work for solving the Y2038 issue. We need to add/change two dozen of system calls to solve Y2038 issue. So this patch series will help to easily modify from existing system call to Y2038 compatible system calls. I started working system call table generation on 4.17-rc1. I used marcin's script - https://github.com/hrw/syscalls-table to generate the syscall.tbl file. And this will be the input to the system call table generation script. But there are couple system call got add in the latest rc release. If run Marcin's script on latest release, It will generate a new syscall.tbl. But I still use the old file - syscall.tbl and once all review got over I'll update syscall.tbl alone w.r.to the tip of the kernel. The impact of this thing, few of the system call won't work. Firoz Khan (3): mips: Add __NR_syscalls macro in uapi/asm/unistd.h mips: Add system call table generation support mips: uapi header and system call table file generation arch/mips/Makefile | 3 + arch/mips/include/asm/Kbuild | 4 + arch/mips/include/uapi/asm/Kbuild | 3 + arch/mips/include/uapi/asm/unistd.h | 1053 +---------------------------- arch/mips/kernel/scall32-o32.S | 385 +---------- arch/mips/kernel/scall64-64.S | 334 +-------- arch/mips/kernel/scall64-n32.S | 337 +-------- arch/mips/kernel/scall64-o32.S | 374 +--------- arch/mips/kernel/syscall_table_32_o32.S | 8 + arch/mips/kernel/syscall_table_64_64.S | 9 + arch/mips/kernel/syscall_table_64_n32.S | 8 + arch/mips/kernel/syscall_table_64_o32.S | 9 + arch/mips/kernel/syscalls/Makefile | 62 ++ arch/mips/kernel/syscalls/README.md | 16 + arch/mips/kernel/syscalls/syscall_32.tbl | 375 ++++++++++ arch/mips/kernel/syscalls/syscall_64.tbl | 335 +++++++++ arch/mips/kernel/syscalls/syscall_n32.tbl | 339 ++++++++++ arch/mips/kernel/syscalls/syscallhdr.sh | 37 + arch/mips/kernel/syscalls/syscalltbl.sh | 44 ++ 19 files changed, 1268 insertions(+), 2467 deletions(-) create mode 100644 arch/mips/kernel/syscall_table_32_o32.S create mode 100644 arch/mips/kernel/syscall_table_64_64.S create mode 100644 arch/mips/kernel/syscall_table_64_n32.S create mode 100644 arch/mips/kernel/syscall_table_64_o32.S create mode 100644 arch/mips/kernel/syscalls/Makefile create mode 100644 arch/mips/kernel/syscalls/README.md create mode 100644 arch/mips/kernel/syscalls/syscall_32.tbl create mode 100644 arch/mips/kernel/syscalls/syscall_64.tbl create mode 100644 arch/mips/kernel/syscalls/syscall_n32.tbl create mode 100644 arch/mips/kernel/syscalls/syscallhdr.sh create mode 100644 arch/mips/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 6 months

5
12
0 0

[PATCH net-next 1/3] net: rework SIOCGSTAMP ioctl handling

by Arnd Bergmann

The SIOCGSTAMP/SIOCGSTAMPNS ioctl commands are implemented by many socket protocol handlers, and all of those end up calling the same sock_get_timestamp()/sock_get_timestampns() helper functions, which results in a lot of duplicate code. With the introduction of 64-bit time_t on 32-bit architectures, this gets worse, as we then need four different ioctl commands in each socket protocol implementation. To simplify that, let's add a new .gettstamp() operation in struct proto_ops, and move ioctl implementation into the common sock_ioctl()/compat_sock_ioctl_trans() functions that these all go through. We can reuse the sock_get_timestamp() implementation, but generalize it so it can deal with both native and compat mode, as well as timeval and timespec structures. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- include/linux/net.h | 2 ++ include/net/compat.h | 3 -- include/net/sock.h | 4 +-- net/appletalk/ddp.c | 7 +---- net/atm/ioctl.c | 16 ----------- net/atm/pvc.c | 1 + net/atm/svc.c | 1 + net/ax25/af_ax25.c | 9 +----- net/bluetooth/af_bluetooth.c | 8 ------ net/bluetooth/l2cap_sock.c | 1 + net/bluetooth/rfcomm/sock.c | 1 + net/bluetooth/sco.c | 1 + net/can/af_can.c | 6 ---- net/can/bcm.c | 1 + net/can/raw.c | 1 + net/compat.c | 54 ------------------------------------ net/core/sock.c | 38 +++++++++++-------------- net/dccp/ipv4.c | 1 + net/dccp/ipv6.c | 1 + net/ieee802154/socket.c | 6 ++-- net/ipv4/af_inet.c | 9 ++---- net/ipv6/af_inet6.c | 8 ++---- net/ipv6/raw.c | 1 + net/l2tp/l2tp_ip.c | 1 + net/l2tp/l2tp_ip6.c | 1 + net/netrom/af_netrom.c | 14 +--------- net/packet/af_packet.c | 7 ++--- net/qrtr/qrtr.c | 4 +-- net/rose/af_rose.c | 7 +---- net/sctp/ipv6.c | 1 + net/sctp/protocol.c | 1 + net/socket.c | 48 ++++++++++---------------------- net/x25/af_x25.c | 27 +----------------- 33 files changed, 63 insertions(+), 228 deletions(-) diff --git a/include/linux/net.h b/include/linux/net.h index e0930678c8bf..2be3e9c772fe 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -155,6 +155,8 @@ struct proto_ops { int (*compat_ioctl) (struct socket *sock, unsigned int cmd, unsigned long arg); #endif + int (*gettstamp) (struct socket *sock, void __user *userstamp, + bool timeval, bool time32); int (*listen) (struct socket *sock, int len); int (*shutdown) (struct socket *sock, int flags); int (*setsockopt)(struct socket *sock, int level, diff --git a/include/net/compat.h b/include/net/compat.h index 4c6d75612b6c..f277653c7e17 100644 --- a/include/net/compat.h +++ b/include/net/compat.h @@ -30,9 +30,6 @@ struct compat_cmsghdr { compat_int_t cmsg_type; }; -int compat_sock_get_timestamp(struct sock *, struct timeval __user *); -int compat_sock_get_timestampns(struct sock *, struct timespec __user *); - #else /* defined(CONFIG_COMPAT) */ /* * To avoid compiler warnings: diff --git a/include/net/sock.h b/include/net/sock.h index 433f45fc2d68..ef6c9409dc75 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1584,6 +1584,8 @@ int sock_setsockopt(struct socket *sock, int level, int op, int sock_getsockopt(struct socket *sock, int level, int op, char __user *optval, int __user *optlen); +int sock_gettstamp(struct socket *sock, void __user *userstamp, + bool timeval, bool time32); struct sk_buff *sock_alloc_send_skb(struct sock *sk, unsigned long size, int noblock, int *errcode); struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len, @@ -2423,8 +2425,6 @@ static inline bool sk_listener(const struct sock *sk) } void sock_enable_timestamp(struct sock *sk, int flag); -int sock_get_timestamp(struct sock *, struct timeval __user *); -int sock_get_timestampns(struct sock *, struct timespec __user *); int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len, int level, int type); diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 9b6bc5abe946..a21a643997aa 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -1806,12 +1806,6 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) rc = put_user(amount, (int __user *)argp); break; } - case SIOCGSTAMP: - rc = sock_get_timestamp(sk, argp); - break; - case SIOCGSTAMPNS: - rc = sock_get_timestampns(sk, argp); - break; /* Routing */ case SIOCADDRT: case SIOCDELRT: @@ -1871,6 +1865,7 @@ static const struct proto_ops atalk_dgram_ops = { .getname = atalk_getname, .poll = datagram_poll, .ioctl = atalk_ioctl, + .gettstamp = sock_gettstamp, #ifdef CONFIG_COMPAT .compat_ioctl = atalk_compat_ioctl, #endif diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c index 2ff0e5e470e3..d955b683aa7c 100644 --- a/net/atm/ioctl.c +++ b/net/atm/ioctl.c @@ -81,22 +81,6 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, (int __user *)argp) ? -EFAULT : 0; goto done; } - case SIOCGSTAMP: /* borrowed from IP */ -#ifdef CONFIG_COMPAT - if (compat) - error = compat_sock_get_timestamp(sk, argp); - else -#endif - error = sock_get_timestamp(sk, argp); - goto done; - case SIOCGSTAMPNS: /* borrowed from IP */ -#ifdef CONFIG_COMPAT - if (compat) - error = compat_sock_get_timestampns(sk, argp); - else -#endif - error = sock_get_timestampns(sk, argp); - goto done; case ATM_SETSC: net_warn_ratelimited("ATM_SETSC is obsolete; used by %s:%d\n", current->comm, task_pid_nr(current)); diff --git a/net/atm/pvc.c b/net/atm/pvc.c index 2cb10af16afc..02bd2a436bdf 100644 --- a/net/atm/pvc.c +++ b/net/atm/pvc.c @@ -118,6 +118,7 @@ static const struct proto_ops pvc_proto_ops = { #ifdef CONFIG_COMPAT .compat_ioctl = vcc_compat_ioctl, #endif + .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = pvc_shutdown, .setsockopt = pvc_setsockopt, diff --git a/net/atm/svc.c b/net/atm/svc.c index 2f91b766ac42..908cbb8654f5 100644 --- a/net/atm/svc.c +++ b/net/atm/svc.c @@ -641,6 +641,7 @@ static const struct proto_ops svc_proto_ops = { #ifdef CONFIG_COMPAT .compat_ioctl = svc_compat_ioctl, #endif + .gettstamp = sock_gettstamp, .listen = svc_listen, .shutdown = svc_shutdown, .setsockopt = svc_setsockopt, diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index c603d33d5410..121f7b877df9 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c @@ -1707,14 +1707,6 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) break; } - case SIOCGSTAMP: - res = sock_get_timestamp(sk, argp); - break; - - case SIOCGSTAMPNS: - res = sock_get_timestampns(sk, argp); - break; - case SIOCAX25ADDUID: /* Add a uid to the uid/call map table */ case SIOCAX25DELUID: /* Delete a uid from the uid/call map table */ case SIOCAX25GETUID: { @@ -1943,6 +1935,7 @@ static const struct proto_ops ax25_proto_ops = { .getname = ax25_getname, .poll = datagram_poll, .ioctl = ax25_ioctl, + .gettstamp = sock_gettstamp, .listen = ax25_listen, .shutdown = ax25_shutdown, .setsockopt = ax25_setsockopt, diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index deacc52d7ff1..34e15ca66779 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -511,14 +511,6 @@ int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) err = put_user(amount, (int __user *) arg); break; - case SIOCGSTAMP: - err = sock_get_timestamp(sk, (struct timeval __user *) arg); - break; - - case SIOCGSTAMPNS: - err = sock_get_timestampns(sk, (struct timespec __user *) arg); - break; - default: err = -ENOIOCTLCMD; break; diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 686bdc6b35b0..e8fed07a49d5 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -1655,6 +1655,7 @@ static const struct proto_ops l2cap_sock_ops = { .recvmsg = l2cap_sock_recvmsg, .poll = bt_sock_poll, .ioctl = bt_sock_ioctl, + .gettstamp = sock_gettstamp, .mmap = sock_no_mmap, .socketpair = sock_no_socketpair, .shutdown = l2cap_sock_shutdown, diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index d606e9212291..a1dde6fab323 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -1049,6 +1049,7 @@ static const struct proto_ops rfcomm_sock_ops = { .setsockopt = rfcomm_sock_setsockopt, .getsockopt = rfcomm_sock_getsockopt, .ioctl = rfcomm_sock_ioctl, + .gettstamp = sock_gettstamp, .poll = bt_sock_poll, .socketpair = sock_no_socketpair, .mmap = sock_no_mmap diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 8f0f9279eac9..e7e5b3ed0394 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -1200,6 +1200,7 @@ static const struct proto_ops sco_sock_ops = { .recvmsg = sco_sock_recvmsg, .poll = bt_sock_poll, .ioctl = bt_sock_ioctl, + .gettstamp = sock_gettstamp, .mmap = sock_no_mmap, .socketpair = sock_no_socketpair, .shutdown = sco_sock_shutdown, diff --git a/net/can/af_can.c b/net/can/af_can.c index 1684ba5b51eb..e8fd5dc1780a 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -89,13 +89,7 @@ static atomic_t skbcounter = ATOMIC_INIT(0); int can_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) { - struct sock *sk = sock->sk; - switch (cmd) { - - case SIOCGSTAMP: - return sock_get_timestamp(sk, (struct timeval __user *)arg); - default: return -ENOIOCTLCMD; } diff --git a/net/can/bcm.c b/net/can/bcm.c index 0af8f0db892a..db3e521b9f47 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -1662,6 +1662,7 @@ static const struct proto_ops bcm_ops = { .getname = sock_no_getname, .poll = datagram_poll, .ioctl = can_ioctl, /* use can_ioctl() from af_can.c */ + .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = sock_no_setsockopt, diff --git a/net/can/raw.c b/net/can/raw.c index 1051eee82581..968f6f8082a1 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -845,6 +845,7 @@ static const struct proto_ops raw_ops = { .getname = raw_getname, .poll = datagram_poll, .ioctl = can_ioctl, /* use can_ioctl() from af_can.c */ + .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = raw_setsockopt, diff --git a/net/compat.c b/net/compat.c index 47a614b370cd..e5456dd4c7a5 100644 --- a/net/compat.c +++ b/net/compat.c @@ -455,60 +455,6 @@ static int compat_sock_getsockopt(struct socket *sock, int level, int optname, return sock_getsockopt(sock, level, optname, optval, optlen); } -int compat_sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp) -{ - struct compat_timeval __user *ctv; - int err; - struct timeval tv; - - if (COMPAT_USE_64BIT_TIME) - return sock_get_timestamp(sk, userstamp); - - ctv = (struct compat_timeval __user *) userstamp; - err = -ENOENT; - sock_enable_timestamp(sk, SOCK_TIMESTAMP); - tv = ktime_to_timeval(sk->sk_stamp); - if (tv.tv_sec == -1) - return err; - if (tv.tv_sec == 0) { - sk->sk_stamp = ktime_get_real(); - tv = ktime_to_timeval(sk->sk_stamp); - } - err = 0; - if (put_user(tv.tv_sec, &ctv->tv_sec) || - put_user(tv.tv_usec, &ctv->tv_usec)) - err = -EFAULT; - return err; -} -EXPORT_SYMBOL(compat_sock_get_timestamp); - -int compat_sock_get_timestampns(struct sock *sk, struct timespec __user *userstamp) -{ - struct compat_timespec __user *ctv; - int err; - struct timespec ts; - - if (COMPAT_USE_64BIT_TIME) - return sock_get_timestampns (sk, userstamp); - - ctv = (struct compat_timespec __user *) userstamp; - err = -ENOENT; - sock_enable_timestamp(sk, SOCK_TIMESTAMP); - ts = ktime_to_timespec(sk->sk_stamp); - if (ts.tv_sec == -1) - return err; - if (ts.tv_sec == 0) { - sk->sk_stamp = ktime_get_real(); - ts = ktime_to_timespec(sk->sk_stamp); - } - err = 0; - if (put_user(ts.tv_sec, &ctv->tv_sec) || - put_user(ts.tv_nsec, &ctv->tv_nsec)) - err = -EFAULT; - return err; -} -EXPORT_SYMBOL(compat_sock_get_timestampns); - static int __compat_sys_getsockopt(int fd, int level, int optname, char __user *optval, int __user *optlen) diff --git a/net/core/sock.c b/net/core/sock.c index 3730eb855095..df17bbfaca27 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2897,37 +2897,31 @@ bool lock_sock_fast(struct sock *sk) } EXPORT_SYMBOL(lock_sock_fast); -int sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp) +int sock_gettstamp(struct socket *sock, void __user *userstamp, + bool timeval, bool time32) { - struct timeval tv; - - sock_enable_timestamp(sk, SOCK_TIMESTAMP); - tv = ktime_to_timeval(sk->sk_stamp); - if (tv.tv_sec == -1) - return -ENOENT; - if (tv.tv_sec == 0) { - sk->sk_stamp = ktime_get_real(); - tv = ktime_to_timeval(sk->sk_stamp); - } - return copy_to_user(userstamp, &tv, sizeof(tv)) ? -EFAULT : 0; -} -EXPORT_SYMBOL(sock_get_timestamp); - -int sock_get_timestampns(struct sock *sk, struct timespec __user *userstamp) -{ - struct timespec ts; + struct sock *sk = sock->sk; + struct timespec64 ts; sock_enable_timestamp(sk, SOCK_TIMESTAMP); - ts = ktime_to_timespec(sk->sk_stamp); + ts = ktime_to_timespec64(sk->sk_stamp); if (ts.tv_sec == -1) return -ENOENT; if (ts.tv_sec == 0) { sk->sk_stamp = ktime_get_real(); - ts = ktime_to_timespec(sk->sk_stamp); + ts = ktime_to_timespec64(sk->sk_stamp); } - return copy_to_user(userstamp, &ts, sizeof(ts)) ? -EFAULT : 0; + + if (timeval) + ts.tv_nsec /= 1000; +#ifdef CONFIG_COMPAT_32BIT_TIME + if (time32) + return put_old_timespec32(&ts, userstamp); +#endif + + return put_timespec64(&ts, userstamp); } -EXPORT_SYMBOL(sock_get_timestampns); +EXPORT_SYMBOL(sock_gettstamp); void sock_enable_timestamp(struct sock *sk, int flag) { diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index b08feb219b44..8103f3525773 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -986,6 +986,7 @@ static const struct proto_ops inet_dccp_ops = { /* FIXME: work on tcp_poll to rename it to inet_csk_poll */ .poll = dccp_poll, .ioctl = inet_ioctl, + .gettstamp = sock_gettstamp, /* FIXME: work on inet_listen to rename it to sock_common_listen */ .listen = inet_dccp_listen, .shutdown = inet_shutdown, diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 6344f1b18a6a..dacdb5b2638d 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -1072,6 +1072,7 @@ static const struct proto_ops inet6_dccp_ops = { .getname = inet6_getname, .poll = dccp_poll, .ioctl = inet6_ioctl, + .gettstamp = sock_gettstamp, .listen = inet_dccp_listen, .shutdown = inet_shutdown, .setsockopt = sock_common_setsockopt, diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c index bc6b912603f1..ce2dfb997537 100644 --- a/net/ieee802154/socket.c +++ b/net/ieee802154/socket.c @@ -164,10 +164,6 @@ static int ieee802154_sock_ioctl(struct socket *sock, unsigned int cmd, struct sock *sk = sock->sk; switch (cmd) { - case SIOCGSTAMP: - return sock_get_timestamp(sk, (struct timeval __user *)arg); - case SIOCGSTAMPNS: - return sock_get_timestampns(sk, (struct timespec __user *)arg); case SIOCGIFADDR: case SIOCSIFADDR: return ieee802154_dev_ioctl(sk, (struct ifreq __user *)arg, @@ -426,6 +422,7 @@ static const struct proto_ops ieee802154_raw_ops = { .getname = sock_no_getname, .poll = datagram_poll, .ioctl = ieee802154_sock_ioctl, + .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = sock_common_setsockopt, @@ -988,6 +985,7 @@ static const struct proto_ops ieee802154_dgram_ops = { .getname = sock_no_getname, .poll = datagram_poll, .ioctl = ieee802154_sock_ioctl, + .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = sock_common_setsockopt, diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 20fda8fb8ffd..3490275bab50 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -911,12 +911,6 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) struct rtentry rt; switch (cmd) { - case SIOCGSTAMP: - err = sock_get_timestamp(sk, (struct timeval __user *)arg); - break; - case SIOCGSTAMPNS: - err = sock_get_timestampns(sk, (struct timespec __user *)arg); - break; case SIOCADDRT: case SIOCDELRT: if (copy_from_user(&rt, p, sizeof(struct rtentry))) @@ -988,6 +982,7 @@ const struct proto_ops inet_stream_ops = { .getname = inet_getname, .poll = tcp_poll, .ioctl = inet_ioctl, + .gettstamp = sock_gettstamp, .listen = inet_listen, .shutdown = inet_shutdown, .setsockopt = sock_common_setsockopt, @@ -1023,6 +1018,7 @@ const struct proto_ops inet_dgram_ops = { .getname = inet_getname, .poll = udp_poll, .ioctl = inet_ioctl, + .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = inet_shutdown, .setsockopt = sock_common_setsockopt, @@ -1055,6 +1051,7 @@ static const struct proto_ops inet_sockraw_ops = { .getname = inet_getname, .poll = datagram_poll, .ioctl = inet_ioctl, + .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = inet_shutdown, .setsockopt = sock_common_setsockopt, diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 673bba31eb18..77f9716958a7 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -532,12 +532,6 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) struct net *net = sock_net(sk); switch (cmd) { - case SIOCGSTAMP: - return sock_get_timestamp(sk, (struct timeval __user *)arg); - - case SIOCGSTAMPNS: - return sock_get_timestampns(sk, (struct timespec __user *)arg); - case SIOCADDRT: case SIOCDELRT: @@ -570,6 +564,7 @@ const struct proto_ops inet6_stream_ops = { .getname = inet6_getname, .poll = tcp_poll, /* ok */ .ioctl = inet6_ioctl, /* must change */ + .gettstamp = sock_gettstamp, .listen = inet_listen, /* ok */ .shutdown = inet_shutdown, /* ok */ .setsockopt = sock_common_setsockopt, /* ok */ @@ -603,6 +598,7 @@ const struct proto_ops inet6_dgram_ops = { .getname = inet6_getname, .poll = udp_poll, /* ok */ .ioctl = inet6_ioctl, /* must change */ + .gettstamp = sock_gettstamp, .listen = sock_no_listen, /* ok */ .shutdown = inet_shutdown, /* ok */ .setsockopt = sock_common_setsockopt, /* ok */ diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 413d98bf24f4..a913ccfff021 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -1344,6 +1344,7 @@ const struct proto_ops inet6_sockraw_ops = { .getname = inet6_getname, .poll = datagram_poll, /* ok */ .ioctl = inet6_ioctl, /* must change */ + .gettstamp = sock_gettstamp, .listen = sock_no_listen, /* ok */ .shutdown = inet_shutdown, /* ok */ .setsockopt = sock_common_setsockopt, /* ok */ diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index 35f6f86d4dcc..b7b844d9edec 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c @@ -615,6 +615,7 @@ static const struct proto_ops l2tp_ip_ops = { .getname = l2tp_ip_getname, .poll = datagram_poll, .ioctl = inet_ioctl, + .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = inet_shutdown, .setsockopt = sock_common_setsockopt, diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c index 237f1a4a0b0c..c379ebfa4cb7 100644 --- a/net/l2tp/l2tp_ip6.c +++ b/net/l2tp/l2tp_ip6.c @@ -751,6 +751,7 @@ static const struct proto_ops l2tp_ip6_ops = { .getname = l2tp_ip6_getname, .poll = datagram_poll, .ioctl = inet6_ioctl, + .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = inet_shutdown, .setsockopt = sock_common_setsockopt, diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 03f37c4e64fe..687103e0a3c8 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -1194,7 +1194,6 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) { struct sock *sk = sock->sk; void __user *argp = (void __user *)arg; - int ret; switch (cmd) { case TIOCOUTQ: { @@ -1220,18 +1219,6 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) return put_user(amount, (int __user *)argp); } - case SIOCGSTAMP: - lock_sock(sk); - ret = sock_get_timestamp(sk, argp); - release_sock(sk); - return ret; - - case SIOCGSTAMPNS: - lock_sock(sk); - ret = sock_get_timestampns(sk, argp); - release_sock(sk); - return ret; - case SIOCGIFADDR: case SIOCSIFADDR: case SIOCGIFDSTADDR: @@ -1357,6 +1344,7 @@ static const struct proto_ops nr_proto_ops = { .getname = nr_getname, .poll = datagram_poll, .ioctl = nr_ioctl, + .gettstamp = sock_gettstamp, .listen = nr_listen, .shutdown = sock_no_shutdown, .setsockopt = nr_setsockopt, diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 5610061e7f2e..06097f1e060b 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -4053,11 +4053,6 @@ static int packet_ioctl(struct socket *sock, unsigned int cmd, spin_unlock_bh(&sk->sk_receive_queue.lock); return put_user(amount, (int __user *)arg); } - case SIOCGSTAMP: - return sock_get_timestamp(sk, (struct timeval __user *)arg); - case SIOCGSTAMPNS: - return sock_get_timestampns(sk, (struct timespec __user *)arg); - #ifdef CONFIG_INET case SIOCADDRT: case SIOCDELRT: @@ -4415,6 +4410,7 @@ static const struct proto_ops packet_ops_spkt = { .getname = packet_getname_spkt, .poll = datagram_poll, .ioctl = packet_ioctl, + .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = sock_no_setsockopt, @@ -4436,6 +4432,7 @@ static const struct proto_ops packet_ops = { .getname = packet_getname, .poll = packet_poll, .ioctl = packet_ioctl, + .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = packet_setsockopt, diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index 86e1e37eb4e8..9da159f3fc2a 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -967,9 +967,6 @@ static int qrtr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) break; } break; - case SIOCGSTAMP: - rc = sock_get_timestamp(sk, argp); - break; case SIOCADDRT: case SIOCDELRT: case SIOCSIFADDR: @@ -1032,6 +1029,7 @@ static const struct proto_ops qrtr_proto_ops = { .recvmsg = qrtr_recvmsg, .getname = qrtr_getname, .ioctl = qrtr_ioctl, + .gettstamp = sock_gettstamp, .poll = datagram_poll, .shutdown = sock_no_shutdown, .setsockopt = sock_no_setsockopt, diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index d00a0ef39a56..64bcbb22c8f7 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -1299,12 +1299,6 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) return put_user(amount, (unsigned int __user *) argp); } - case SIOCGSTAMP: - return sock_get_timestamp(sk, (struct timeval __user *) argp); - - case SIOCGSTAMPNS: - return sock_get_timestampns(sk, (struct timespec __user *) argp); - case SIOCGIFADDR: case SIOCSIFADDR: case SIOCGIFDSTADDR: @@ -1472,6 +1466,7 @@ static const struct proto_ops rose_proto_ops = { .getname = rose_getname, .poll = datagram_poll, .ioctl = rose_ioctl, + .gettstamp = sock_gettstamp, .listen = rose_listen, .shutdown = sock_no_shutdown, .setsockopt = rose_setsockopt, diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index fc6c5e4bffa5..62da13b888e0 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -1028,6 +1028,7 @@ static const struct proto_ops inet6_seqpacket_ops = { .getname = sctp_getname, .poll = sctp_poll, .ioctl = inet6_ioctl, + .gettstamp = sock_gettstamp, .listen = sctp_inet_listen, .shutdown = inet_shutdown, .setsockopt = sock_common_setsockopt, diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index e948db29ab53..b640eeedc8b4 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -1026,6 +1026,7 @@ static const struct proto_ops inet_seqpacket_ops = { .getname = inet_getname, /* Semantics are different. */ .poll = sctp_poll, .ioctl = inet_ioctl, + .gettstamp = sock_gettstamp, .listen = sctp_inet_listen, .shutdown = inet_shutdown, /* Looks harmless. */ .setsockopt = sock_common_setsockopt, /* IP_SOL IP_OPTION is a problem */ diff --git a/net/socket.c b/net/socket.c index b9d71b503720..6814e8dc8af1 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1069,6 +1069,15 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg) err = open_related_ns(&net->ns, get_net_ns); break; + case SIOCGSTAMP: + case SIOCGSTAMPNS: + if (!sock->ops->gettstamp) { + err = -ENOIOCTLCMD; + break; + } + err = sock->ops->gettstamp(sock, argp, + cmd == SIOCGSTAMP, false); + break; default: err = sock_do_ioctl(net, sock, cmd, arg); break; @@ -2740,38 +2749,6 @@ void socket_seq_show(struct seq_file *seq) #endif /* CONFIG_PROC_FS */ #ifdef CONFIG_COMPAT -static int do_siocgstamp(struct net *net, struct socket *sock, - unsigned int cmd, void __user *up) -{ - mm_segment_t old_fs = get_fs(); - struct timeval ktv; - int err; - - set_fs(KERNEL_DS); - err = sock_do_ioctl(net, sock, cmd, (unsigned long)&ktv); - set_fs(old_fs); - if (!err) - err = compat_put_timeval(&ktv, up); - - return err; -} - -static int do_siocgstampns(struct net *net, struct socket *sock, - unsigned int cmd, void __user *up) -{ - mm_segment_t old_fs = get_fs(); - struct timespec kts; - int err; - - set_fs(KERNEL_DS); - err = sock_do_ioctl(net, sock, cmd, (unsigned long)&kts); - set_fs(old_fs); - if (!err) - err = compat_put_timespec(&kts, up); - - return err; -} - static int compat_dev_ifconf(struct net *net, struct compat_ifconf __user *uifc32) { struct compat_ifconf ifc32; @@ -3119,9 +3096,12 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock, case SIOCDELRT: return routing_ioctl(net, sock, cmd, argp); case SIOCGSTAMP: - return do_siocgstamp(net, sock, cmd, argp); case SIOCGSTAMPNS: - return do_siocgstampns(net, sock, cmd, argp); + if (!sock->ops->gettstamp) + return -ENOIOCTLCMD; + return sock->ops->gettstamp(sock, argp, cmd == SIOCGSTAMP, + !COMPAT_USE_64BIT_TIME); + case SIOCBONDSLAVEINFOQUERY: case SIOCBONDINFOQUERY: case SIOCSHWTSTAMP: diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index d49aa79b7997..fe2673d17009 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1388,18 +1388,6 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) break; } - case SIOCGSTAMP: - rc = -EINVAL; - if (sk) - rc = sock_get_timestamp(sk, - (struct timeval __user *)argp); - break; - case SIOCGSTAMPNS: - rc = -EINVAL; - if (sk) - rc = sock_get_timestampns(sk, - (struct timespec __user *)argp); - break; case SIOCGIFADDR: case SIOCSIFADDR: case SIOCGIFDSTADDR: @@ -1671,8 +1659,6 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) { void __user *argp = compat_ptr(arg); - struct sock *sk = sock->sk; - int rc = -ENOIOCTLCMD; switch(cmd) { @@ -1680,18 +1666,6 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd, case TIOCINQ: rc = x25_ioctl(sock, cmd, (unsigned long)argp); break; - case SIOCGSTAMP: - rc = -EINVAL; - if (sk) - rc = compat_sock_get_timestamp(sk, - (struct timeval __user*)argp); - break; - case SIOCGSTAMPNS: - rc = -EINVAL; - if (sk) - rc = compat_sock_get_timestampns(sk, - (struct timespec __user*)argp); - break; case SIOCGIFADDR: case SIOCSIFADDR: case SIOCGIFDSTADDR: @@ -1755,6 +1729,7 @@ static const struct proto_ops x25_proto_ops = { #ifdef CONFIG_COMPAT .compat_ioctl = compat_x25_ioctl, #endif + .gettstamp = sock_gettstamp, .listen = x25_listen, .shutdown = sock_no_shutdown, .setsockopt = x25_setsockopt, -- 2.18.0

7 years, 6 months

3
9
0 0

[PATCH 0/5] System call table generation support

by Firoz Khan

The purpose of this patch series is: 1. We can easily add/modify/delete system call by changing entry in syscall.tbl file. No need to manually edit many files. 2. It is easy to unify the system call implementation across all the architectures. The system call tables are in different format in all architecture and it will be difficult to manually add or modify the system calls manually in the respective files. To make it easy by keeping a script and which'll generate the header file and syscall table file so this change will unify the implementation across all architectures. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, m68k, microblaze, mips, parisc, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work for solving the Y2038 issue. We need to add/change two dozen of system calls to solve Y2038 issue. So this patch series will help to easily modify from existing system call to Y2038 compatible system calls. I started working system call table generation on 4.17-rc1. I used marcin's script - https://github.com/hrw/syscalls-table to generate the syscall.tbl file. And this will be the input to the system call table generation script. But there are couple system call got add in the latest rc release. If run Marcin's script on latest release, it will generate a different syscall.tbl. But I still use the old file - syscall.tbl and once all review got over I'll update syscall.tbl alone w.r.to the tip of the kernel. The impact of this is, few of the system call won't work. Firoz Khan (5): ia64: Replace NR_syscalls macro from asm/unistd.h ia64: Added an offset for system call number ia64: Replaced the system call table entry from entry.S ia64: Added system call table generation support ia64: uapi header and system call table file generation arch/ia64/Makefile | 3 + arch/ia64/include/asm/Kbuild | 2 + arch/ia64/include/asm/unistd.h | 4 - arch/ia64/include/uapi/asm/Kbuild | 2 + arch/ia64/include/uapi/asm/unistd.h | 331 +------------------------------ arch/ia64/kernel/entry.S | 335 +------------------------------- arch/ia64/kernel/fsys.S | 2 +- arch/ia64/kernel/gate.S | 4 +- arch/ia64/kernel/ivt.S | 2 +- arch/ia64/kernel/patch.c | 2 +- arch/ia64/kernel/syscall.S | 13 ++ arch/ia64/kernel/syscalls/Makefile | 40 ++++ arch/ia64/kernel/syscalls/syscall.tbl | 334 +++++++++++++++++++++++++++++++ arch/ia64/kernel/syscalls/syscallhdr.sh | 33 ++++ arch/ia64/kernel/syscalls/syscalltbl.sh | 34 ++++ arch/ia64/mm/init.c | 6 +- 16 files changed, 474 insertions(+), 673 deletions(-) create mode 100644 arch/ia64/kernel/syscall.S create mode 100644 arch/ia64/kernel/syscalls/Makefile create mode 100644 arch/ia64/kernel/syscalls/syscall.tbl create mode 100644 arch/ia64/kernel/syscalls/syscallhdr.sh create mode 100644 arch/ia64/kernel/syscalls/syscalltbl.sh -- 1.9.1

7 years, 6 months

2
7
0 0

[PATCH 0/3] System call table generation support

by Firoz Khan

The purpose of this patch series is: 1. We can easily add/modify/delete system call by changing entry in syscall.tbl file. No need to manually edit many files. 2. It is easy to unify the system call implementation across all the architectures. The system call tables are in different format in all architecture and it will be difficult to manually add or modify the system calls manually in the respective files. To make it easy by keeping a script and which'll generate the header file and syscall table file so this change will unify the implementation across all architectures. syscall.tbl contains the list of available system calls along with system call number and corresponding entry point. Add a new system call in this architecture will be possible by adding new entry in the syscall.tbl file. Adding a new table entry consisting of: - System call number. - ABI. - System call name. - Entry point name. Important thing to note, I have added this support only for 32-bit ABI. It seems like no one using 64-bit ABI for long time. But it is very easy to add the support for64-bit. Please let me know if any- one need this support:) ARM, s390 and x86 architecuture does exist the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for alpha, m68k, microblaze, ia64, mips, parisc, powerpc, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work for solving the Y2038 issue. We need to add/change two dozen of system calls to solve Y2038 issue. So this patch series will help to easily modify from existing system call to Y2038 compatible system calls. I started working system call table generation on 4.17-rc1. I used marcin's script - https://github.com/hrw/syscalls-table to generate the syscall.tbl file. And this will be the input to the system call table generation script. But there are couple system call got add in the latest rc release. If run Marcin's script on latest release, it will generate a different syscall.tbl. But I still use the old file - syscall.tbl and once all review got over I'll update syscall.tbl alone w.r.to the tip of the kernel. The impact of this is, few of the system call won't work. Firoz Khan (3): sh: Rename NR_syscalls macro to __NR_syscalls sh: Added system call table generation support sh: uapi header and system call table file generation arch/sh/Makefile | 3 + arch/sh/include/asm/Kbuild | 2 + arch/sh/include/asm/ftrace.h | 2 +- arch/sh/include/uapi/asm/Kbuild | 2 + arch/sh/include/uapi/asm/unistd_32.h | 2 +- arch/sh/include/uapi/asm/unistd_64.h | 2 +- arch/sh/kernel/Makefile | 2 +- arch/sh/kernel/cpu/sh5/entry.S | 2 +- arch/sh/kernel/entry-common.S | 2 +- arch/sh/kernel/syscall.S | 9 + arch/sh/kernel/syscalls/Makefile | 37 ++++ arch/sh/kernel/syscalls/syscall.tbl | 388 ++++++++++++++++++++++++++++++++ arch/sh/kernel/syscalls/syscallhdr.sh | 33 +++ arch/sh/kernel/syscalls/syscalltbl.sh | 28 +++ arch/sh/kernel/syscalls_32.S | 402 ---------------------------------- 15 files changed, 508 insertions(+), 408 deletions(-) create mode 100644 arch/sh/kernel/syscall.S create mode 100644 arch/sh/kernel/syscalls/Makefile create mode 100644 arch/sh/kernel/syscalls/syscall.tbl create mode 100644 arch/sh/kernel/syscalls/syscallhdr.sh create mode 100644 arch/sh/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/sh/kernel/syscalls_32.S -- 1.9.1

7 years, 6 months

3
6
0 0

[PATCH v3 0/5] y2038: Make ppoll, io_pgetevents and pselect y2038 safe

by Deepa Dinamani

The series transitions the ppoll, io_getevents, and pselect syscalls to be y2038 safe. This is part of the work proceeding for syscalls for y2038. It is based on the series [1] from Arnd Bergmann. The overview of the series is as below: 1. Refactor sigmask handling logic for the above syscalls. 2. Provide y2038 safe versions of syscalls for all ABIs. [1] https://lkml.org/lkml/2018/8/27/651 Changes since v2: * remove 64BIT_TIME conditional for ppoll, pselect, io_getpevents as per review comments Changes since v1: * fixed bug pointed out by arnd Deepa Dinamani (5): signal: Add set_user_sigmask() signal: Add restore_user_sigmask() ppoll: use __kernel_timespec pselect6: use __kernel_timespec io_pgetevents: use __kernel_timespec fs/aio.c | 135 ++++++++++----- fs/eventpoll.c | 52 +----- fs/select.c | 360 ++++++++++++++++++++++----------------- include/linux/compat.h | 20 +++ include/linux/signal.h | 4 + include/linux/syscalls.h | 20 ++- kernel/signal.c | 78 +++++++++ 7 files changed, 427 insertions(+), 242 deletions(-) -- 2.17.1

7 years, 6 months

2
7
0 0

(no subject)

by Arnd Bergmann

Hi Thomas, Please pull the system call changes into a branch of the tip tree. These are the ones I posted right after rc1, with the addition of two bug fixes that were contributed by Guenther and the kbuild test robot. I've had the changes in linux-next since then and not received any other bug reports or feedback. I panicked a little at one point when I realized that there is a sparc64 specific bug in some of my patches, but I then found that at least this series is not affected at all. Arnd The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3: Linux 4.19-rc1 (2018-08-26 14:11:59 -0700) are available in the Git repository at: git+ssh://git@ra.kernel.org:/pub/scm/linux/kernel/git/arnd/playground.git tags/y2038 for you to fetch changes up to 67314ec7b0250290cc85eaa7a2f88a8ddb9e8547: RISC-V: Request newstat syscalls (2018-09-05 22:44:21 +0200) ---------------------------------------------------------------- y2038: convert more syscalls Here is another set of system call changes to prepare the change over to 64-bit time_t. As before, the strategy is to change system calls that take a 'struct timespec' argument over to 'struct __kernel_timespec', which for now is defined to be the same but will get redefined to use a 64-bit time_t argument once we are ready to modify the system call tables. The major change from previous patches is that the plan is no longer to directly use the 'compat' system calls for providing compatibility with the existing 32-bit time_t based entry points. Instead, we rename the compat code to something that makes more sense on 32-bit architectures, e.g. compat_timespec becomes old_timespec32. With the renamed types in place, we change over the 'stat' and 'utimes' families of system calls, sched_rr_get_interval, recvmmsg and rt_sigtimedwait. Another series for poll, select and io_pgetevents is currently being tested. ---------------------------------------------------------------- Arnd Bergmann (14): y2038: remove unused time interfaces y2038: make do_gettimeofday() and get_seconds() inline y2038: globally rename compat_time to old_time32 y2038: Remove newstat family from default syscall set y2038: Remove stat64 family from default syscall set asm-generic: Move common compat types to asm-generic/compat.h asm-generic: Remove unneeded __ARCH_WANT_SYS_LLSEEK macro asm-generic: Remove empty asm/unistd.h y2038: Change sys_utimensat() to use __kernel_timespec y2038: Compile utimes()/futimesat() conditionally y2038: utimes: Rework #ifdef guards for compat syscalls y2038: sched: Change sched_rr_get_interval to use __kernel_timespec y2038: socket: Change recvmmsg to use __kernel_timespec y2038: signal: Change rt_sigtimedwait to use __kernel_timespec Guenter Roeck (1): RISC-V: Request newstat syscalls kbuild test robot (1): y2038: __get_old_timespec32() can be static arch/alpha/include/asm/unistd.h | 2 ++ arch/arc/include/uapi/asm/unistd.h | 1 + arch/arm/include/asm/unistd.h | 4 ++-- arch/arm64/include/asm/compat.h | 26 +++++--------------------- arch/arm64/include/asm/stat.h | 2 +- arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/uapi/asm/unistd.h | 1 + arch/c6x/include/uapi/asm/unistd.h | 1 + arch/h8300/include/uapi/asm/unistd.h | 1 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/ia64/include/asm/unistd.h | 3 +++ arch/m68k/include/asm/unistd.h | 2 +- arch/microblaze/include/asm/unistd.h | 2 +- arch/mips/include/asm/compat.h | 28 +++++----------------------- arch/mips/include/asm/unistd.h | 3 ++- arch/mips/kernel/binfmt_elfn32.c | 14 +++++++------- arch/mips/kernel/binfmt_elfo32.c | 14 +++++++------- arch/nds32/include/uapi/asm/unistd.h | 1 + arch/nios2/include/uapi/asm/unistd.h | 1 + arch/openrisc/include/uapi/asm/unistd.h | 1 + arch/parisc/include/asm/compat.h | 24 +++++------------------- arch/parisc/include/asm/unistd.h | 3 ++- arch/powerpc/include/asm/compat.h | 24 +++++------------------- arch/powerpc/include/asm/unistd.h | 3 ++- arch/powerpc/kernel/asm-offsets.c | 8 ++++---- arch/powerpc/oprofile/backtrace.c | 2 +- arch/riscv/include/asm/unistd.h | 1 + arch/s390/include/asm/compat.h | 18 ++---------------- arch/s390/include/asm/unistd.h | 3 ++- arch/sh/include/asm/unistd.h | 2 +- arch/sparc/include/asm/compat.h | 25 +++++-------------------- arch/sparc/include/asm/unistd.h | 3 ++- arch/unicore32/include/uapi/asm/unistd.h | 1 + arch/x86/include/asm/compat.h | 19 ++----------------- arch/x86/include/asm/unistd.h | 3 ++- arch/xtensa/include/asm/unistd.h | 2 +- fs/aio.c | 8 ++++---- fs/compat_binfmt_elf.c | 2 +- fs/read_write.c | 2 +- fs/select.c | 20 ++++++++++---------- fs/stat.c | 3 +++ fs/timerfd.c | 12 ++++++------ fs/utimes.c | 73 +++++++++++++++++++++++++++++++++++-------------------------------------- include/asm-generic/compat.h | 24 +++++++++++++++++++++++- include/asm-generic/unistd.h | 13 ------------- include/linux/compat.h | 101 +++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------ include/linux/compat_time.h | 32 -------------------------------- include/linux/elfcore-compat.h | 8 ++++---- include/linux/restart_block.h | 4 ++-- include/linux/socket.h | 4 ++-- include/linux/syscalls.h | 21 ++++++++++++--------- include/linux/time32.h | 78 +++++++++++++++++++++++++++++++++++++++++------------------------------------- include/linux/timekeeping.h | 12 ------------ include/linux/timekeeping32.h | 53 +++++++---------------------------------------------- include/uapi/asm-generic/unistd.h | 2 ++ ipc/mqueue.c | 8 ++++---- ipc/msg.c | 6 +++--- ipc/sem.c | 10 +++++----- ipc/shm.c | 6 +++--- ipc/syscall.c | 2 +- ipc/util.h | 2 +- kernel/compat.c | 8 ++++---- kernel/futex_compat.c | 2 +- kernel/sched/core.c | 8 ++++---- kernel/signal.c | 19 ++++++++++--------- kernel/time/hrtimer.c | 8 ++++---- kernel/time/posix-stubs.c | 18 +++++++++--------- kernel/time/posix-timers.c | 30 +++++++++++++++--------------- kernel/time/time.c | 97 ++++++++++++++++++++++++++++++++++++++----------------------------------------------------------- kernel/time/timekeeping.c | 24 ------------------------ net/compat.c | 10 +++++----- net/socket.c | 18 ++++++++---------- 72 files changed, 398 insertions(+), 601 deletions(-) delete mode 100644 include/asm-generic/unistd.h delete mode 100644 include/linux/compat_time.h Reply Forward

7 years, 6 months

1
1
0 0

[PATCH v2 0/5] y2038: Make ppoll, io_pgetevents and pselect y2038 safe

by Deepa Dinamani

The series transitions the ppoll, io_getevents, and pselect syscalls to be y2038 safe. This is part of the work proceeding for syscalls for y2038. It is based on the series [1] from Arnd Bergmann. The overview of the series is as below: 1. Refactor sigmask handling logic for the above syscalls. 2. Provide y2038 safe versions of syscalls for all ABIs. [1] https://lkml.org/lkml/2018/8/27/651 Changes since v1: * fixed bug pointed out by arnd Deepa Dinamani (5): signal: Add set_user_sigmask() signal: Add restore_user_sigmask() ppoll: use __kernel_timespec pselect6: use __kernel_timespec io_pgetevents: use __kernel_timespec fs/aio.c | 138 ++++++++++----- fs/eventpoll.c | 52 +----- fs/select.c | 367 +++++++++++++++++++++++---------------- include/linux/compat.h | 20 +++ include/linux/signal.h | 4 + include/linux/syscalls.h | 20 ++- kernel/signal.c | 78 +++++++++ 7 files changed, 437 insertions(+), 242 deletions(-) -- 2.17.1

7 years, 6 months

3
9
0 0

[PATCH 0/5] y2038: Make ppoll, io_pgetevents and pselect y2038 safe

by Deepa Dinamani

The series transitions the ppoll, io_getevents, and pselect syscalls to be y2038 safe. This is part of the work proceeding for syscalls for y2038. It is based on the series [1] from Arnd Bergmann. The overview of the series is as below: 1. Refactor sigmask handling logic for the above syscalls. 2. Provide y2038 safe versions of syscalls for all ABIs. [1] https://lkml.org/lkml/2018/8/27/651 Deepa Dinamani (5): signal: Add set_user_sigmask() signal: Add restore_user_sigmask() ppoll: use __kernel_timespec pselect6: use __kernel_timespec io_pgetevents: use __kernel_timespec fs/aio.c | 138 ++++++++++----- fs/eventpoll.c | 52 +----- fs/select.c | 367 +++++++++++++++++++++++---------------- include/linux/compat.h | 20 +++ include/linux/signal.h | 4 + include/linux/syscalls.h | 20 ++- kernel/signal.c | 78 +++++++++ 7 files changed, 437 insertions(+), 242 deletions(-) -- 2.17.1

7 years, 6 months

2
8
0 0

[PATCH v2 1/2] rtc: mips: default to rtc-cmos on mips

by Arnd Bergmann

The old rtc driver is getting in the way of some compat_ioctl simplification. Looking up the loongson64 git history, it seems that everyone uses the more modern but compatible RTC_CMOS driver anyway, so let's remove the special case for loongson64. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- arch/mips/Kconfig | 2 +- drivers/char/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 35511999156a..c695825d9377 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -75,7 +75,7 @@ config MIPS select MODULES_USE_ELF_RELA if MODULES && 64BIT select MODULES_USE_ELF_REL if MODULES select PERF_USE_VMALLOC - select RTC_LIB if !MACH_LOONGSON64 + select RTC_LIB select SYSCTL_EXCEPTION_TRACE select VIRT_TO_BUS diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index ce277ee0a28a..131b4c300050 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -268,7 +268,7 @@ if RTC_LIB=n config RTC tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)" - depends on ALPHA || (MIPS && MACH_LOONGSON64) + depends on ALPHA ---help--- If you say Y here and create a character special file /dev/rtc with major number 10 and minor number 135 using mknod ("man mknod"), you -- 2.18.0

7 years, 6 months

3
5
0 0

[PATCH 1/5] media: dvb: fix compat ioctl tramslation

by Arnd Bergmann

The VIDEO_GET_EVENT and VIDEO_STILLPICTURE was added back in 2005 but it never worked because the command number is wrong. Using the right command number means we have a better chance of them actually doing the right thing, though clearly nobody has ever tried it successfully. I noticed these while auditing the remaining users of compat_time_t for y2038 bugs. This one is fine in that regard, it just never did anything. Fixes: 6e87abd0b8cb ("[DVB]: Add compat ioctl handling.") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- fs/compat_ioctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index a9b00942e87d..0c46ce224590 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -141,6 +141,7 @@ struct compat_video_event { unsigned int frame_rate; } u; }; +#define VIDEO_GET_EVENT32 _IOR('o', 28, struct compat_video_event) static int do_video_get_event(struct file *file, unsigned int cmd, struct compat_video_event __user *up) @@ -152,7 +153,7 @@ static int do_video_get_event(struct file *file, if (kevent == NULL) return -EFAULT; - err = do_ioctl(file, cmd, (unsigned long)kevent); + err = do_ioctl(file, VIDEO_GET_EVENT, (unsigned long)kevent); if (!err) { err = convert_in_user(&kevent->type, &up->type); err |= convert_in_user(&kevent->timestamp, &up->timestamp); @@ -171,6 +172,7 @@ struct compat_video_still_picture { compat_uptr_t iFrame; int32_t size; }; +#define VIDEO_STILLPICTURE32 _IOW('o', 30, struct compat_video_still_picture) static int do_video_stillpicture(struct file *file, unsigned int cmd, struct compat_video_still_picture __user *up) @@ -193,7 +195,7 @@ static int do_video_stillpicture(struct file *file, if (err) return -EFAULT; - err = do_ioctl(file, cmd, (unsigned long) up_native); + err = do_ioctl(file, VIDEO_STILLPICTURE, (unsigned long) up_native); return err; } @@ -1305,9 +1307,9 @@ static long do_ioctl_trans(unsigned int cmd, return rtc_ioctl(file, cmd, argp); /* dvb */ - case VIDEO_GET_EVENT: + case VIDEO_GET_EVENT32: return do_video_get_event(file, cmd, argp); - case VIDEO_STILLPICTURE: + case VIDEO_STILLPICTURE32: return do_video_stillpicture(file, cmd, argp); } -- 2.18.0

7 years, 7 months

2
5
0 0

[PATCH net-next 1/5] pppoe: fix PPPOEIOCSFWD compat handling

by Arnd Bergmann

Support for handling the PPPOEIOCSFWD ioctl in compat mode was added in linux-2.5.69 along with hundreds of other commands, but was always broken sincen only the structure is compatible, but the command number is not, due to the size being sizeof(size_t), or at first sizeof(sizeof((struct sockaddr_pppox)), which is different on 64-bit architectures. Fix it by defining a separate command code that matches the 32-bit version, and marking that one as compatible. This should apply to all stable kernels. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- drivers/net/ppp/pppoe.c | 4 ++++ fs/compat_ioctl.c | 2 +- include/linux/if_pppox.h | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index ce61231e96ea..d1c3f9292c54 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -57,6 +57,7 @@ * */ +#include <linux/compat.h> #include <linux/string.h> #include <linux/module.h> #include <linux/kernel.h> @@ -780,6 +781,9 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd, err = 0; break; +#ifdef CONFIG_COMPAT + case PPPOEIOCSFWD32: +#endif case PPPOEIOCSFWD: { struct pppox_sock *relay_po; diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index a9b00942e87d..a8bb193fdfd5 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -895,7 +895,7 @@ COMPATIBLE_IOCTL(PPPIOCATTCHAN) COMPATIBLE_IOCTL(PPPIOCGCHAN) COMPATIBLE_IOCTL(PPPIOCGL2TPSTATS) /* PPPOX */ -COMPATIBLE_IOCTL(PPPOEIOCSFWD) +COMPATIBLE_IOCTL(PPPOEIOCSFWD32) COMPATIBLE_IOCTL(PPPOEIOCDFWD) /* Big A */ /* sparc only */ diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index ba7a9b0c7c57..d221f1465f41 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h @@ -85,6 +85,8 @@ extern void unregister_pppox_proto(int proto_num); extern void pppox_unbind_sock(struct sock *sk);/* delete ppp-channel binding */ extern int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); +#define PPPOEIOCSFWD32 _IOW(0xB1 ,0, compat_size_t) + /* PPPoX socket states */ enum { PPPOX_NONE = 0, /* initial state */ -- 2.18.0

7 years, 7 months

2
11
0 0

[PATCH 00/14] y2038 syscall changes for 4.20

by Arnd Bergmann

Hi Thomas, I've rebased the syscall changes on top of 4.19-rc1, and the old_time32 rename. This is the first set of those patches, the ones that I hope are all uncontroversial and obvious now. I'm still in the process of reorganizing and testing the next set batch top, and plan to send them after you've merged these. The first three patches are new here, the other ones have been posted before a few times. Arnd Arnd Bergmann (14): y2038: remove unused time interfaces y2038: make do_gettimeofday() and get_seconds() inline y2038: globally rename compat_time to old_time32 y2038: Remove newstat family from default syscall set y2038: Remove stat64 family from default syscall set asm-generic: Move common compat types to asm-generic/compat.h asm-generic: Remove unneeded __ARCH_WANT_SYS_LLSEEK macro asm-generic: Remove empty asm/unistd.h y2038: Change sys_utimensat() to use __kernel_timespec y2038: Compile utimes()/futimesat() conditionally y2038: utimes: Rework #ifdef guards for compat syscalls y2038: sched: Change sched_rr_get_interval to use __kernel_timespec y2038: socket: Change recvmmsg to use __kernel_timespec y2038: signal: Change rt_sigtimedwait to use __kernel_timespec arch/alpha/include/asm/unistd.h | 2 + arch/arc/include/uapi/asm/unistd.h | 1 + arch/arm/include/asm/unistd.h | 4 +- arch/arm64/include/asm/compat.h | 26 ++---- arch/arm64/include/asm/stat.h | 2 +- arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/uapi/asm/unistd.h | 1 + arch/c6x/include/uapi/asm/unistd.h | 1 + arch/h8300/include/uapi/asm/unistd.h | 1 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/ia64/include/asm/unistd.h | 3 + arch/m68k/include/asm/unistd.h | 2 +- arch/microblaze/include/asm/unistd.h | 2 +- arch/mips/include/asm/compat.h | 28 ++----- arch/mips/include/asm/unistd.h | 3 +- arch/mips/kernel/binfmt_elfn32.c | 14 ++-- arch/mips/kernel/binfmt_elfo32.c | 14 ++-- arch/nds32/include/uapi/asm/unistd.h | 1 + arch/nios2/include/uapi/asm/unistd.h | 1 + arch/openrisc/include/uapi/asm/unistd.h | 1 + arch/parisc/include/asm/compat.h | 24 ++---- arch/parisc/include/asm/unistd.h | 3 +- arch/powerpc/include/asm/compat.h | 24 ++---- arch/powerpc/include/asm/unistd.h | 3 +- arch/powerpc/kernel/asm-offsets.c | 8 +- arch/powerpc/oprofile/backtrace.c | 2 +- arch/s390/include/asm/compat.h | 18 +--- arch/s390/include/asm/unistd.h | 3 +- arch/sh/include/asm/unistd.h | 2 +- arch/sparc/include/asm/compat.h | 25 ++---- arch/sparc/include/asm/unistd.h | 3 +- arch/unicore32/include/uapi/asm/unistd.h | 1 + arch/x86/include/asm/compat.h | 19 +---- arch/x86/include/asm/unistd.h | 3 +- arch/xtensa/include/asm/unistd.h | 2 +- fs/aio.c | 8 +- fs/compat_binfmt_elf.c | 2 +- fs/read_write.c | 2 +- fs/select.c | 20 ++--- fs/stat.c | 3 + fs/timerfd.c | 12 +-- fs/utimes.c | 73 ++++++++-------- include/asm-generic/compat.h | 24 +++++- include/asm-generic/unistd.h | 13 --- include/linux/compat.h | 101 +++++++++++------------ include/linux/compat_time.h | 32 ------- include/linux/elfcore-compat.h | 8 +- include/linux/restart_block.h | 4 +- include/linux/socket.h | 4 +- include/linux/syscalls.h | 21 +++-- include/linux/time32.h | 78 ++++++++--------- include/linux/timekeeping.h | 12 --- include/linux/timekeeping32.h | 53 ++---------- include/uapi/asm-generic/unistd.h | 2 + ipc/mqueue.c | 8 +- ipc/msg.c | 6 +- ipc/sem.c | 10 +-- ipc/shm.c | 6 +- ipc/syscall.c | 2 +- ipc/util.h | 2 +- kernel/compat.c | 8 +- kernel/futex_compat.c | 2 +- kernel/sched/core.c | 8 +- kernel/signal.c | 19 +++-- kernel/time/hrtimer.c | 8 +- kernel/time/posix-stubs.c | 18 ++-- kernel/time/posix-timers.c | 30 +++---- kernel/time/time.c | 97 +++++++++------------- kernel/time/timekeeping.c | 24 ------ net/compat.c | 10 +-- net/socket.c | 18 ++-- 71 files changed, 397 insertions(+), 601 deletions(-) delete mode 100644 include/asm-generic/unistd.h delete mode 100644 include/linux/compat_time.h -- 2.18.0

7 years, 7 months

3
18
0 0

[PATCH 1/2] rtc: mips: default to rtc-cmos on mips

by Arnd Bergmann

The old rtc driver is getting in the way of some compat_ioctl simplification. Looking up the loongson64 git history, it seems that everyone uses the more modern but compatible RTC_CMOS driver anyway, so let's remove the special case for loongson64. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- arch/mips/Kconfig | 2 +- drivers/char/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 35511999156a..c695825d9377 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -75,7 +75,7 @@ config MIPS select MODULES_USE_ELF_RELA if MODULES && 64BIT select MODULES_USE_ELF_REL if MODULES select PERF_USE_VMALLOC - select RTC_LIB if !MACH_LOONGSON64 + select RTC_LIB select SYSCTL_EXCEPTION_TRACE select VIRT_TO_BUS diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index ce277ee0a28a..131b4c300050 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -268,7 +268,7 @@ if RTC_LIB=n config RTC tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)" - depends on ALPHA || (MIPS && MACH_LOONGSON64) + depends on ALPHA ---help--- If you say Y here and create a character special file /dev/rtc with major number 10 and minor number 135 using mknod ("man mknod"), you -- 2.18.0

7 years, 7 months

2
3
0 0

Patch "posix-timers: Fix nanosleep_copyout() for CONFIG_COMPAT_32BIT_TIME" has been added to the 4.17-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled posix-timers: Fix nanosleep_copyout() for CONFIG_COMPAT_32BIT_TIME to the 4.17-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: posix-timers-fix-nanosleep_copyout-for-config_compat_32bit_time.patch and it can be found in the queue-4.17 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Wed Aug 22 09:16:55 CEST 2018 From: Arnd Bergmann <arnd(a)arndb.de> Date: Mon, 18 Jun 2018 16:07:59 +0200 Subject: posix-timers: Fix nanosleep_copyout() for CONFIG_COMPAT_32BIT_TIME From: Arnd Bergmann <arnd(a)arndb.de> [ Upstream commit 0fe2795516b9e1c59b58b02bdf8658698117ec4e ] Commit b5793b0d92c9 added support for building the nanosleep compat system call on 32-bit architectures, but missed one change in nanosleep_copyout(), which would trigger a BUG() as soon as any architecture is switched over to use it. Use the proper config symbol to enable the code path. Fixes: Commit b5793b0d92c9 ("posix-timers: Make compat syscalls depend on CONFIG_COMPAT_32BIT_TIME") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Cc: y2038(a)lists.linaro.org Cc: Anna-Maria Gleixner <anna-maria(a)linutronix.de> Cc: Deepa Dinamani <deepa.kernel(a)gmail.com> Cc: "Rafael J. Wysocki" <rafael.j.wysocki(a)intel.com> Link: https://lkml.kernel.org/r/20180618140811.2998503-1-arnd@arndb.de Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- kernel/time/hrtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1659,7 +1659,7 @@ EXPORT_SYMBOL_GPL(hrtimer_init_sleeper); int nanosleep_copyout(struct restart_block *restart, struct timespec64 *ts) { switch(restart->nanosleep.type) { -#ifdef CONFIG_COMPAT +#ifdef CONFIG_COMPAT_32BIT_TIME case TT_COMPAT: if (compat_put_timespec64(ts, restart->nanosleep.compat_rmtp)) return -EFAULT; Patches currently in stable-queue which might be from arnd(a)arndb.de are queue-4.17/posix-timers-fix-nanosleep_copyout-for-config_compat_32bit_time.patch queue-4.17/ieee802154-mcr20a-add-missing-includes.patch queue-4.17/drm-sun4i-link-in-front-end-code-if-needed.patch

7 years, 7 months

3
5
0 0

[PATCH] y2038: provide aliases for compat helpers

by Arnd Bergmann

As part of the system call rework for 64-bit time_t, we are restructuring the way that compat syscalls deal with 32-bit time_t, reusing the implementation for 32-bit architectures. Christoph Hellwig suggested a rename of the associated types and interfaces to avoid the confusing usage of the 'compat' prefix for 32-bit architectures. To prepare for doing that in linux-4.20, this adds a set of macros that lets us convert subsystems separately to the new names and avoid some of the nastier merge conflicts. Link: https://lore.kernel.org/lkml/20180713133204.3123939-1-arnd@arndb.de/ Cc: Christoph Hellwig <hch(a)lst.de> Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- The patch I posted originally was ready but didn't see proper linux-next testing as I did not get to finalize it before my summer vacation, so this is the minimal replacement I'd still like to get into 4.19-rc1, in order to base patches for system calls, sound, networking, media and file systems on top of. I have put it into linux-next now after realizing that it would be a problem to do all my other planned changes for the 4.20 merge window. Please let me know if you have concerns about the approach, or provide an Ack if this is ok with you. --- include/linux/time32.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/linux/time32.h b/include/linux/time32.h index 0b14f936100a..d1ae43c13e25 100644 --- a/include/linux/time32.h +++ b/include/linux/time32.h @@ -207,4 +207,19 @@ static inline s64 timeval_to_ns(const struct timeval *tv) extern struct timeval ns_to_timeval(const s64 nsec); extern struct __kernel_old_timeval ns_to_kernel_old_timeval(s64 nsec); +/* + * New aliases for compat time functions. These will be used to replace + * the compat code so it can be shared between 32-bit and 64-bit builds + * both of which provide compatibility with old 32-bit tasks. + */ +#define old_time32_t compat_time_t +#define old_timeval32 compat_timeval +#define old_timespec32 compat_timespec +#define old_itimerspec32 compat_itimerspec +#define ns_to_old_timeval32 ns_to_compat_timeval +#define get_old_itimerspec32 get_compat_itimerspec64 +#define put_old_itimerspec32 put_compat_itimerspec64 +#define get_old_timespec32 compat_get_timespec64 +#define put_old_timespec32 compat_put_timespec64 + #endif -- 2.18.0

7 years, 7 months

2
1
0 0

Patch "posix-timers: Fix nanosleep_copyout() for CONFIG_COMPAT_32BIT_TIME" has been added to the 4.14-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled posix-timers: Fix nanosleep_copyout() for CONFIG_COMPAT_32BIT_TIME to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: posix-timers-fix-nanosleep_copyout-for-config_compat_32bit_time.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Wed Aug 22 09:33:46 CEST 2018 From: Arnd Bergmann <arnd(a)arndb.de> Date: Mon, 18 Jun 2018 16:07:59 +0200 Subject: posix-timers: Fix nanosleep_copyout() for CONFIG_COMPAT_32BIT_TIME From: Arnd Bergmann <arnd(a)arndb.de> [ Upstream commit 0fe2795516b9e1c59b58b02bdf8658698117ec4e ] Commit b5793b0d92c9 added support for building the nanosleep compat system call on 32-bit architectures, but missed one change in nanosleep_copyout(), which would trigger a BUG() as soon as any architecture is switched over to use it. Use the proper config symbol to enable the code path. Fixes: Commit b5793b0d92c9 ("posix-timers: Make compat syscalls depend on CONFIG_COMPAT_32BIT_TIME") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Cc: y2038(a)lists.linaro.org Cc: Anna-Maria Gleixner <anna-maria(a)linutronix.de> Cc: Deepa Dinamani <deepa.kernel(a)gmail.com> Cc: "Rafael J. Wysocki" <rafael.j.wysocki(a)intel.com> Link: https://lkml.kernel.org/r/20180618140811.2998503-1-arnd@arndb.de Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- kernel/time/hrtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1450,7 +1450,7 @@ EXPORT_SYMBOL_GPL(hrtimer_init_sleeper); int nanosleep_copyout(struct restart_block *restart, struct timespec64 *ts) { switch(restart->nanosleep.type) { -#ifdef CONFIG_COMPAT +#ifdef CONFIG_COMPAT_32BIT_TIME case TT_COMPAT: if (compat_put_timespec64(ts, restart->nanosleep.compat_rmtp)) return -EFAULT; Patches currently in stable-queue which might be from arnd(a)arndb.de are queue-4.14/posix-timers-fix-nanosleep_copyout-for-config_compat_32bit_time.patch

7 years, 7 months

1
0
0 0

Joie

by Gerald

I am so unlucky! My old bicycle is broken again. I am sure that it is not a big problem and any male can fix it quickly. Please, come and help me with my problem. I’ll pay you back with my superior body ;) http://www.odv-kac.si/377m71fuj8/jixzqvu.php?eTIwMzhAbGlzdHMubGluYXJvLm9yZw…

7 years, 7 months

1
0
0 0

[PATCH 0/6] System call table generation support

by Firoz Khan

The goal of this patch series is to easily add/modify/delete a system call by changing entry in syscall.tbl file. No need to manually edit many files. The another goal of this patch series is to to unify the system call implementation across all the architectures. ARM, s390 and x86 architecuture does have the similar support. I leverage their implementation to come up with a generic solution. I have done the same support for work for ia64, m68k, microblaze, mips, parisc, powerpc, sh, sparc, and xtensa. But I started sending the patch for one architecuture for review. Below mentioned git repository contains more details. Git repo:- https://github.com/frzkhn/system_call_table_generator/ Finally, this is the ground work for solving the Y2038 issue. We need to change two dozen of system calls to solve Y2038 issue. So this implementation will help to easily modify from existing system call to Y2038 compatible system calls. Firoz Khan (6): alpha: Move __IGNORE* entries to non uapi header alpha: Add CONFIG_OSF4_COMPAT for compat syscall support alpha: Unify the not-implemented system call entry name alpha: Replace NR_SYSCALLS macro from asm/unistd.h alpha: Add system call table generation support alpha: uapi header and system call table file generation arch/alpha/Makefile | 3 + arch/alpha/include/asm/Kbuild | 3 +- arch/alpha/include/asm/unistd.h | 7 +- arch/alpha/include/uapi/asm/Kbuild | 2 + arch/alpha/include/uapi/asm/unistd.h | 489 --------------------------- arch/alpha/kernel/Makefile | 2 +- arch/alpha/kernel/entry.S | 4 +- arch/alpha/kernel/osf_sys.c | 9 +- arch/alpha/kernel/syscall.S | 20 ++ arch/alpha/kernel/syscalls/Makefile | 37 +++ arch/alpha/kernel/syscalls/syscall.tbl | 450 +++++++++++++++++++++++++ arch/alpha/kernel/syscalls/syscallhdr.sh | 33 ++ arch/alpha/kernel/syscalls/syscalltbl.sh | 28 ++ arch/alpha/kernel/systbls.S | 552 ------------------------------- 14 files changed, 589 insertions(+), 1050 deletions(-) delete mode 100644 arch/alpha/include/uapi/asm/unistd.h create mode 100644 arch/alpha/kernel/syscall.S create mode 100644 arch/alpha/kernel/syscalls/Makefile create mode 100644 arch/alpha/kernel/syscalls/syscall.tbl create mode 100644 arch/alpha/kernel/syscalls/syscallhdr.sh create mode 100644 arch/alpha/kernel/syscalls/syscalltbl.sh delete mode 100644 arch/alpha/kernel/systbls.S -- 2.7.4

7 years, 7 months

6
17
0 0

[PATCH v3 0/7] Introduce struct __kernel_timex

by Deepa Dinamani

The series introduces struct __kernel_timex as a substitute for the non y2038 safe struct timex. The series is based on the original series posted by Arnd Bergmann in [1]. The overview of the series is as below: 1. Prepare for the compat timex interfaces to be used unconditionally. 2. Introduce struct __kernel_timex. 3. Use struct __kernel_timex in place of struct timex. 4. Switch syscalls to use struct __kernel_timex. [1] https://sourceware.org/ml/libc-alpha/2015-05/msg00070.html Changes since v2: * Use only generic compat.h for riscv Changes since v1: * Fix riscv asm/compat.h to pick up generic compat types Deepa Dinamani (7): arm64: Make basic compat_* types always available sparc: Make thread_info.h available directly riscv: Delete asm/compat.h timex: prepare compat helpers for y2038 changes time: Add struct __kernel_timex timex: use __kernel_timex internally timex: change syscalls to use struct __kernel_timex arch/alpha/kernel/osf_sys.c | 2 +- arch/arm64/include/asm/compat.h | 22 ++++----- arch/riscv/include/asm/Kbuild | 1 + arch/riscv/include/asm/compat.h | 29 ------------ arch/sparc/include/asm/compat.h | 2 + drivers/ptp/ptp_clock.c | 2 +- include/asm-generic/compat.h | 8 +++- include/linux/compat.h | 33 -------------- include/linux/compat_time.h | 34 ++++++++++++++ include/linux/posix-clock.h | 2 +- include/linux/syscalls.h | 5 +-- include/linux/timex.h | 9 +++- include/uapi/linux/timex.h | 41 +++++++++++++++++ kernel/compat.c | 63 -------------------------- kernel/time/ntp.c | 12 ++--- kernel/time/ntp_internal.h | 2 +- kernel/time/posix-clock.c | 2 +- kernel/time/posix-timers.c | 14 ++---- kernel/time/posix-timers.h | 2 +- kernel/time/time.c | 80 ++++++++++++++++++++++++++++++--- kernel/time/timekeeping.c | 4 +- 21 files changed, 199 insertions(+), 170 deletions(-) delete mode 100644 arch/riscv/include/asm/compat.h base-commit: 526674536360a4c508e84f67314c2028e45e1bf2 -- 2.17.1 Cc: catalin.marinas(a)arm.com Cc: davem(a)davemloft.net Cc: linux-alpha(a)vger.kernel.org Cc: linux-api(a)vger.kernel.org Cc: linux-arch(a)vger.kernel.org Cc: linux-riscv(a)lists.infradead.org Cc: netdev(a)vger.kernel.org Cc: palmer(a)sifive.com

7 years, 8 months

5
19
0 0

[PATCH 1/3] hfs: stop using timespec based interfaces

by Arnd Bergmann

The native HFS timestamps overflow in year 2040, two years after the Unix y2038 overflow. However, the way that the conversion between on-disk timestamps and in-kernel timestamps was implemented, 64-bit machines actually ended up converting negative UTC timestamps (1902 through 1969) into times between 2038 and 2106. Rather than making all machines faithfully represent timestamps in the ancient past but break after 2040, this changes the file system to always use the unsigned UTC interpretation, reading back times between 1970 and 2106. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- fs/hfs/hfs_fs.h | 6 ++++-- fs/hfs/inode.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/hfs/hfs_fs.h b/fs/hfs/hfs_fs.h index 6d0783e2e276..ff432931a5b1 100644 --- a/fs/hfs/hfs_fs.h +++ b/fs/hfs/hfs_fs.h @@ -245,6 +245,8 @@ extern void hfs_mark_mdb_dirty(struct super_block *sb); * Unix: unsigned lil-endian since 00:00 GMT, Jan. 1, 1970 * mac: unsigned big-endian since 00:00 GMT, Jan. 1, 1904 * + * We treat all timestamps before 1970 as times after 2038, so this + * actually works until year 2106 */ #define __hfs_u_to_mtime(sec) cpu_to_be32(sec + 2082844800U - sys_tz.tz_minuteswest * 60) #define __hfs_m_to_utime(sec) (be32_to_cpu(sec) - 2082844800U + sys_tz.tz_minuteswest * 60) @@ -252,9 +254,9 @@ extern void hfs_mark_mdb_dirty(struct super_block *sb); #define HFS_I(inode) (container_of(inode, struct hfs_inode_info, vfs_inode)) #define HFS_SB(sb) ((struct hfs_sb_info *)(sb)->s_fs_info) -#define hfs_m_to_utime(time) (struct timespec){ .tv_sec = __hfs_m_to_utime(time) } +#define hfs_m_to_utime(time) (struct timespec64){ .tv_sec = __hfs_m_to_utime(time) } #define hfs_u_to_mtime(time) __hfs_u_to_mtime((time).tv_sec) -#define hfs_mtime() __hfs_u_to_mtime(get_seconds()) +#define hfs_mtime() __hfs_u_to_mtime(ktime_get_real_seconds()) static inline const char *hfs_mdb_name(struct super_block *sb) { diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c index 2a16111d312f..b3309b83371a 100644 --- a/fs/hfs/inode.c +++ b/fs/hfs/inode.c @@ -351,7 +351,7 @@ static int hfs_read_inode(struct inode *inode, void *data) inode->i_mode &= ~hsb->s_file_umask; inode->i_mode |= S_IFREG; inode->i_ctime = inode->i_atime = inode->i_mtime = - timespec_to_timespec64(hfs_m_to_utime(rec->file.MdDat)); + hfs_m_to_utime(rec->file.MdDat); inode->i_op = &hfs_file_inode_operations; inode->i_fop = &hfs_file_operations; inode->i_mapping->a_ops = &hfs_aops; @@ -362,7 +362,7 @@ static int hfs_read_inode(struct inode *inode, void *data) HFS_I(inode)->fs_blocks = 0; inode->i_mode = S_IFDIR | (S_IRWXUGO & ~hsb->s_dir_umask); inode->i_ctime = inode->i_atime = inode->i_mtime = - timespec_to_timespec64(hfs_m_to_utime(rec->dir.MdDat)); + hfs_m_to_utime(rec->dir.MdDat); inode->i_op = &hfs_dir_inode_operations; inode->i_fop = &hfs_dir_operations; break; -- 2.9.0

7 years, 8 months

3
11
0 0

[PATCH] vfs: replace current_kernel_time64 with ktime equivalent

by Arnd Bergmann

current_time is the last remaining caller of current_kernel_time64(), which is a wrapper around ktime_get_coarse_real_ts64(). This calls the latter directly for consistency with the rest of the kernel that is moving to the ktime_get_ family of time accessors, as now documented in Documentation/core-api/timekeeping.rst. An open questions is whether we may want to actually call the more accurate ktime_get_real_ts64() for file systems that save high-resolution timestamps in their on-disk format. This would add a small overhead to each update of the inode stamps but lead to inode timestamps to actually have a usable resolution better than one jiffy (1 to 10 milliseconds normally). Experiments on a variety of hardware platforms show a typical time of around 100 CPU cycles to read the cycle counter and calculate the accurate time from that. On old platforms without a cycle counter, this can be signiciantly higher, up to several microseconds to access a hardware clock, but those have become very rare by now. I traced the original addition of the current_kernel_time() call to set the nanosecond fields back to linux-2.5.48, where Andi Kleen added a patch with subject "nanosecond stat timefields". Andi explains that the motivation was to introduce as little overhead as possible back then. At this time, reading the clock hardware was also more expensive when most architectures did not have a cycle counter. One side effect of having more accurate inode timestamp would be having to write out the inode every time that mtime/ctime/atime get touched on most systems, whereas many file systems today only write it when the timestamps have changed, i.e. at most once per jiffy unless something else changes as well. That change would certainly be noticed in some workloads, which is enough reason to not do it without a good reason, regardless of the cost of reading the time. One thing we could still consider however would be to round the timestamps from current_time() to multiples of NSEC_PER_JIFFY, e.g. full milliseconds rather than having six or seven meaningless but confusing digits at the end of the timestamp. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> -- changes in v2: * wait for Documentation to get merged first, as Dave Chinner requested * rewrite changelog based on discussion --- fs/inode.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/inode.c b/fs/inode.c index 462eb50b096f..c2dbab9a7cf5 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -2105,7 +2105,9 @@ EXPORT_SYMBOL(timespec64_trunc); */ struct timespec64 current_time(struct inode *inode) { - struct timespec64 now = current_kernel_time64(); + struct timespec64 now; + + ktime_get_coarse_real_ts64(&now); if (unlikely(!inode->i_sb)) { WARN(1, "current_time() called with uninitialized super_block in the inode"); -- 2.18.0

7 years, 8 months

1
0
0 0

[PATCH v2 1/4] sh: dreamcast: rtc: push down rtc class ops into driver

by Arnd Bergmann

The dreamcast RTC support has an extra level of indirection to provide either the old read_persistent_clock/update_persistent_clock interface or the rtc-generic device for hctosys/systohc. Both do the same thing here, so we can do away with the abstraction and simply enable the RTC core code to take care of it. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- arch/sh/boards/mach-dreamcast/Makefile | 4 +- arch/sh/boards/mach-dreamcast/rtc.c | 39 +++++++++++++------ arch/sh/boards/mach-dreamcast/setup.c | 1 - arch/sh/configs/dreamcast_defconfig | 2 + arch/sh/include/mach-dreamcast/mach/sysasic.h | 1 - 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/arch/sh/boards/mach-dreamcast/Makefile b/arch/sh/boards/mach-dreamcast/Makefile index 7b97546c7e5f..62b024bc2a3e 100644 --- a/arch/sh/boards/mach-dreamcast/Makefile +++ b/arch/sh/boards/mach-dreamcast/Makefile @@ -2,5 +2,5 @@ # Makefile for the Sega Dreamcast specific parts of the kernel # -obj-y := setup.o irq.o rtc.o - +obj-y := setup.o irq.o +obj-$(CONFIG_RTC_DRV_GENERIC) += rtc.o diff --git a/arch/sh/boards/mach-dreamcast/rtc.c b/arch/sh/boards/mach-dreamcast/rtc.c index 061d65714fcc..4f168d8d2951 100644 --- a/arch/sh/boards/mach-dreamcast/rtc.c +++ b/arch/sh/boards/mach-dreamcast/rtc.c @@ -11,8 +11,9 @@ */ #include <linux/time.h> -#include <asm/rtc.h> -#include <asm/io.h> +#include <linux/rtc.h> +#include <linux/io.h> +#include <linux/platform_device.h> /* The AICA RTC has an Epoch of 1/1/1950, so we must subtract 20 years (in seconds) to get the standard Unix Epoch when getting the time, and add @@ -30,9 +31,10 @@ * * Grabs the current RTC seconds counter and adjusts it to the Unix Epoch. */ -static void aica_rtc_gettimeofday(struct timespec *ts) +static int aica_rtc_gettimeofday(struct device *dev, struct rtc_time *tm) { unsigned long val1, val2; + time64_t t; do { val1 = ((__raw_readl(AICA_RTC_SECS_H) & 0xffff) << 16) | @@ -42,10 +44,12 @@ static void aica_rtc_gettimeofday(struct timespec *ts) (__raw_readl(AICA_RTC_SECS_L) & 0xffff); } while (val1 != val2); - ts->tv_sec = val1 - TWENTY_YEARS; + /* normalize to 1970..2106 time range */ + t = (u32)(val1 - TWENTY_YEARS); - /* Can't get nanoseconds with just a seconds counter. */ - ts->tv_nsec = 0; + rtc_time64_to_tm(t, tm); + + return 0; } /** @@ -54,10 +58,11 @@ static void aica_rtc_gettimeofday(struct timespec *ts) * * Adjusts the given @tv to the AICA Epoch and sets the RTC seconds counter. */ -static int aica_rtc_settimeofday(const time_t secs) +static int aica_rtc_settimeofday(struct device *dev, struct rtc_time *tm) { unsigned long val1, val2; - unsigned long adj = secs + TWENTY_YEARS; + time64_t secs = rtc_tm_to_time64(tm); + u32 adj = secs + TWENTY_YEARS; do { __raw_writel((adj & 0xffff0000) >> 16, AICA_RTC_SECS_H); @@ -73,9 +78,19 @@ static int aica_rtc_settimeofday(const time_t secs) return 0; } -void aica_time_init(void) +static const struct rtc_class_ops rtc_generic_ops = { + .read_time = aica_rtc_gettimeofday, + .set_time = aica_rtc_settimeofday, +}; + +static int __init aica_time_init(void) { - rtc_sh_get_time = aica_rtc_gettimeofday; - rtc_sh_set_time = aica_rtc_settimeofday; -} + struct platform_device *pdev; + + pdev = platform_device_register_data(NULL, "rtc-generic", -1, + &rtc_generic_ops, + sizeof(rtc_generic_ops)); + return PTR_ERR_OR_ZERO(pdev); +} +arch_initcall(aica_time_init); diff --git a/arch/sh/boards/mach-dreamcast/setup.c b/arch/sh/boards/mach-dreamcast/setup.c index ad1a4db72e04..672c2ad8f8d5 100644 --- a/arch/sh/boards/mach-dreamcast/setup.c +++ b/arch/sh/boards/mach-dreamcast/setup.c @@ -30,7 +30,6 @@ static void __init dreamcast_setup(char **cmdline_p) { - board_time_init = aica_time_init; } static struct sh_machine_vector mv_dreamcast __initmv = { diff --git a/arch/sh/configs/dreamcast_defconfig b/arch/sh/configs/dreamcast_defconfig index 3f08dc54480b..1d27666c029f 100644 --- a/arch/sh/configs/dreamcast_defconfig +++ b/arch/sh/configs/dreamcast_defconfig @@ -70,3 +70,5 @@ CONFIG_PROC_KCORE=y CONFIG_TMPFS=y CONFIG_HUGETLBFS=y # CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_GENERIC=y diff --git a/arch/sh/include/mach-dreamcast/mach/sysasic.h b/arch/sh/include/mach-dreamcast/mach/sysasic.h index 58f710e1ebc2..59effd1ed3e1 100644 --- a/arch/sh/include/mach-dreamcast/mach/sysasic.h +++ b/arch/sh/include/mach-dreamcast/mach/sysasic.h @@ -42,7 +42,6 @@ /* arch/sh/boards/mach-dreamcast/irq.c */ extern int systemasic_irq_demux(int); extern void systemasic_irq_init(void); -extern void aica_time_init(void); #endif /* __ASM_SH_DREAMCAST_SYSASIC_H */ -- 2.18.0

7 years, 8 months

1
3
0 0

[PATCH 1/2] [v2] hfs/hfsplus: follow MacOS time behavior

by Arnd Bergmann

According to the official documentation for HFS+ [1], inode timestamps are supposed to cover the time range from 1904 to 2040 as originally used in classic MacOS. The traditional Linux usage is to convert the timestamps into an unsigned 32-bit number based on the Unix epoch and from there to a time_t. On 32-bit systems, that wraps the time from 2038 to 1902, so the last two years of the valid time range become garbled. On 64-bit systems, all times before 1970 get turned into timestamps between 2038 and 2106, which is more convenient but also different from the documented behavior. Looking at the Darwin sources [2], it seems that MacOS is inconsistent in yet another way: all timestamps are wrapped around to a 32-bit unsigned number when written to the disk, but when read back, all numeric values lower than 2082844800U are assumed to be invalid, so we cannot represent the times before 1970 or the times after 2040. While all implementations seem to agree on the interpretation of values between 1970 and 2038, they often differ on the exact range they support when reading back values outside of the common range: MacOS (traditional): 1904-2040 Apple Documentation: 1904-2040 MacOS X source comments: 1970-2040 MacOS X source code: 1970-2038 32-bit Linux: 1902-2038 64-bit Linux: 1970-2106 hfsfuse: 1970-2040 hfsutils (32 bit, old libc) 1902-2038 hfsutils (32 bit, new libc) 1970-2106 hfsutils (64 bit) 1904-2040 hfsplus-utils 1904-2040 hfsexplorer 1904-2040 7-zip 1904-2040 This changes Linux over to mostly the same behavior as described in the code comment in MacOS X, disallowing all times before 1970 and after 2040, while still allowing times between 2038 and 2040 like most other implementations do. Most importantly, it means we can have the same behavior on 32-bit and 64-bit. Cc: stable(a)vger.kernel.org Link: [1] https://developer.apple.com/library/archive/technotes/tn/tn1150.html Link: [2] https://opensource.apple.com/source/hfs/hfs-407.30.1/core/MacOSStubs.c.auto… Suggested-by: Viacheslav Dubeyko <slava(a)dubeyko.com> Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- v2: treat pre-1970 dates as invalid following MacOS X behavior, reword and expand changelog text --- fs/hfs/hfs_fs.h | 29 +++++++++++++++++++++++++---- fs/hfsplus/hfsplus_fs.h | 26 +++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/fs/hfs/hfs_fs.h b/fs/hfs/hfs_fs.h index 6d0783e2e276..1af998fb522e 100644 --- a/fs/hfs/hfs_fs.h +++ b/fs/hfs/hfs_fs.h @@ -246,14 +246,35 @@ extern void hfs_mark_mdb_dirty(struct super_block *sb); * mac: unsigned big-endian since 00:00 GMT, Jan. 1, 1904 * */ -#define __hfs_u_to_mtime(sec) cpu_to_be32(sec + 2082844800U - sys_tz.tz_minuteswest * 60) -#define __hfs_m_to_utime(sec) (be32_to_cpu(sec) - 2082844800U + sys_tz.tz_minuteswest * 60) +static inline time64_t __hfs_m_to_utime(__be32 mt) +{ + time64_t ut = (u32)(be32_to_cpu(mt) - 2082844800U); + + /* + * Times past 2040-02-06 06:28 are assumed to be invalid, + * matching the MacOS behavior. + */ + if (ut > 2082844800U + UINT_MAX) + ut = 0; + + return ut + sys_tz.tz_minuteswest * 60; +} +static inline __be32 __hfs_u_to_mtime(time64_t ut) +{ + ut -= - sys_tz.tz_minuteswest * 60; + + /* + * MacOS wraps "invalid" times after 2040 when writing back, so + * let's do the same here. + */ + return cpu_to_be32(lower_32_bits(ut + 2082844800U)); +} #define HFS_I(inode) (container_of(inode, struct hfs_inode_info, vfs_inode)) #define HFS_SB(sb) ((struct hfs_sb_info *)(sb)->s_fs_info) -#define hfs_m_to_utime(time) (struct timespec){ .tv_sec = __hfs_m_to_utime(time) } -#define hfs_u_to_mtime(time) __hfs_u_to_mtime((time).tv_sec) +#define hfs_m_to_utime(time) (struct timespec){ .tv_sec = __hfs_m_to_utime(time) } +#define hfs_u_to_mtime(time) __hfs_u_to_mtime((time).tv_sec) #define hfs_mtime() __hfs_u_to_mtime(get_seconds()) static inline const char *hfs_mdb_name(struct super_block *sb) diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h index d9255abafb81..7f0943e540a0 100644 --- a/fs/hfsplus/hfsplus_fs.h +++ b/fs/hfsplus/hfsplus_fs.h @@ -530,9 +530,29 @@ int hfsplus_submit_bio(struct super_block *sb, sector_t sector, void *buf, void **data, int op, int op_flags); int hfsplus_read_wrapper(struct super_block *sb); -/* time macros */ -#define __hfsp_mt2ut(t) (be32_to_cpu(t) - 2082844800U) -#define __hfsp_ut2mt(t) (cpu_to_be32(t + 2082844800U)) +/* time helpers */ +static inline time64_t __hfsp_mt2ut(__be32 mt) +{ + time64_t ut = (u32)(be32_to_cpu(mt) - 2082844800U); + + /* + * Times past 2040-02-06 06:28 are assumed to be invalid, + * matching the MacOS behavior. + */ + if (ut > 2082844800U + UINT_MAX) + ut = 0; + + return ut; +} + +static inline __be32 __hfsp_ut2mt(time64_t ut) +{ + /* + * MacOS wraps "invalid" times after 2040 when writing back, so + * let's do the same here. + */ + return cpu_to_be32(lower_32_bits(ut + 2082844800U)); +} /* compatibility */ #define hfsp_mt2ut(t) (struct timespec){ .tv_sec = __hfsp_mt2ut(t) } -- 2.9.0

7 years, 8 months

2
3
0 0

[PATCH] [RESEND] firewire: ohci: stop using get_seconds() for BUS_TIME

by Arnd Bergmann

The ohci driver uses the get_seconds() function to implement the 32-bit CSR_BUS_TIME register. This was added in 2010 commit a48777e03ad5 ("firewire: add CSR BUS_TIME support"). As get_seconds() returns a 32-bit value (on 32-bit architectures), it seems like a good fit for that register, but it is also deprecated because of the y2038/y2106 overflow problem, and should be replaced throughout the kernel with either ktime_get_real_seconds() or ktime_get_seconds(). I'm using the latter here, which uses monotonic time. This has the advantage of behaving better during concurrent settimeofday() updates or leap second adjustments and won't overflow a 32-bit integer, but the downside of using CLOCK_MONOTONIC instead of CLOCK_REALTIME is that the observed values are not related to external clocks. If we instead need UTC but can live with clock jumps or overflows, then we should use ktime_get_real_seconds() instead, retaining the existing behavior. Reviewed-by: Clemens Ladisch <clemens(a)ladisch.de> Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- I notice that Stefan Richter has not been active on the mailing lists since February 2018. Andrew, could you pick it up in the meantime? --- drivers/firewire/ohci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 45c048751f3b..5125841ea338 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -1765,7 +1765,7 @@ static u32 update_bus_time(struct fw_ohci *ohci) if (unlikely(!ohci->bus_time_running)) { reg_write(ohci, OHCI1394_IntMaskSet, OHCI1394_cycle64Seconds); - ohci->bus_time = (lower_32_bits(get_seconds()) & ~0x7f) | + ohci->bus_time = (lower_32_bits(ktime_get_seconds()) & ~0x7f) | (cycle_time_seconds & 0x40); ohci->bus_time_running = true; } -- 2.9.0

7 years, 8 months

2
1
0 0

[PATCH 1/3] [v2] powerpc: mac: fix rtc read/write functions

by Arnd Bergmann

As Mathieu pointed out, my conversion to time64_t was incorrect and resulted in negative times to be read from the RTC. The problem is that during the conversion from a byte array to a time64_t, the 'unsigned char' variable holding the top byte gets turned into a negative signed 32-bit integer before being assigned to the 64-bit variable for any times after 1972. This changes the logic to cast to an unsigned 32-bit number first for the Macintosh time and then convert that to the Unix time, which then gives us a time in the documented 1904..2040 year range. I decided not to use the longer 1970..2106 range that other drivers use, for consistency with the literal interpretation of the register, but that could be easily changed if we decide we want to support any Mac after 2040. Just to be on the safe side, I'm also adding a WARN_ON that will trigger if either the year 2040 has come and is observed by this driver, or we run into an RTC that got set back to a pre-1970 date for some reason (the two are indistinguishable). For the RTC write functions, Andreas found another problem: both pmu_request() and cuda_request() are varargs functions, so changing the type of the arguments passed into them from 32 bit to 64 bit breaks the API for the set_rtc_time functions. This changes it back to 32 bits. The same code exists in arch/m68k/ and is patched in an identical way now in a separate patch. Fixes: 5bfd643583b2 ("powerpc: use time64_t in read_persistent_clock") Reported-by: Mathieu Malaterre <malat(a)debian.org> Reported-by: Andreas Schwab <schwab(a)linux-m68k.org> Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- arch/powerpc/platforms/powermac/time.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c index 7c968e46736f..12e6e4d30602 100644 --- a/arch/powerpc/platforms/powermac/time.c +++ b/arch/powerpc/platforms/powermac/time.c @@ -42,7 +42,11 @@ #define DBG(x...) #endif -/* Apparently the RTC stores seconds since 1 Jan 1904 */ +/* + * Offset between Unix time (1970-based) and Mac time (1904-based). Cuda and PMU + * times wrap in 2040. If we need to handle later times, the read_time functions + * need to be changed to interpret wrapped times as post-2040. + */ #define RTC_OFFSET 2082844800 /* @@ -97,8 +101,11 @@ static time64_t cuda_get_time(void) if (req.reply_len != 7) printk(KERN_ERR "cuda_get_time: got %d byte reply\n", req.reply_len); - now = (req.reply[3] << 24) + (req.reply[4] << 16) - + (req.reply[5] << 8) + req.reply[6]; + now = (u32)((req.reply[3] << 24) + (req.reply[4] << 16) + + (req.reply[5] << 8) + req.reply[6]); + /* it's either after year 2040, or the RTC has gone backwards */ + WARN_ON(now < RTC_OFFSET); + return now - RTC_OFFSET; } @@ -106,10 +113,10 @@ static time64_t cuda_get_time(void) static int cuda_set_rtc_time(struct rtc_time *tm) { - time64_t nowtime; + u32 nowtime; struct adb_request req; - nowtime = rtc_tm_to_time64(tm) + RTC_OFFSET; + nowtime = lower_32_bits(rtc_tm_to_time64(tm) + RTC_OFFSET); if (cuda_request(&req, NULL, 6, CUDA_PACKET, CUDA_SET_TIME, nowtime >> 24, nowtime >> 16, nowtime >> 8, nowtime) < 0) @@ -140,8 +147,12 @@ static time64_t pmu_get_time(void) if (req.reply_len != 4) printk(KERN_ERR "pmu_get_time: got %d byte reply from PMU\n", req.reply_len); - now = (req.reply[0] << 24) + (req.reply[1] << 16) - + (req.reply[2] << 8) + req.reply[3]; + now = (u32)((req.reply[0] << 24) + (req.reply[1] << 16) + + (req.reply[2] << 8) + req.reply[3]); + + /* it's either after year 2040, or the RTC has gone backwards */ + WARN_ON(now < RTC_OFFSET); + return now - RTC_OFFSET; } @@ -149,10 +160,10 @@ static time64_t pmu_get_time(void) static int pmu_set_rtc_time(struct rtc_time *tm) { - time64_t nowtime; + u32 nowtime; struct adb_request req; - nowtime = rtc_tm_to_time64(tm) + RTC_OFFSET; + nowtime = lower_32_bits(rtc_tm_to_time64(tm) + RTC_OFFSET); if (pmu_request(&req, NULL, 5, PMU_SET_RTC, nowtime >> 24, nowtime >> 16, nowtime >> 8, nowtime) < 0) return -ENXIO; -- 2.9.0

7 years, 8 months

7
22
0 0

[PATCH v2 1/6] ext4: sysfs: print ext4_super_block fields as little-endian

by Arnd Bergmann

While working on extended rand for last_error/first_error timestamps, I noticed that the endianess is wrong, we access the little-endian fields in struct ext4_super_block as native-endian when we print them. This adds a special case in ext4_attr_show() and ext4_attr_store() to byteswap the superblock fields if needed. In older kernels, this code was part of super.c, it got moved to sysfs.c in linux-4.4. Cc: stable(a)vger.kernel.org Fixes: 52c198c6820f ("ext4: add sysfs entry showing whether the fs contains errors") Reviewed-by: Andreas Dilger <adilger(a)dilger.ca> Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- fs/ext4/sysfs.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c index f34da0bb8f17..b970a200f20c 100644 --- a/fs/ext4/sysfs.c +++ b/fs/ext4/sysfs.c @@ -274,8 +274,12 @@ static ssize_t ext4_attr_show(struct kobject *kobj, case attr_pointer_ui: if (!ptr) return 0; - return snprintf(buf, PAGE_SIZE, "%u\n", - *((unsigned int *) ptr)); + if (a->attr_ptr == ptr_ext4_super_block_offset) + return snprintf(buf, PAGE_SIZE, "%u\n", + le32_to_cpup(ptr)); + else + return snprintf(buf, PAGE_SIZE, "%u\n", + *((unsigned int *) ptr)); case attr_pointer_atomic: if (!ptr) return 0; @@ -308,7 +312,10 @@ static ssize_t ext4_attr_store(struct kobject *kobj, ret = kstrtoul(skip_spaces(buf), 0, &t); if (ret) return ret; - *((unsigned int *) ptr) = t; + if (a->attr_ptr == ptr_ext4_super_block_offset) + *((__le32 *) ptr) = cpu_to_le32(t); + else + *((unsigned int *) ptr) = t; return len; case attr_inode_readahead: return inode_readahead_blks_store(sbi, buf, len); -- 2.9.0

7 years, 8 months

2
11
0 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038