The branch main has been updated by asomers:
URL:
https://cgit.FreeBSD.org/src/commit/?id=1868a91fac5e01576b98e286d7408df875b65144
commit 1868a91fac5e01576b98e286d7408df875b65144
Author: Alan Somers <asom...@freebsd.org>
AuthorDate: 2021-01-03 02:57:39 +0000
Commit: Alan Somers <asom...@freebsd.org>
CommitDate: 2021-01-03 02:57:58 +0000
Regenerate syscall files after addition of aio_writev/aio_readv
---
sys/compat/freebsd32/freebsd32_proto.h | 10 ++++++
sys/compat/freebsd32/freebsd32_syscall.h | 2 ++
sys/compat/freebsd32/freebsd32_syscalls.c | 4 +--
sys/compat/freebsd32/freebsd32_sysent.c | 4 +--
sys/compat/freebsd32/freebsd32_systrace_args.c | 44 ++++++++++++++++++++++++++
sys/kern/init_sysent.c | 4 +--
sys/kern/syscalls.c | 4 +--
sys/kern/systrace_args.c | 44 ++++++++++++++++++++++++++
sys/sys/syscall.h | 2 ++
sys/sys/syscall.mk | 2 ++
sys/sys/sysproto.h | 10 ++++++
11 files changed, 122 insertions(+), 8 deletions(-)
diff --git a/sys/compat/freebsd32/freebsd32_proto.h
b/sys/compat/freebsd32/freebsd32_proto.h
index 279515468f84..148f58050117 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -251,6 +251,12 @@ struct freebsd32_lio_listio_args {
char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)];
char sig_l_[PADL_(struct sigevent32 *)]; struct sigevent32 * sig; char
sig_r_[PADR_(struct sigevent32 *)];
};
+struct freebsd32_aio_writev_args {
+ char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char
aiocbp_r_[PADR_(struct aiocb32 *)];
+};
+struct freebsd32_aio_readv_args {
+ char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char
aiocbp_r_[PADR_(struct aiocb32 *)];
+};
struct freebsd32_lutimes_args {
char path_l_[PADL_(const char *)]; const char * path; char
path_r_[PADR_(const char *)];
char tptr_l_[PADL_(struct timeval32 *)]; struct timeval32 * tptr; char
tptr_r_[PADR_(struct timeval32 *)];
@@ -789,6 +795,8 @@ int freebsd32_clock_getcpuclockid2(struct thread *, struct
freebsd32_clock_getcp
int freebsd32_aio_read(struct thread *, struct freebsd32_aio_read_args *);
int freebsd32_aio_write(struct thread *, struct freebsd32_aio_write_args *);
int freebsd32_lio_listio(struct thread *, struct freebsd32_lio_listio_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_lutimes(struct thread *, struct freebsd32_lutimes_args *);
int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *);
int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *);
@@ -1374,6 +1382,8 @@ int freebsd11_freebsd32_fstatat(struct thread *,
struct freebsd11_freebsd32_fsta
#define FREEBSD32_SYS_AUE_freebsd32_aio_read AUE_AIO_READ
#define FREEBSD32_SYS_AUE_freebsd32_aio_write AUE_AIO_WRITE
#define FREEBSD32_SYS_AUE_freebsd32_lio_listio AUE_LIO_LISTIO
+#define FREEBSD32_SYS_AUE_freebsd32_aio_writev AUE_AIO_WRITEV
+#define FREEBSD32_SYS_AUE_freebsd32_aio_readv AUE_AIO_READV
#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_getdents AUE_O_GETDENTS
#define FREEBSD32_SYS_AUE_freebsd32_lutimes AUE_LUTIMES
#define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h
b/sys/compat/freebsd32/freebsd32_syscall.h
index f3633479f271..edb68b36096e 100644
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -229,6 +229,8 @@
#define FREEBSD32_SYS_freebsd32_aio_read 255
#define FREEBSD32_SYS_freebsd32_aio_write 256
#define FREEBSD32_SYS_freebsd32_lio_listio 257
+#define FREEBSD32_SYS_freebsd32_aio_writev 258
+#define FREEBSD32_SYS_freebsd32_aio_readv 259
#define FREEBSD32_SYS_freebsd11_freebsd32_getdents 272
#define FREEBSD32_SYS_lchmod 274
/* 275 is obsolete netbsd_lchown */
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c
b/sys/compat/freebsd32/freebsd32_syscalls.c
index bb0af9d0b546..ba36bd222f11 100644
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -267,8 +267,8 @@ const char *freebsd32_syscallnames[] = {
"freebsd32_aio_read", /* 255 = freebsd32_aio_read */
"freebsd32_aio_write", /* 256 = freebsd32_aio_write */
"freebsd32_lio_listio", /* 257 = freebsd32_lio_listio */
- "#258", /* 258 = nosys */
- "#259", /* 259 = nosys */
+ "freebsd32_aio_writev", /* 258 = freebsd32_aio_writev */
+ "freebsd32_aio_readv", /* 259 = freebsd32_aio_readv */
"#260", /* 260 = nosys */
"#261", /* 261 = nosys */
"#262", /* 262 = nosys */
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c
b/sys/compat/freebsd32/freebsd32_sysent.c
index 0207bb356041..91d6e27778d4 100644
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -320,8 +320,8 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = AS(freebsd32_aio_read_args), .sy_call = (sy_call_t
*)freebsd32_aio_read, .sy_auevent = AUE_AIO_READ, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 255 = freebsd32_aio_read */
{ .sy_narg = AS(freebsd32_aio_write_args), .sy_call = (sy_call_t
*)freebsd32_aio_write, .sy_auevent = AUE_AIO_WRITE, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 256 = freebsd32_aio_write */
{ .sy_narg = AS(freebsd32_lio_listio_args), .sy_call = (sy_call_t
*)freebsd32_lio_listio, .sy_auevent = AUE_LIO_LISTIO, .sy_flags =
SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 257 =
freebsd32_lio_listio */
- { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 258 = nosys
*/
- { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 259 = nosys
*/
+ { .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 }, /* 258 =
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 }, /* 259 = freebsd32_aio_readv */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 260 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 261 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 262 = nosys
*/
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c
b/sys/compat/freebsd32/freebsd32_systrace_args.c
index 88a073508586..3d6b228709a8 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -1284,6 +1284,20 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
*n_args = 4;
break;
}
+ /* freebsd32_aio_writev */
+ case 258: {
+ struct freebsd32_aio_writev_args *p = params;
+ uarg[0] = (intptr_t) p->aiocbp; /* struct aiocb32 * */
+ *n_args = 1;
+ break;
+ }
+ /* freebsd32_aio_readv */
+ case 259: {
+ struct freebsd32_aio_readv_args *p = params;
+ uarg[0] = (intptr_t) p->aiocbp; /* struct aiocb32 * */
+ *n_args = 1;
+ break;
+ }
/* lchmod */
case 274: {
struct lchmod_args *p = params;
@@ -5420,6 +5434,26 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
};
break;
+ /* freebsd32_aio_writev */
+ case 258:
+ switch(ndx) {
+ case 0:
+ p = "userland struct aiocb32 *";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* freebsd32_aio_readv */
+ case 259:
+ switch(ndx) {
+ case 0:
+ p = "userland struct aiocb32 *";
+ break;
+ default:
+ break;
+ };
+ break;
/* lchmod */
case 274:
switch(ndx) {
@@ -9893,6 +9927,16 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* freebsd32_aio_writev */
+ case 258:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* freebsd32_aio_readv */
+ case 259:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* lchmod */
case 274:
if (ndx == 0 || ndx == 1)
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 80b10ac6b626..775ae9f7fc7e 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -313,8 +313,8 @@ struct sysent sysent[] = {
{ .sy_narg = AS(aio_read_args), .sy_call = (sy_call_t *)sys_aio_read,
.sy_auevent = AUE_AIO_READ, .sy_flags = SYF_CAPENABLED, .sy_thrcnt =
SY_THR_STATIC }, /* 255 = aio_read */
{ .sy_narg = AS(aio_write_args), .sy_call = (sy_call_t *)sys_aio_write,
.sy_auevent = AUE_AIO_WRITE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt =
SY_THR_STATIC }, /* 256 = aio_write */
{ .sy_narg = AS(lio_listio_args), .sy_call = (sy_call_t
*)sys_lio_listio, .sy_auevent = AUE_LIO_LISTIO, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 257 = lio_listio */
- { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 258 = nosys
*/
- { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 259 = nosys
*/
+ { .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 }, /* 258 = 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 }, /* 259 = aio_readv */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 260 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 261 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 262 = nosys
*/
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index e986d999640f..8b17b9af24d6 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -264,8 +264,8 @@ const char *syscallnames[] = {
"aio_read", /* 255 = aio_read */
"aio_write", /* 256 = aio_write */
"lio_listio", /* 257 = lio_listio */
- "#258", /* 258 = nosys */
- "#259", /* 259 = nosys */
+ "aio_writev", /* 258 = aio_writev */
+ "aio_readv", /* 259 = aio_readv */
"#260", /* 260 = nosys */
"#261", /* 261 = nosys */
"#262", /* 262 = nosys */
diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c
index 8076cc441137..936faddd8b11 100644
--- a/sys/kern/systrace_args.c
+++ b/sys/kern/systrace_args.c
@@ -1320,6 +1320,20 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
*n_args = 4;
break;
}
+ /* aio_writev */
+ case 258: {
+ struct aio_writev_args *p = params;
+ uarg[0] = (intptr_t) p->aiocbp; /* struct aiocb * */
+ *n_args = 1;
+ break;
+ }
+ /* aio_readv */
+ case 259: {
+ struct aio_readv_args *p = params;
+ uarg[0] = (intptr_t) p->aiocbp; /* struct aiocb * */
+ *n_args = 1;
+ break;
+ }
/* lchmod */
case 274: {
struct lchmod_args *p = params;
@@ -5471,6 +5485,26 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
};
break;
+ /* aio_writev */
+ case 258:
+ switch(ndx) {
+ case 0:
+ p = "userland struct aiocb *";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* aio_readv */
+ case 259:
+ switch(ndx) {
+ case 0:
+ p = "userland struct aiocb *";
+ break;
+ default:
+ break;
+ };
+ break;
/* lchmod */
case 274:
switch(ndx) {
@@ -9820,6 +9854,16 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* aio_writev */
+ case 258:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* aio_readv */
+ case 259:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* lchmod */
case 274:
if (ndx == 0 || ndx == 1)
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index cbbbe7c1d211..9da639113a6f 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -234,6 +234,8 @@
#define SYS_aio_read 255
#define SYS_aio_write 256
#define SYS_lio_listio 257
+#define SYS_aio_writev 258
+#define SYS_aio_readv 259
#define SYS_freebsd11_getdents 272
#define SYS_lchmod 274
/* 275 is obsolete netbsd_lchown */
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index ecd82f1722da..cd2a595891e5 100644
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -168,6 +168,8 @@ MIASM = \
aio_read.o \
aio_write.o \
lio_listio.o \
+ aio_writev.o \
+ aio_readv.o \
freebsd11_getdents.o \
lchmod.o \
lutimes.o \
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 3ff472872a5a..24f76b1c4409 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -714,6 +714,12 @@ struct lio_listio_args {
char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)];
char sig_l_[PADL_(struct sigevent *)]; struct sigevent * sig; char
sig_r_[PADR_(struct sigevent *)];
};
+struct aio_writev_args {
+ char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char
aiocbp_r_[PADR_(struct aiocb *)];
+};
+struct aio_readv_args {
+ char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char
aiocbp_r_[PADR_(struct aiocb *)];
+};
struct lchmod_args {
char path_l_[PADL_(const char *)]; const char * path; char
path_r_[PADR_(const char *)];
char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
@@ -1996,6 +2002,8 @@ int sys_lchown(struct thread *, struct lchown_args
*);
int sys_aio_read(struct thread *, struct aio_read_args *);
int sys_aio_write(struct thread *, struct aio_write_args *);
int sys_lio_listio(struct thread *, struct lio_listio_args *);
+int sys_aio_writev(struct thread *, struct aio_writev_args *);
+int sys_aio_readv(struct thread *, struct aio_readv_args *);
int sys_lchmod(struct thread *, struct lchmod_args *);
int sys_lutimes(struct thread *, struct lutimes_args *);
int sys_preadv(struct thread *, struct preadv_args *);
@@ -2907,6 +2915,8 @@ int freebsd12_closefrom(struct thread *, struct
freebsd12_closefrom_args *);
#define SYS_AUE_aio_read AUE_AIO_READ
#define SYS_AUE_aio_write AUE_AIO_WRITE
#define SYS_AUE_lio_listio AUE_LIO_LISTIO
+#define SYS_AUE_aio_writev AUE_AIO_WRITEV
+#define SYS_AUE_aio_readv AUE_AIO_READV
#define SYS_AUE_freebsd11_getdents AUE_O_GETDENTS
#define SYS_AUE_lchmod AUE_LCHMOD
#define SYS_AUE_lutimes AUE_LUTIMES
_______________________________________________
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"
