The branch main has been updated by dchagin:
URL:
https://cgit.FreeBSD.org/src/commit/?id=cdddbb77c30b7f518f7ac78b113a823c3ca0cd11
commit cdddbb77c30b7f518f7ac78b113a823c3ca0cd11
Author: Dmitry Chagin <dcha...@freebsd.org>
AuthorDate: 2022-05-04 10:06:46 +0000
Commit: Dmitry Chagin <dcha...@freebsd.org>
CommitDate: 2022-05-04 10:06:46 +0000
linux(4): Regen for sched_rr_get_interval_time64 syscall.
MFC after: 2 weeks
---
sys/amd64/linux32/linux32_proto.h | 5 +++--
sys/amd64/linux32/linux32_sysent.c | 2 +-
sys/amd64/linux32/linux32_systrace_args.c | 18 +++++++++++++++++-
sys/i386/linux/linux_proto.h | 5 +++--
sys/i386/linux/linux_sysent.c | 2 +-
sys/i386/linux/linux_systrace_args.c | 18 +++++++++++++++++-
6 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/sys/amd64/linux32/linux32_proto.h
b/sys/amd64/linux32/linux32_proto.h
index 58dcfc6eaff8..3254c33baaae 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -1610,7 +1610,8 @@ struct linux_sys_futex_time64_args {
char val3_l_[PADL_(uint32_t)]; uint32_t val3; char
val3_r_[PADR_(uint32_t)];
};
struct linux_sched_rr_get_interval_time64_args {
- syscallarg_t dummy;
+ char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
+ char interval_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 *
interval; char interval_r_[PADR_(struct l_timespec64 *)];
};
struct linux_pidfd_send_signal_args {
char pidfd_l_[PADL_(l_int)]; l_int pidfd; char pidfd_r_[PADR_(l_int)];
@@ -2388,7 +2389,7 @@ int linux_mount_setattr(struct thread *, struct
linux_mount_setattr_args *);
#define LINUX32_SYS_AUE_linux_semtimedop_time64 AUE_NULL
#define LINUX32_SYS_AUE_linux_rt_sigtimedwait_time64 AUE_NULL
#define LINUX32_SYS_AUE_linux_sys_futex_time64 AUE_NULL
-#define LINUX32_SYS_AUE_linux_sched_rr_get_interval_time64 AUE_NULL
+#define LINUX32_SYS_AUE_linux_sched_rr_get_interval_time64
AUE_SCHED_RR_GET_INTERVAL
#define LINUX32_SYS_AUE_linux_pidfd_send_signal AUE_NULL
#define LINUX32_SYS_AUE_linux_io_uring_setup AUE_NULL
#define LINUX32_SYS_AUE_linux_io_uring_enter AUE_NULL
diff --git a/sys/amd64/linux32/linux32_sysent.c
b/sys/amd64/linux32/linux32_sysent.c
index 9954e369ce98..27449f412cb8 100644
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c
@@ -440,7 +440,7 @@ struct sysent linux32_sysent[] = {
{ .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_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_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 */
{ .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 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_uring_setup,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
425 = linux_io_uring_setup */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_uring_enter,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
426 = linux_io_uring_enter */
diff --git a/sys/amd64/linux32/linux32_systrace_args.c
b/sys/amd64/linux32/linux32_systrace_args.c
index a0f4c1699d06..8cc88ba300dd 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -3107,7 +3107,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
}
/* linux_sched_rr_get_interval_time64 */
case 423: {
- *n_args = 0;
+ struct linux_sched_rr_get_interval_time64_args *p = params;
+ iarg[a++] = p->pid; /* l_pid_t */
+ uarg[a++] = (intptr_t)p->interval; /* struct l_timespec64 * */
+ *n_args = 2;
break;
}
/* linux_pidfd_send_signal */
@@ -8265,6 +8268,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
/* linux_sched_rr_get_interval_time64 */
case 423:
+ switch (ndx) {
+ case 0:
+ p = "l_pid_t";
+ break;
+ case 1:
+ p = "userland struct l_timespec64 *";
+ break;
+ default:
+ break;
+ };
break;
/* linux_pidfd_send_signal */
case 424:
@@ -10094,6 +10107,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
/* linux_sched_rr_get_interval_time64 */
case 423:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_pidfd_send_signal */
case 424:
if (ndx == 0 || ndx == 1)
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index c3ab9a6dfc64..43e8578ba0c9 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -1603,7 +1603,8 @@ struct linux_sys_futex_time64_args {
char val3_l_[PADL_(uint32_t)]; uint32_t val3; char
val3_r_[PADR_(uint32_t)];
};
struct linux_sched_rr_get_interval_time64_args {
- syscallarg_t dummy;
+ char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
+ char interval_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 *
interval; char interval_r_[PADR_(struct l_timespec64 *)];
};
struct linux_pidfd_send_signal_args {
char pidfd_l_[PADL_(l_int)]; l_int pidfd; char pidfd_r_[PADR_(l_int)];
@@ -2385,7 +2386,7 @@ int linux_mount_setattr(struct thread *, struct
linux_mount_setattr_args *);
#define LINUX_SYS_AUE_linux_semtimedop_time64 AUE_NULL
#define LINUX_SYS_AUE_linux_rt_sigtimedwait_time64 AUE_NULL
#define LINUX_SYS_AUE_linux_sys_futex_time64 AUE_NULL
-#define LINUX_SYS_AUE_linux_sched_rr_get_interval_time64 AUE_NULL
+#define LINUX_SYS_AUE_linux_sched_rr_get_interval_time64
AUE_SCHED_RR_GET_INTERVAL
#define LINUX_SYS_AUE_linux_pidfd_send_signal AUE_NULL
#define LINUX_SYS_AUE_linux_io_uring_setup AUE_NULL
#define LINUX_SYS_AUE_linux_io_uring_enter AUE_NULL
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index 6ef4a556d9a2..f2c5543d57ce 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -440,7 +440,7 @@ struct sysent linux_sysent[] = {
{ .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_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_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 */
{ .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 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_uring_setup,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
425 = linux_io_uring_setup */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_uring_enter,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
426 = linux_io_uring_enter */
diff --git a/sys/i386/linux/linux_systrace_args.c
b/sys/i386/linux/linux_systrace_args.c
index 0f1848600a32..660be1e8a9f4 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -3146,7 +3146,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
}
/* linux_sched_rr_get_interval_time64 */
case 423: {
- *n_args = 0;
+ struct linux_sched_rr_get_interval_time64_args *p = params;
+ iarg[a++] = p->pid; /* l_pid_t */
+ uarg[a++] = (intptr_t)p->interval; /* struct l_timespec64 * */
+ *n_args = 2;
break;
}
/* linux_pidfd_send_signal */
@@ -8342,6 +8345,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
/* linux_sched_rr_get_interval_time64 */
case 423:
+ switch (ndx) {
+ case 0:
+ p = "l_pid_t";
+ break;
+ case 1:
+ p = "userland struct l_timespec64 *";
+ break;
+ default:
+ break;
+ };
break;
/* linux_pidfd_send_signal */
case 424:
@@ -10200,6 +10213,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
/* linux_sched_rr_get_interval_time64 */
case 423:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_pidfd_send_signal */
case 424:
if (ndx == 0 || ndx == 1)
