Date: Thu, 30 Mar 2017 19:59:23 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r316291 - in stable/11/sys: amd64/linux amd64/linux32 i386/linux Message-ID: <201703301959.v2UJxNtx041915@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dchagin Date: Thu Mar 30 19:59:23 2017 New Revision: 316291 URL: https://svnweb.freebsd.org/changeset/base/316291 Log: MFC r314292: Regen after r314291 (timerfd definition). Modified: stable/11/sys/amd64/linux/linux_proto.h stable/11/sys/amd64/linux/linux_syscall.h stable/11/sys/amd64/linux/linux_syscalls.c stable/11/sys/amd64/linux/linux_sysent.c stable/11/sys/amd64/linux/linux_systrace_args.c stable/11/sys/amd64/linux32/linux32_proto.h stable/11/sys/amd64/linux32/linux32_syscall.h stable/11/sys/amd64/linux32/linux32_syscalls.c stable/11/sys/amd64/linux32/linux32_sysent.c stable/11/sys/amd64/linux32/linux32_systrace_args.c stable/11/sys/i386/linux/linux_proto.h stable/11/sys/i386/linux/linux_syscall.h stable/11/sys/i386/linux/linux_syscalls.c stable/11/sys/i386/linux/linux_sysent.c stable/11/sys/i386/linux/linux_systrace_args.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/linux/linux_proto.h ============================================================================== --- stable/11/sys/amd64/linux/linux_proto.h Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/amd64/linux/linux_proto.h Thu Mar 30 19:59:23 2017 (r316291) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/amd64/linux/syscalls.master 313284 2017-02-05 14:17:09Z dchagin + * created from FreeBSD: stable/11/sys/amd64/linux/syscalls.master 316290 2017-03-30 19:56:41Z dchagin */ #ifndef _LINUX_SYSPROTO_H_ @@ -1001,7 +1001,8 @@ struct linux_signalfd_args { register_t dummy; }; struct linux_timerfd_create_args { - register_t dummy; + char clockid_l_[PADL_(l_int)]; l_int clockid; char clockid_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; }; struct linux_eventfd_args { char initval_l_[PADL_(l_uint)]; l_uint initval; char initval_r_[PADR_(l_uint)]; @@ -1013,10 +1014,14 @@ struct linux_fallocate_args { char len_l_[PADL_(l_loff_t)]; l_loff_t len; char len_r_[PADR_(l_loff_t)]; }; struct linux_timerfd_settime_args { - register_t dummy; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char new_value_l_[PADL_(const struct l_itimerspec *)]; const struct l_itimerspec * new_value; char new_value_r_[PADR_(const struct l_itimerspec *)]; + char old_value_l_[PADL_(struct l_itimerspec *)]; struct l_itimerspec * old_value; char old_value_r_[PADR_(struct l_itimerspec *)]; }; struct linux_timerfd_gettime_args { - register_t dummy; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char old_value_l_[PADL_(struct l_itimerspec *)]; struct l_itimerspec * old_value; char old_value_r_[PADR_(struct l_itimerspec *)]; }; struct linux_accept4_args { char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; Modified: stable/11/sys/amd64/linux/linux_syscall.h ============================================================================== --- stable/11/sys/amd64/linux/linux_syscall.h Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/amd64/linux/linux_syscall.h Thu Mar 30 19:59:23 2017 (r316291) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/amd64/linux/syscalls.master 313284 2017-02-05 14:17:09Z dchagin + * created from FreeBSD: stable/11/sys/amd64/linux/syscalls.master 316290 2017-03-30 19:56:41Z dchagin */ #define LINUX_SYS_read 0 Modified: stable/11/sys/amd64/linux/linux_syscalls.c ============================================================================== --- stable/11/sys/amd64/linux/linux_syscalls.c Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/amd64/linux/linux_syscalls.c Thu Mar 30 19:59:23 2017 (r316291) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/amd64/linux/syscalls.master 313284 2017-02-05 14:17:09Z dchagin + * created from FreeBSD: stable/11/sys/amd64/linux/syscalls.master 316290 2017-03-30 19:56:41Z dchagin */ const char *linux_syscallnames[] = { Modified: stable/11/sys/amd64/linux/linux_sysent.c ============================================================================== --- stable/11/sys/amd64/linux/linux_sysent.c Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/amd64/linux/linux_sysent.c Thu Mar 30 19:59:23 2017 (r316291) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/amd64/linux/syscalls.master 313284 2017-02-05 14:17:09Z dchagin + * created from FreeBSD: stable/11/sys/amd64/linux/syscalls.master 316290 2017-03-30 19:56:41Z dchagin */ #include <sys/param.h> @@ -301,11 +301,11 @@ struct sysent linux_sysent[] = { { AS(linux_utimensat_args), (sy_call_t *)linux_utimensat, AUE_FUTIMESAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 280 = linux_utimensat */ { AS(linux_epoll_pwait_args), (sy_call_t *)linux_epoll_pwait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 281 = linux_epoll_pwait */ { 0, (sy_call_t *)linux_signalfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 282 = linux_signalfd */ - { 0, (sy_call_t *)linux_timerfd_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 283 = linux_timerfd_create */ + { AS(linux_timerfd_create_args), (sy_call_t *)linux_timerfd_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 283 = linux_timerfd_create */ { AS(linux_eventfd_args), (sy_call_t *)linux_eventfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 284 = linux_eventfd */ { AS(linux_fallocate_args), (sy_call_t *)linux_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 285 = linux_fallocate */ - { 0, (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 286 = linux_timerfd_settime */ - { 0, (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 287 = linux_timerfd_gettime */ + { AS(linux_timerfd_settime_args), (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 286 = linux_timerfd_settime */ + { AS(linux_timerfd_gettime_args), (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 287 = linux_timerfd_gettime */ { AS(linux_accept4_args), (sy_call_t *)linux_accept4, AUE_ACCEPT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 288 = linux_accept4 */ { 0, (sy_call_t *)linux_signalfd4, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 289 = linux_signalfd4 */ { AS(linux_eventfd2_args), (sy_call_t *)linux_eventfd2, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 290 = linux_eventfd2 */ Modified: stable/11/sys/amd64/linux/linux_systrace_args.c ============================================================================== --- stable/11/sys/amd64/linux/linux_systrace_args.c Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/amd64/linux/linux_systrace_args.c Thu Mar 30 19:59:23 2017 (r316291) @@ -2078,7 +2078,10 @@ systrace_args(int sysnum, void *params, } /* linux_timerfd_create */ case 283: { - *n_args = 0; + struct linux_timerfd_create_args *p = params; + iarg[0] = p->clockid; /* l_int */ + iarg[1] = p->flags; /* l_int */ + *n_args = 2; break; } /* linux_eventfd */ @@ -2100,12 +2103,20 @@ systrace_args(int sysnum, void *params, } /* linux_timerfd_settime */ case 286: { - *n_args = 0; + struct linux_timerfd_settime_args *p = params; + iarg[0] = p->fd; /* l_int */ + iarg[1] = p->flags; /* l_int */ + uarg[2] = (intptr_t) p->new_value; /* const struct l_itimerspec * */ + uarg[3] = (intptr_t) p->old_value; /* struct l_itimerspec * */ + *n_args = 4; break; } /* linux_timerfd_gettime */ case 287: { - *n_args = 0; + struct linux_timerfd_gettime_args *p = params; + iarg[0] = p->fd; /* l_int */ + uarg[1] = (intptr_t) p->old_value; /* struct l_itimerspec * */ + *n_args = 2; break; } /* linux_accept4 */ @@ -5644,6 +5655,16 @@ systrace_entry_setargdesc(int sysnum, in break; /* linux_timerfd_create */ case 283: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + default: + break; + }; break; /* linux_eventfd */ case 284: @@ -5676,9 +5697,35 @@ systrace_entry_setargdesc(int sysnum, in break; /* linux_timerfd_settime */ case 286: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + case 2: + p = "const struct l_itimerspec *"; + break; + case 3: + p = "struct l_itimerspec *"; + break; + default: + break; + }; break; /* linux_timerfd_gettime */ case 287: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "struct l_itimerspec *"; + break; + default: + break; + }; break; /* linux_accept4 */ case 288: @@ -5771,7 +5818,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_ulong"; break; case 1: - p = "userland struct iovec *"; + p = "struct iovec *"; break; case 2: p = "l_ulong"; @@ -5793,7 +5840,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_ulong"; break; case 1: - p = "userland struct iovec *"; + p = "struct iovec *"; break; case 2: p = "l_ulong"; @@ -5821,7 +5868,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_int"; break; case 3: - p = "userland l_siginfo_t *"; + p = "l_siginfo_t *"; break; default: break; @@ -5932,13 +5979,13 @@ systrace_entry_setargdesc(int sysnum, in case 309: switch(ndx) { case 0: - p = "userland l_uint *"; + p = "l_uint *"; break; case 1: - p = "userland l_uint *"; + p = "l_uint *"; break; case 2: - p = "userland void *"; + p = "void *"; break; default: break; @@ -5951,13 +5998,13 @@ systrace_entry_setargdesc(int sysnum, in p = "l_pid_t"; break; case 1: - p = "userland const struct iovec *"; + p = "const struct iovec *"; break; case 2: p = "l_ulong"; break; case 3: - p = "userland const struct iovec *"; + p = "const struct iovec *"; break; case 4: p = "l_ulong"; @@ -5976,13 +6023,13 @@ systrace_entry_setargdesc(int sysnum, in p = "l_pid_t"; break; case 1: - p = "userland const struct iovec *"; + p = "const struct iovec *"; break; case 2: p = "l_ulong"; break; case 3: - p = "userland const struct iovec *"; + p = "const struct iovec *"; break; case 4: p = "l_ulong"; @@ -6023,7 +6070,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_int"; break; case 1: - p = "userland const char *"; + p = "const char *"; break; case 2: p = "l_int"; @@ -6039,7 +6086,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_pid_t"; break; case 1: - p = "userland void *"; + p = "void *"; break; case 2: p = "l_uint"; @@ -6055,7 +6102,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_pid_t"; break; case 1: - p = "userland void *"; + p = "void *"; break; case 2: p = "l_uint"; @@ -6074,13 +6121,13 @@ systrace_entry_setargdesc(int sysnum, in p = "l_int"; break; case 1: - p = "userland const char *"; + p = "const char *"; break; case 2: p = "l_int"; break; case 3: - p = "userland const char *"; + p = "const char *"; break; case 4: p = "unsigned int"; @@ -6099,7 +6146,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_uint"; break; case 2: - p = "userland const char *"; + p = "const char *"; break; default: break; @@ -6109,7 +6156,7 @@ systrace_entry_setargdesc(int sysnum, in case 318: switch(ndx) { case 0: - p = "userland char *"; + p = "char *"; break; case 1: p = "l_size_t"; @@ -6125,7 +6172,7 @@ systrace_entry_setargdesc(int sysnum, in case 319: switch(ndx) { case 0: - p = "userland const char *"; + p = "const char *"; break; case 1: p = "l_uint"; @@ -6147,7 +6194,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_ulong"; break; case 3: - p = "userland const char *"; + p = "const char *"; break; case 4: p = "l_ulong"; @@ -6163,7 +6210,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_int"; break; case 1: - p = "userland void *"; + p = "void *"; break; case 2: p = "l_uint"; @@ -6179,13 +6226,13 @@ systrace_entry_setargdesc(int sysnum, in p = "l_int"; break; case 1: - p = "userland const char *"; + p = "const char *"; break; case 2: - p = "userland const char **"; + p = "const char **"; break; case 3: - p = "userland const char **"; + p = "const char **"; break; case 4: p = "l_int"; @@ -6240,13 +6287,13 @@ systrace_entry_setargdesc(int sysnum, in p = "l_int"; break; case 1: - p = "userland l_loff_t *"; + p = "l_loff_t *"; break; case 2: p = "l_int"; break; case 3: - p = "userland l_loff_t *"; + p = "l_loff_t *"; break; case 4: p = "l_size_t"; @@ -6265,7 +6312,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_ulong"; break; case 1: - p = "userland const struct iovec *"; + p = "const struct iovec *"; break; case 2: p = "l_ulong"; @@ -6290,7 +6337,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_ulong"; break; case 1: - p = "userland const struct iovec *"; + p = "const struct iovec *"; break; case 2: p = "l_ulong"; @@ -7494,6 +7541,9 @@ systrace_return_setargdesc(int sysnum, i case 282: /* linux_timerfd_create */ case 283: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_eventfd */ case 284: if (ndx == 0 || ndx == 1) @@ -7506,8 +7556,14 @@ systrace_return_setargdesc(int sysnum, i break; /* linux_timerfd_settime */ case 286: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_timerfd_gettime */ case 287: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_accept4 */ case 288: if (ndx == 0 || ndx == 1) Modified: stable/11/sys/amd64/linux32/linux32_proto.h ============================================================================== --- stable/11/sys/amd64/linux32/linux32_proto.h Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/amd64/linux32/linux32_proto.h Thu Mar 30 19:59:23 2017 (r316291) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 313284 2017-02-05 14:17:09Z dchagin + * created from FreeBSD: stable/11/sys/amd64/linux32/syscalls.master 316290 2017-03-30 19:56:41Z dchagin */ #ifndef _LINUX32_SYSPROTO_H_ @@ -1063,7 +1063,8 @@ struct linux_signalfd_args { register_t dummy; }; struct linux_timerfd_create_args { - register_t dummy; + char clockid_l_[PADL_(l_int)]; l_int clockid; char clockid_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; }; struct linux_eventfd_args { char initval_l_[PADL_(l_uint)]; l_uint initval; char initval_r_[PADR_(l_uint)]; @@ -1075,10 +1076,14 @@ struct linux_fallocate_args { char len_l_[PADL_(l_loff_t)]; l_loff_t len; char len_r_[PADR_(l_loff_t)]; }; struct linux_timerfd_settime_args { - register_t dummy; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char new_value_l_[PADL_(const struct l_itimerspec *)]; const struct l_itimerspec * new_value; char new_value_r_[PADR_(const struct l_itimerspec *)]; + char old_value_l_[PADL_(struct l_itimerspec *)]; struct l_itimerspec * old_value; char old_value_r_[PADR_(struct l_itimerspec *)]; }; struct linux_timerfd_gettime_args { - register_t dummy; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char old_value_l_[PADL_(struct l_itimerspec *)]; struct l_itimerspec * old_value; char old_value_r_[PADR_(struct l_itimerspec *)]; }; struct linux_signalfd4_args { register_t dummy; Modified: stable/11/sys/amd64/linux32/linux32_syscall.h ============================================================================== --- stable/11/sys/amd64/linux32/linux32_syscall.h Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/amd64/linux32/linux32_syscall.h Thu Mar 30 19:59:23 2017 (r316291) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 313284 2017-02-05 14:17:09Z dchagin + * created from FreeBSD: stable/11/sys/amd64/linux32/syscalls.master 316290 2017-03-30 19:56:41Z dchagin */ #define LINUX32_SYS_linux_exit 1 Modified: stable/11/sys/amd64/linux32/linux32_syscalls.c ============================================================================== --- stable/11/sys/amd64/linux32/linux32_syscalls.c Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/amd64/linux32/linux32_syscalls.c Thu Mar 30 19:59:23 2017 (r316291) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 313284 2017-02-05 14:17:09Z dchagin + * created from FreeBSD: stable/11/sys/amd64/linux32/syscalls.master 316290 2017-03-30 19:56:41Z dchagin */ const char *linux32_syscallnames[] = { Modified: stable/11/sys/amd64/linux32/linux32_sysent.c ============================================================================== --- stable/11/sys/amd64/linux32/linux32_sysent.c Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/amd64/linux32/linux32_sysent.c Thu Mar 30 19:59:23 2017 (r316291) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 313284 2017-02-05 14:17:09Z dchagin + * created from FreeBSD: stable/11/sys/amd64/linux32/syscalls.master 316290 2017-03-30 19:56:41Z dchagin */ #include "opt_compat.h" @@ -341,11 +341,11 @@ struct sysent linux32_sysent[] = { { AS(linux_epoll_pwait_args), (sy_call_t *)linux_epoll_pwait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 319 = linux_epoll_pwait */ { AS(linux_utimensat_args), (sy_call_t *)linux_utimensat, AUE_FUTIMESAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 320 = linux_utimensat */ { 0, (sy_call_t *)linux_signalfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 321 = linux_signalfd */ - { 0, (sy_call_t *)linux_timerfd_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 322 = linux_timerfd_create */ + { AS(linux_timerfd_create_args), (sy_call_t *)linux_timerfd_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 322 = linux_timerfd_create */ { AS(linux_eventfd_args), (sy_call_t *)linux_eventfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 323 = linux_eventfd */ { AS(linux_fallocate_args), (sy_call_t *)linux_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 324 = linux_fallocate */ - { 0, (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 325 = linux_timerfd_settime */ - { 0, (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 326 = linux_timerfd_gettime */ + { AS(linux_timerfd_settime_args), (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 325 = linux_timerfd_settime */ + { AS(linux_timerfd_gettime_args), (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 326 = linux_timerfd_gettime */ { 0, (sy_call_t *)linux_signalfd4, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 327 = linux_signalfd4 */ { AS(linux_eventfd2_args), (sy_call_t *)linux_eventfd2, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 328 = linux_eventfd2 */ { AS(linux_epoll_create1_args), (sy_call_t *)linux_epoll_create1, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 329 = linux_epoll_create1 */ Modified: stable/11/sys/amd64/linux32/linux32_systrace_args.c ============================================================================== --- stable/11/sys/amd64/linux32/linux32_systrace_args.c Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/amd64/linux32/linux32_systrace_args.c Thu Mar 30 19:59:23 2017 (r316291) @@ -2189,7 +2189,10 @@ systrace_args(int sysnum, void *params, } /* linux_timerfd_create */ case 322: { - *n_args = 0; + struct linux_timerfd_create_args *p = params; + iarg[0] = p->clockid; /* l_int */ + iarg[1] = p->flags; /* l_int */ + *n_args = 2; break; } /* linux_eventfd */ @@ -2211,12 +2214,20 @@ systrace_args(int sysnum, void *params, } /* linux_timerfd_settime */ case 325: { - *n_args = 0; + struct linux_timerfd_settime_args *p = params; + iarg[0] = p->fd; /* l_int */ + iarg[1] = p->flags; /* l_int */ + uarg[2] = (intptr_t) p->new_value; /* const struct l_itimerspec * */ + uarg[3] = (intptr_t) p->old_value; /* struct l_itimerspec * */ + *n_args = 4; break; } /* linux_timerfd_gettime */ case 326: { - *n_args = 0; + struct linux_timerfd_gettime_args *p = params; + iarg[0] = p->fd; /* l_int */ + uarg[1] = (intptr_t) p->old_value; /* struct l_itimerspec * */ + *n_args = 2; break; } /* linux_signalfd4 */ @@ -5998,6 +6009,16 @@ systrace_entry_setargdesc(int sysnum, in break; /* linux_timerfd_create */ case 322: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + default: + break; + }; break; /* linux_eventfd */ case 323: @@ -6030,9 +6051,35 @@ systrace_entry_setargdesc(int sysnum, in break; /* linux_timerfd_settime */ case 325: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + case 2: + p = "const struct l_itimerspec *"; + break; + case 3: + p = "struct l_itimerspec *"; + break; + default: + break; + }; break; /* linux_timerfd_gettime */ case 326: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "struct l_itimerspec *"; + break; + default: + break; + }; break; /* linux_signalfd4 */ case 327: @@ -6099,7 +6146,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_ulong"; break; case 1: - p = "userland struct iovec *"; + p = "struct iovec *"; break; case 2: p = "l_ulong"; @@ -6121,7 +6168,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_ulong"; break; case 1: - p = "userland struct iovec *"; + p = "struct iovec *"; break; case 2: p = "l_ulong"; @@ -6149,7 +6196,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_int"; break; case 3: - p = "userland l_siginfo_t *"; + p = "l_siginfo_t *"; break; default: break; @@ -6253,13 +6300,13 @@ systrace_entry_setargdesc(int sysnum, in p = "l_pid_t"; break; case 1: - p = "userland const struct iovec *"; + p = "const struct iovec *"; break; case 2: p = "l_ulong"; break; case 3: - p = "userland const struct iovec *"; + p = "const struct iovec *"; break; case 4: p = "l_ulong"; @@ -6278,13 +6325,13 @@ systrace_entry_setargdesc(int sysnum, in p = "l_pid_t"; break; case 1: - p = "userland const struct iovec *"; + p = "const struct iovec *"; break; case 2: p = "l_ulong"; break; case 3: - p = "userland const struct iovec *"; + p = "const struct iovec *"; break; case 4: p = "l_ulong"; @@ -6325,7 +6372,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_int"; break; case 1: - p = "userland const char *"; + p = "const char *"; break; case 2: p = "l_int"; @@ -6341,7 +6388,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_pid_t"; break; case 1: - p = "userland void *"; + p = "void *"; break; case 2: p = "l_uint"; @@ -6357,7 +6404,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_pid_t"; break; case 1: - p = "userland void *"; + p = "void *"; break; case 2: p = "l_uint"; @@ -6376,13 +6423,13 @@ systrace_entry_setargdesc(int sysnum, in p = "l_int"; break; case 1: - p = "userland const char *"; + p = "const char *"; break; case 2: p = "l_int"; break; case 3: - p = "userland const char *"; + p = "const char *"; break; case 4: p = "unsigned int"; @@ -6401,7 +6448,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_uint"; break; case 2: - p = "userland const char *"; + p = "const char *"; break; default: break; @@ -6411,7 +6458,7 @@ systrace_entry_setargdesc(int sysnum, in case 355: switch(ndx) { case 0: - p = "userland char *"; + p = "char *"; break; case 1: p = "l_size_t"; @@ -6427,7 +6474,7 @@ systrace_entry_setargdesc(int sysnum, in case 356: switch(ndx) { case 0: - p = "userland const char *"; + p = "const char *"; break; case 1: p = "l_uint"; @@ -6443,7 +6490,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_int"; break; case 1: - p = "userland void *"; + p = "void *"; break; case 2: p = "l_uint"; @@ -6459,13 +6506,13 @@ systrace_entry_setargdesc(int sysnum, in p = "l_int"; break; case 1: - p = "userland const char *"; + p = "const char *"; break; case 2: - p = "userland const char **"; + p = "const char **"; break; case 3: - p = "userland const char **"; + p = "const char **"; break; case 4: p = "l_int"; @@ -6790,13 +6837,13 @@ systrace_entry_setargdesc(int sysnum, in p = "l_int"; break; case 1: - p = "userland l_loff_t *"; + p = "l_loff_t *"; break; case 2: p = "l_int"; break; case 3: - p = "userland l_loff_t *"; + p = "l_loff_t *"; break; case 4: p = "l_size_t"; @@ -6815,7 +6862,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_ulong"; break; case 1: - p = "userland const struct iovec *"; + p = "const struct iovec *"; break; case 2: p = "l_ulong"; @@ -6840,7 +6887,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_ulong"; break; case 1: - p = "userland const struct iovec *"; + p = "const struct iovec *"; break; case 2: p = "l_ulong"; @@ -8128,6 +8175,9 @@ systrace_return_setargdesc(int sysnum, i case 321: /* linux_timerfd_create */ case 322: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_eventfd */ case 323: if (ndx == 0 || ndx == 1) @@ -8140,8 +8190,14 @@ systrace_return_setargdesc(int sysnum, i break; /* linux_timerfd_settime */ case 325: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_timerfd_gettime */ case 326: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_signalfd4 */ case 327: /* linux_eventfd2 */ Modified: stable/11/sys/i386/linux/linux_proto.h ============================================================================== --- stable/11/sys/i386/linux/linux_proto.h Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/i386/linux/linux_proto.h Thu Mar 30 19:59:23 2017 (r316291) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/i386/linux/syscalls.master 313284 2017-02-05 14:17:09Z dchagin + * created from FreeBSD: stable/11/sys/i386/linux/syscalls.master 316290 2017-03-30 19:56:41Z dchagin */ #ifndef _LINUX_SYSPROTO_H_ @@ -1081,7 +1081,8 @@ struct linux_signalfd_args { register_t dummy; }; struct linux_timerfd_create_args { - register_t dummy; + char clockid_l_[PADL_(l_int)]; l_int clockid; char clockid_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; }; struct linux_eventfd_args { char initval_l_[PADL_(l_uint)]; l_uint initval; char initval_r_[PADR_(l_uint)]; @@ -1093,10 +1094,14 @@ struct linux_fallocate_args { char len_l_[PADL_(l_loff_t)]; l_loff_t len; char len_r_[PADR_(l_loff_t)]; }; struct linux_timerfd_settime_args { - register_t dummy; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char new_value_l_[PADL_(const struct l_itimerspec *)]; const struct l_itimerspec * new_value; char new_value_r_[PADR_(const struct l_itimerspec *)]; + char old_value_l_[PADL_(struct l_itimerspec *)]; struct l_itimerspec * old_value; char old_value_r_[PADR_(struct l_itimerspec *)]; }; struct linux_timerfd_gettime_args { - register_t dummy; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char old_value_l_[PADL_(struct l_itimerspec *)]; struct l_itimerspec * old_value; char old_value_r_[PADR_(struct l_itimerspec *)]; }; struct linux_signalfd4_args { register_t dummy; Modified: stable/11/sys/i386/linux/linux_syscall.h ============================================================================== --- stable/11/sys/i386/linux/linux_syscall.h Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/i386/linux/linux_syscall.h Thu Mar 30 19:59:23 2017 (r316291) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/i386/linux/syscalls.master 313284 2017-02-05 14:17:09Z dchagin + * created from FreeBSD: stable/11/sys/i386/linux/syscalls.master 316290 2017-03-30 19:56:41Z dchagin */ #define LINUX_SYS_linux_exit 1 Modified: stable/11/sys/i386/linux/linux_syscalls.c ============================================================================== --- stable/11/sys/i386/linux/linux_syscalls.c Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/i386/linux/linux_syscalls.c Thu Mar 30 19:59:23 2017 (r316291) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/i386/linux/syscalls.master 313284 2017-02-05 14:17:09Z dchagin + * created from FreeBSD: stable/11/sys/i386/linux/syscalls.master 316290 2017-03-30 19:56:41Z dchagin */ const char *linux_syscallnames[] = { Modified: stable/11/sys/i386/linux/linux_sysent.c ============================================================================== --- stable/11/sys/i386/linux/linux_sysent.c Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/i386/linux/linux_sysent.c Thu Mar 30 19:59:23 2017 (r316291) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/i386/linux/syscalls.master 313284 2017-02-05 14:17:09Z dchagin + * created from FreeBSD: stable/11/sys/i386/linux/syscalls.master 316290 2017-03-30 19:56:41Z dchagin */ #include <sys/param.h> @@ -340,11 +340,11 @@ struct sysent linux_sysent[] = { { AS(linux_epoll_pwait_args), (sy_call_t *)linux_epoll_pwait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 319 = linux_epoll_pwait */ { AS(linux_utimensat_args), (sy_call_t *)linux_utimensat, AUE_FUTIMESAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 320 = linux_utimensat */ { 0, (sy_call_t *)linux_signalfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 321 = linux_signalfd */ - { 0, (sy_call_t *)linux_timerfd_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 322 = linux_timerfd_create */ + { AS(linux_timerfd_create_args), (sy_call_t *)linux_timerfd_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 322 = linux_timerfd_create */ { AS(linux_eventfd_args), (sy_call_t *)linux_eventfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 323 = linux_eventfd */ { AS(linux_fallocate_args), (sy_call_t *)linux_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 324 = linux_fallocate */ - { 0, (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 325 = linux_timerfd_settime */ - { 0, (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 326 = linux_timerfd_gettime */ + { AS(linux_timerfd_settime_args), (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 325 = linux_timerfd_settime */ + { AS(linux_timerfd_gettime_args), (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 326 = linux_timerfd_gettime */ { 0, (sy_call_t *)linux_signalfd4, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 327 = linux_signalfd4 */ { AS(linux_eventfd2_args), (sy_call_t *)linux_eventfd2, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 328 = linux_eventfd2 */ { AS(linux_epoll_create1_args), (sy_call_t *)linux_epoll_create1, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 329 = linux_epoll_create1 */ Modified: stable/11/sys/i386/linux/linux_systrace_args.c ============================================================================== --- stable/11/sys/i386/linux/linux_systrace_args.c Thu Mar 30 19:56:41 2017 (r316290) +++ stable/11/sys/i386/linux/linux_systrace_args.c Thu Mar 30 19:59:23 2017 (r316291) @@ -2265,7 +2265,10 @@ systrace_args(int sysnum, void *params, } /* linux_timerfd_create */ case 322: { - *n_args = 0; + struct linux_timerfd_create_args *p = params; + iarg[0] = p->clockid; /* l_int */ + iarg[1] = p->flags; /* l_int */ + *n_args = 2; break; } /* linux_eventfd */ @@ -2287,12 +2290,20 @@ systrace_args(int sysnum, void *params, } /* linux_timerfd_settime */ case 325: { - *n_args = 0; + struct linux_timerfd_settime_args *p = params; + iarg[0] = p->fd; /* l_int */ + iarg[1] = p->flags; /* l_int */ + uarg[2] = (intptr_t) p->new_value; /* const struct l_itimerspec * */ + uarg[3] = (intptr_t) p->old_value; /* struct l_itimerspec * */ + *n_args = 4; break; } /* linux_timerfd_gettime */ case 326: { - *n_args = 0; + struct linux_timerfd_gettime_args *p = params; + iarg[0] = p->fd; /* l_int */ + uarg[1] = (intptr_t) p->old_value; /* struct l_itimerspec * */ + *n_args = 2; break; } /* linux_signalfd4 */ @@ -6229,6 +6240,16 @@ systrace_entry_setargdesc(int sysnum, in break; /* linux_timerfd_create */ case 322: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + default: + break; + }; break; /* linux_eventfd */ case 323: @@ -6261,9 +6282,35 @@ systrace_entry_setargdesc(int sysnum, in break; /* linux_timerfd_settime */ case 325: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "l_int"; + break; + case 2: + p = "const struct l_itimerspec *"; + break; + case 3: + p = "struct l_itimerspec *"; + break; + default: + break; + }; break; /* linux_timerfd_gettime */ case 326: + switch(ndx) { + case 0: + p = "l_int"; + break; + case 1: + p = "struct l_itimerspec *"; + break; + default: + break; + }; break; /* linux_signalfd4 */ case 327: @@ -6330,7 +6377,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_ulong"; break; case 1: - p = "userland struct iovec *"; + p = "struct iovec *"; break; case 2: p = "l_ulong"; @@ -6352,7 +6399,7 @@ systrace_entry_setargdesc(int sysnum, in p = "l_ulong"; break; case 1: - p = "userland struct iovec *"; + p = "struct iovec *"; break; case 2: p = "l_ulong"; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703301959.v2UJxNtx041915>