Merge FreeBSD 2024-06-14

etc/mtree/BSD.tests.dist

@@ -835,6 +835,8 @@
                     etalon
                     ..
                 ..
+                virstor
+                ..
             ..
         ..
         kern
@@ -1223,6 +1225,8 @@
     usr.sbin
         chown
         ..
+        ctladm
+        ..
         daemon
         ..
         etcupdate

lib/geom/virstor/geom_virstor.c

@@ -157,8 +157,7 @@ virstor_label(struct gctl_req *req)
 	char param[32];
 	int hardcode, nargs, error;
 	struct virstor_map_entry *map;
-	size_t total_chunks;	/* We'll run out of memory if
-				   this needs to be bigger. */
+	size_t total_chunks, write_max_map_entries;
 	unsigned int map_chunks; /* Chunks needed by the map (map size). */
 	size_t map_size;	/* In bytes. */
 	ssize_t written;
@@ -196,27 +195,6 @@ virstor_label(struct gctl_req *req)
 		return;
 	}
 
-	if (md.md_chunk_size % MAXPHYS != 0) {
-		/* XXX: This is not strictly needed, but it's convenient to
-		 * impose some limitations on it, so why not MAXPHYS. */
-		size_t new_size = rounddown(md.md_chunk_size, MAXPHYS);
-		if (new_size < md.md_chunk_size)
-			new_size += MAXPHYS;
-		fprintf(stderr, "Resizing chunk size to be a multiple of "
-		    "MAXPHYS (%d kB).\n", MAXPHYS / 1024);
-		fprintf(stderr, "New chunk size: %zu kB\n", new_size / 1024);
-		md.md_chunk_size = new_size;
-	}
-
-	if (md.md_virsize % md.md_chunk_size != 0) {
-		off_t chunk_count = md.md_virsize / md.md_chunk_size;
-		md.md_virsize = chunk_count * md.md_chunk_size;
-		fprintf(stderr, "Resizing virtual size to be a multiple of "
-		    "chunk size.\n");
-		fprintf(stderr, "New virtual size: %zu MB\n",
-		    (size_t)(md.md_virsize/(1024 * 1024)));
-	}
-
 	msize = secsize = 0;
 	for (i = 1; i < (unsigned)nargs; i++) {
 		snprintf(param, sizeof(param), "arg%u", i);
@@ -241,11 +219,20 @@ virstor_label(struct gctl_req *req)
 	}
 
 	if (md.md_chunk_size % secsize != 0) {
-		fprintf(stderr, "Error: chunk size is not a multiple of sector "
-		    "size.");
-		gctl_error(req, "Chunk size (in bytes) must be multiple of %u.",
-		    (unsigned int)secsize);
-		return;
+		size_t new_size = roundup(md.md_chunk_size, secsize);
+		fprintf(stderr, "Resizing chunk size to be a multiple of "
+		    "sector size (%zu bytes).\n", secsize);
+		fprintf(stderr, "New chunk size: %zu kB\n", new_size / 1024);
+		md.md_chunk_size = new_size;
+	}
+
+	if (md.md_virsize % md.md_chunk_size != 0) {
+		off_t chunk_count = md.md_virsize / md.md_chunk_size;
+		md.md_virsize = chunk_count * md.md_chunk_size;
+		fprintf(stderr, "Resizing virtual size to be a multiple of "
+		    "chunk size.\n");
+		fprintf(stderr, "New virtual size: %zu MB\n",
+		    (size_t)(md.md_virsize / (1024 * 1024)));
 	}
 
 	total_chunks = md.md_virsize / md.md_chunk_size;
@@ -325,28 +312,56 @@ virstor_label(struct gctl_req *req)
 		sprintf(param, "%s%s", _PATH_DEV, name);
 		fd = open(param, O_RDWR);
 	}
-	if (fd < 0)
+	if (fd < 0) {
 		gctl_error(req, "Cannot open provider %s to write map", name);
+		return;
+	}
 
-	/* Do it with calloc because there might be a need to set up chunk flags
-	 * in the future */
-	map = calloc(total_chunks, sizeof(*map));
+	/*
+	 * Initialize and write the map.  Don't malloc the whole map at once,
+	 * in case it's large.  Use calloc because there might be a need to set
+	 * up chunk flags in the future.
+	 */
+	write_max_map_entries = 1024 * 1024 / sizeof(*map);
+	if (write_max_map_entries > total_chunks)
+		write_max_map_entries = total_chunks;
+	map = calloc(write_max_map_entries, sizeof(*map));
 	if (map == NULL) {
 		gctl_error(req,
 		    "Out of memory (need %zu bytes for allocation map)",
-		    map_size);
+		    write_max_map_entries * sizeof(*map));
+		close(fd);
+		return;
 	}
-
-	written = pwrite(fd, map, map_size, 0);
-	free(map);
-	if ((size_t)written != map_size) {
-		if (verbose) {
-			fprintf(stderr, "\nTried to write %zu, written %zd (%s)\n",
-			    map_size, written, strerror(errno));
+	for (size_t chunk = 0; chunk < total_chunks;
+	    chunk += write_max_map_entries) {
+		size_t bytes_to_write, entries_to_write;
+
+		entries_to_write = total_chunks - chunk;
+		if (entries_to_write > write_max_map_entries)
+			entries_to_write = write_max_map_entries;
+		bytes_to_write = entries_to_write * sizeof(*map);
+		for (size_t off = 0; off < bytes_to_write; off += written) {
+			written = write(fd, ((char *)map) + off,
+			    bytes_to_write - off);
+			if (written < 0) {
+				if (verbose) {
+					fprintf(stderr,
+					    "\nError writing map at offset "
+					    "%zu of %zu: %s\n",
+					    chunk * sizeof(*map) + off,
+					    map_size, strerror(errno));
+				}
+				gctl_error(req,
+				    "Error writing out allocation map!");
+				free(map);
+				close(fd);
+				return;
+			}
 		}
-		gctl_error(req, "Error writing out allocation map!");
-		return;
 	}
+	free(map);
+	map = NULL;
 	close (fd);
 
 	if (verbose)

lib/libc/arm/aeabi/aeabi_vfp.h

@@ -65,7 +65,7 @@
  * C Helper macros
  */
 
-#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
+#if !defined(SOFTFLOAT_FOR_GCC)
 /*
  * Generate a function that will either call into the VFP implementation,
  * or the soft float version for a given __aeabi_* helper. The function

lib/libc/arm/gen/_setjmp.S

@@ -58,12 +58,12 @@
 ENTRY(_setjmp)
 	ldr	r1, .L_setjmp_magic
 
-#if !defined(_STANDALONE) && __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
+#if !defined(_STANDALONE) && !defined(SOFTFLOAT_FOR_GCC)
 	add	r2, r0, #(_JB_REG_D8 * 4)
 	vstmia	r2, {d8-d15}
 	vmrs	r2, fpscr
 	str	r2, [r0, #(_JB_REG_FPSCR * 4)]
-#endif /* !_STANDALONE && __ARM_ARCH >= 6 */
+#endif /* !_STANDALONE && !SOFTFLOAT_FOR_GCC */
 
 	str	r1, [r0]
 
@@ -91,12 +91,12 @@ ENTRY(_longjmp)
 	teq	ip, r2				/* magic correct? */
 	bne	botch				/*   no, botch */
 
-#if !defined(_STANDALONE) && __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
+#if !defined(_STANDALONE) && !defined(SOFTFLOAT_FOR_GCC)
 	add	ip, r0, #(_JB_REG_D8 * 4)
 	vldmia	ip, {d8-d15}
 	ldr	ip, [r0, #(_JB_REG_FPSCR * 4)]
 	vmsr	fpscr, ip
-#endif /* !_STANDALONE && __ARM_ARCH >= 6 */
+#endif /* !_STANDALONE && !SOFTFLOAT_FOR_GCC */
 
 	add	r0, r0, #(_JB_REG_R4 * 4)
        	/* Restore integer registers */

lib/libc/arm/gen/setjmp.S

@@ -61,7 +61,7 @@ ENTRY(setjmp)
 
 	ldr	r1, .Lsetjmp_magic
 
-#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
+#if !defined(SOFTFLOAT_FOR_GCC)
 	add	r2, r0, #(_JB_REG_D8 * 4)
 	vstmia	r2, {d8-d15}
 	vmrs	r2, fpscr
@@ -102,7 +102,7 @@ ENTRY(__longjmp)
 	bl	PIC_SYM(_C_LABEL(sigprocmask), PLT)
 	ldmfd	sp!, {r0-r2, r14}
 
-#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
+#if !defined(SOFTFLOAT_FOR_GCC)
 	add	ip, r0, #(_JB_REG_D8 * 4)
 	vldmia	ip, {d8-d15}
 	ldr	ip, [r0, #(_JB_REG_FPSCR * 4)]

lib/libsys/arm/__vdso_gettc.c

@@ -37,7 +37,6 @@
 #include <errno.h>
 #include "libc_private.h"
 
-#if __ARM_ARCH >= 6
 static inline uint64_t
 cp15_cntvct_get(void)
 {
@@ -55,7 +54,6 @@ cp15_cntpct_get(void)
 	__asm __volatile("mrrc\tp15, 0, %Q0, %R0, c14" : "=r" (reg));
 	return (reg);
 }
-#endif
 
 #pragma weak __vdso_gettc
 int
@@ -64,7 +62,6 @@ __vdso_gettc(const struct vdso_timehands *th, u_int *tc)
 
 	if (th->th_algo != VDSO_TH_ALGO_ARM_GENTIM)
 		return (ENOSYS);
-#if __ARM_ARCH >= 6
 	/*
 	 * Userspace gettimeofday() is only enabled on ARMv7 CPUs, but
 	 * libc is compiled for ARMv6.  Due to clang issues, .arch
@@ -73,10 +70,6 @@ __vdso_gettc(const struct vdso_timehands *th, u_int *tc)
 	__asm __volatile(".word\t0xf57ff06f" : : : "memory"); /* isb */
 	*tc = th->th_physical == 0 ? cp15_cntvct_get() : cp15_cntpct_get();
 	return (0);
-#else
-	*tc = 0;
-	return (ENOSYS);
-#endif
 }
 
 #pragma weak __vdso_gettimekeep

lib/msun/arm/fenv.c

@@ -32,10 +32,6 @@
 
 #include <machine/acle-compat.h>
 
-#if __ARM_ARCH >= 6
-#define FENV_ARMv6
-#endif
-
 /* When SOFTFP_ABI is defined we are using the softfp ABI. */
 #if defined(__VFP_FP__) && !defined(__ARM_PCS_VFP)
 #define SOFTFP_ABI
@@ -52,7 +48,7 @@ const fenv_t __fe_dfl_env = 0;
 
 
 /* If this is a non-mangled softfp version special processing is required */
-#if defined(FENV_MANGLE) || !defined(SOFTFP_ABI) || !defined(FENV_ARMv6)
+#if defined(FENV_MANGLE) || !defined(SOFTFP_ABI)
 
 /*
  * The following macros map between the softfloat emulator's flags and

lib/msun/src/s_fma.c

@@ -244,7 +244,7 @@ fma(double x, double y, double z)
 		zs = copysign(DBL_MIN, zs);
 
 	fesetround(FE_TONEAREST);
-	/* work around clang bug 8100 */
+	/* work around clang issue #8472 */
 	volatile double vxs = xs;
 
 	/*
@@ -276,7 +276,7 @@ fma(double x, double y, double z)
 		 * rounding modes.
 		 */
 		fesetround(oround);
-		/* work around clang bug 8100 */
+		/* work around clang issue #8472 */
 		volatile double vrlo = r.lo;
 		adj = vrlo + xy.lo;
 		return (ldexp(r.hi + adj, spread));

lib/msun/src/s_fmal.c

@@ -225,7 +225,7 @@ fmal(long double x, long double y, long double z)
 		zs = copysignl(LDBL_MIN, zs);
 
 	fesetround(FE_TONEAREST);
-	/* work around clang bug 8100 */
+	/* work around clang issue #8472 */
 	volatile long double vxs = xs;
 
 	/*
@@ -257,7 +257,7 @@ fmal(long double x, long double y, long double z)
 		 * rounding modes.
 		 */
 		fesetround(oround);
-		/* work around clang bug 8100 */
+		/* work around clang issue #8472 */
 		volatile long double vrlo = r.lo;
 		adj = vrlo + xy.lo;
 		return (ldexpl(r.hi + adj, spread));

libexec/rc/rc.subr

@@ -1219,6 +1219,7 @@ run_rc_command()
 	if [ -n "$_svcj_options" ]; then	# translate service jail options
 		_svcj_cmd_options=""
 
+		_svcj_sysvipc_x=0
 		for _svcj_option in $_svcj_options; do
 			case "$_svcj_option" in
 				mlock)
@@ -1243,8 +1244,13 @@ run_rc_command()
 					_svcj_cmd_options="allow.nfsd enforce_statfs=1 ${_svcj_cmd_options}"
 					;;
 				sysvipc)
+					_svcj_sysvipc_x=$((${_svcj_sysvipc_x} + 1))
 					_svcj_cmd_options="sysvmsg=inherit sysvsem=inherit sysvshm=inherit  ${_svcj_cmd_options}"
 					;;
+				sysvipcnew)
+					_svcj_sysvipc_x=$((${_svcj_sysvipc_x} + 1))
+					_svcj_cmd_options="sysvmsg=new sysvsem=new sysvshm=new ${_svcj_cmd_options}"
+					;;
 				vmm)
 					_svcj_cmd_options="allow.vmm ${_svcj_cmd_options}"
 					;;
@@ -1253,6 +1259,11 @@ run_rc_command()
 					;;
 			esac
 		done
+		if [ ${_svcj_sysvipc_x} -gt 1 ]; then
+			echo -n "ERROR: more than one sysvipc option is "
+			echo "specified in ${name}_svcj_options: $_svcj_options"
+			return 1
+		fi
 	fi
 
 	[ -z "$autoboot" ] && eval $_pidcmd	# determine the pid if necessary
@@ -1321,11 +1332,28 @@ run_rc_command()
 				start)
 					if [ "${_rc_svcj}" != jailing ]; then
 						_return=1
-						$JAIL_CMD -c $_svcj_generic_params $_svcj_cmd_options \
-						    exec.start="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}start $rc_extra_args" \
-						    exec.stop="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}stop $rc_extra_args" \
-						    exec.consolelog="/var/log/svcj_${name}_console.log" \
-						    name=svcj-${name} && _return=0
+						_do_jailing=1
+
+						if check_jail jailed; then
+							if [ $(${SYSCTL_N} security.jail.children.max) -eq 0 ]; then
+								echo ERROR: jail parameter children.max is set to 0, can not create a new service jail.
+								_do_jailing=0
+							else
+								_free_jails=$(($(${SYSCTL_N} security.jail.children.max) - $(${SYSCTL_N} security.jail.children.cur)))
+								if [ ${_free_jails} -eq 0 ]; then
+									echo ERROR: max number of jail children reached, can not create a new service jail.
+									_do_jailing=0
+
+								fi
+							fi
+						fi
+						if [ ${_do_jailing} -eq 1 ]; then
+							$JAIL_CMD -c $_svcj_generic_params $_svcj_cmd_options \
+							    exec.start="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}start $rc_extra_args" \
+							    exec.stop="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}stop $rc_extra_args" \
+							    exec.consolelog="/var/log/svcj_${name}_console.log" \
+							    name=svcj-${name} && _return=0
+						fi
 					else
 						_run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" || _return=1
 					fi
@@ -1421,6 +1449,18 @@ run_rc_command()
 
 			if checkyesno ${name}_svcj; then
 				if [ "${_rc_svcj}" != jailing ]; then
+					if check_jail jailed; then
+						if [ $(${SYSCTL_N} security.jail.children.max) -eq 0 ]; then
+							echo ERROR: jail parameter children.max is set to 0, can not create a new service jail.
+							return 1
+						else
+							_free_jails=$(($(${SYSCTL_N} security.jail.children.max) - $(${SYSCTL_N} security.jail.children.cur)))
+							if [ ${_free_jails} -eq 0 ]; then
+								echo ERROR: max number of jail children reached, can not create a new service jail.
+								return 1
+							fi
+						fi
+					fi
 					$JAIL_CMD -c $_svcj_generic_params $_svcj_cmd_options\
 					    exec.start="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}start $rc_extra_args" \
 					    exec.stop="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}stop $rc_extra_args" \