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

linux(4): Regen for semtimedop syscalls.

Browse Source 
MFC after:		2 weeks
This commit is contained in:
Dmitry Chagin 2022-05-06 20:02:16 +03:00
parent f19c4e2341
commit 430460d717
12 changed files with 120 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -759,7 +759,10 @@ struct linux_restart_syscall_args {
syscallarg_t dummy;
};
struct linux_semtimedop_args {
syscallarg_t dummy;
char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)];
char tsops_l_[PADL_(struct sembuf *)]; struct sembuf * tsops; char tsops_r_[PADR_(struct sembuf *)];
char nsops_l_[PADL_(l_size_t)]; l_size_t nsops; char nsops_r_[PADR_(l_size_t)];
char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)];
};
struct linux_fadvise64_args {
char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];

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

@ -237,7 +237,7 @@ struct sysent linux_sysent[] = {
{ .sy_narg = AS(linux_getdents64_args), .sy_call = (sy_call_t *)linux_getdents64, .sy_auevent = AUE_GETDIRENTRIES, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 217 = linux_getdents64 */
{ .sy_narg = AS(linux_set_tid_address_args), .sy_call = (sy_call_t *)linux_set_tid_address, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 218 = linux_set_tid_address */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_restart_syscall, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 219 = linux_restart_syscall */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_semtimedop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 220 = linux_semtimedop */
{ .sy_narg = AS(linux_semtimedop_args), .sy_call = (sy_call_t *)linux_semtimedop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 220 = linux_semtimedop */
{ .sy_narg = AS(linux_fadvise64_args), .sy_call = (sy_call_t *)linux_fadvise64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 221 = linux_fadvise64 */
{ .sy_narg = AS(linux_timer_create_args), .sy_call = (sy_call_t *)linux_timer_create, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 222 = linux_timer_create */
{ .sy_narg = AS(linux_timer_settime_args), .sy_call = (sy_call_t *)linux_timer_settime, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 223 = linux_timer_settime */

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

@ -1656,7 +1656,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
}
/* linux_semtimedop */
case 220: {
*n_args = 0;
struct linux_semtimedop_args *p = params;
iarg[a++] = p->semid; /* l_int */
uarg[a++] = (intptr_t)p->tsops; /* struct sembuf * */
iarg[a++] = p->nsops; /* l_size_t */
uarg[a++] = (intptr_t)p->timeout; /* struct l_timespec * */
*n_args = 4;
break;
}
/* linux_fadvise64 */
@ -5373,6 +5378,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
/* linux_semtimedop */
case 220:
switch (ndx) {
case 0:
p = "l_int";
break;
case 1:
p = "userland struct sembuf *";
break;
case 2:
p = "l_size_t";
break;
case 3:
p = "userland struct l_timespec *";
break;
default:
break;
};
break;
/* linux_fadvise64 */
case 221:
@ -8059,6 +8080,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 219:
/* linux_semtimedop */
case 220:
if (ndx == 0 || ndx == 1)
p = "int";
break;
/* linux_fadvise64 */
case 221:
if (ndx == 0 || ndx == 1)

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

@ -1605,7 +1605,10 @@ struct linux_mq_timedreceive_time64_args {
syscallarg_t dummy;
};
struct linux_semtimedop_time64_args {
syscallarg_t dummy;
char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)];
char tsops_l_[PADL_(struct sembuf *)]; struct sembuf * tsops; char tsops_r_[PADR_(struct sembuf *)];
char nsops_l_[PADL_(l_size_t)]; l_size_t nsops; char nsops_r_[PADR_(l_size_t)];
char timeout_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * timeout; char timeout_r_[PADR_(struct l_timespec64 *)];
};
struct linux_rt_sigtimedwait_time64_args {
char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)];

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

@ -437,7 +437,7 @@ struct sysent linux32_sysent[] = {
{ .sy_narg = AS(linux_recvmmsg_time64_args), .sy_call = (sy_call_t *)linux_recvmmsg_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 417 = linux_recvmmsg_time64 */
{ .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 = AS(linux_semtimedop_time64_args), .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 = 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 = AS(linux_sched_rr_get_interval_time64_args), .sy_call = (sy_call_t *)linux_sched_rr_get_interval_time64, .sy_auevent = AUE_SCHED_RR_GET_INTERVAL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 423 = linux_sched_rr_get_interval_time64 */

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

@ -3102,7 +3102,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
}
/* linux_semtimedop_time64 */
case 420: {
*n_args = 0;
struct linux_semtimedop_time64_args *p = params;
iarg[a++] = p->semid; /* l_int */
uarg[a++] = (intptr_t)p->tsops; /* struct sembuf * */
iarg[a++] = p->nsops; /* l_size_t */
uarg[a++] = (intptr_t)p->timeout; /* struct l_timespec64 * */
*n_args = 4;
break;
}
/* linux_rt_sigtimedwait_time64 */
@ -8314,6 +8319,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
/* linux_semtimedop_time64 */
case 420:
switch (ndx) {
case 0:
p = "l_int";
break;
case 1:
p = "userland struct sembuf *";
break;
case 2:
p = "l_size_t";
break;
case 3:
p = "userland struct l_timespec64 *";
break;
default:
break;
};
break;
/* linux_rt_sigtimedwait_time64 */
case 421:
@ -10203,6 +10224,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 419:
/* linux_semtimedop_time64 */
case 420:
if (ndx == 0 || ndx == 1)
p = "int";
break;
/* linux_rt_sigtimedwait_time64 */
case 421:
if (ndx == 0 || ndx == 1)

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

@ -731,7 +731,10 @@ struct linux_semctl_args {
char arg_l_[PADL_(union l_semun)]; union l_semun arg; char arg_r_[PADR_(union l_semun)];
};
struct linux_semtimedop_args {
syscallarg_t dummy;
char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)];
char tsops_l_[PADL_(struct sembuf *)]; struct sembuf * tsops; char tsops_r_[PADR_(struct sembuf *)];
char nsops_l_[PADL_(l_size_t)]; l_size_t nsops; char nsops_r_[PADR_(l_size_t)];
char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)];
};
struct linux_shmget_args {
char key_l_[PADL_(l_key_t)]; l_key_t key; char key_r_[PADR_(l_key_t)];

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

@ -209,7 +209,7 @@ struct sysent linux_sysent[] = {
{ .sy_narg = AS(linux_msgsnd_args), .sy_call = (sy_call_t *)linux_msgsnd, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 189 = linux_msgsnd */
{ .sy_narg = AS(linux_semget_args), .sy_call = (sy_call_t *)linux_semget, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 190 = linux_semget */
{ .sy_narg = AS(linux_semctl_args), .sy_call = (sy_call_t *)linux_semctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 191 = linux_semctl */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_semtimedop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 192 = linux_semtimedop */
{ .sy_narg = AS(linux_semtimedop_args), .sy_call = (sy_call_t *)linux_semtimedop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 192 = linux_semtimedop */
{ .sy_narg = AS(semop_args), .sy_call = (sy_call_t *)sys_semop, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 193 = semop */
{ .sy_narg = AS(linux_shmget_args), .sy_call = (sy_call_t *)linux_shmget, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 194 = linux_shmget */
{ .sy_narg = AS(linux_shmctl_args), .sy_call = (sy_call_t *)linux_shmctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 195 = linux_shmctl */

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

@ -1512,7 +1512,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
}
/* linux_semtimedop */
case 192: {
*n_args = 0;
struct linux_semtimedop_args *p = params;
iarg[a++] = p->semid; /* l_int */
uarg[a++] = (intptr_t)p->tsops; /* struct sembuf * */
iarg[a++] = p->nsops; /* l_size_t */
uarg[a++] = (intptr_t)p->timeout; /* struct l_timespec * */
*n_args = 4;
break;
}
/* semop */
@ -4835,6 +4840,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
/* linux_semtimedop */
case 192:
switch (ndx) {
case 0:
p = "l_int";
break;
case 1:
p = "userland struct sembuf *";
break;
case 2:
p = "l_size_t";
break;
case 3:
p = "userland struct l_timespec *";
break;
default:
break;
};
break;
/* semop */
case 193:
@ -7038,6 +7059,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
/* linux_semtimedop */
case 192:
if (ndx == 0 || ndx == 1)
p = "int";
break;
/* semop */
case 193:
if (ndx == 0 || ndx == 1)

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

@ -1598,7 +1598,10 @@ struct linux_mq_timedreceive_time64_args {
syscallarg_t dummy;
};
struct linux_semtimedop_time64_args {
syscallarg_t dummy;
char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)];
char tsops_l_[PADL_(struct sembuf *)]; struct sembuf * tsops; char tsops_r_[PADR_(struct sembuf *)];
char nsops_l_[PADL_(l_size_t)]; l_size_t nsops; char nsops_r_[PADR_(l_size_t)];
char timeout_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * timeout; char timeout_r_[PADR_(struct l_timespec64 *)];
};
struct linux_rt_sigtimedwait_time64_args {
char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)];

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

@ -437,7 +437,7 @@ struct sysent linux_sysent[] = {
{ .sy_narg = AS(linux_recvmmsg_time64_args), .sy_call = (sy_call_t *)linux_recvmmsg_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 417 = linux_recvmmsg_time64 */
{ .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 = AS(linux_semtimedop_time64_args), .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 = 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 = AS(linux_sched_rr_get_interval_time64_args), .sy_call = (sy_call_t *)linux_sched_rr_get_interval_time64, .sy_auevent = AUE_SCHED_RR_GET_INTERVAL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 423 = linux_sched_rr_get_interval_time64 */

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

@ -3141,7 +3141,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
}
/* linux_semtimedop_time64 */
case 420: {
*n_args = 0;
struct linux_semtimedop_time64_args *p = params;
iarg[a++] = p->semid; /* l_int */
uarg[a++] = (intptr_t)p->tsops; /* struct sembuf * */
iarg[a++] = p->nsops; /* l_size_t */
uarg[a++] = (intptr_t)p->timeout; /* struct l_timespec64 * */
*n_args = 4;
break;
}
/* linux_rt_sigtimedwait_time64 */
@ -8391,6 +8396,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
/* linux_semtimedop_time64 */
case 420:
switch (ndx) {
case 0:
p = "l_int";
break;
case 1:
p = "userland struct sembuf *";
break;
case 2:
p = "l_size_t";
break;
case 3:
p = "userland struct l_timespec64 *";
break;
default:
break;
};
break;
/* linux_rt_sigtimedwait_time64 */
case 421:
@ -10309,6 +10330,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 419:
/* linux_semtimedop_time64 */
case 420:
if (ndx == 0 || ndx == 1)
p = "int";
break;
/* linux_rt_sigtimedwait_time64 */
case 421:
if (ndx == 0 || ndx == 1)