Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

* freebsd/12-stable/master: MFC r342747 - zfsboot: support newer ZFS versions MFC r342793 - selectively disable ZFS without disabling loader MFC r345246: i386: improve detection of the fast page fault assist.
HardenedBSD · Mar 20, 2019 · eed2cf0 · eed2cf0
2 parents 9e9163d + 22a1fb5
commit eed2cf0
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 17 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,3 +3,4 @@
 *.cpp  diff=cpp
 *.hpp  diff=cpp
 *.py   diff=python
+. svn-properties=svn:keywords=tools/build/options/WITHOUT_LOADER_ZFS
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
@@ -187,6 +187,7 @@ __DEFAULT_YES_OPTIONS = \
     WIRELESS \
     WPA_SUPPLICANT_EAPOL \
     ZFS \
+    LOADER_ZFS \
     ZONEINFO
 
 __DEFAULT_NO_OPTIONS = \
@@ -495,6 +496,7 @@ MK_SOURCELESS_UCODE:= no
 
 .if ${MK_CDDL} == "no"
 MK_ZFS:=	no
+MK_LOADER_ZFS:=	no
 MK_CTF:=	no
 .endif
 

diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile
@@ -25,7 +25,7 @@ CWARNFLAGS.zfs_module.c += -Wno-unused-function
 
 # architecture-specific loader code
 SRCS=	boot1.c self_reloc.c start.S ufs_module.c
-.if ${MK_ZFS} != "no"
+.if ${MK_LOADER_ZFS} != "no"
 SRCS+=		zfs_module.c
 CFLAGS.zfs_module.c+=	-I${ZFSSRC}
 CFLAGS.zfs_module.c+=	-I${SYSDIR}/cddl/boot/zfs

diff --git a/stand/efi/libefi/Makefile b/stand/efi/libefi/Makefile
@@ -45,7 +45,7 @@ CFLAGS+= -fPIC -mno-red-zone
 .endif
 CFLAGS+= -I${EFIINC}
 CFLAGS+= -I${EFIINCMD}
-.if ${MK_ZFS} != "no"
+.if ${MK_LOADER_ZFS} != "no"
 CFLAGS+=	-I${ZFSSRC}
 CFLAGS+=	-DEFI_ZFS_BOOT
 .endif

diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile
@@ -30,7 +30,7 @@ SRCS=	autoload.c \
 	vers.c
 
 CFLAGS+=	-I${.CURDIR}/../loader
-.if ${MK_ZFS} != "no"
+.if ${MK_LOADER_ZFS} != "no"
 CFLAGS+=	-I${ZFSSRC}
 CFLAGS+=	-DEFI_ZFS_BOOT
 HAVE_ZFS=	yes

diff --git a/stand/i386/Makefile b/stand/i386/Makefile
@@ -20,6 +20,6 @@ SUBDIR.yes+=	pxeldr
 SUBDIR.yes+=	kgzldr
 .endif
 
-SUBDIR.${MK_ZFS}+=	zfsboot gptzfsboot
+SUBDIR.${MK_LOADER_ZFS}+=	zfsboot gptzfsboot
 
 .include <bsd.subdir.mk>
diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-HAVE_ZFS=		${MK_ZFS}
+HAVE_ZFS=		${MK_LOADER_ZFS}
 
 LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
@@ -64,7 +64,7 @@ ${LOADER}: ${LOADER}.bin ${BTXLDR} ${BTXKERN}
 ${LOADER}.bin: ${LOADER}.sym
 	strip -R .comment -R .note -o ${.TARGET} ${.ALLSRC}
 
-.if ${MK_ZFS} == "yes" && ${LOADER_INTERP} == ${LOADER_DEFAULT_INTERP}
+.if ${MK_LOADER_ZFS} == "yes" && ${LOADER_INTERP} == ${LOADER_DEFAULT_INTERP}
 LINKS+=		${BINDIR}/${LOADER} ${BINDIR}/zfsloader
 .endif
 .if ${LOADER_INTERP} == ${LOADER_DEFAULT_INTERP}

diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile
@@ -165,7 +165,7 @@ SRCS+=  explicit_bzero.c
 .endif
 
 # Maybe ZFS
-.if ${MK_ZFS} == "yes"
+.if ${MK_LOADER_ZFS} == "yes"
 .include "${SASRC}/zfs/Makefile.inc"
 .endif
 

diff --git a/stand/sparc64/Makefile b/stand/sparc64/Makefile
@@ -5,6 +5,6 @@ NO_OBJ=t
 .include <bsd.init.mk>
 
 SUBDIR.yes=	boot1 loader
-SUBDIR.${MK_ZFS}+=zfsboot
+SUBDIR.${MK_LOADER_ZFS}+=zfsboot
 
 .include <bsd.subdir.mk>
diff --git a/stand/sparc64/loader/Makefile b/stand/sparc64/loader/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-HAVE_ZFS=		${MK_ZFS}
+HAVE_ZFS=		${MK_LOADER_ZFS}
 
 LOADER_DISK_SUPPORT?=	yes
 LOADER_UFS_SUPPORT?=	yes
@@ -21,7 +21,7 @@ NEWVERSWHAT?=	"bootstrap loader" sparc64
 VERSION_FILE=	${.CURDIR}/../loader/version
 INSTALLFLAGS=	-b
 
-.if ${MK_ZFS} != "no"
+.if ${MK_LOADER_ZFS} != "no"
 HAVE_ZFS=	yes
 .endif
 
@@ -42,7 +42,7 @@ HELP_FILES=	${.CURDIR}/help.sparc64
 
 LDFLAGS+=	-static
 
-.if ${MK_ZFS} == "yes"
+.if ${MK_LOADER_ZFS} == "yes"
 LINKS=		${BINDIR}/loader ${BINDIR}/zfsloader
 .endif
 

diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile
@@ -45,7 +45,7 @@ VERSION_FILE=	${.CURDIR}/../userboot/version
 LINKS+=		${BINDIR}/${SHLIB_NAME} ${BINDIR}/userboot.so
 .endif
 
-.if ${MK_ZFS} != "no"
+.if ${MK_LOADER_ZFS} != "no"
 CFLAGS+=	-DUSERBOOT_ZFS_SUPPORT
 HAVE_ZFS=yes
 .endif

diff --git a/sys/cddl/boot/zfs/zfsimpl.h b/sys/cddl/boot/zfs/zfsimpl.h
@@ -1121,6 +1121,8 @@ typedef struct sa_hdr_phys {
 #define	SA_PARENT_OFFSET	40
 #define	SA_SYMLINK_OFFSET	160
 
+#define	ZIO_OBJSET_MAC_LEN		32
+
 /*
  * Intent log header - this on disk structure holds fields to manage
  * the log.  All fields are 64 bit to easily handle cross architectures.
@@ -1133,17 +1135,24 @@ typedef struct zil_header {
 	uint64_t zh_pad[5];
 } zil_header_t;
 
-#define	OBJSET_PHYS_SIZE 2048
+#define	OBJSET_PHYS_SIZE_V2 2048
+#define	OBJSET_PHYS_SIZE_V3 4096
 
 typedef struct objset_phys {
 	dnode_phys_t os_meta_dnode;
 	zil_header_t os_zil_header;
 	uint64_t os_type;
 	uint64_t os_flags;
-	char os_pad[OBJSET_PHYS_SIZE - sizeof (dnode_phys_t)*3 -
-	    sizeof (zil_header_t) - sizeof (uint64_t)*2];
+	uint8_t os_portable_mac[ZIO_OBJSET_MAC_LEN];
+	uint8_t os_local_mac[ZIO_OBJSET_MAC_LEN];
+	char os_pad0[OBJSET_PHYS_SIZE_V2 - sizeof (dnode_phys_t)*3 -
+		sizeof (zil_header_t) - sizeof (uint64_t)*2 -
+		2*ZIO_OBJSET_MAC_LEN];
 	dnode_phys_t os_userused_dnode;
 	dnode_phys_t os_groupused_dnode;
+	dnode_phys_t os_projectused_dnode;
+	char os_pad1[OBJSET_PHYS_SIZE_V3 - OBJSET_PHYS_SIZE_V2 -
+	    sizeof (dnode_phys_t)];
 } objset_phys_t;
 
 typedef struct dsl_dir_phys {

diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s
@@ -131,6 +131,10 @@ IDTVEC(prot)
 	pushl	$T_PROTFLT
 	jmp	irettraps
 IDTVEC(page)
+	testl	$PSL_VM, TF_EFLAGS-TF_ERR(%esp)
+	jnz	1f
+	testb	$SEL_RPL_MASK, TF_CS-TF_ERR(%esp)
+	jnz	1f
 	cmpl	$PMAP_TRM_MIN_ADDRESS, TF_EIP-TF_ERR(%esp)
 	jb	1f
 	movl	%ebx, %cr3

diff --git a/sys/sys/param.h b/sys/sys/param.h
@@ -60,7 +60,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1200504	/* Master, propagated to newvers */
+#define __FreeBSD_version 1200505	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,

diff --git a/tools/build/options/WITHOUT_LOADER_ZFS b/tools/build/options/WITHOUT_LOADER_ZFS
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build ZFS file system boot loader support.
diff --git a/tools/build/options/WITHOUT_ZFS b/tools/build/options/WITHOUT_ZFS
@@ -1,2 +1,2 @@
 .\" $FreeBSD$
-Set to not build ZFS file system.
+Set to not build ZFS file system kernel module, libraries, and user commands.