This commit is contained in:
Konstantin Belousov 2023-08-22 18:53:35 +03:00
parent 4a69fc16a5
commit c7df872096
10 changed files with 77 additions and 3 deletions

View File

@ -501,4 +501,5 @@
#define FREEBSD32_SYS_sched_getcpu 581 #define FREEBSD32_SYS_sched_getcpu 581
#define FREEBSD32_SYS_swapoff 582 #define FREEBSD32_SYS_swapoff 582
#define FREEBSD32_SYS_kqueuex 583 #define FREEBSD32_SYS_kqueuex 583
#define FREEBSD32_SYS_MAXSYSCALL 584 #define FREEBSD32_SYS_membarrier 584
#define FREEBSD32_SYS_MAXSYSCALL 585

View File

@ -589,4 +589,5 @@ const char *freebsd32_syscallnames[] = {
"sched_getcpu", /* 581 = sched_getcpu */ "sched_getcpu", /* 581 = sched_getcpu */
"swapoff", /* 582 = swapoff */ "swapoff", /* 582 = swapoff */
"kqueuex", /* 583 = kqueuex */ "kqueuex", /* 583 = kqueuex */
"membarrier", /* 584 = membarrier */
}; };

View File

@ -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 = 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(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(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 */
}; };

View File

@ -3327,6 +3327,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
*n_args = 1; *n_args = 1;
break; 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: default:
*n_args = 0; *n_args = 0;
break; break;
@ -8980,6 +8989,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break; break;
}; };
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: default:
break; break;
}; };
@ -10843,6 +10868,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
if (ndx == 0 || ndx == 1) if (ndx == 0 || ndx == 1)
p = "int"; p = "int";
break; break;
/* membarrier */
case 584:
if (ndx == 0 || ndx == 1)
p = "int";
break;
default: default:
break; break;
}; };

View File

@ -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 = 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(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(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 */
}; };

View File

@ -589,4 +589,5 @@ const char *syscallnames[] = {
"sched_getcpu", /* 581 = sched_getcpu */ "sched_getcpu", /* 581 = sched_getcpu */
"swapoff", /* 582 = swapoff */ "swapoff", /* 582 = swapoff */
"kqueuex", /* 583 = kqueuex */ "kqueuex", /* 583 = kqueuex */
"membarrier", /* 584 = membarrier */
}; };

View File

@ -3423,6 +3423,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
*n_args = 1; *n_args = 1;
break; 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: default:
*n_args = 0; *n_args = 0;
break; break;
@ -9150,6 +9159,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break; break;
}; };
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: default:
break; break;
}; };
@ -11108,6 +11133,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
if (ndx == 0 || ndx == 1) if (ndx == 0 || ndx == 1)
p = "int"; p = "int";
break; break;
/* membarrier */
case 584:
if (ndx == 0 || ndx == 1)
p = "int";
break;
default: default:
break; break;
}; };

View File

@ -520,4 +520,5 @@
#define SYS_sched_getcpu 581 #define SYS_sched_getcpu 581
#define SYS_swapoff 582 #define SYS_swapoff 582
#define SYS_kqueuex 583 #define SYS_kqueuex 583
#define SYS_MAXSYSCALL 584 #define SYS_membarrier 584
#define SYS_MAXSYSCALL 585

View File

@ -425,4 +425,5 @@ MIASM = \
fspacectl.o \ fspacectl.o \
sched_getcpu.o \ sched_getcpu.o \
swapoff.o \ swapoff.o \
kqueuex.o kqueuex.o \
membarrier.o

View File

@ -1857,6 +1857,11 @@ struct swapoff_args {
struct kqueuex_args { struct kqueuex_args {
char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; 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_exit(struct thread *, struct exit_args *);
int sys_fork(struct thread *, struct fork_args *); int sys_fork(struct thread *, struct fork_args *);
int sys_read(struct thread *, struct read_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_sched_getcpu(struct thread *, struct sched_getcpu_args *);
int sys_swapoff(struct thread *, struct swapoff_args *); int sys_swapoff(struct thread *, struct swapoff_args *);
int sys_kqueuex(struct thread *, struct kqueuex_args *); int sys_kqueuex(struct thread *, struct kqueuex_args *);
int sys_membarrier(struct thread *, struct membarrier_args *);
#ifdef COMPAT_43 #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_sched_getcpu AUE_NULL
#define SYS_AUE_swapoff AUE_SWAPOFF #define SYS_AUE_swapoff AUE_SWAPOFF
#define SYS_AUE_kqueuex AUE_KQUEUE #define SYS_AUE_kqueuex AUE_KQUEUE
#define SYS_AUE_membarrier AUE_NULL
#undef PAD_ #undef PAD_
#undef PADL_ #undef PADL_