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

linux(4): Regen for rt_sigtimedwait_time64 system call.

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Dmitry Chagin 2021-06-10 14:52:43 +03:00
parent db4a1f331b
commit c002529000
6 changed files with 60 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1579,7 +1579,10 @@ struct linux_semtimedop_time64_args {
register_t dummy;
};
struct linux_rt_sigtimedwait_time64_args {
register_t dummy;
char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)];
char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)];
char timeout_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * timeout; char timeout_r_[PADR_(struct l_timespec64 *)];
char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)];
};
struct linux_sys_futex_time64_args {
char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)];

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

@ -438,7 +438,7 @@ struct sysent linux32_sysent[] = {
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_mq_timedsend_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 418 = linux_mq_timedsend_time64 */
{ .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 = AS(linux_rt_sigtimedwait_time64_args), .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 = 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 */

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

@ -3066,7 +3066,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
}
/* linux_rt_sigtimedwait_time64 */
case 421: {
*n_args = 0;
struct linux_rt_sigtimedwait_time64_args *p = params;
uarg[0] = (intptr_t)p->mask; /* l_sigset_t * */
uarg[1] = (intptr_t)p->ptr; /* l_siginfo_t * */
uarg[2] = (intptr_t)p->timeout; /* struct l_timespec64 * */
iarg[3] = p->sigsetsize; /* l_size_t */
*n_args = 4;
break;
}
/* linux_sys_futex_time64 */
@ -8125,6 +8130,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
/* linux_rt_sigtimedwait_time64 */
case 421:
switch (ndx) {
case 0:
p = "userland l_sigset_t *";
break;
case 1:
p = "userland l_siginfo_t *";
break;
case 2:
p = "userland struct l_timespec64 *";
break;
case 3:
p = "l_size_t";
break;
default:
break;
};
break;
/* linux_sys_futex_time64 */
case 422:
@ -9915,6 +9936,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 420:
/* linux_rt_sigtimedwait_time64 */
case 421:
if (ndx == 0 || ndx == 1)
p = "int";
break;
/* linux_sys_futex_time64 */
case 422:
if (ndx == 0 || ndx == 1)

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

@ -1572,7 +1572,10 @@ struct linux_semtimedop_time64_args {
register_t dummy;
};
struct linux_rt_sigtimedwait_time64_args {
register_t dummy;
char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)];
char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)];
char timeout_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * timeout; char timeout_r_[PADR_(struct l_timespec64 *)];
char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)];
};
struct linux_sys_futex_time64_args {
char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)];

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

@ -438,7 +438,7 @@ struct sysent linux_sysent[] = {
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_mq_timedsend_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 418 = linux_mq_timedsend_time64 */
{ .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 = AS(linux_rt_sigtimedwait_time64_args), .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 = 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 */

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

@ -3105,7 +3105,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
}
/* linux_rt_sigtimedwait_time64 */
case 421: {
*n_args = 0;
struct linux_rt_sigtimedwait_time64_args *p = params;
uarg[0] = (intptr_t)p->mask; /* l_sigset_t * */
uarg[1] = (intptr_t)p->ptr; /* l_siginfo_t * */
uarg[2] = (intptr_t)p->timeout; /* struct l_timespec64 * */
iarg[3] = p->sigsetsize; /* l_size_t */
*n_args = 4;
break;
}
/* linux_sys_futex_time64 */
@ -8202,6 +8207,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
/* linux_rt_sigtimedwait_time64 */
case 421:
switch (ndx) {
case 0:
p = "userland l_sigset_t *";
break;
case 1:
p = "userland l_siginfo_t *";
break;
case 2:
p = "userland struct l_timespec64 *";
break;
case 3:
p = "l_size_t";
break;
default:
break;
};
break;
/* linux_sys_futex_time64 */
case 422:
@ -10021,6 +10042,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 420:
/* linux_rt_sigtimedwait_time64 */
case 421:
if (ndx == 0 || ndx == 1)
p = "int";
break;
/* linux_sys_futex_time64 */
case 422:
if (ndx == 0 || ndx == 1)