The branch main has been updated by dchagin:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ac80ae931323411c8a034624b0369eb6c0fe0934
commit ac80ae931323411c8a034624b0369eb6c0fe0934
Author: Dmitry Chagin <dcha...@freebsd.org>
AuthorDate: 2022-05-04 10:06:51 +0000
Commit: Dmitry Chagin <dcha...@freebsd.org>
CommitDate: 2022-05-04 10:06:51 +0000
linux(4): Regen for timerfd_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 a23b0afe3740..fc40376eea99 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -1558,7 +1558,8 @@ struct linux_timer_settime64_args {
char old_l_[PADL_(struct l_itimerspec64 *)]; struct l_itimerspec64 *
old; char old_r_[PADR_(struct l_itimerspec64 *)];
};
struct linux_timerfd_gettime64_args {
- syscallarg_t dummy;
+ char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
+ char old_value_l_[PADL_(struct l_itimerspec64 *)]; struct
l_itimerspec64 * old_value; char old_value_r_[PADR_(struct l_itimerspec64 *)];
};
struct linux_timerfd_settime64_args {
char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
diff --git a/sys/amd64/linux32/linux32_sysent.c
b/sys/amd64/linux32/linux32_sysent.c
index bff497aef77e..e2f77bbc7cb3 100644
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c
@@ -427,7 +427,7 @@ struct sysent linux32_sysent[] = {
{ .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 = 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 = AS(linux_timer_settime64_args), .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 = AS(linux_timerfd_gettime64_args), .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 = AS(linux_timerfd_settime64_args), .sy_call = (sy_call_t
*)linux_timerfd_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 411 = linux_timerfd_settime64 */
{ .sy_narg = AS(linux_utimensat_time64_args), .sy_call = (sy_call_t
*)linux_utimensat_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 412 = linux_utimensat_time64 */
{ .sy_narg = AS(linux_pselect6_time64_args), .sy_call = (sy_call_t
*)linux_pselect6_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 413 = linux_pselect6_time64 */
diff --git a/sys/amd64/linux32/linux32_systrace_args.c
b/sys/amd64/linux32/linux32_systrace_args.c
index 3879c2dcbd9c..a719cddbdabb 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -3025,7 +3025,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
}
/* linux_timerfd_gettime64 */
case 410: {
- *n_args = 0;
+ struct linux_timerfd_gettime64_args *p = params;
+ iarg[a++] = p->fd; /* l_int */
+ uarg[a++] = (intptr_t)p->old_value; /* struct l_itimerspec64 *
*/
+ *n_args = 2;
break;
}
/* linux_timerfd_settime64 */
@@ -8176,6 +8179,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
/* linux_timerfd_gettime64 */
case 410:
+ switch (ndx) {
+ case 0:
+ p = "l_int";
+ break;
+ case 1:
+ p = "userland struct l_itimerspec64 *";
+ break;
+ default:
+ break;
+ };
break;
/* linux_timerfd_settime64 */
case 411:
@@ -10129,6 +10142,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
/* linux_timerfd_gettime64 */
case 410:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_timerfd_settime64 */
case 411:
if (ndx == 0 || ndx == 1)
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index fd7b9b5730c7..ed6765b1bd3c 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -1551,7 +1551,8 @@ struct linux_timer_settime64_args {
char old_l_[PADL_(struct l_itimerspec64 *)]; struct l_itimerspec64 *
old; char old_r_[PADR_(struct l_itimerspec64 *)];
};
struct linux_timerfd_gettime64_args {
- syscallarg_t dummy;
+ char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
+ char old_value_l_[PADL_(struct l_itimerspec64 *)]; struct
l_itimerspec64 * old_value; char old_value_r_[PADR_(struct l_itimerspec64 *)];
};
struct linux_timerfd_settime64_args {
char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index a6a1f34ef990..ac71fe2e6b96 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -427,7 +427,7 @@ struct sysent linux_sysent[] = {
{ .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 = 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 = AS(linux_timer_settime64_args), .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 = AS(linux_timerfd_gettime64_args), .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 = AS(linux_timerfd_settime64_args), .sy_call = (sy_call_t
*)linux_timerfd_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 411 = linux_timerfd_settime64 */
{ .sy_narg = AS(linux_utimensat_time64_args), .sy_call = (sy_call_t
*)linux_utimensat_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 412 = linux_utimensat_time64 */
{ .sy_narg = AS(linux_pselect6_time64_args), .sy_call = (sy_call_t
*)linux_pselect6_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 413 = linux_pselect6_time64 */
diff --git a/sys/i386/linux/linux_systrace_args.c
b/sys/i386/linux/linux_systrace_args.c
index 75657bd992cd..72e8564c8b4f 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -3064,7 +3064,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
}
/* linux_timerfd_gettime64 */
case 410: {
- *n_args = 0;
+ struct linux_timerfd_gettime64_args *p = params;
+ iarg[a++] = p->fd; /* l_int */
+ uarg[a++] = (intptr_t)p->old_value; /* struct l_itimerspec64 *
*/
+ *n_args = 2;
break;
}
/* linux_timerfd_settime64 */
@@ -8253,6 +8256,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
/* linux_timerfd_gettime64 */
case 410:
+ switch (ndx) {
+ case 0:
+ p = "l_int";
+ break;
+ case 1:
+ p = "userland struct l_itimerspec64 *";
+ break;
+ default:
+ break;
+ };
break;
/* linux_timerfd_settime64 */
case 411:
@@ -10235,6 +10248,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
/* linux_timerfd_gettime64 */
case 410:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_timerfd_settime64 */
case 411:
if (ndx == 0 || ndx == 1)
