src - FreeBSD source tree

diff options


context:
space:
mode:

author	Dmitry Chagin <dchagin@FreeBSD.org>	2021-06-10 11:52:43 +0000
committer	Dmitry Chagin <dchagin@FreeBSD.org>	2021-06-10 11:52:43 +0000
commit	c0025290006044d2dd7e3b1b52c04d796dddc374 (patch)
tree	a0cc7e0a39db5f977e1e85dc0e2acb4ded591129
parent	db4a1f331b73eb821d5d9c3cbb478ad50223f023 (diff)
download	src-c0025290006044d2dd7e3b1b52c04d796dddc374.tar.gz src-c0025290006044d2dd7e3b1b52c04d796dddc374.zip

linux(4): Regen for rt_sigtimedwait_time64 system call.

MFC after: 2 weeks

Diffstat

-rw-r--r--

sys/amd64/linux32/linux32_proto.h

-rw-r--r--

sys/amd64/linux32/linux32_sysent.c

-rw-r--r--

sys/amd64/linux32/linux32_systrace_args.c

-rw-r--r--

sys/i386/linux/linux_proto.h

-rw-r--r--

sys/i386/linux/linux_sysent.c

-rw-r--r--

sys/i386/linux/linux_systrace_args.c

6 files changed, 60 insertions, 6 deletions

diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h
index 5379aaf9c4f6..6d23a13ca4c3 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h

@@ -1579,7 +1579,10 @@ struct linux_semtimedop_time64_args {

register_t dummy;

};

struct linux_rt_sigtimedwait_time64_args {

- register_t dummy;

+ char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)];

+ char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)];

+ char timeout_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * timeout; char timeout_r_[PADR_(struct l_timespec64 *)];

+ char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)];

};

struct linux_sys_futex_time64_args {

char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)];

diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c
index f84844d58e20..d131db0a570c 100644
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c

@@ -438,7 +438,7 @@ struct sysent linux32_sysent[] = {

{ .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 = 0, .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_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_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 */

diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c
index 10a400677f07..e31c309800e5 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c

@@ -3066,7 +3066,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)

}

/* linux_rt_sigtimedwait_time64 */

case 421: {

- *n_args = 0;

+ struct linux_rt_sigtimedwait_time64_args *p = params;

+ uarg[0] = (intptr_t)p->mask; /* l_sigset_t * */

+ uarg[1] = (intptr_t)p->ptr; /* l_siginfo_t * */

+ uarg[2] = (intptr_t)p->timeout; /* struct l_timespec64 * */

+ iarg[3] = p->sigsetsize; /* l_size_t */

+ *n_args = 4;

break;

}

/* linux_sys_futex_time64 */

@@ -8125,6 +8130,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)

break;

/* linux_rt_sigtimedwait_time64 */

case 421:

+ switch (ndx) {

+ case 0:

+ p = "userland l_sigset_t *";

+ break;

+ case 1:

+ p = "userland l_siginfo_t *";

+ break;

+ case 2:

+ p = "userland struct l_timespec64 *";

+ break;

+ case 3:

+ p = "l_size_t";

+ break;

+ default:

+ break;

+ };

break;

/* linux_sys_futex_time64 */

case 422:

@@ -9915,6 +9936,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)

case 420:

/* linux_rt_sigtimedwait_time64 */

case 421:

+ if (ndx == 0 || ndx == 1)

+ p = "int";

+ break;

/* linux_sys_futex_time64 */

case 422:

if (ndx == 0 || ndx == 1)

diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 42e8d0a17f85..8ba444340fea 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h

@@ -1572,7 +1572,10 @@ struct linux_semtimedop_time64_args {

register_t dummy;

};

struct linux_rt_sigtimedwait_time64_args {

- register_t dummy;

+ char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)];

+ char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)];

+ char timeout_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * timeout; char timeout_r_[PADR_(struct l_timespec64 *)];

+ char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)];

};

struct linux_sys_futex_time64_args {

char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)];

diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index d5435b99e51b..722fe27ca8cb 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c

@@ -438,7 +438,7 @@ struct sysent linux_sysent[] = {

{ .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 = 0, .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 */

diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c
index 3355d72448e3..7d2189734252 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c

@@ -3105,7 +3105,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)

}

/* linux_rt_sigtimedwait_time64 */

case 421: {

- *n_args = 0;

+ struct linux_rt_sigtimedwait_time64_args *p = params;

+ uarg[0] = (intptr_t)p->mask; /* l_sigset_t * */

+ uarg[1] = (intptr_t)p->ptr; /* l_siginfo_t * */

+ uarg[2] = (intptr_t)p->timeout; /* struct l_timespec64 * */

+ iarg[3] = p->sigsetsize; /* l_size_t */

+ *n_args = 4;

break;

}

/* linux_sys_futex_time64 */

@@ -8202,6 +8207,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)

break;

/* linux_rt_sigtimedwait_time64 */

case 421:

+ switch (ndx) {

+ case 0:

+ p = "userland l_sigset_t *";

+ break;

+ case 1:

+ p = "userland l_siginfo_t *";

+ break;

+ case 2:

+ p = "userland struct l_timespec64 *";

+ break;

+ case 3:

+ p = "l_size_t";

+ break;

+ default:

+ break;

+ };

break;

/* linux_sys_futex_time64 */

case 422:

@@ -10021,6 +10042,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)

case 420:

/* linux_rt_sigtimedwait_time64 */

case 421:

+ if (ndx == 0 || ndx == 1)

+ p = "int";

+ break;

/* linux_sys_futex_time64 */

case 422:

if (ndx == 0 || ndx == 1)