src - FreeBSD source tree

diff options


context:
space:
mode:

author	Dmitry Chagin <dchagin@FreeBSD.org>	2021-06-07 01:56:58 +0000
committer	Dmitry Chagin <dchagin@FreeBSD.org>	2021-06-07 01:56:58 +0000
commit	ea7fa5583c407664b278a5f50cb16c7a7c6bcbc0 (patch)
tree	bb69aae1e85bc6a690f3c99bfad4aee5132b869b
parent	e4bffb80bbc6a2e4b3be89aefcbd5bb2c2fc0ba0 (diff)
download	src-ea7fa5583c407664b278a5f50cb16c7a7c6bcbc0.tar.gz src-ea7fa5583c407664b278a5f50cb16c7a7c6bcbc0.zip

Regen for ('e4bffb80bbc6a2e4b3be89aefcbd5bb2c2fc0ba0') Linux

utimensat_time64 syscall. 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 3055651ac382..8d2f74d3f04c 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h

@@ -1546,7 +1546,10 @@ struct linux_timerfd_settime64_args {

register_t dummy;

};

struct linux_utimensat_time64_args {

- register_t dummy;

+ char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];

+ char pathname_l_[PADL_(const char *)]; const char * pathname; char pathname_r_[PADR_(const char *)];

+ char times64_l_[PADL_(const struct l_timespec64 *)]; const struct l_timespec64 * times64; char times64_r_[PADR_(const struct l_timespec64 *)];

+ char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];

};

struct linux_pselect6_time64_args {

register_t dummy;

diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c
index 4c0c0e991244..da751f94b5e6 100644
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c

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

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

- { .sy_narg = 0, .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_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 = 0, .sy_call = (sy_call_t *)linux_pselect6_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 413 = linux_pselect6_time64 */

{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_ppoll_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 414 = linux_ppoll_time64 */

{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 415 = nosys */

diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c
index 1a1f46412f33..4d6a54e37e11 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c

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

}

/* linux_utimensat_time64 */

case 412: {

- *n_args = 0;

+ struct linux_utimensat_time64_args *p = params;

+ iarg[0] = p->dfd; /* l_int */

+ uarg[1] = (intptr_t)p->pathname; /* const char * */

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

+ iarg[3] = p->flags; /* l_int */

+ *n_args = 4;

break;

}

/* linux_pselect6_time64 */

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

break;

/* linux_utimensat_time64 */

case 412:

+ switch (ndx) {

+ case 0:

+ p = "l_int";

+ break;

+ case 1:

+ p = "userland const char *";

+ break;

+ case 2:

+ p = "userland const struct l_timespec64 *";

+ break;

+ case 3:

+ p = "l_int";

+ break;

+ default:

+ break;

+ };

break;

/* linux_pselect6_time64 */

case 413:

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

case 411:

/* linux_utimensat_time64 */

case 412:

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

+ p = "int";

+ break;

/* linux_pselect6_time64 */

case 413:

/* linux_ppoll_time64 */

diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index d306e345224a..1a963a49aecd 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h

@@ -1539,7 +1539,10 @@ struct linux_timerfd_settime64_args {

register_t dummy;

};

struct linux_utimensat_time64_args {

- register_t dummy;

+ char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];

+ char pathname_l_[PADL_(const char *)]; const char * pathname; char pathname_r_[PADR_(const char *)];

+ char times64_l_[PADL_(const struct l_timespec64 *)]; const struct l_timespec64 * times64; char times64_r_[PADR_(const struct l_timespec64 *)];

+ char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];

};

struct linux_pselect6_time64_args {

register_t dummy;

diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index 83e8550b15f6..bb9280580dde 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c

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