The branch main has been updated by dchagin:
URL:
https://cgit.FreeBSD.org/src/commit/?id=75e409495f67a39114e09224b8915cb0ecc481c4
commit 75e409495f67a39114e09224b8915cb0ecc481c4
Author: Dmitry Chagin <dcha...@freebsd.org>
AuthorDate: 2022-04-26 16:35:55 +0000
Commit: Dmitry Chagin <dcha...@freebsd.org>
CommitDate: 2022-04-26 16:35:55 +0000
linux(4): Regen for rseq syscall.
---
sys/amd64/linux/linux_proto.h | 5 ++++-
sys/amd64/linux/linux_sysent.c | 2 +-
sys/amd64/linux/linux_systrace_args.c | 26 +++++++++++++++++++++++++-
sys/amd64/linux32/linux32_proto.h | 5 ++++-
sys/amd64/linux32/linux32_sysent.c | 2 +-
sys/amd64/linux32/linux32_systrace_args.c | 26 +++++++++++++++++++++++++-
sys/arm64/linux/linux_proto.h | 5 ++++-
sys/arm64/linux/linux_sysent.c | 2 +-
sys/arm64/linux/linux_systrace_args.c | 26 +++++++++++++++++++++++++-
sys/i386/linux/linux_proto.h | 5 ++++-
sys/i386/linux/linux_sysent.c | 2 +-
sys/i386/linux/linux_systrace_args.c | 26 +++++++++++++++++++++++++-
12 files changed, 120 insertions(+), 12 deletions(-)
diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h
index ad4f29bf4a6e..5df0a4cf7686 100644
--- a/sys/amd64/linux/linux_proto.h
+++ b/sys/amd64/linux/linux_proto.h
@@ -1319,7 +1319,10 @@ struct linux_io_pgetevents_args {
syscallarg_t dummy;
};
struct linux_rseq_args {
- syscallarg_t dummy;
+ char rseq_l_[PADL_(struct linux_rseq *)]; struct linux_rseq * rseq;
char rseq_r_[PADR_(struct linux_rseq *)];
+ char rseq_len_l_[PADL_(uint32_t)]; uint32_t rseq_len; char
rseq_len_r_[PADR_(uint32_t)];
+ char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
+ char sig_l_[PADL_(uint32_t)]; uint32_t sig; char
sig_r_[PADR_(uint32_t)];
};
struct linux_pidfd_send_signal_args {
char pidfd_l_[PADL_(l_int)]; l_int pidfd; char pidfd_r_[PADR_(l_int)];
diff --git a/sys/amd64/linux/linux_sysent.c b/sys/amd64/linux/linux_sysent.c
index f2ec4ed77f6c..be053dc920c2 100644
--- a/sys/amd64/linux/linux_sysent.c
+++ b/sys/amd64/linux/linux_sysent.c
@@ -351,7 +351,7 @@ struct sysent linux_sysent[] = {
{ .sy_narg = AS(linux_pkey_free_args), .sy_call = (sy_call_t
*)linux_pkey_free, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 331 = linux_pkey_free */
{ .sy_narg = AS(linux_statx_args), .sy_call = (sy_call_t *)linux_statx,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 332
= linux_statx */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_pgetevents,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
333 = linux_io_pgetevents */
- { .sy_narg = 0, .sy_call = (sy_call_t *)linux_rseq, .sy_auevent =
AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 334 =
linux_rseq */
+ { .sy_narg = AS(linux_rseq_args), .sy_call = (sy_call_t *)linux_rseq,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
334 = linux_rseq */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 335 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 336 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 337 = nosys
*/
diff --git a/sys/amd64/linux/linux_systrace_args.c
b/sys/amd64/linux/linux_systrace_args.c
index eec96830a242..2b6f872fb539 100644
--- a/sys/amd64/linux/linux_systrace_args.c
+++ b/sys/amd64/linux/linux_systrace_args.c
@@ -2613,7 +2613,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
}
/* linux_rseq */
case 334: {
- *n_args = 0;
+ struct linux_rseq_args *p = params;
+ uarg[a++] = (intptr_t)p->rseq; /* struct linux_rseq * */
+ uarg[a++] = p->rseq_len; /* uint32_t */
+ iarg[a++] = p->flags; /* l_int */
+ uarg[a++] = p->sig; /* uint32_t */
+ *n_args = 4;
break;
}
/* linux_pidfd_send_signal */
@@ -6964,6 +6969,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
/* linux_rseq */
case 334:
+ switch (ndx) {
+ case 0:
+ p = "userland struct linux_rseq *";
+ break;
+ case 1:
+ p = "uint32_t";
+ break;
+ case 2:
+ p = "l_int";
+ break;
+ case 3:
+ p = "uint32_t";
+ break;
+ default:
+ break;
+ };
break;
/* linux_pidfd_send_signal */
case 424:
@@ -8499,6 +8520,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
case 333:
/* linux_rseq */
case 334:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_pidfd_send_signal */
case 424:
if (ndx == 0 || ndx == 1)
diff --git a/sys/amd64/linux32/linux32_proto.h
b/sys/amd64/linux32/linux32_proto.h
index b39367e9d9dd..dd3ea44a7f0a 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -1470,7 +1470,10 @@ struct linux_io_pgetevents_args {
syscallarg_t dummy;
};
struct linux_rseq_args {
- syscallarg_t dummy;
+ char rseq_l_[PADL_(struct linux_rseq *)]; struct linux_rseq * rseq;
char rseq_r_[PADR_(struct linux_rseq *)];
+ char rseq_len_l_[PADL_(uint32_t)]; uint32_t rseq_len; char
rseq_len_r_[PADR_(uint32_t)];
+ char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
+ char sig_l_[PADL_(uint32_t)]; uint32_t sig; char
sig_r_[PADR_(uint32_t)];
};
struct linux_semget_args {
char key_l_[PADL_(l_key_t)]; l_key_t key; char key_r_[PADR_(l_key_t)];
diff --git a/sys/amd64/linux32/linux32_sysent.c
b/sys/amd64/linux32/linux32_sysent.c
index f72ade6723f9..f4f67821be15 100644
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c
@@ -403,7 +403,7 @@ struct sysent linux32_sysent[] = {
{ .sy_narg = AS(linux_statx_args), .sy_call = (sy_call_t *)linux_statx,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 383
= linux_statx */
{ .sy_narg = AS(linux_arch_prctl_args), .sy_call = (sy_call_t
*)linux_arch_prctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 384 = linux_arch_prctl */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_pgetevents,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
385 = linux_io_pgetevents */
- { .sy_narg = 0, .sy_call = (sy_call_t *)linux_rseq, .sy_auevent =
AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 386 =
linux_rseq */
+ { .sy_narg = AS(linux_rseq_args), .sy_call = (sy_call_t *)linux_rseq,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
386 = linux_rseq */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 387 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 388 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 389 = nosys
*/
diff --git a/sys/amd64/linux32/linux32_systrace_args.c
b/sys/amd64/linux32/linux32_systrace_args.c
index c9c7914d01be..82c402dc679a 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -2867,7 +2867,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
}
/* linux_rseq */
case 386: {
- *n_args = 0;
+ struct linux_rseq_args *p = params;
+ uarg[a++] = (intptr_t)p->rseq; /* struct linux_rseq * */
+ uarg[a++] = p->rseq_len; /* uint32_t */
+ iarg[a++] = p->flags; /* l_int */
+ uarg[a++] = p->sig; /* uint32_t */
+ *n_args = 4;
break;
}
/* linux_semget */
@@ -7873,6 +7878,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
/* linux_rseq */
case 386:
+ switch (ndx) {
+ case 0:
+ p = "userland struct linux_rseq *";
+ break;
+ case 1:
+ p = "uint32_t";
+ break;
+ case 2:
+ p = "l_int";
+ break;
+ case 3:
+ p = "uint32_t";
+ break;
+ default:
+ break;
+ };
break;
/* linux_semget */
case 393:
@@ -9924,6 +9945,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
case 385:
/* linux_rseq */
case 386:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_semget */
case 393:
if (ndx == 0 || ndx == 1)
diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h
index 29dd536bb1e5..f4943e19522e 100644
--- a/sys/arm64/linux/linux_proto.h
+++ b/sys/arm64/linux/linux_proto.h
@@ -1126,7 +1126,10 @@ struct linux_io_pgetevents_args {
syscallarg_t dummy;
};
struct linux_rseq_args {
- syscallarg_t dummy;
+ char rseq_l_[PADL_(struct linux_rseq *)]; struct linux_rseq * rseq;
char rseq_r_[PADR_(struct linux_rseq *)];
+ char rseq_len_l_[PADL_(uint32_t)]; uint32_t rseq_len; char
rseq_len_r_[PADR_(uint32_t)];
+ char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
+ char sig_l_[PADL_(uint32_t)]; uint32_t sig; char
sig_r_[PADR_(uint32_t)];
};
struct linux_kexec_file_load_args {
syscallarg_t dummy;
diff --git a/sys/arm64/linux/linux_sysent.c b/sys/arm64/linux/linux_sysent.c
index f0faa9f51b74..a20724b85952 100644
--- a/sys/arm64/linux/linux_sysent.c
+++ b/sys/arm64/linux/linux_sysent.c
@@ -310,7 +310,7 @@ struct sysent linux_sysent[] = {
{ .sy_narg = AS(linux_pkey_free_args), .sy_call = (sy_call_t
*)linux_pkey_free, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 290 = linux_pkey_free */
{ .sy_narg = AS(linux_statx_args), .sy_call = (sy_call_t *)linux_statx,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 291
= linux_statx */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_pgetevents,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
292 = linux_io_pgetevents */
- { .sy_narg = 0, .sy_call = (sy_call_t *)linux_rseq, .sy_auevent =
AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 293 =
linux_rseq */
+ { .sy_narg = AS(linux_rseq_args), .sy_call = (sy_call_t *)linux_rseq,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
293 = linux_rseq */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_kexec_file_load,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 294
= linux_kexec_file_load */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 295 =
unimpl_md_syscall */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 296 =
unimpl_md_syscall */
diff --git a/sys/arm64/linux/linux_systrace_args.c
b/sys/arm64/linux/linux_systrace_args.c
index 454b78863b3f..50eb78bc6b44 100644
--- a/sys/arm64/linux/linux_systrace_args.c
+++ b/sys/arm64/linux/linux_systrace_args.c
@@ -2230,7 +2230,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
}
/* linux_rseq */
case 293: {
- *n_args = 0;
+ struct linux_rseq_args *p = params;
+ uarg[a++] = (intptr_t)p->rseq; /* struct linux_rseq * */
+ uarg[a++] = p->rseq_len; /* uint32_t */
+ iarg[a++] = p->flags; /* l_int */
+ uarg[a++] = p->sig; /* uint32_t */
+ *n_args = 4;
break;
}
/* linux_kexec_file_load */
@@ -6036,6 +6041,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
/* linux_rseq */
case 293:
+ switch (ndx) {
+ case 0:
+ p = "userland struct linux_rseq *";
+ break;
+ case 1:
+ p = "uint32_t";
+ break;
+ case 2:
+ p = "l_int";
+ break;
+ case 3:
+ p = "uint32_t";
+ break;
+ default:
+ break;
+ };
break;
/* linux_kexec_file_load */
case 294:
@@ -7357,6 +7378,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
case 292:
/* linux_rseq */
case 293:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_kexec_file_load */
case 294:
/* linux_pidfd_send_signal */
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 6a7ac3373f99..e926267cb0e1 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -1463,7 +1463,10 @@ struct linux_io_pgetevents_args {
syscallarg_t dummy;
};
struct linux_rseq_args {
- syscallarg_t dummy;
+ char rseq_l_[PADL_(struct linux_rseq *)]; struct linux_rseq * rseq;
char rseq_r_[PADR_(struct linux_rseq *)];
+ char rseq_len_l_[PADL_(uint32_t)]; uint32_t rseq_len; char
rseq_len_r_[PADR_(uint32_t)];
+ char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
+ char sig_l_[PADL_(uint32_t)]; uint32_t sig; char
sig_r_[PADR_(uint32_t)];
};
struct linux_semget_args {
char key_l_[PADL_(l_key_t)]; l_key_t key; char key_r_[PADR_(l_key_t)];
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index 9d64311c8c56..2d1c44761a94 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -403,7 +403,7 @@ struct sysent linux_sysent[] = {
{ .sy_narg = AS(linux_statx_args), .sy_call = (sy_call_t *)linux_statx,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 383
= linux_statx */
{ .sy_narg = AS(linux_arch_prctl_args), .sy_call = (sy_call_t
*)linux_arch_prctl, .sy_auevent = AUE_PRCTL, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 384 = linux_arch_prctl */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_io_pgetevents,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
385 = linux_io_pgetevents */
- { .sy_narg = 0, .sy_call = (sy_call_t *)linux_rseq, .sy_auevent =
AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 386 =
linux_rseq */
+ { .sy_narg = AS(linux_rseq_args), .sy_call = (sy_call_t *)linux_rseq,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
386 = linux_rseq */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 387 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 388 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 389 = nosys
*/
diff --git a/sys/i386/linux/linux_systrace_args.c
b/sys/i386/linux/linux_systrace_args.c
index a2a2c3b7bb53..c2c12901d87d 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -2906,7 +2906,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
}
/* linux_rseq */
case 386: {
- *n_args = 0;
+ struct linux_rseq_args *p = params;
+ uarg[a++] = (intptr_t)p->rseq; /* struct linux_rseq * */
+ uarg[a++] = p->rseq_len; /* uint32_t */
+ iarg[a++] = p->flags; /* l_int */
+ uarg[a++] = p->sig; /* uint32_t */
+ *n_args = 4;
break;
}
/* linux_semget */
@@ -7950,6 +7955,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
/* linux_rseq */
case 386:
+ switch (ndx) {
+ case 0:
+ p = "userland struct linux_rseq *";
+ break;
+ case 1:
+ p = "uint32_t";
+ break;
+ case 2:
+ p = "l_int";
+ break;
+ case 3:
+ p = "uint32_t";
+ break;
+ default:
+ break;
+ };
break;
/* linux_semget */
case 393:
@@ -10030,6 +10051,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
case 385:
/* linux_rseq */
case 386:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_semget */
case 393:
if (ndx == 0 || ndx == 1)
