upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-27 03:33:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux(4): Regen for timer_gettime64 syscall.

Browse source 
MFC after:      2 weeks

(cherry picked from commit 1cccef6dff)
This commit is contained in:
Dmitry Chagin 2022-06-17 22:34:20 +03:00
parent f925361540
commit ff95f72dee
6 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/amd64/linux32/linux32_proto.h
View file

@ -1548,7 +1548,8 @@ struct linux_clock_nanosleep_time64_args {
char rmtp_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * rmtp; char rmtp_r_[PADR_(struct l_timespec64 *)];
};
struct linux_timer_gettime64_args {
register_t dummy;
char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)];
char setting_l_[PADL_(struct l_itimerspec64 *)]; struct l_itimerspec64 * setting; char setting_r_[PADR_(struct l_itimerspec64 *)];
};
struct linux_timer_settime64_args {
register_t dummy;

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

@ -425,7 +425,7 @@ struct sysent linux32_sysent[] = {
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_clock_adjtime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 405 = linux_clock_adjtime64 */
{ .sy_narg = AS(linux_clock_getres_time64_args), .sy_call = (sy_call_t *)linux_clock_getres_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 406 = linux_clock_getres_time64 */
{ .sy_narg = AS(linux_clock_nanosleep_time64_args), .sy_call = (sy_call_t *)linux_clock_nanosleep_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 407 = linux_clock_nanosleep_time64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_timer_gettime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 408 = linux_timer_gettime64 */
{ .sy_narg = AS(linux_timer_gettime64_args), .sy_call = (sy_call_t *)linux_timer_gettime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 408 = linux_timer_gettime64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_timer_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 409 = linux_timer_settime64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_timerfd_gettime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 410 = linux_timerfd_gettime64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_timerfd_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 411 = linux_timerfd_settime64 */

18
sys/amd64/linux32/linux32_systrace_args.c
View file

@ -3006,7 +3006,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
}
/* linux_timer_gettime64 */
case 408: {
*n_args = 0;
struct linux_timer_gettime64_args *p = params;
iarg[0] = p->timerid; /* l_timer_t */
uarg[1] = (intptr_t)p->setting; /* struct l_itimerspec64 * */
*n_args = 2;
break;
}
/* linux_timer_settime64 */
@ -8130,6 +8133,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
/* linux_timer_gettime64 */
case 408:
switch (ndx) {
case 0:
p = "l_timer_t";
break;
case 1:
p = "userland struct l_itimerspec64 *";
break;
default:
break;
};
break;
/* linux_timer_settime64 */
case 409:
@ -10063,6 +10076,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
/* linux_timer_gettime64 */
case 408:
if (ndx == 0 || ndx == 1)
p = "int";
break;
/* linux_timer_settime64 */
case 409:
/* linux_timerfd_gettime64 */

3
sys/i386/linux/linux_proto.h
View file

@ -1541,7 +1541,8 @@ struct linux_clock_nanosleep_time64_args {
char rmtp_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * rmtp; char rmtp_r_[PADR_(struct l_timespec64 *)];
};
struct linux_timer_gettime64_args {
register_t dummy;
char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)];
char setting_l_[PADL_(struct l_itimerspec64 *)]; struct l_itimerspec64 * setting; char setting_r_[PADR_(struct l_itimerspec64 *)];
};
struct linux_timer_settime64_args {
register_t dummy;

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

@ -425,7 +425,7 @@ struct sysent linux_sysent[] = {
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_clock_adjtime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 405 = linux_clock_adjtime64 */
{ .sy_narg = AS(linux_clock_getres_time64_args), .sy_call = (sy_call_t *)linux_clock_getres_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 406 = linux_clock_getres_time64 */
{ .sy_narg = AS(linux_clock_nanosleep_time64_args), .sy_call = (sy_call_t *)linux_clock_nanosleep_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 407 = linux_clock_nanosleep_time64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_timer_gettime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 408 = linux_timer_gettime64 */
{ .sy_narg = AS(linux_timer_gettime64_args), .sy_call = (sy_call_t *)linux_timer_gettime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 408 = linux_timer_gettime64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_timer_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 409 = linux_timer_settime64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_timerfd_gettime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 410 = linux_timerfd_gettime64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_timerfd_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 411 = linux_timerfd_settime64 */

18
sys/i386/linux/linux_systrace_args.c
View file

@ -3045,7 +3045,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
}
/* linux_timer_gettime64 */
case 408: {
*n_args = 0;
struct linux_timer_gettime64_args *p = params;
iarg[0] = p->timerid; /* l_timer_t */
uarg[1] = (intptr_t)p->setting; /* struct l_itimerspec64 * */
*n_args = 2;
break;
}
/* linux_timer_settime64 */
@ -8207,6 +8210,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
/* linux_timer_gettime64 */
case 408:
switch (ndx) {
case 0:
p = "l_timer_t";
break;
case 1:
p = "userland struct l_itimerspec64 *";
break;
default:
break;
};
break;
/* linux_timer_settime64 */
case 409:
@ -10169,6 +10182,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
/* linux_timer_gettime64 */
case 408:
if (ndx == 0 || ndx == 1)
p = "int";
break;
/* linux_timer_settime64 */
case 409:
/* linux_timerfd_gettime64 */