Merge FreeBSD 2024-10-11

Makefile.inc1

@@ -633,28 +633,27 @@ VERSION=	FreeBSD ${_REVISION}-${_BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDA
 .endif
 MAJOR_REVISION=	${_REVISION:R}
 
-.if !defined(PKG_VERSION)
 _PKG_REVISION=	${_REVISION}
 _STRTIMENOW=	%Y%m%d%H%M%S
 _TIMENOW=	${_STRTIMENOW:gmtime}
 BRANCH_EXT=
 .if ${_BRANCH:MCURRENT*} || ${_BRANCH:MSTABLE*} || ${_BRANCH:MPRERELEASE*}
-_PKG_REVISION=	${MAJOR_REVISION}
-BRANCH_EXT=	snap
-EXTRA_REVISION=	.${BRANCH_EXT}${_TIMENOW}
+_PKG_REVISION:= ${MAJOR_REVISION}
+BRANCH_EXT=	${MAJOR_REVISION}.snap
+EXTRA_REVISION=	.snap${_TIMENOW}
 .elif ${_BRANCH:MALPHA*}
-BRANCH_EXT=	a${_BRANCH:C/ALPHA([0-9]+).*/\1/}
-EXTRA_REVISION=	.${BRANCH_EXT}.${_TIMENOW}
+BRANCH_EXT=	alpha
+EXTRA_REVISION=	.${_BRANCH:C/ALPHA([0-9]+).*/\1/}.${_TIMENOW}
 .elif ${_BRANCH:MBETA*}
-BRANCH_EXT=	b${_BRANCH:C/BETA([0-9]+).*/\1/}
-EXTRA_REVISION=	.${BRANCH_EXT}.${_TIMENOW}
+BRANCH_EXT=	beta
+EXTRA_REVISION=	.${_BRANCH:C/BETA([0-9]+).*/\1/}.${_TIMENOW}
 .elif ${_BRANCH:MRC*}
-BRANCH_EXT=	rc${_BRANCH:C/RC([0-9]+).*/\1/}
-EXTRA_REVISION=	.${BRANCH_EXT}.${_TIMENOW}
+BRANCH_EXT=	rc
+EXTRA_REVISION=	.rc${_BRANCH:C/RC([0-9]+).*/\1/}.${_TIMENOW}
 .elif ${_BRANCH:M*-p*}
-BRANCH_EXT=	p${_BRANCH:C/.*-p([0-9]+$)/\1/}
-EXTRA_REVISION=	${BRANCH_EXT}
+EXTRA_REVISION=	p${_BRANCH:C/.*-p([0-9]+$)/\1/}
 .endif
+.if !defined(PKG_VERSION)
 PKG_VERSION:=	${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g}
 .endif
 .endif	# !defined(PKG_VERSION)
@@ -2181,7 +2180,26 @@ PKG_EXT=	pkg
 .if exists(${PKG_ABI_FILE}) && exists(${REPODIR}/${PKG_ABI})
 PKG_VERSION_FROM!=/usr/bin/readlink ${REPODIR}/${PKG_ABI}/latest
 PKG_VERSION_FROM_DIR=	${REPODIR}/${PKG_ABI}/${PKG_VERSION_FROM}
-BRANCH_EXT_FROM=	${PKG_VERSION_FROM:C/^[^[:alpha:]]+p?([[:alpha:]]*)[0-9]+$/\1/}
+# Determine the name of the branch base on the version
+# X.bY => beta
+# X.aY => alpha
+# X.rcY => rc
+# X.snap => snap
+# all others mean release
+#
+# This will be used when comparing to the branch that we are building
+# to decide if we keep old packages or new packages when only their
+# version differs
+BRANCH_EXT_FROM=
+.if ${PKG_VERSION_FROM:M*.snap*}
+BRANCH_EXT_FROM=	${PKG_VERSION_FROM:C/.snap.*$//}.snap
+.elif ${PKG_VERSION_FROM:M*.b*}
+BRANCH_EXT_FROM=	beta
+.elif ${PKG_VERSION_FROM:M*.rc*}
+BRANCH_EXT_FROM=	rc
+.elif ${PKG_VERSION_FROM:M*.a*}
+BRANCH_EXT_FROM=	alpha
+.endif
 .else
 PKG_VERSION_FROM=
 PKG_VERSION_FROM_DIR=
@@ -2222,7 +2240,7 @@ real-update-packages: stage-packages .PHONY
 	    continue; \
 	  fi ; \
 	  newsum=$$(pkg query -F ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} '%X') ; \
-	  if [ "${BRANCH_EXT_FROM}" == "${BRANCH_EXT:C/[0-9]+$//}" -a "$${oldsum}" == "$${newsum}" ]; then \
+	  if [ "${BRANCH_EXT_FROM}" = "${BRANCH_EXT}" -a "$${oldsum}" = "$${newsum}" ]; then \
 	   echo "==> Keeping old ${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION_FROM}.${PKG_EXT}" ; \
 	   rm ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} ; \
 	   cp $${pkg} ${REPODIR}/${PKG_ABI}/${PKG_VERSION} ; \

cddl/lib/libzdb/Makefile

@@ -14,6 +14,7 @@ CSTD=	c99
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include

cddl/lib/libzfs_core/Makefile

@@ -20,6 +20,7 @@ CFLAGS+= -I${ZFSTOP}/include
 CFLAGS+= -I${ZFSTOP}/lib/libzfs_core/common
 CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
 CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
 CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include

cddl/lib/libzfsbootenv/Makefile

@@ -21,6 +21,7 @@ CFLAGS+= -DIN_BASE
 CFLAGS+= -I${ZFSTOP}/include
 CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
 CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+= -I${ZFSTOP}/module/icp/include
 CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h

cddl/lib/libzpool/Makefile

@@ -12,8 +12,6 @@
 .PATH: ${ZFSTOP}/module/zstd/lib/compress
 .PATH: ${ZFSTOP}/module/zstd/lib/decompress
 
-.PATH: ${ZFSTOP}/module/os/linux/zfs
-
 .if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S)
 .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
 ATOMIC_SRCS=	opensolaris_atomic.S
@@ -32,12 +30,16 @@ PACKAGE=	zfs
 LIB=		zpool
 
 USER_C = \
-	abd_os.c \
+	arc_os.c \
 	kernel.c \
 	taskq.c \
-	util.c
+	util.c \
+	zfs_debug.c
+
+.PATH: ${ZFSTOP}/module/os/linux/zfs
 
 KERNEL_C = \
+	simd_stat.c \
 	zfeature_common.c \
 	zfs_comutil.c \
 	zfs_deleg.c \
@@ -50,9 +52,9 @@ KERNEL_C = \
 	zpool_prop.c \
 	zprop_common.c \
 	abd.c \
+	abd_os.c \
 	aggsum.c \
 	arc.c \
-	arc_os.c \
         blake3_zfs.c \
 	blkptr.c \
 	bplist.c \
@@ -70,6 +72,7 @@ KERNEL_C = \
 	ddt_zap.c \
 	dmu.c \
 	dmu_diff.c \
+	dmu_direct.c \
 	dmu_object.c \
 	dmu_objset.c \
 	dmu_recv.c \
@@ -170,7 +173,6 @@ KERNEL_C = \
 	zfeature.c \
 	zfs_byteswap.c \
         zfs_chksum.c \
-	zfs_debug.c \
 	zfs_fm.c \
 	zfs_fuid.c \
 	zfs_sa.c \
@@ -246,7 +248,8 @@ LUA_C = \
 
 UNICODE_C = u8_textprep.c uconv.c
 
-SRCS=		${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C}
+SRCS+=		${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C}
+
 
 WARNS?=		2
 CFLAGS+= \
@@ -259,6 +262,7 @@ CFLAGS+= \
 	-I${ZFSTOP}/include/os/freebsd/zfs \
 	-I${SRCTOP}/cddl/compat/opensolaris/include \
 	-I${ZFSTOP}/module/icp/include \
+	-I${SRCTOP}/compat/linuxkpi/common/include/linux \
 	-include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
 	-DHAVE_ISSETUGID \
 	-include ${SRCTOP}/sys/modules/zfs/zfs_config.h \

cddl/lib/libzutil/Makefile

@@ -28,6 +28,7 @@ CSTD=	c99
 CFLAGS+= -I${ZFSTOP}/include
 CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
 CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
 CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include

cddl/lib/pam_zfs_key/Makefile

@@ -16,6 +16,7 @@ CFLAGS+= -DIN_BASE
 CFLAGS+= -I${ZFSTOP}/include
 CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
 CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+= -I${ZFSTOP}/module/icp/include
 CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h

cddl/share/zfs/compatibility.d/Makefile

@@ -11,7 +11,8 @@ FILES= \
 	freebsd-11.2 \
 	freebsd-11.3 \
 	freenas-9.10.2 \
-	grub2 \
+	grub2-2.06 \
+	grub2-2.12 \
 	openzfsonosx-1.7.0 \
 	openzfsonosx-1.8.1 \
 	openzfsonosx-1.9.3 \
@@ -20,6 +21,7 @@ FILES= \
 	openzfs-2.1-freebsd \
 	openzfs-2.1-linux \
 	openzfs-2.2 \
+	openzfs-2.3 \
 	zol-0.6.1 \
 	zol-0.6.4 \
 	zol-0.6.5 \
@@ -44,13 +46,19 @@ LINKS= \
 	${FILESDIR}/freebsd-11.3	${FILESDIR}/freebsd-12.4 \
 	${FILESDIR}/freebsd-11.3	${FILESDIR}/freenas-11.3 \
 	${FILESDIR}/freenas-11.0	${FILESDIR}/freenas-11.1 \
+	${FILESDIR}/grub2-2.12		${FILESDIR}/grub2 \
 	${FILESDIR}/openzfsonosx-1.9.3	${FILESDIR}/openzfsonosx-1.9.4 \
 	${FILESDIR}/openzfs-2.0-freebsd	${FILESDIR}/truenas-12.0 \
+	${FILESDIR}/openzfs-2.1-freebsd	${FILESDIR}/freebsd-13.0 \
+	${FILESDIR}/openzfs-2.1-freebsd	${FILESDIR}/freebsd-13.1 \
+	${FILESDIR}/openzfs-2.1-freebsd	${FILESDIR}/freebsd-13.2 \
 	${FILESDIR}/zol-0.7		${FILESDIR}/ubuntu-18.04 \
 	${FILESDIR}/zol-0.8		${FILESDIR}/ubuntu-20.04 \
 	${FILESDIR}/openzfs-2.1-linux	${FILESDIR}/ubuntu-22.04 \
 	${FILESDIR}/openzfs-2.2		${FILESDIR}/openzfs-2.2-linux \
-	${FILESDIR}/openzfs-2.2		${FILESDIR}/openzfs-2.2-freebsd
+	${FILESDIR}/openzfs-2.2		${FILESDIR}/openzfs-2.2-freebsd \
+	${FILESDIR}/openzfs-2.3		${FILESDIR}/openzfs-2.3-linux \
+	${FILESDIR}/openzfs-2.3		${FILESDIR}/openzfs-2.3-freebsd
 
 LINKMODE= ${NOBINMODE}
 

cddl/usr.sbin/zfsd/zfsd.8

@@ -154,7 +154,6 @@ will log interesting events and its actions to syslog with facility
 .Em daemon
 and identity
 .Op zfsd .
-.El
 .Sh FILES
 .Bl -tag -width a -compact
 .It Pa /var/db/zfsd/cases

contrib/capsicum-test/capsicum-freebsd.h

@@ -59,14 +59,12 @@ typedef unsigned long cap_ioctl_t;
 // Too many links
 #define E_TOO_MANY_LINKS EMLINK
 
-// TODO(FreeBSD): uncomment if/when FreeBSD propagates rights on accept.
-// FreeBSD does not generate a capability from accept(cap_fd,...).
-// https://bugs.freebsd.org/201052
-// #define CAP_FROM_ACCEPT
-// TODO(FreeBSD): uncomment if/when FreeBSD propagates rights on sctp_peeloff.
-// FreeBSD does not generate a capability from sctp_peeloff(cap_fd,...).
-// https://bugs.freebsd.org/201052
-// #define CAP_FROM_PEELOFF
+// As of commit 85b0f9de11c3 ("capsicum: propagate rights on accept(2)")
+// FreeBSD generates a capability from accept(cap_fd,...).
+#define CAP_FROM_ACCEPT
+// As of commit 91a9e4e01dab ("capsicum: propagate rights on sctp_peeloff")
+// FreeBSD generates a capability from sctp_peeloff(cap_fd,...).
+#define CAP_FROM_PEELOFF
 
 #endif  /* __FreeBSD__ */
 

contrib/capsicum-test/sctp.cc

@@ -1,6 +1,5 @@
 // Tests of SCTP functionality
 // Requires: libsctp-dev package on Debian Linux, CONFIG_IP_SCTP in kernel config
-#ifdef HAVE_SCTP
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -12,6 +11,7 @@
 #include "capsicum.h"
 #include "capsicum-test.h"
 
+#ifdef HAVE_SCTP
 static cap_rights_t r_ro;
 static cap_rights_t r_wo;
 static cap_rights_t r_rw;
@@ -61,6 +61,9 @@ static int SctpClient(int port, unsigned char byte) {
 
 TEST(Sctp, Socket) {
   int sock = socket(AF_INET, SOCK_SEQPACKET, IPPROTO_SCTP);
+  if (sock == -1 && errno == EPROTONOSUPPORT) {
+    GTEST_SKIP() << "socket(..., IPPROTO_SCTP) -> EPROTONOSUPPORT";
+  }
   EXPECT_OK(sock);
   if (sock < 0) return;
 

contrib/kyua/cli/cmd_test.cpp

@@ -64,22 +64,19 @@
     bool _parallel;
 
 public:
-    /// The amount of positive test results found so far.
-    unsigned long good_count;
-
-    /// The amount of negative test results found so far.
-    unsigned long bad_count;
+    /// The amount of test results per type.
+    std::map<enum model::test_result_type, unsigned long> type_count;
 
     /// Constructor for the hooks.
     ///
     /// \param ui_ Object to interact with the I/O of the program.
     /// \param parallel_ True if we are executing more than one test at once.
     print_hooks(cmdline::ui* ui_, const bool parallel_) :
         _ui(ui_),
-        _parallel(parallel_),
-        good_count(0),
-        bad_count(0)
+        _parallel(parallel_)
     {
+        for (const auto& pair : model::test_result_types)
+            type_count[pair.first] = 0;
     }
 
     /// Called when the processing of a test case begins.
@@ -116,10 +113,8 @@
         }
         _ui->out(F("%s  [%s]") % cli::format_result(result) %
             cli::format_delta(duration));
-        if (result.good())
-            good_count++;
-        else
-            bad_count++;
+
+        type_count[result.type()]++;
     }
 };
 
@@ -159,19 +154,42 @@
         kyuafile_path(cmdline), build_root_path(cmdline), results.second,
         parse_filters(cmdline.arguments()), user_config, hooks);
 
+    unsigned long total = 0;
+    unsigned long good = 0;
+    unsigned long bad = 0;
+    for (const auto& pair : model::test_result_types) {
+        const auto& type = pair.second;
+        const auto count = hooks.type_count[type.id];
+        total += count;
+        if (type.is_run && type.is_good)
+            good += count;
+        if (!type.is_good)
+            bad += count;
+    }
+
     int exit_code;
-    if (hooks.good_count > 0 || hooks.bad_count > 0) {
+    if (total > 0) {
         ui->out("");
         if (!results.first.empty()) {
             ui->out(F("Results file id is %s") % results.first);
         }
         ui->out(F("Results saved to %s") % results.second);
         ui->out("");
 
-        ui->out(F("%s/%s passed (%s failed)") % hooks.good_count %
-                (hooks.good_count + hooks.bad_count) % hooks.bad_count);
+        ui->out(F("%s/%s passed (") % good % total, false);
+        const auto& types = model::test_result_types;
+        for (auto it = types.begin(); it != types.end(); it++) {
+            const auto& type = it->second;
+            if (!type.is_run || !type.is_good) {
+                if (it != types.begin())
+                    ui->out(", ", false);
+                ui->out(F("%s %s") % hooks.type_count[type.id] % type.name,
+                    false);
+            }
+        }
+        ui->out(")");
 
-        exit_code = (hooks.bad_count == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
+        exit_code = (bad == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
     } else {
         // TODO(jmmv): Delete created empty file; it's useless!
         if (!results.first.empty()) {