Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Aug 2020 12:44:48 +0000 (UTC)
From:      Pawel Biernacki <kaktus@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r363833 - in stable/12/sys: compat/freebsd32 kern sys
Message-ID:  <202008041244.074CimgQ045155@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kaktus
Date: Tue Aug  4 12:44:47 2020
New Revision: 363833
URL: https://svnweb.freebsd.org/changeset/base/363833

Log:
  regen

Modified:
  stable/12/sys/compat/freebsd32/freebsd32_proto.h
  stable/12/sys/compat/freebsd32/freebsd32_syscall.h
  stable/12/sys/compat/freebsd32/freebsd32_syscalls.c
  stable/12/sys/compat/freebsd32/freebsd32_sysent.c
  stable/12/sys/compat/freebsd32/freebsd32_systrace_args.c
  stable/12/sys/kern/init_sysent.c
  stable/12/sys/kern/syscalls.c
  stable/12/sys/kern/systrace_args.c
  stable/12/sys/sys/syscall.h
  stable/12/sys/sys/sysproto.h

Modified: stable/12/sys/compat/freebsd32/freebsd32_proto.h
==============================================================================
--- stable/12/sys/compat/freebsd32/freebsd32_proto.h	Tue Aug  4 12:42:55 2020	(r363832)
+++ stable/12/sys/compat/freebsd32/freebsd32_proto.h	Tue Aug  4 12:44:47 2020	(r363833)
@@ -728,6 +728,14 @@ struct freebsd32_cpuset_setdomain_args {
 	char mask_l_[PADL_(domainset_t *)]; domainset_t * mask; char mask_r_[PADR_(domainset_t *)];
 	char policy_l_[PADL_(int)]; int policy; char policy_r_[PADR_(int)];
 };
+struct freebsd32___sysctlbyname_args {
+	char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)];
+	char namelen_l_[PADL_(size_t)]; size_t namelen; char namelen_r_[PADR_(size_t)];
+	char old_l_[PADL_(void *)]; void * old; char old_r_[PADR_(void *)];
+	char oldlenp_l_[PADL_(uint32_t *)]; uint32_t * oldlenp; char oldlenp_r_[PADR_(uint32_t *)];
+	char new_l_[PADL_(void *)]; void * new; char new_r_[PADR_(void *)];
+	char newlen_l_[PADL_(size_t)]; size_t newlen; char newlen_r_[PADR_(size_t)];
+};
 #if !defined(PAD64_REQUIRED) && (defined(__powerpc__) || defined(__mips__))
 #define PAD64_REQUIRED
 #endif
@@ -865,6 +873,7 @@ int	freebsd32_mknodat(struct thread *, struct freebsd3
 int	freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *);
 int	freebsd32_cpuset_getdomain(struct thread *, struct freebsd32_cpuset_getdomain_args *);
 int	freebsd32_cpuset_setdomain(struct thread *, struct freebsd32_cpuset_setdomain_args *);
+int	freebsd32___sysctlbyname(struct thread *, struct freebsd32___sysctlbyname_args *);
 
 #ifdef COMPAT_43
 
@@ -1419,6 +1428,7 @@ int	freebsd11_freebsd32_fstatat(struct thread *, struc
 #define	FREEBSD32_SYS_AUE_freebsd32_kevent	AUE_KEVENT
 #define	FREEBSD32_SYS_AUE_freebsd32_cpuset_getdomain	AUE_NULL
 #define	FREEBSD32_SYS_AUE_freebsd32_cpuset_setdomain	AUE_NULL
+#define	FREEBSD32_SYS_AUE_freebsd32___sysctlbyname	AUE_SYSCTL
 
 #undef PAD_
 #undef PADL_

Modified: stable/12/sys/compat/freebsd32/freebsd32_syscall.h
==============================================================================
--- stable/12/sys/compat/freebsd32/freebsd32_syscall.h	Tue Aug  4 12:42:55 2020	(r363832)
+++ stable/12/sys/compat/freebsd32/freebsd32_syscall.h	Tue Aug  4 12:44:47 2020	(r363833)
@@ -494,4 +494,5 @@
 #define	FREEBSD32_SYS_fhlink	565
 #define	FREEBSD32_SYS_fhlinkat	566
 #define	FREEBSD32_SYS_fhreadlink	567
-#define	FREEBSD32_SYS_MAXSYSCALL	568
+#define	FREEBSD32_SYS_freebsd32___sysctlbyname	570
+#define	FREEBSD32_SYS_MAXSYSCALL	571

Modified: stable/12/sys/compat/freebsd32/freebsd32_syscalls.c
==============================================================================
--- stable/12/sys/compat/freebsd32/freebsd32_syscalls.c	Tue Aug  4 12:42:55 2020	(r363832)
+++ stable/12/sys/compat/freebsd32/freebsd32_syscalls.c	Tue Aug  4 12:44:47 2020	(r363833)
@@ -604,4 +604,7 @@ const char *freebsd32_syscallnames[] = {
 	"fhlink",			/* 565 = fhlink */
 	"fhlinkat",			/* 566 = fhlinkat */
 	"fhreadlink",			/* 567 = fhreadlink */
+	"#568",			/* 568 = funlinkat */
+	"#569",			/* 569 = copy_file_range */
+	"freebsd32___sysctlbyname",			/* 570 = freebsd32___sysctlbyname */
 };

Modified: stable/12/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- stable/12/sys/compat/freebsd32/freebsd32_sysent.c	Tue Aug  4 12:42:55 2020	(r363832)
+++ stable/12/sys/compat/freebsd32/freebsd32_sysent.c	Tue Aug  4 12:44:47 2020	(r363833)
@@ -651,4 +651,7 @@ struct sysent freebsd32_sysent[] = {
 	{ AS(fhlink_args), (sy_call_t *)sys_fhlink, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 565 = fhlink */
 	{ AS(fhlinkat_args), (sy_call_t *)sys_fhlinkat, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 566 = fhlinkat */
 	{ AS(fhreadlink_args), (sy_call_t *)sys_fhreadlink, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 567 = fhreadlink */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 568 = funlinkat */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 569 = copy_file_range */
+	{ AS(freebsd32___sysctlbyname_args), (sy_call_t *)freebsd32___sysctlbyname, AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 570 = freebsd32___sysctlbyname */
 };

Modified: stable/12/sys/compat/freebsd32/freebsd32_systrace_args.c
==============================================================================
--- stable/12/sys/compat/freebsd32/freebsd32_systrace_args.c	Tue Aug  4 12:42:55 2020	(r363832)
+++ stable/12/sys/compat/freebsd32/freebsd32_systrace_args.c	Tue Aug  4 12:44:47 2020	(r363833)
@@ -3310,6 +3310,18 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
 		*n_args = 3;
 		break;
 	}
+	/* freebsd32___sysctlbyname */
+	case 570: {
+		struct freebsd32___sysctlbyname_args *p = params;
+		uarg[0] = (intptr_t) p->name; /* const char * */
+		uarg[1] = p->namelen; /* size_t */
+		uarg[2] = (intptr_t) p->old; /* void * */
+		uarg[3] = (intptr_t) p->oldlenp; /* uint32_t * */
+		uarg[4] = (intptr_t) p->new; /* void * */
+		uarg[5] = p->newlen; /* size_t */
+		*n_args = 6;
+		break;
+	}
 	default:
 		*n_args = 0;
 		break;
@@ -8905,6 +8917,31 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
 			break;
 		};
 		break;
+	/* freebsd32___sysctlbyname */
+	case 570:
+		switch(ndx) {
+		case 0:
+			p = "userland const char *";
+			break;
+		case 1:
+			p = "size_t";
+			break;
+		case 2:
+			p = "userland void *";
+			break;
+		case 3:
+			p = "userland uint32_t *";
+			break;
+		case 4:
+			p = "userland void *";
+			break;
+		case 5:
+			p = "size_t";
+			break;
+		default:
+			break;
+		};
+		break;
 	default:
 		break;
 	};
@@ -10771,6 +10808,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
 		break;
 	/* fhreadlink */
 	case 567:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
+	/* freebsd32___sysctlbyname */
+	case 570:
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;

Modified: stable/12/sys/kern/init_sysent.c
==============================================================================
--- stable/12/sys/kern/init_sysent.c	Tue Aug  4 12:42:55 2020	(r363832)
+++ stable/12/sys/kern/init_sysent.c	Tue Aug  4 12:44:47 2020	(r363833)
@@ -617,4 +617,7 @@ struct sysent sysent[] = {
 	{ AS(fhlink_args), (sy_call_t *)sys_fhlink, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 565 = fhlink */
 	{ AS(fhlinkat_args), (sy_call_t *)sys_fhlinkat, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 566 = fhlinkat */
 	{ AS(fhreadlink_args), (sy_call_t *)sys_fhreadlink, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 567 = fhreadlink */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 568 = funlinkat */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 569 = copy_file_range */
+	{ AS(__sysctlbyname_args), (sy_call_t *)sys___sysctlbyname, AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 570 = __sysctlbyname */
 };

Modified: stable/12/sys/kern/syscalls.c
==============================================================================
--- stable/12/sys/kern/syscalls.c	Tue Aug  4 12:42:55 2020	(r363832)
+++ stable/12/sys/kern/syscalls.c	Tue Aug  4 12:44:47 2020	(r363833)
@@ -574,4 +574,7 @@ const char *syscallnames[] = {
 	"fhlink",			/* 565 = fhlink */
 	"fhlinkat",			/* 566 = fhlinkat */
 	"fhreadlink",			/* 567 = fhreadlink */
+	"#568",			/* 568 = funlinkat */
+	"#569",			/* 569 = copy_file_range */
+	"__sysctlbyname",			/* 570 = __sysctlbyname */
 };

Modified: stable/12/sys/kern/systrace_args.c
==============================================================================
--- stable/12/sys/kern/systrace_args.c	Tue Aug  4 12:42:55 2020	(r363832)
+++ stable/12/sys/kern/systrace_args.c	Tue Aug  4 12:44:47 2020	(r363833)
@@ -3302,6 +3302,18 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
 		*n_args = 3;
 		break;
 	}
+	/* __sysctlbyname */
+	case 570: {
+		struct __sysctlbyname_args *p = params;
+		uarg[0] = (intptr_t) p->name; /* const char * */
+		uarg[1] = p->namelen; /* size_t */
+		uarg[2] = (intptr_t) p->old; /* void * */
+		uarg[3] = (intptr_t) p->oldlenp; /* size_t * */
+		uarg[4] = (intptr_t) p->new; /* void * */
+		uarg[5] = p->newlen; /* size_t */
+		*n_args = 6;
+		break;
+	}
 	default:
 		*n_args = 0;
 		break;
@@ -8810,6 +8822,31 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
 			break;
 		};
 		break;
+	/* __sysctlbyname */
+	case 570:
+		switch(ndx) {
+		case 0:
+			p = "userland const char *";
+			break;
+		case 1:
+			p = "size_t";
+			break;
+		case 2:
+			p = "userland void *";
+			break;
+		case 3:
+			p = "userland size_t *";
+			break;
+		case 4:
+			p = "userland void *";
+			break;
+		case 5:
+			p = "size_t";
+			break;
+		default:
+			break;
+		};
+		break;
 	default:
 		break;
 	};
@@ -10703,6 +10740,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
 		break;
 	/* fhreadlink */
 	case 567:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
+	/* __sysctlbyname */
+	case 570:
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;

Modified: stable/12/sys/sys/syscall.h
==============================================================================
--- stable/12/sys/sys/syscall.h	Tue Aug  4 12:42:55 2020	(r363832)
+++ stable/12/sys/sys/syscall.h	Tue Aug  4 12:44:47 2020	(r363833)
@@ -503,4 +503,5 @@
 #define	SYS_fhlink	565
 #define	SYS_fhlinkat	566
 #define	SYS_fhreadlink	567
-#define	SYS_MAXSYSCALL	568
+#define	SYS___sysctlbyname	570
+#define	SYS_MAXSYSCALL	571

Modified: stable/12/sys/sys/sysproto.h
==============================================================================
--- stable/12/sys/sys/sysproto.h	Tue Aug  4 12:42:55 2020	(r363832)
+++ stable/12/sys/sys/sysproto.h	Tue Aug  4 12:44:47 2020	(r363833)
@@ -1790,6 +1790,14 @@ struct fhreadlink_args {
 	char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
 	char bufsize_l_[PADL_(size_t)]; size_t bufsize; char bufsize_r_[PADR_(size_t)];
 };
+struct __sysctlbyname_args {
+	char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)];
+	char namelen_l_[PADL_(size_t)]; size_t namelen; char namelen_r_[PADR_(size_t)];
+	char old_l_[PADL_(void *)]; void * old; char old_r_[PADR_(void *)];
+	char oldlenp_l_[PADL_(size_t *)]; size_t * oldlenp; char oldlenp_r_[PADR_(size_t *)];
+	char new_l_[PADL_(void *)]; void * new; char new_r_[PADR_(void *)];
+	char newlen_l_[PADL_(size_t)]; size_t newlen; char newlen_r_[PADR_(size_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 *);
@@ -2174,6 +2182,7 @@ int	sys_getfhat(struct thread *, struct getfhat_args *
 int	sys_fhlink(struct thread *, struct fhlink_args *);
 int	sys_fhlinkat(struct thread *, struct fhlinkat_args *);
 int	sys_fhreadlink(struct thread *, struct fhreadlink_args *);
+int	sys___sysctlbyname(struct thread *, struct __sysctlbyname_args *);
 
 #ifdef COMPAT_43
 
@@ -3075,6 +3084,7 @@ int	freebsd11_mknodat(struct thread *, struct freebsd1
 #define	SYS_AUE_fhlink	AUE_NULL
 #define	SYS_AUE_fhlinkat	AUE_NULL
 #define	SYS_AUE_fhreadlink	AUE_NULL
+#define	SYS_AUE___sysctlbyname	AUE_SYSCTL
 
 #undef PAD_
 #undef PADL_



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008041244.074CimgQ045155>