svn commit: r359837 - in head/sys: compat/freebsd32 kern sys

Kyle Evans kevans at FreeBSD.org
Sun Apr 12 21:23:54 UTC 2020


Author: kevans
Date: Sun Apr 12 21:23:51 2020
New Revision: 359837
URL: https://svnweb.freebsd.org/changeset/base/359837

Log:
  sysent: re-roll after introduction of close_range in r359836

Modified:
  head/sys/compat/freebsd32/freebsd32_syscall.h
  head/sys/compat/freebsd32/freebsd32_syscalls.c
  head/sys/compat/freebsd32/freebsd32_sysent.c
  head/sys/compat/freebsd32/freebsd32_systrace_args.c
  head/sys/kern/init_sysent.c
  head/sys/kern/syscalls.c
  head/sys/kern/systrace_args.c
  head/sys/sys/syscall.h
  head/sys/sys/syscall.mk
  head/sys/sys/sysproto.h

Modified: head/sys/compat/freebsd32/freebsd32_syscall.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscall.h	Sun Apr 12 21:23:19 2020	(r359836)
+++ head/sys/compat/freebsd32/freebsd32_syscall.h	Sun Apr 12 21:23:51 2020	(r359837)
@@ -501,4 +501,5 @@
 #define	FREEBSD32_SYS_shm_rename	572
 #define	FREEBSD32_SYS_sigfastblock	573
 #define	FREEBSD32_SYS___realpathat	574
-#define	FREEBSD32_SYS_MAXSYSCALL	575
+#define	FREEBSD32_SYS_close_range	575
+#define	FREEBSD32_SYS_MAXSYSCALL	576

Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscalls.c	Sun Apr 12 21:23:19 2020	(r359836)
+++ head/sys/compat/freebsd32/freebsd32_syscalls.c	Sun Apr 12 21:23:51 2020	(r359837)
@@ -611,4 +611,5 @@ const char *freebsd32_syscallnames[] = {
 	"shm_rename",			/* 572 = shm_rename */
 	"sigfastblock",			/* 573 = sigfastblock */
 	"__realpathat",			/* 574 = __realpathat */
+	"close_range",			/* 575 = close_range */
 };

Modified: head/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_sysent.c	Sun Apr 12 21:23:19 2020	(r359836)
+++ head/sys/compat/freebsd32/freebsd32_sysent.c	Sun Apr 12 21:23:51 2020	(r359837)
@@ -664,4 +664,5 @@ struct sysent freebsd32_sysent[] = {
 	{ AS(shm_rename_args), (sy_call_t *)sys_shm_rename, AUE_SHMRENAME, NULL, 0, 0, 0, SY_THR_STATIC },	/* 572 = shm_rename */
 	{ AS(sigfastblock_args), (sy_call_t *)sys_sigfastblock, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 573 = sigfastblock */
 	{ AS(__realpathat_args), (sy_call_t *)sys___realpathat, AUE_REALPATHAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 574 = __realpathat */
+	{ AS(close_range_args), (sy_call_t *)sys_close_range, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 575 = close_range */
 };

Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_systrace_args.c	Sun Apr 12 21:23:19 2020	(r359836)
+++ head/sys/compat/freebsd32/freebsd32_systrace_args.c	Sun Apr 12 21:23:51 2020	(r359837)
@@ -3374,6 +3374,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
 		*n_args = 5;
 		break;
 	}
+	/* close_range */
+	case 575: {
+		struct close_range_args *p = params;
+		uarg[0] = p->lowfd; /* u_int */
+		uarg[1] = p->highfd; /* u_int */
+		iarg[2] = p->flags; /* int */
+		*n_args = 3;
+		break;
+	}
 	default:
 		*n_args = 0;
 		break;
@@ -9095,6 +9104,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
 			break;
 		};
 		break;
+	/* close_range */
+	case 575:
+		switch(ndx) {
+		case 0:
+			p = "u_int";
+			break;
+		case 1:
+			p = "u_int";
+			break;
+		case 2:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
 	default:
 		break;
 	};
@@ -10991,6 +11016,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
 		break;
 	/* __realpathat */
 	case 574:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
+	/* close_range */
+	case 575:
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;

Modified: head/sys/kern/init_sysent.c
==============================================================================
--- head/sys/kern/init_sysent.c	Sun Apr 12 21:23:19 2020	(r359836)
+++ head/sys/kern/init_sysent.c	Sun Apr 12 21:23:51 2020	(r359837)
@@ -630,4 +630,5 @@ struct sysent sysent[] = {
 	{ AS(shm_rename_args), (sy_call_t *)sys_shm_rename, AUE_SHMRENAME, NULL, 0, 0, 0, SY_THR_STATIC },	/* 572 = shm_rename */
 	{ AS(sigfastblock_args), (sy_call_t *)sys_sigfastblock, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 573 = sigfastblock */
 	{ AS(__realpathat_args), (sy_call_t *)sys___realpathat, AUE_REALPATHAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 574 = __realpathat */
+	{ AS(close_range_args), (sy_call_t *)sys_close_range, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 575 = close_range */
 };

Modified: head/sys/kern/syscalls.c
==============================================================================
--- head/sys/kern/syscalls.c	Sun Apr 12 21:23:19 2020	(r359836)
+++ head/sys/kern/syscalls.c	Sun Apr 12 21:23:51 2020	(r359837)
@@ -581,4 +581,5 @@ const char *syscallnames[] = {
 	"shm_rename",			/* 572 = shm_rename */
 	"sigfastblock",			/* 573 = sigfastblock */
 	"__realpathat",			/* 574 = __realpathat */
+	"close_range",			/* 575 = close_range */
 };

Modified: head/sys/kern/systrace_args.c
==============================================================================
--- head/sys/kern/systrace_args.c	Sun Apr 12 21:23:19 2020	(r359836)
+++ head/sys/kern/systrace_args.c	Sun Apr 12 21:23:51 2020	(r359837)
@@ -3366,6 +3366,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
 		*n_args = 5;
 		break;
 	}
+	/* close_range */
+	case 575: {
+		struct close_range_args *p = params;
+		uarg[0] = p->lowfd; /* u_int */
+		uarg[1] = p->highfd; /* u_int */
+		iarg[2] = p->flags; /* int */
+		*n_args = 3;
+		break;
+	}
 	default:
 		*n_args = 0;
 		break;
@@ -9000,6 +9009,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
 			break;
 		};
 		break;
+	/* close_range */
+	case 575:
+		switch(ndx) {
+		case 0:
+			p = "u_int";
+			break;
+		case 1:
+			p = "u_int";
+			break;
+		case 2:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
 	default:
 		break;
 	};
@@ -10923,6 +10948,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
 		break;
 	/* __realpathat */
 	case 574:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
+	/* close_range */
+	case 575:
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;

Modified: head/sys/sys/syscall.h
==============================================================================
--- head/sys/sys/syscall.h	Sun Apr 12 21:23:19 2020	(r359836)
+++ head/sys/sys/syscall.h	Sun Apr 12 21:23:51 2020	(r359837)
@@ -510,4 +510,5 @@
 #define	SYS_shm_rename	572
 #define	SYS_sigfastblock	573
 #define	SYS___realpathat	574
-#define	SYS_MAXSYSCALL	575
+#define	SYS_close_range	575
+#define	SYS_MAXSYSCALL	576

Modified: head/sys/sys/syscall.mk
==============================================================================
--- head/sys/sys/syscall.mk	Sun Apr 12 21:23:19 2020	(r359836)
+++ head/sys/sys/syscall.mk	Sun Apr 12 21:23:51 2020	(r359837)
@@ -415,4 +415,5 @@ MIASM =  \
 	shm_open2.o \
 	shm_rename.o \
 	sigfastblock.o \
-	__realpathat.o
+	__realpathat.o \
+	close_range.o

Modified: head/sys/sys/sysproto.h
==============================================================================
--- head/sys/sys/sysproto.h	Sun Apr 12 21:23:19 2020	(r359836)
+++ head/sys/sys/sysproto.h	Sun Apr 12 21:23:51 2020	(r359837)
@@ -1830,6 +1830,11 @@ struct __realpathat_args {
 	char size_l_[PADL_(size_t)]; size_t size; char size_r_[PADR_(size_t)];
 	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
 };
+struct close_range_args {
+	char lowfd_l_[PADL_(u_int)]; u_int lowfd; char lowfd_r_[PADR_(u_int)];
+	char highfd_l_[PADL_(u_int)]; u_int highfd; char highfd_r_[PADR_(u_int)];
+	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+};
 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 *);
@@ -2220,6 +2225,7 @@ int	sys_shm_open2(struct thread *, struct shm_open2_ar
 int	sys_shm_rename(struct thread *, struct shm_rename_args *);
 int	sys_sigfastblock(struct thread *, struct sigfastblock_args *);
 int	sys___realpathat(struct thread *, struct __realpathat_args *);
+int	sys_close_range(struct thread *, struct close_range_args *);
 
 #ifdef COMPAT_43
 
@@ -3145,6 +3151,7 @@ int	freebsd12_shm_open(struct thread *, struct freebsd
 #define	SYS_AUE_shm_rename	AUE_SHMRENAME
 #define	SYS_AUE_sigfastblock	AUE_NULL
 #define	SYS_AUE___realpathat	AUE_REALPATHAT
+#define	SYS_AUE_close_range	AUE_NULL
 
 #undef PAD_
 #undef PADL_


More information about the svn-src-head mailing list