git: 615e64836b7b - stable/13 - regen
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 11 Feb 2024 01:52:55 UTC
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=615e64836b7bcf69c695c2cbe822851ffafb67cc
commit 615e64836b7bcf69c695c2cbe822851ffafb67cc
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-01-24 05:33:52 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-02-11 01:40:30 +0000
regen
---
sys/compat/freebsd32/freebsd32_syscall.h | 3 +-
sys/compat/freebsd32/freebsd32_syscalls.c | 6 ++++
sys/compat/freebsd32/freebsd32_sysent.c | 6 ++++
sys/compat/freebsd32/freebsd32_systrace_args.c | 38 ++++++++++++++++++++++++++
sys/kern/init_sysent.c | 4 +++
sys/kern/syscalls.c | 4 +++
sys/kern/systrace_args.c | 38 ++++++++++++++++++++++++++
sys/sys/syscall.h | 3 +-
sys/sys/syscall.mk | 3 +-
sys/sys/sysproto.h | 9 ++++++
10 files changed, 111 insertions(+), 3 deletions(-)
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h
index 2e9bd9f419f5..205b35b8fedc 100644
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -508,4 +508,5 @@
#define FREEBSD32_SYS_freebsd32_aio_writev 578
#define FREEBSD32_SYS_freebsd32_aio_readv 579
#define FREEBSD32_SYS_sched_getcpu 581
-#define FREEBSD32_SYS_MAXSYSCALL 583
+#define FREEBSD32_SYS_kcmp 588
+#define FREEBSD32_SYS_MAXSYSCALL 589
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c
index d804247bb173..7aee0a507acf 100644
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -618,4 +618,10 @@ const char *freebsd32_syscallnames[] = {
"#580", /* 580 = fspacectl */
"sched_getcpu", /* 581 = sched_getcpu */
"#582", /* 582 = swapoff */
+ "#583", /* 583 = kqueuex */
+ "#584", /* 584 = membarrier */
+ "#585", /* 585 = timerfd_create */
+ "#586", /* 586 = timerfd_gettime */
+ "#587", /* 587 = timerfd_settime */
+ "kcmp", /* 588 = kcmp */
};
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c
index 10b94aa4a899..ff8f80a6ff42 100644
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -671,4 +671,10 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 580 = fspacectl */
{ .sy_narg = 0, .sy_call = (sy_call_t *)sys_sched_getcpu, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 581 = sched_getcpu */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 582 = swapoff */
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 583 = kqueuex */
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 584 = membarrier */
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 585 = timerfd_create */
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 586 = timerfd_gettime */
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 587 = timerfd_settime */
+ { .sy_narg = AS(kcmp_args), .sy_call = (sy_call_t *)sys_kcmp, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 588 = kcmp */
};
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c
index 96f0ee10dbda..0daa93ef04de 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -3411,6 +3411,17 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
*n_args = 0;
break;
}
+ /* kcmp */
+ case 588: {
+ struct kcmp_args *p = params;
+ iarg[0] = p->pid1; /* pid_t */
+ iarg[1] = p->pid2; /* pid_t */
+ iarg[2] = p->type; /* int */
+ uarg[3] = p->idx1; /* u_int */
+ uarg[4] = p->idx2; /* u_int */
+ *n_args = 5;
+ break;
+ }
default:
*n_args = 0;
break;
@@ -9190,6 +9201,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
/* sched_getcpu */
case 581:
break;
+ /* kcmp */
+ case 588:
+ switch (ndx) {
+ case 0:
+ p = "pid_t";
+ break;
+ case 1:
+ p = "pid_t";
+ break;
+ case 2:
+ p = "int";
+ break;
+ case 3:
+ p = "u_int";
+ break;
+ case 4:
+ p = "u_int";
+ break;
+ default:
+ break;
+ };
+ break;
default:
break;
};
@@ -11111,6 +11144,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
/* sched_getcpu */
case 581:
+ /* kcmp */
+ case 588:
+ 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 b2d0120da519..83eaed3ddaed 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -639,4 +639,8 @@ struct sysent sysent[] = {
{ .sy_narg = AS(swapoff_args), .sy_call = (sy_call_t *)sys_swapoff, .sy_auevent = AUE_SWAPOFF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 582 = swapoff */
{ .sy_narg = AS(kqueuex_args), .sy_call = (sy_call_t *)sys_kqueuex, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueuex */
{ .sy_narg = AS(membarrier_args), .sy_call = (sy_call_t *)sys_membarrier, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 584 = membarrier */
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 585 = timerfd_create */
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 586 = timerfd_gettime */
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 587 = timerfd_settime */
+ { .sy_narg = AS(kcmp_args), .sy_call = (sy_call_t *)sys_kcmp, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 588 = kcmp */
};
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 22475e2ee226..b3b958d145bc 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -590,4 +590,8 @@ const char *syscallnames[] = {
"swapoff", /* 582 = swapoff */
"kqueuex", /* 583 = kqueuex */
"membarrier", /* 584 = membarrier */
+ "#585", /* 585 = timerfd_create */
+ "#586", /* 586 = timerfd_gettime */
+ "#587", /* 587 = timerfd_settime */
+ "kcmp", /* 588 = kcmp */
};
diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c
index 00e3bead052e..714c5225e45b 100644
--- a/sys/kern/systrace_args.c
+++ b/sys/kern/systrace_args.c
@@ -3427,6 +3427,17 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
*n_args = 3;
break;
}
+ /* kcmp */
+ case 588: {
+ struct kcmp_args *p = params;
+ iarg[0] = p->pid1; /* pid_t */
+ iarg[1] = p->pid2; /* pid_t */
+ iarg[2] = p->type; /* int */
+ uarg[3] = p->idx1; /* uintptr_t */
+ uarg[4] = p->idx2; /* uintptr_t */
+ *n_args = 5;
+ break;
+ }
default:
*n_args = 0;
break;
@@ -9158,6 +9169,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
};
break;
+ /* kcmp */
+ case 588:
+ switch (ndx) {
+ case 0:
+ p = "pid_t";
+ break;
+ case 1:
+ p = "pid_t";
+ break;
+ case 2:
+ p = "int";
+ break;
+ case 3:
+ p = "uintptr_t";
+ break;
+ case 4:
+ p = "uintptr_t";
+ break;
+ default:
+ break;
+ };
+ break;
default:
break;
};
@@ -11121,6 +11154,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* kcmp */
+ case 588:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
default:
break;
};
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 26d541f4548c..945588b280d0 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -520,4 +520,5 @@
#define SYS_swapoff 582
#define SYS_kqueuex 583
#define SYS_membarrier 584
-#define SYS_MAXSYSCALL 585
+#define SYS_kcmp 588
+#define SYS_MAXSYSCALL 589
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index 2be42554587d..9764db522002 100644
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -425,4 +425,5 @@ MIASM = \
sched_getcpu.o \
swapoff.o \
kqueuex.o \
- membarrier.o
+ membarrier.o \
+ kcmp.o
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 64ee28267df3..af22fee46aca 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -1861,6 +1861,13 @@ struct membarrier_args {
char flags_l_[PADL_(unsigned)]; unsigned flags; char flags_r_[PADR_(unsigned)];
char cpu_id_l_[PADL_(int)]; int cpu_id; char cpu_id_r_[PADR_(int)];
};
+struct kcmp_args {
+ char pid1_l_[PADL_(pid_t)]; pid_t pid1; char pid1_r_[PADR_(pid_t)];
+ char pid2_l_[PADL_(pid_t)]; pid_t pid2; char pid2_r_[PADR_(pid_t)];
+ char type_l_[PADL_(int)]; int type; char type_r_[PADR_(int)];
+ char idx1_l_[PADL_(uintptr_t)]; uintptr_t idx1; char idx1_r_[PADR_(uintptr_t)];
+ char idx2_l_[PADL_(uintptr_t)]; uintptr_t idx2; char idx2_r_[PADR_(uintptr_t)];
+};
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 *);
@@ -2259,6 +2266,7 @@ int sys_sched_getcpu(struct thread *, struct sched_getcpu_args *);
int sys_swapoff(struct thread *, struct swapoff_args *);
int sys_kqueuex(struct thread *, struct kqueuex_args *);
int sys_membarrier(struct thread *, struct membarrier_args *);
+int sys_kcmp(struct thread *, struct kcmp_args *);
#ifdef COMPAT_43
@@ -3207,6 +3215,7 @@ int freebsd12_closefrom(struct thread *, struct freebsd12_closefrom_args *);
#define SYS_AUE_swapoff AUE_SWAPOFF
#define SYS_AUE_kqueuex AUE_KQUEUE
#define SYS_AUE_membarrier AUE_NULL
+#define SYS_AUE_kcmp AUE_NULL
#undef PAD_
#undef PADL_