d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux(4): Regen for futex_time64 system call.

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Dmitry Chagin 2021-06-10 14:28:25 +03:00
parent 2e46d0c3d9
commit 985978806e
10 changed files with 96 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/amd64/linux32/linux32_proto.h
View File

@ -1581,8 +1581,13 @@ struct linux_semtimedop_time64_args {
struct linux_rt_sigtimedwait_time64_args {
register_t dummy;
};
struct linux_futex_time64_args {
register_t dummy;
struct linux_sys_futex_time64_args {
char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)];
char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)];
char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)];
char timeout_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * timeout; char timeout_r_[PADR_(struct l_timespec64 *)];
char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)];
char val3_l_[PADL_(uint32_t)]; uint32_t val3; char val3_r_[PADR_(uint32_t)];
};
struct linux_sched_rr_get_interval_time64_args {
register_t dummy;
@ -1989,7 +1994,7 @@ int linux_mq_timedsend_time64(struct thread *, struct linux_mq_timedsend_time64_
int linux_mq_timedreceive_time64(struct thread *, struct linux_mq_timedreceive_time64_args *);
int linux_semtimedop_time64(struct thread *, struct linux_semtimedop_time64_args *);
int linux_rt_sigtimedwait_time64(struct thread *, struct linux_rt_sigtimedwait_time64_args *);
int linux_futex_time64(struct thread *, struct linux_futex_time64_args *);
int linux_sys_futex_time64(struct thread *, struct linux_sys_futex_time64_args *);
int linux_sched_rr_get_interval_time64(struct thread *, struct linux_sched_rr_get_interval_time64_args *);
int linux_pidfd_send_signal(struct thread *, struct linux_pidfd_send_signal_args *);
int linux_io_uring_setup(struct thread *, struct linux_io_uring_setup_args *);
@ -2400,7 +2405,7 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *);
#define LINUX32_SYS_AUE_linux_mq_timedreceive_time64 AUE_NULL
#define LINUX32_SYS_AUE_linux_semtimedop_time64 AUE_NULL
#define LINUX32_SYS_AUE_linux_rt_sigtimedwait_time64 AUE_NULL
#define LINUX32_SYS_AUE_linux_futex_time64 AUE_NULL
#define LINUX32_SYS_AUE_linux_sys_futex_time64 AUE_NULL
#define LINUX32_SYS_AUE_linux_sched_rr_get_interval_time64 AUE_NULL
#define LINUX32_SYS_AUE_linux_pidfd_send_signal AUE_NULL
#define LINUX32_SYS_AUE_linux_io_uring_setup AUE_NULL

2
sys/amd64/linux32/linux32_syscall.h
View File

@ -383,7 +383,7 @@
#define LINUX32_SYS_linux_mq_timedreceive_time64 419
#define LINUX32_SYS_linux_semtimedop_time64 420
#define LINUX32_SYS_linux_rt_sigtimedwait_time64 421
#define LINUX32_SYS_linux_futex_time64 422
#define LINUX32_SYS_linux_sys_futex_time64 422
#define LINUX32_SYS_linux_sched_rr_get_interval_time64 423
#define LINUX32_SYS_linux_pidfd_send_signal 424
#define LINUX32_SYS_linux_io_uring_setup 425

2
sys/amd64/linux32/linux32_syscalls.c
View File

@ -429,7 +429,7 @@ const char *linux32_syscallnames[] = {
"linux_mq_timedreceive_time64", /* 419 = linux_mq_timedreceive_time64 */
"linux_semtimedop_time64", /* 420 = linux_semtimedop_time64 */
"linux_rt_sigtimedwait_time64", /* 421 = linux_rt_sigtimedwait_time64 */
"linux_futex_time64", /* 422 = linux_futex_time64 */
"linux_sys_futex_time64", /* 422 = linux_sys_futex_time64 */
"linux_sched_rr_get_interval_time64", /* 423 = linux_sched_rr_get_interval_time64 */
"linux_pidfd_send_signal", /* 424 = linux_pidfd_send_signal */
"linux_io_uring_setup", /* 425 = linux_io_uring_setup */

2
sys/amd64/linux32/linux32_sysent.c
View File

@ -439,7 +439,7 @@ struct sysent linux32_sysent[] = {
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_mq_timedreceive_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 419 = linux_mq_timedreceive_time64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_semtimedop_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 420 = linux_semtimedop_time64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_rt_sigtimedwait_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 421 = linux_rt_sigtimedwait_time64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_futex_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 422 = linux_futex_time64 */
{ .sy_narg = AS(linux_sys_futex_time64_args), .sy_call = (sy_call_t *)linux_sys_futex_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 422 = linux_sys_futex_time64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_sched_rr_get_interval_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 423 = linux_sched_rr_get_interval_time64 */
{ .sy_narg = AS(linux_pidfd_send_signal_args), .sy_call = (sy_call_t *)linux_pidfd_send_signal, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 424 = linux_pidfd_send_signal */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_uring_setup, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 425 = linux_io_uring_setup */

40
sys/amd64/linux32/linux32_systrace_args.c
View File

@ -3069,9 +3069,16 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
*n_args = 0;
break;
}
/* linux_futex_time64 */
/* linux_sys_futex_time64 */
case 422: {
*n_args = 0;
struct linux_sys_futex_time64_args *p = params;
uarg[0] = (intptr_t)p->uaddr; /* uint32_t * */
iarg[1] = p->op; /* l_int */
uarg[2] = p->val; /* uint32_t */
uarg[3] = (intptr_t)p->timeout; /* struct l_timespec64 * */
uarg[4] = (intptr_t)p->uaddr2; /* uint32_t * */
uarg[5] = p->val3; /* uint32_t */
*n_args = 6;
break;
}
/* linux_sched_rr_get_interval_time64 */
@ -8119,8 +8126,30 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
/* linux_rt_sigtimedwait_time64 */
case 421:
break;
/* linux_futex_time64 */
/* linux_sys_futex_time64 */
case 422:
switch (ndx) {
case 0:
p = "userland uint32_t *";
break;
case 1:
p = "l_int";
break;
case 2:
p = "uint32_t";
break;
case 3:
p = "userland struct l_timespec64 *";
break;
case 4:
p = "userland uint32_t *";
break;
case 5:
p = "uint32_t";
break;
default:
break;
};
break;
/* linux_sched_rr_get_interval_time64 */
case 423:
@ -9886,8 +9915,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 420:
/* linux_rt_sigtimedwait_time64 */
case 421:
/* linux_futex_time64 */
/* linux_sys_futex_time64 */
case 422:
if (ndx == 0 || ndx == 1)
p = "int";
break;
/* linux_sched_rr_get_interval_time64 */
case 423:
/* linux_pidfd_send_signal */

13
sys/i386/linux/linux_proto.h
View File

@ -1574,8 +1574,13 @@ struct linux_semtimedop_time64_args {
struct linux_rt_sigtimedwait_time64_args {
register_t dummy;
};
struct linux_futex_time64_args {
register_t dummy;
struct linux_sys_futex_time64_args {
char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)];
char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)];
char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)];
char timeout_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * timeout; char timeout_r_[PADR_(struct l_timespec64 *)];
char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)];
char val3_l_[PADL_(uint32_t)]; uint32_t val3; char val3_r_[PADR_(uint32_t)];
};
struct linux_sched_rr_get_interval_time64_args {
register_t dummy;
@ -1984,7 +1989,7 @@ int linux_mq_timedsend_time64(struct thread *, struct linux_mq_timedsend_time64_
int linux_mq_timedreceive_time64(struct thread *, struct linux_mq_timedreceive_time64_args *);
int linux_semtimedop_time64(struct thread *, struct linux_semtimedop_time64_args *);
int linux_rt_sigtimedwait_time64(struct thread *, struct linux_rt_sigtimedwait_time64_args *);
int linux_futex_time64(struct thread *, struct linux_futex_time64_args *);
int linux_sys_futex_time64(struct thread *, struct linux_sys_futex_time64_args *);
int linux_sched_rr_get_interval_time64(struct thread *, struct linux_sched_rr_get_interval_time64_args *);
int linux_pidfd_send_signal(struct thread *, struct linux_pidfd_send_signal_args *);
int linux_io_uring_setup(struct thread *, struct linux_io_uring_setup_args *);
@ -2397,7 +2402,7 @@ int linux_mount_setattr(struct thread *, struct linux_mount_setattr_args *);
#define LINUX_SYS_AUE_linux_mq_timedreceive_time64 AUE_NULL
#define LINUX_SYS_AUE_linux_semtimedop_time64 AUE_NULL
#define LINUX_SYS_AUE_linux_rt_sigtimedwait_time64 AUE_NULL
#define LINUX_SYS_AUE_linux_futex_time64 AUE_NULL
#define LINUX_SYS_AUE_linux_sys_futex_time64 AUE_NULL
#define LINUX_SYS_AUE_linux_sched_rr_get_interval_time64 AUE_NULL
#define LINUX_SYS_AUE_linux_pidfd_send_signal AUE_NULL
#define LINUX_SYS_AUE_linux_io_uring_setup AUE_NULL

2
sys/i386/linux/linux_syscall.h
View File

@ -390,7 +390,7 @@
#define LINUX_SYS_linux_mq_timedreceive_time64 419
#define LINUX_SYS_linux_semtimedop_time64 420
#define LINUX_SYS_linux_rt_sigtimedwait_time64 421
#define LINUX_SYS_linux_futex_time64 422
#define LINUX_SYS_linux_sys_futex_time64 422
#define LINUX_SYS_linux_sched_rr_get_interval_time64 423
#define LINUX_SYS_linux_pidfd_send_signal 424
#define LINUX_SYS_linux_io_uring_setup 425

2
sys/i386/linux/linux_syscalls.c
View File

@ -429,7 +429,7 @@ const char *linux_syscallnames[] = {
"linux_mq_timedreceive_time64", /* 419 = linux_mq_timedreceive_time64 */
"linux_semtimedop_time64", /* 420 = linux_semtimedop_time64 */
"linux_rt_sigtimedwait_time64", /* 421 = linux_rt_sigtimedwait_time64 */
"linux_futex_time64", /* 422 = linux_futex_time64 */
"linux_sys_futex_time64", /* 422 = linux_sys_futex_time64 */
"linux_sched_rr_get_interval_time64", /* 423 = linux_sched_rr_get_interval_time64 */
"linux_pidfd_send_signal", /* 424 = linux_pidfd_send_signal */
"linux_io_uring_setup", /* 425 = linux_io_uring_setup */

2
sys/i386/linux/linux_sysent.c
View File

@ -439,7 +439,7 @@ struct sysent linux_sysent[] = {
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_mq_timedreceive_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 419 = linux_mq_timedreceive_time64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_semtimedop_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 420 = linux_semtimedop_time64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_rt_sigtimedwait_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 421 = linux_rt_sigtimedwait_time64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_futex_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 422 = linux_futex_time64 */
{ .sy_narg = AS(linux_sys_futex_time64_args), .sy_call = (sy_call_t *)linux_sys_futex_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 422 = linux_sys_futex_time64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_sched_rr_get_interval_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 423 = linux_sched_rr_get_interval_time64 */
{ .sy_narg = AS(linux_pidfd_send_signal_args), .sy_call = (sy_call_t *)linux_pidfd_send_signal, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 424 = linux_pidfd_send_signal */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_uring_setup, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 425 = linux_io_uring_setup */

40
sys/i386/linux/linux_systrace_args.c
View File

@ -3108,9 +3108,16 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
*n_args = 0;
break;
}
/* linux_futex_time64 */
/* linux_sys_futex_time64 */
case 422: {
*n_args = 0;
struct linux_sys_futex_time64_args *p = params;
uarg[0] = (intptr_t)p->uaddr; /* uint32_t * */
iarg[1] = p->op; /* l_int */
uarg[2] = p->val; /* uint32_t */
uarg[3] = (intptr_t)p->timeout; /* struct l_timespec64 * */
uarg[4] = (intptr_t)p->uaddr2; /* uint32_t * */
uarg[5] = p->val3; /* uint32_t */
*n_args = 6;
break;
}
/* linux_sched_rr_get_interval_time64 */
@ -8196,8 +8203,30 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
/* linux_rt_sigtimedwait_time64 */
case 421:
break;
/* linux_futex_time64 */
/* linux_sys_futex_time64 */
case 422:
switch (ndx) {
case 0:
p = "userland uint32_t *";
break;
case 1:
p = "l_int";
break;
case 2:
p = "uint32_t";
break;
case 3:
p = "userland struct l_timespec64 *";
break;
case 4:
p = "userland uint32_t *";
break;
case 5:
p = "uint32_t";
break;
default:
break;
};
break;
/* linux_sched_rr_get_interval_time64 */
case 423:
@ -9992,8 +10021,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 420:
/* linux_rt_sigtimedwait_time64 */
case 421:
/* linux_futex_time64 */
/* linux_sys_futex_time64 */
case 422:
if (ndx == 0 || ndx == 1)
p = "int";
break;
/* linux_sched_rr_get_interval_time64 */
case 423:
/* linux_pidfd_send_signal */