Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SysV IPC: reduce diff around obsolete syscalls #2184

Merged
merged 2 commits into from
Aug 10, 2024
Merged

SysV IPC: reduce diff around obsolete syscalls #2184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
679902d
sysv ipc: match FreeBSD for {msg,sem,shm}sys args
brooksdavis Aug 6, 2024
b145632
sysent: regen
brooksdavis Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/libsys/_libsys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ typedef int (__sys_lgetfh_t)(const char * __kerncap, struct fhandle * __kerncap)
typedef int (__sys_getfh_t)(const char * __kerncap, struct fhandle * __kerncap);
typedef int (__sys_sysarch_t)(int, char * __kerncap);
typedef int (__sys_rtprio_t)(int, pid_t, struct rtprio * __kerncap);
typedef int (__sys_semsys_t)(int, intcap_t, intcap_t, intcap_t, intcap_t);
typedef int (__sys_msgsys_t)(int, intcap_t, intcap_t, intcap_t, intcap_t, intcap_t);
typedef int (__sys_shmsys_t)(int, intcap_t, intcap_t, intcap_t);
typedef int (__sys_semsys_t)(int, int, int, int, int);
typedef int (__sys_msgsys_t)(int, int, int, int, int, int);
typedef int (__sys_shmsys_t)(int, int, int, int);
typedef int (__sys_setfib_t)(int);
typedef int (__sys_ntp_adjtime_t)(struct timex * __kerncap);
typedef int (__sys_setgid_t)(gid_t);
Expand Down Expand Up @@ -572,9 +572,9 @@ int __sys_lgetfh(const char * __kerncap fname, struct fhandle * __kerncap fhp);
int __sys_getfh(const char * __kerncap fname, struct fhandle * __kerncap fhp);
int __sys_sysarch(int op, char * __kerncap parms);
int __sys_rtprio(int function, pid_t pid, struct rtprio * __kerncap rtp);
int __sys_semsys(int which, intcap_t a2, intcap_t a3, intcap_t a4, intcap_t a5);
int __sys_msgsys(int which, intcap_t a2, intcap_t a3, intcap_t a4, intcap_t a5, intcap_t a6);
int __sys_shmsys(int which, intcap_t a2, intcap_t a3, intcap_t a4);
int __sys_semsys(int which, int a2, int a3, int a4, int a5);
int __sys_msgsys(int which, int a2, int a3, int a4, int a5, int a6);
int __sys_shmsys(int which, int a2, int a3, int a4);
int __sys_setfib(int fibnum);
int __sys_ntp_adjtime(struct timex * __kerncap tp);
int __sys_setgid(gid_t gid);
Expand Down
24 changes: 12 additions & 12 deletions sys/compat/freebsd32/freebsd32_proto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,24 +134,24 @@ struct freebsd32_sysarch_args {
};
struct freebsd32_semsys_args {
char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
char a2_l_[PADL_(intptr_t)]; intptr_t a2; char a2_r_[PADR_(intptr_t)];
char a3_l_[PADL_(intptr_t)]; intptr_t a3; char a3_r_[PADR_(intptr_t)];
char a4_l_[PADL_(intptr_t)]; intptr_t a4; char a4_r_[PADR_(intptr_t)];
char a5_l_[PADL_(intptr_t)]; intptr_t a5; char a5_r_[PADR_(intptr_t)];
char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)];
char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)];
char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)];
char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)];
};
struct freebsd32_msgsys_args {
char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
char a2_l_[PADL_(intptr_t)]; intptr_t a2; char a2_r_[PADR_(intptr_t)];
char a3_l_[PADL_(intptr_t)]; intptr_t a3; char a3_r_[PADR_(intptr_t)];
char a4_l_[PADL_(intptr_t)]; intptr_t a4; char a4_r_[PADR_(intptr_t)];
char a5_l_[PADL_(intptr_t)]; intptr_t a5; char a5_r_[PADR_(intptr_t)];
char a6_l_[PADL_(intptr_t)]; intptr_t a6; char a6_r_[PADR_(intptr_t)];
char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)];
char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)];
char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)];
char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)];
char a6_l_[PADL_(int)]; int a6; char a6_r_[PADR_(int)];
};
struct freebsd32_shmsys_args {
char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
char a2_l_[PADL_(intptr_t)]; intptr_t a2; char a2_r_[PADR_(intptr_t)];
char a3_l_[PADL_(intptr_t)]; intptr_t a3; char a3_r_[PADR_(intptr_t)];
char a4_l_[PADL_(intptr_t)]; intptr_t a4; char a4_r_[PADR_(intptr_t)];
char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)];
char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)];
char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)];
};
struct freebsd32_ntp_adjtime_args {
char tp_l_[PADL_(struct timex32 *)]; struct timex32 * tp; char tp_r_[PADR_(struct timex32 *)];
Expand Down
48 changes: 24 additions & 24 deletions sys/compat/freebsd32/freebsd32_systrace_args.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,32 +827,32 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 169: {
struct freebsd32_semsys_args *p = params;
iarg[a++] = p->which; /* int */
uarg[a++] = (intptr_t)p->a2; /* intptr_t */
uarg[a++] = (intptr_t)p->a3; /* intptr_t */
uarg[a++] = (intptr_t)p->a4; /* intptr_t */
uarg[a++] = (intptr_t)p->a5; /* intptr_t */
iarg[a++] = p->a2; /* int */
iarg[a++] = p->a3; /* int */
iarg[a++] = p->a4; /* int */
iarg[a++] = p->a5; /* int */
*n_args = 5;
break;
}
/* freebsd32_msgsys */
case 170: {
struct freebsd32_msgsys_args *p = params;
iarg[a++] = p->which; /* int */
uarg[a++] = (intptr_t)p->a2; /* intptr_t */
uarg[a++] = (intptr_t)p->a3; /* intptr_t */
uarg[a++] = (intptr_t)p->a4; /* intptr_t */
uarg[a++] = (intptr_t)p->a5; /* intptr_t */
uarg[a++] = (intptr_t)p->a6; /* intptr_t */
iarg[a++] = p->a2; /* int */
iarg[a++] = p->a3; /* int */
iarg[a++] = p->a4; /* int */
iarg[a++] = p->a5; /* int */
iarg[a++] = p->a6; /* int */
*n_args = 6;
break;
}
/* freebsd32_shmsys */
case 171: {
struct freebsd32_shmsys_args *p = params;
iarg[a++] = p->which; /* int */
uarg[a++] = (intptr_t)p->a2; /* intptr_t */
uarg[a++] = (intptr_t)p->a3; /* intptr_t */
uarg[a++] = (intptr_t)p->a4; /* intptr_t */
iarg[a++] = p->a2; /* int */
iarg[a++] = p->a3; /* int */
iarg[a++] = p->a4; /* int */
*n_args = 4;
break;
}
Expand Down Expand Up @@ -4706,16 +4706,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
p = "intptr_t";
p = "int";
break;
case 2:
p = "intptr_t";
p = "int";
break;
case 3:
p = "intptr_t";
p = "int";
break;
case 4:
p = "intptr_t";
p = "int";
break;
default:
break;
Expand All @@ -4728,19 +4728,19 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
p = "intptr_t";
p = "int";
break;
case 2:
p = "intptr_t";
p = "int";
break;
case 3:
p = "intptr_t";
p = "int";
break;
case 4:
p = "intptr_t";
p = "int";
break;
case 5:
p = "intptr_t";
p = "int";
break;
default:
break;
Expand All @@ -4753,13 +4753,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
p = "intptr_t";
p = "int";
break;
case 2:
p = "intptr_t";
p = "int";
break;
case 3:
p = "intptr_t";
p = "int";
break;
default:
break;
Expand Down
27 changes: 0 additions & 27 deletions sys/compat/freebsd64/freebsd64_proto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,27 +359,6 @@ struct freebsd64_rtprio_args {
char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
char rtp_l_[PADL_(struct rtprio *)]; struct rtprio * rtp; char rtp_r_[PADR_(struct rtprio *)];
};
struct freebsd64_semsys_args {
char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
char a2_l_[PADL_(intptr_t)]; intptr_t a2; char a2_r_[PADR_(intptr_t)];
char a3_l_[PADL_(intptr_t)]; intptr_t a3; char a3_r_[PADR_(intptr_t)];
char a4_l_[PADL_(intptr_t)]; intptr_t a4; char a4_r_[PADR_(intptr_t)];
char a5_l_[PADL_(intptr_t)]; intptr_t a5; char a5_r_[PADR_(intptr_t)];
};
struct freebsd64_msgsys_args {
char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
char a2_l_[PADL_(intptr_t)]; intptr_t a2; char a2_r_[PADR_(intptr_t)];
char a3_l_[PADL_(intptr_t)]; intptr_t a3; char a3_r_[PADR_(intptr_t)];
char a4_l_[PADL_(intptr_t)]; intptr_t a4; char a4_r_[PADR_(intptr_t)];
char a5_l_[PADL_(intptr_t)]; intptr_t a5; char a5_r_[PADR_(intptr_t)];
char a6_l_[PADL_(intptr_t)]; intptr_t a6; char a6_r_[PADR_(intptr_t)];
};
struct freebsd64_shmsys_args {
char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
char a2_l_[PADL_(intptr_t)]; intptr_t a2; char a2_r_[PADR_(intptr_t)];
char a3_l_[PADL_(intptr_t)]; intptr_t a3; char a3_r_[PADR_(intptr_t)];
char a4_l_[PADL_(intptr_t)]; intptr_t a4; char a4_r_[PADR_(intptr_t)];
};
struct freebsd64_ntp_adjtime_args {
char tp_l_[PADL_(struct timex *)]; struct timex * tp; char tp_r_[PADR_(struct timex *)];
};
Expand Down Expand Up @@ -1607,9 +1586,6 @@ int freebsd64_lgetfh(struct thread *, struct freebsd64_lgetfh_args *);
int freebsd64_getfh(struct thread *, struct freebsd64_getfh_args *);
int freebsd64_sysarch(struct thread *, struct freebsd64_sysarch_args *);
int freebsd64_rtprio(struct thread *, struct freebsd64_rtprio_args *);
int freebsd64_semsys(struct thread *, struct freebsd64_semsys_args *);
int freebsd64_msgsys(struct thread *, struct freebsd64_msgsys_args *);
int freebsd64_shmsys(struct thread *, struct freebsd64_shmsys_args *);
int freebsd64_ntp_adjtime(struct thread *, struct freebsd64_ntp_adjtime_args *);
int freebsd64_pathconf(struct thread *, struct freebsd64_pathconf_args *);
int freebsd64_getrlimit(struct thread *, struct freebsd64_getrlimit_args *);
Expand Down Expand Up @@ -2153,9 +2129,6 @@ int freebsd13_freebsd64_swapoff(struct thread *, struct freebsd13_freebsd64_swap
#define FREEBSD64_SYS_AUE_freebsd64_getfh AUE_NFS_GETFH
#define FREEBSD64_SYS_AUE_freebsd64_sysarch AUE_SYSARCH
#define FREEBSD64_SYS_AUE_freebsd64_rtprio AUE_RTPRIO
#define FREEBSD64_SYS_AUE_freebsd64_semsys AUE_SEMSYS
#define FREEBSD64_SYS_AUE_freebsd64_msgsys AUE_MSGSYS
#define FREEBSD64_SYS_AUE_freebsd64_shmsys AUE_SHMSYS
#define FREEBSD64_SYS_AUE_freebsd6_freebsd64_pread AUE_PREAD
#define FREEBSD64_SYS_AUE_freebsd6_freebsd64_pwrite AUE_PWRITE
#define FREEBSD64_SYS_AUE_freebsd64_ntp_adjtime AUE_NTP_ADJTIME
Expand Down
6 changes: 3 additions & 3 deletions sys/compat/freebsd64/freebsd64_syscall.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@
/* 164 is obsolete freebsd4_uname */
#define FREEBSD64_SYS_freebsd64_sysarch 165
#define FREEBSD64_SYS_freebsd64_rtprio 166
#define FREEBSD64_SYS_freebsd64_semsys 169
#define FREEBSD64_SYS_freebsd64_msgsys 170
#define FREEBSD64_SYS_freebsd64_shmsys 171
#define FREEBSD64_SYS_semsys 169
#define FREEBSD64_SYS_msgsys 170
#define FREEBSD64_SYS_shmsys 171
/* 173 is freebsd6 freebsd64_pread */
/* 174 is freebsd6 freebsd64_pwrite */
#define FREEBSD64_SYS_setfib 175
Expand Down
6 changes: 3 additions & 3 deletions sys/compat/freebsd64/freebsd64_syscall.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ MIASM = \
freebsd64_getfh.o \
freebsd64_sysarch.o \
freebsd64_rtprio.o \
freebsd64_semsys.o \
freebsd64_msgsys.o \
freebsd64_shmsys.o \
semsys.o \
msgsys.o \
shmsys.o \
setfib.o \
freebsd64_ntp_adjtime.o \
setgid.o \
Expand Down
6 changes: 3 additions & 3 deletions sys/compat/freebsd64/freebsd64_syscalls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ const char *freebsd64_syscallnames[] = {
"freebsd64_rtprio", /* 166 = freebsd64_rtprio */
"#167", /* 167 = reserved for local use */
"#168", /* 168 = reserved for local use */
"freebsd64_semsys", /* 169 = freebsd64_semsys */
"freebsd64_msgsys", /* 170 = freebsd64_msgsys */
"freebsd64_shmsys", /* 171 = freebsd64_shmsys */
"semsys", /* 169 = semsys */
"msgsys", /* 170 = msgsys */
"shmsys", /* 171 = shmsys */
"#172", /* 172 = reserved for local use */
"compat6.freebsd64_pread", /* 173 = freebsd6 freebsd64_pread */
"compat6.freebsd64_pwrite", /* 174 = freebsd6 freebsd64_pwrite */
Expand Down
6 changes: 3 additions & 3 deletions sys/compat/freebsd64/freebsd64_sysent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@
{ .sy_narg = AS(freebsd64_rtprio_args), .sy_call = (sy_call_t *)freebsd64_rtprio, .sy_auevent = AUE_RTPRIO, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 166 = freebsd64_rtprio */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 167 = reserved for local use */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 168 = reserved for local use */
{ .sy_narg = AS(freebsd64_semsys_args), .sy_call = (sy_call_t *)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 169 = freebsd64_semsys */
{ .sy_narg = AS(freebsd64_msgsys_args), .sy_call = (sy_call_t *)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 170 = freebsd64_msgsys */
{ .sy_narg = AS(freebsd64_shmsys_args), .sy_call = (sy_call_t *)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 171 = freebsd64_shmsys */
{ .sy_narg = AS(semsys_args), .sy_call = (sy_call_t *)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 169 = semsys */

Check failure on line 221 in sys/compat/freebsd64/freebsd64_sysent.c

View workflow job for this annotation

GitHub Actions / Style Checker 

line over 120 characters
{ .sy_narg = AS(msgsys_args), .sy_call = (sy_call_t *)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 170 = msgsys */

Check failure on line 222 in sys/compat/freebsd64/freebsd64_sysent.c

View workflow job for this annotation

GitHub Actions / Style Checker 

line over 120 characters
{ .sy_narg = AS(shmsys_args), .sy_call = (sy_call_t *)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 171 = shmsys */

Check failure on line 223 in sys/compat/freebsd64/freebsd64_sysent.c

View workflow job for this annotation

GitHub Actions / Style Checker 

line over 120 characters
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 172 = reserved for local use */
{ compat6(AS(freebsd6_freebsd64_pread_args),freebsd64_pread), .sy_auevent = AUE_PREAD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 173 = freebsd6 freebsd64_pread */
{ compat6(AS(freebsd6_freebsd64_pwrite_args),freebsd64_pwrite), .sy_auevent = AUE_PWRITE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 174 = freebsd6 freebsd64_pwrite */
Expand Down
Loading
Loading