Date: Wed, 23 Aug 2023 00:07:39 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: c7df87209634 - main - Regen Message-ID: <202308230007.37N07dIw082936@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c7df87209634129df476049c2f38cd4ebefa386f commit c7df87209634129df476049c2f38cd4ebefa386f Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2023-08-22 15:53:35 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2023-08-23 00:02:21 +0000 Regen --- 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 | 30 ++++++++++++++++++++++++++ sys/kern/init_sysent.c | 1 + sys/kern/syscalls.c | 1 + sys/kern/systrace_args.c | 30 ++++++++++++++++++++++++++ sys/sys/syscall.h | 3 ++- sys/sys/syscall.mk | 3 ++- sys/sys/sysproto.h | 7 ++++++ 10 files changed, 77 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 7b282257d2a0..c3d8617abf4b 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -501,4 +501,5 @@ #define FREEBSD32_SYS_sched_getcpu 581 #define FREEBSD32_SYS_swapoff 582 #define FREEBSD32_SYS_kqueuex 583 -#define FREEBSD32_SYS_MAXSYSCALL 584 +#define FREEBSD32_SYS_membarrier 584 +#define FREEBSD32_SYS_MAXSYSCALL 585 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index 36bfc0c8e847..19d454743c55 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -589,4 +589,5 @@ const char *freebsd32_syscallnames[] = { "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ "kqueuex", /* 583 = kqueuex */ + "membarrier", /* 584 = membarrier */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 3ec8bce6986b..971f06a643c5 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -645,4 +645,5 @@ struct sysent freebsd32_sysent[] = { { .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 = 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 */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 01288c111644..5dfc82c30b7b 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3327,6 +3327,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 1; break; } + /* membarrier */ + case 584: { + struct membarrier_args *p = params; + iarg[a++] = p->cmd; /* int */ + uarg[a++] = p->flags; /* unsigned */ + iarg[a++] = p->cpu_id; /* int */ + *n_args = 3; + break; + } default: *n_args = 0; break; @@ -8980,6 +8989,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* membarrier */ + case 584: + switch (ndx) { + case 0: + p = "int"; + break; + case 1: + p = "unsigned"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -10843,6 +10868,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* membarrier */ + case 584: + 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 c175a43d19cb..1e62c46b8be0 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -644,4 +644,5 @@ struct sysent sysent[] = { { .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 = 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 */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index aafb1f26bd0b..bfbc51e0903d 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -589,4 +589,5 @@ const char *syscallnames[] = { "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ "kqueuex", /* 583 = kqueuex */ + "membarrier", /* 584 = membarrier */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 594636c585db..d023391aa7a7 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3423,6 +3423,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 1; break; } + /* membarrier */ + case 584: { + struct membarrier_args *p = params; + iarg[a++] = p->cmd; /* int */ + uarg[a++] = p->flags; /* unsigned */ + iarg[a++] = p->cpu_id; /* int */ + *n_args = 3; + break; + } default: *n_args = 0; break; @@ -9150,6 +9159,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* membarrier */ + case 584: + switch (ndx) { + case 0: + p = "int"; + break; + case 1: + p = "unsigned"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -11108,6 +11133,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* membarrier */ + case 584: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 96e525f99a86..1af14eecec73 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -520,4 +520,5 @@ #define SYS_sched_getcpu 581 #define SYS_swapoff 582 #define SYS_kqueuex 583 -#define SYS_MAXSYSCALL 584 +#define SYS_membarrier 584 +#define SYS_MAXSYSCALL 585 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 88a004a98332..4337ccb32a0c 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -425,4 +425,5 @@ MIASM = \ fspacectl.o \ sched_getcpu.o \ swapoff.o \ - kqueuex.o + kqueuex.o \ + membarrier.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 46bd4970e04d..9e1ea67730e3 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1857,6 +1857,11 @@ struct swapoff_args { struct kqueuex_args { char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; }; +struct membarrier_args { + char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; + 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)]; +}; int sys_exit(struct thread *, struct exit_args *); int sys_fork(struct thread *, struct fork_args *); int sys_read(struct thread *, struct read_args *); @@ -2253,6 +2258,7 @@ int sys_fspacectl(struct thread *, struct fspacectl_args *); 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 *); #ifdef COMPAT_43 @@ -3223,6 +3229,7 @@ int freebsd13_swapoff(struct thread *, struct freebsd13_swapoff_args *); #define SYS_AUE_sched_getcpu AUE_NULL #define SYS_AUE_swapoff AUE_SWAPOFF #define SYS_AUE_kqueuex AUE_KQUEUE +#define SYS_AUE_membarrier AUE_NULL #undef PAD_ #undef PADL_
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308230007.37N07dIw082936>