The branch main has been updated by khng:
URL:
https://cgit.FreeBSD.org/src/commit/?id=da9fe3529b3ddc7a4edcbfe323dfbd280ac40f09
commit da9fe3529b3ddc7a4edcbfe323dfbd280ac40f09
Author: Ka Ho Ng <k...@freebsd.org>
AuthorDate: 2021-08-04 19:34:42 +0000
Commit: Ka Ho Ng <k...@freebsd.org>
CommitDate: 2021-08-05 15:22:02 +0000
Regen after 0dc332bff200
---
sys/compat/freebsd32/freebsd32_proto.h | 9 ++++++
sys/compat/freebsd32/freebsd32_syscall.h | 3 +-
sys/compat/freebsd32/freebsd32_syscalls.c | 1 +
sys/compat/freebsd32/freebsd32_sysent.c | 1 +
sys/compat/freebsd32/freebsd32_systrace_args.c | 38 ++++++++++++++++++++++++++
sys/kern/init_sysent.c | 1 +
sys/kern/syscalls.c | 1 +
sys/kern/systrace_args.c | 38 ++++++++++++++++++++++++++
sys/sys/syscall.h | 3 +-
sys/sys/syscall.mk | 3 +-
sys/sys/sysproto.h | 9 ++++++
11 files changed, 104 insertions(+), 3 deletions(-)
diff --git a/sys/compat/freebsd32/freebsd32_proto.h
b/sys/compat/freebsd32/freebsd32_proto.h
index d7d4d4fec5ff..3a59abc99dcf 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -751,6 +751,13 @@ struct freebsd32_aio_writev_args {
struct freebsd32_aio_readv_args {
char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char
aiocbp_r_[PADR_(struct aiocb32 *)];
};
+struct freebsd32_fspacectl_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
+ char rqsr_l_[PADL_(const struct spacectl_range32 *)]; const struct
spacectl_range32 * rqsr; char rqsr_r_[PADR_(const struct spacectl_range32 *)];
+ char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+ char rmsr_l_[PADL_(struct spacectl_range32 *)]; struct spacectl_range32
* rmsr; char rmsr_r_[PADR_(struct spacectl_range32 *)];
+};
#if !defined(PAD64_REQUIRED) && !defined(__amd64__)
#define PAD64_REQUIRED
#endif
@@ -893,6 +900,7 @@ int freebsd32_cpuset_setdomain(struct thread *, struct
freebsd32_cpuset_setdomai
int freebsd32___sysctlbyname(struct thread *, struct
freebsd32___sysctlbyname_args *);
int freebsd32_aio_writev(struct thread *, struct freebsd32_aio_writev_args
*);
int freebsd32_aio_readv(struct thread *, struct freebsd32_aio_readv_args *);
+int freebsd32_fspacectl(struct thread *, struct freebsd32_fspacectl_args *);
#ifdef COMPAT_43
@@ -1486,6 +1494,7 @@ int freebsd11_freebsd32_fstatat(struct thread *,
struct freebsd11_freebsd32_fsta
#define FREEBSD32_SYS_AUE_freebsd32___sysctlbyname AUE_SYSCTL
#define FREEBSD32_SYS_AUE_freebsd32_aio_writev AUE_AIO_WRITEV
#define FREEBSD32_SYS_AUE_freebsd32_aio_readv AUE_AIO_READV
+#define FREEBSD32_SYS_AUE_freebsd32_fspacectl AUE_FSPACECTL
#undef PAD_
#undef PADL_
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h
b/sys/compat/freebsd32/freebsd32_syscall.h
index c6ca12448ad2..7898b3a25c2e 100644
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -508,4 +508,5 @@
#define FREEBSD32_SYS___specialfd 577
#define FREEBSD32_SYS_freebsd32_aio_writev 578
#define FREEBSD32_SYS_freebsd32_aio_readv 579
-#define FREEBSD32_SYS_MAXSYSCALL 580
+#define FREEBSD32_SYS_freebsd32_fspacectl 580
+#define FREEBSD32_SYS_MAXSYSCALL 581
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c
b/sys/compat/freebsd32/freebsd32_syscalls.c
index 4a79f2efdaa4..51b7dbc249d0 100644
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -616,4 +616,5 @@ const char *freebsd32_syscallnames[] = {
"__specialfd", /* 577 = __specialfd */
"freebsd32_aio_writev", /* 578 = freebsd32_aio_writev */
"freebsd32_aio_readv", /* 579 = freebsd32_aio_readv */
+ "freebsd32_fspacectl", /* 580 = freebsd32_fspacectl */
};
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c
b/sys/compat/freebsd32/freebsd32_sysent.c
index 98b43274e9d8..6e1ae033b765 100644
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -669,4 +669,5 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = AS(__specialfd_args), .sy_call = (sy_call_t
*)sys___specialfd, .sy_auevent = AUE_SPECIALFD, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 577 = __specialfd */
{ .sy_narg = AS(freebsd32_aio_writev_args), .sy_call = (sy_call_t
*)freebsd32_aio_writev, .sy_auevent = AUE_AIO_WRITEV, .sy_flags =
SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 578 =
freebsd32_aio_writev */
{ .sy_narg = AS(freebsd32_aio_readv_args), .sy_call = (sy_call_t
*)freebsd32_aio_readv, .sy_auevent = AUE_AIO_READV, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 579 = freebsd32_aio_readv */
+ { .sy_narg = AS(freebsd32_fspacectl_args), .sy_call = (sy_call_t
*)freebsd32_fspacectl, .sy_auevent = AUE_FSPACECTL, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 580 = freebsd32_fspacectl */
};
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c
b/sys/compat/freebsd32/freebsd32_systrace_args.c
index 818a34e0cdad..7c970c358296 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -3407,6 +3407,17 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
*n_args = 1;
break;
}
+ /* freebsd32_fspacectl */
+ case 580: {
+ struct freebsd32_fspacectl_args *p = params;
+ iarg[0] = p->fd; /* int */
+ iarg[1] = p->cmd; /* int */
+ uarg[2] = (intptr_t)p->rqsr; /* const struct spacectl_range32 *
*/
+ iarg[3] = p->flags; /* int */
+ uarg[4] = (intptr_t)p->rmsr; /* struct spacectl_range32 * */
+ *n_args = 5;
+ break;
+ }
default:
*n_args = 0;
break;
@@ -9183,6 +9194,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
};
break;
+ /* freebsd32_fspacectl */
+ case 580:
+ switch (ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ case 2:
+ p = "userland const struct spacectl_range32 *";
+ break;
+ case 3:
+ p = "int";
+ break;
+ case 4:
+ p = "userland struct spacectl_range32 *";
+ break;
+ default:
+ break;
+ };
+ break;
default:
break;
};
@@ -11102,6 +11135,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* freebsd32_fspacectl */
+ case 580:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
default:
break;
};
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index bc5beb83cf3f..414b998420aa 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -635,4 +635,5 @@ struct sysent sysent[] = {
{ .sy_narg = AS(__specialfd_args), .sy_call = (sy_call_t
*)sys___specialfd, .sy_auevent = AUE_SPECIALFD, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 577 = __specialfd */
{ .sy_narg = AS(aio_writev_args), .sy_call = (sy_call_t
*)sys_aio_writev, .sy_auevent = AUE_AIO_WRITEV, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 578 = aio_writev */
{ .sy_narg = AS(aio_readv_args), .sy_call = (sy_call_t *)sys_aio_readv,
.sy_auevent = AUE_AIO_READV, .sy_flags = SYF_CAPENABLED, .sy_thrcnt =
SY_THR_STATIC }, /* 579 = aio_readv */
+ { .sy_narg = AS(fspacectl_args), .sy_call = (sy_call_t *)sys_fspacectl,
.sy_auevent = AUE_FSPACECTL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt =
SY_THR_STATIC }, /* 580 = fspacectl */
};
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 190c82dd4e5e..4d5423a28bb8 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -586,4 +586,5 @@ const char *syscallnames[] = {
"__specialfd", /* 577 = __specialfd */
"aio_writev", /* 578 = aio_writev */
"aio_readv", /* 579 = aio_readv */
+ "fspacectl", /* 580 = fspacectl */
};
diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c
index 8f8274b1cdac..d924e49be355 100644
--- a/sys/kern/systrace_args.c
+++ b/sys/kern/systrace_args.c
@@ -3399,6 +3399,17 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
*n_args = 1;
break;
}
+ /* fspacectl */
+ case 580: {
+ struct fspacectl_args *p = params;
+ iarg[0] = p->fd; /* int */
+ iarg[1] = p->cmd; /* int */
+ uarg[2] = (intptr_t)p->rqsr; /* const struct spacectl_range * */
+ iarg[3] = p->flags; /* int */
+ uarg[4] = (intptr_t)p->rmsr; /* struct spacectl_range * */
+ *n_args = 5;
+ break;
+ }
default:
*n_args = 0;
break;
@@ -9088,6 +9099,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
};
break;
+ /* fspacectl */
+ case 580:
+ switch (ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ case 2:
+ p = "userland const struct spacectl_range *";
+ break;
+ case 3:
+ p = "int";
+ break;
+ case 4:
+ p = "userland struct spacectl_range *";
+ break;
+ default:
+ break;
+ };
+ break;
default:
break;
};
@@ -11034,6 +11067,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* fspacectl */
+ case 580:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
default:
break;
};
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 950055c9559e..34c836f22ccc 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -517,4 +517,5 @@
#define SYS___specialfd 577
#define SYS_aio_writev 578
#define SYS_aio_readv 579
-#define SYS_MAXSYSCALL 580
+#define SYS_fspacectl 580
+#define SYS_MAXSYSCALL 581
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index e007d2c81e61..52cc8c9a7563 100644
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -422,4 +422,5 @@ MIASM = \
rpctls_syscall.o \
__specialfd.o \
aio_writev.o \
- aio_readv.o
+ aio_readv.o \
+ fspacectl.o
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index f17b1951f559..cec3c1925e5d 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -1847,6 +1847,13 @@ struct aio_writev_args {
struct aio_readv_args {
char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char
aiocbp_r_[PADR_(struct aiocb *)];
};
+struct fspacectl_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
+ char rqsr_l_[PADL_(const struct spacectl_range *)]; const struct
spacectl_range * rqsr; char rqsr_r_[PADR_(const struct spacectl_range *)];
+ char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+ char rmsr_l_[PADL_(struct spacectl_range *)]; struct spacectl_range *
rmsr; char rmsr_r_[PADR_(struct spacectl_range *)];
+};
int nosys(struct thread *, struct nosys_args *);
void sys_sys_exit(struct thread *, struct sys_exit_args *);
int sys_fork(struct thread *, struct fork_args *);
@@ -2241,6 +2248,7 @@ int sys_rpctls_syscall(struct thread *, struct
rpctls_syscall_args *);
int sys___specialfd(struct thread *, struct __specialfd_args *);
int sys_aio_writev(struct thread *, struct aio_writev_args *);
int sys_aio_readv(struct thread *, struct aio_readv_args *);
+int sys_fspacectl(struct thread *, struct fspacectl_args *);
#ifdef COMPAT_43
@@ -3185,6 +3193,7 @@ int freebsd12_closefrom(struct thread *, struct
freebsd12_closefrom_args *);
#define SYS_AUE___specialfd AUE_SPECIALFD
#define SYS_AUE_aio_writev AUE_AIO_WRITEV
#define SYS_AUE_aio_readv AUE_AIO_READV
+#define SYS_AUE_fspacectl AUE_FSPACECTL
#undef PAD_
#undef PADL_
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
