The branch main has been updated by dchagin:
URL:
https://cgit.FreeBSD.org/src/commit/?id=1cccef6dff13f4854ac75c243c36317ccd4defc1
commit 1cccef6dff13f4854ac75c243c36317ccd4defc1
Author: Dmitry Chagin <dcha...@freebsd.org>
AuthorDate: 2022-05-04 10:06:48 +0000
Commit: Dmitry Chagin <dcha...@freebsd.org>
CommitDate: 2022-05-04 10:06:48 +0000
linux(4): Regen for timer_gettime64 syscall.
MFC after: 2 weeks
---
sys/amd64/linux32/linux32_proto.h | 3 ++-
sys/amd64/linux32/linux32_sysent.c | 2 +-
sys/amd64/linux32/linux32_systrace_args.c | 18 +++++++++++++++++-
sys/i386/linux/linux_proto.h | 3 ++-
sys/i386/linux/linux_sysent.c | 2 +-
sys/i386/linux/linux_systrace_args.c | 18 +++++++++++++++++-
6 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/sys/amd64/linux32/linux32_proto.h
b/sys/amd64/linux32/linux32_proto.h
index 3254c33baaae..4fb67539965c 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -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 {
- syscallarg_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 {
syscallarg_t dummy;
diff --git a/sys/amd64/linux32/linux32_sysent.c
b/sys/amd64/linux32/linux32_sysent.c
index 27449f412cb8..418356a373f9 100644
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c
@@ -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 */
diff --git a/sys/amd64/linux32/linux32_systrace_args.c
b/sys/amd64/linux32/linux32_systrace_args.c
index 8cc88ba300dd..56593829ef7f 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -3007,7 +3007,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[a++] = p->timerid; /* l_timer_t */
+ uarg[a++] = (intptr_t)p->setting; /* struct l_itimerspec64 * */
+ *n_args = 2;
break;
}
/* linux_timer_settime64 */
@@ -8131,6 +8134,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:
@@ -10064,6 +10077,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 */
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 43e8578ba0c9..4b3ce9852f5b 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -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 {
- syscallarg_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 {
syscallarg_t dummy;
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index f2c5543d57ce..3d76b8584b05 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -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 */
diff --git a/sys/i386/linux/linux_systrace_args.c
b/sys/i386/linux/linux_systrace_args.c
index 660be1e8a9f4..d764167f2400 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -3046,7 +3046,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[a++] = p->timerid; /* l_timer_t */
+ uarg[a++] = (intptr_t)p->setting; /* struct l_itimerspec64 * */
+ *n_args = 2;
break;
}
/* linux_timer_settime64 */
@@ -8208,6 +8211,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:
@@ -10170,6 +10183,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 */
