summaryrefslogtreecommitdiff
path: root/sys/modules
diff options
context:
space:
mode:
authorchs <chs@NetBSD.org>2018-05-28 21:04:59 +0000
committerchs <chs@NetBSD.org>2018-05-28 21:04:59 +0000
commiteada09acaeaeefa47b9692e7d920bf851863dfb7 (patch)
treecd53eb38844283a2a5b01c3cb1c9539d8ad6de25 /sys/modules
parentdefb6b6ddc595a2a77bd37b2d01ff89341730763 (diff)
merge a new version of the CDDL dtrace and ZFS code.
this changes the upstream vendor from OpenSolaris to FreeBSD, and this version is based on FreeBSD svn r315983. in addition to the 10 years of improvements from upstream, this version also has these NetBSD-specific enhancements: - dtrace FBT probes can now be placed in kernel modules. - ZFS now supports mmap().
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/dtrace/dtrace/Makefile22
-rw-r--r--sys/modules/dtrace/fbt/Makefile16
-rw-r--r--sys/modules/dtrace/linux32_syscall/Makefile6
-rw-r--r--sys/modules/dtrace/linux_syscall/Makefile6
-rw-r--r--sys/modules/dtrace/netbsd32_syscall/Makefile6
-rw-r--r--sys/modules/dtrace/profile/Makefile4
-rw-r--r--sys/modules/dtrace/syscall/Makefile6
-rw-r--r--sys/modules/solaris/Makefile.solmod24
-rw-r--r--sys/modules/zfs/Makefile.zfsmod54
9 files changed, 93 insertions, 51 deletions
diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile
index e08dfe1a608..3a67c61c373 100644
--- a/sys/modules/dtrace/dtrace/Makefile
+++ b/sys/modules/dtrace/dtrace/Makefile
@@ -21,23 +21,41 @@ ARCH=${MACHINE_CPU}
KMOD= dtrace
SRCS= dtrace.c \
+ dtrace_xoroshiro128_plus.c \
dtrace_asm.S \
dtrace_subr.c
.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+.PATH: ${OSNETDIR}/dev/dtrace/x86
SRCS+= dis_tables.c \
instr_size.c
+CPPFLAGS+= -I${OSNETDIR}/dev/dtrace/x86
.endif
CPPFLAGS+= -I${OSNETDIR}/sys \
-I${OSNETDIR}/dev/dtrace \
-I${OSNETDIR}/dev/dtrace/${ARCH} \
-I${OSNETDIR}/dist/uts/common \
+ -I${OSNETDIR}/dist/common/util \
-DDIS_MEM
-CPPFLAGS+= -DSMP -DDEBUG
+CPPFLAGS+= -Wno-unknown-pragmas \
+ -Wno-shadow \
+ -Wno-unused-variable \
+ -Wno-discarded-qualifiers \
+ -Wno-unused-function
-CPPFLAGS+= -Wno-unknown-pragmas
+COPTS.dis_tables.c+= \
+ -Wno-missing-field-initializers \
+ -Wno-cast-qual \
+ -Wno-parentheses \
+ -Wno-uninitialized
+
+COPTS.dtrace.c+= \
+ -Wno-unused-but-set-variable \
+
+COPTS.dtrace_subr.c+= \
+ -Wno-unused-value
EXPORT_SYMS= dtrace_register \
dtrace_unregister \
diff --git a/sys/modules/dtrace/fbt/Makefile b/sys/modules/dtrace/fbt/Makefile
index 682449b103b..36005fdd1eb 100644
--- a/sys/modules/dtrace/fbt/Makefile
+++ b/sys/modules/dtrace/fbt/Makefile
@@ -3,17 +3,27 @@
.include "../../Makefile.inc"
.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/fbt
+.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/fbt/${MACHINE_CPU}
+
+.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/fbt/x86
+CPPFLAGS+= -I${NETBSDSRCDIR}/external/cddl/osnet/dev/fbt/x86
+.endif
KMOD= dtrace_fbt
-SRCS= fbt.c
+SRCS= fbt.c fbt_isa.c
.PATH: ${S}/kern
SRCS+= kern_ctf.c
-CPPFLAGS.fbt.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/sys \
- -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
+CPPFLAGS+= -I${NETBSDSRCDIR}/external/cddl/osnet/sys \
+ -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common \
+ -I${NETBSDSRCDIR}/external/cddl/osnet/dev/fbt \
+ -I${NETBSDSRCDIR}/external/cddl/osnet/dev/fbt/${MACHINE_CPU}
CPPFLAGS+= -Wno-unknown-pragmas
+CPPFLAGS+= -DDIAGNOSTIC
+
.include <bsd.kmodule.mk>
diff --git a/sys/modules/dtrace/linux32_syscall/Makefile b/sys/modules/dtrace/linux32_syscall/Makefile
index ddb1071023a..f59e5f4aac8 100644
--- a/sys/modules/dtrace/linux32_syscall/Makefile
+++ b/sys/modules/dtrace/linux32_syscall/Makefile
@@ -8,8 +8,10 @@ KMOD= dtrace_syscall_linux32
SRCS= systrace.c
CPPFLAGS+= -I${NETBSDSRCDIR}/external/cddl/osnet/sys \
- -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
+ -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common \
+ -I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace
-CPPFLAGS+= -Wno-unknown-pragmas
+CPPFLAGS+= -Wno-unknown-pragmas \
+ -Wno-discarded-qualifiers
.include <bsd.kmodule.mk>
diff --git a/sys/modules/dtrace/linux_syscall/Makefile b/sys/modules/dtrace/linux_syscall/Makefile
index 45706f1fc59..e0430409dd5 100644
--- a/sys/modules/dtrace/linux_syscall/Makefile
+++ b/sys/modules/dtrace/linux_syscall/Makefile
@@ -8,8 +8,10 @@ KMOD= dtrace_syscall_linux
SRCS= systrace.c
CPPFLAGS+= -I${NETBSDSRCDIR}/external/cddl/osnet/sys \
- -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
+ -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common \
+ -I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace
-CPPFLAGS+= -Wno-unknown-pragmas
+CPPFLAGS+= -Wno-unknown-pragmas \
+ -Wno-discarded-qualifiers
.include <bsd.kmodule.mk>
diff --git a/sys/modules/dtrace/netbsd32_syscall/Makefile b/sys/modules/dtrace/netbsd32_syscall/Makefile
index 33244c8da11..9151d4fea1c 100644
--- a/sys/modules/dtrace/netbsd32_syscall/Makefile
+++ b/sys/modules/dtrace/netbsd32_syscall/Makefile
@@ -8,8 +8,10 @@ KMOD= dtrace_syscall_netbsd32
SRCS= systrace.c
CPPFLAGS+= -I${NETBSDSRCDIR}/external/cddl/osnet/sys \
- -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
+ -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common \
+ -I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace
-CPPFLAGS+= -Wno-unknown-pragmas
+CPPFLAGS+= -Wno-unknown-pragmas \
+ -Wno-discarded-qualifiers
.include <bsd.kmodule.mk>
diff --git a/sys/modules/dtrace/profile/Makefile b/sys/modules/dtrace/profile/Makefile
index 53851ddf0cb..dbc7408e4c4 100644
--- a/sys/modules/dtrace/profile/Makefile
+++ b/sys/modules/dtrace/profile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/09/18 19:45:24 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/28 21:05:01 chs Exp $
.include "../../Makefile.inc"
@@ -11,6 +11,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cddl/osnet/sys \
-I${NETBSDSRCDIR}/external/cddl/osnet/dev/profile \
-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
-CPPFLAGS+= -Wno-unknown-pragmas -Wno-cast-qual
+CPPFLAGS+= -Wno-unknown-pragmas -Wno-cast-qual -Wno-discarded-qualifiers
.include <bsd.kmodule.mk>
diff --git a/sys/modules/dtrace/syscall/Makefile b/sys/modules/dtrace/syscall/Makefile
index c6a704017c9..91443b71ed2 100644
--- a/sys/modules/dtrace/syscall/Makefile
+++ b/sys/modules/dtrace/syscall/Makefile
@@ -8,8 +8,10 @@ KMOD= dtrace_syscall
SRCS= systrace.c
CPPFLAGS+= -I${NETBSDSRCDIR}/external/cddl/osnet/sys \
- -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
+ -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common \
+ -I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace
-CPPFLAGS+= -Wno-unknown-pragmas
+CPPFLAGS+= -Wno-unknown-pragmas \
+ -Wno-discarded-qualifiers
.include <bsd.kmodule.mk>
diff --git a/sys/modules/solaris/Makefile.solmod b/sys/modules/solaris/Makefile.solmod
index 3ab62ad7d4a..458bc6ef63a 100644
--- a/sys/modules/solaris/Makefile.solmod
+++ b/sys/modules/solaris/Makefile.solmod
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.solmod,v 1.4 2012/11/21 17:48:05 pooka Exp $
+# $NetBSD: Makefile.solmod,v 1.5 2018/05/28 21:05:01 chs Exp $
ZFSDIR= ${S}/../external/cddl/osnet
@@ -8,6 +8,7 @@ SRCS= avl.c
.PATH: ${ZFSDIR}/dist/common/nvpair
+SRCS+= fnvpair.c
SRCS+= nvpair.c
SRCS+= nvpair_alloc_fixed.c
@@ -46,19 +47,21 @@ SRCS+= acl_common.c
.PATH: ${ZFSDIR}/sys/kern
+SRCS+= callb.c
+SRCS+= ddi.c
+SRCS+= kmem.c
SRCS+= kobj.c
SRCS+= kstat.c
SRCS+= misc.c
-SRCS+= policy.c
-SRCS+= string.c
-SRCS+= zone.c
-SRCS+= callb.c
-SRCS+= ddi.c
SRCS+= mod.c
+SRCS+= opensolaris.c
+SRCS+= policy.c
SRCS+= printf.c
+SRCS+= string.c
+SRCS+= sysevent.c
SRCS+= taskq.c
SRCS+= vfs.c
-SRCS+= opensolaris.c
+SRCS+= zone.c
WARNS= 0
NOGCCERROR= yes
@@ -76,14 +79,9 @@ CWARNFLAGS+= -Wno-format
CPPFLAGS+= -I${ZFSDIR}/sys
CPPFLAGS+= -I${ZFSDIR}/dist/common/acl
+CPPFLAGS+= -I${ZFSDIR}/dist/common
CPPFLAGS+= -I${ZFSDIR}/dist/uts/common/zmod
CPPFLAGS+= -I${ZFSDIR}/dist/uts/common
CPPFLAGS+= -I${ZFSDIR}/sys/sys
-CPPFLAGS+= -Dcaddr_t=__caddr_t "-D__va_list=va_list"
-CPPFLAGS+= -std=c99
-# CPPFLAGS+= -D_NFS_NFS_H_
-# CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
-CPPFLAGS+= -DDIAGNOSTIC
-
NEED_ISYSTEM= # duplicate headers, depends on -isystem to build
diff --git a/sys/modules/zfs/Makefile.zfsmod b/sys/modules/zfs/Makefile.zfsmod
index 9f99d3ee981..95de57425a6 100644
--- a/sys/modules/zfs/Makefile.zfsmod
+++ b/sys/modules/zfs/Makefile.zfsmod
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfsmod,v 1.6 2016/06/18 21:45:05 christos Exp $
+# $NetBSD: Makefile.zfsmod,v 1.7 2018/05/28 21:05:01 chs Exp $
ZFSDIR= ${S}/../external/cddl/osnet
@@ -12,14 +12,6 @@ SRCS+= zfs_prop.c
SRCS+= zpool_prop.c
SRCS+= zprop_common.c
-.PATH: ${ZFSDIR}/dist/uts/common/fs
-
-#SRCS+= gfs.c
-
-.PATH: ${ZFSDIR}/dist/uts/common/zmod
-
-#SRCS+= trees.c
-
.PATH: ${ZFSDIR}/lib/libzpool
SRCS+= atomic.c
@@ -27,11 +19,16 @@ SRCS+= atomic.c
.PATH: ${ZFSDIR}/dist/uts/common/fs/zfs
SRCS+= arc.c
+SRCS+= blkptr.c
SRCS+= bplist.c
+SRCS+= bpobj.c
+SRCS+= bptree.c
+SRCS+= bqueue.c
SRCS+= dbuf.c
SRCS+= ddt.c
SRCS+= ddt_zap.c
SRCS+= dmu.c
+SRCS+= dmu_diff.c
SRCS+= dmu_object.c
SRCS+= dmu_objset.c
SRCS+= dmu_send.c
@@ -40,25 +37,37 @@ SRCS+= dmu_tx.c
SRCS+= dmu_zfetch.c
SRCS+= dnode.c
SRCS+= dnode_sync.c
+SRCS+= dsl_bookmark.c
SRCS+= dsl_dataset.c
+SRCS+= dsl_deadlist.c
SRCS+= dsl_deleg.c
+SRCS+= dsl_destroy.c
SRCS+= dsl_dir.c
SRCS+= dsl_pool.c
SRCS+= dsl_prop.c
-SRCS+= dsl_scrub.c
+SRCS+= dsl_scan.c
SRCS+= dsl_synctask.c
+SRCS+= dsl_userhold.c
+#SRCS+= edonr_zfs.c
SRCS+= gzip.c
+SRCS+= lz4.c
SRCS+= lzjb.c
SRCS+= metaslab.c
+SRCS+= multilist.c
+SRCS+= range_tree.c
SRCS+= refcount.c
SRCS+= rrwlock.c
+SRCS+= sa.c
SRCS+= sha256.c
+#SRCS+= skein_zfs.c
SRCS+= spa.c
SRCS+= spa_config.c
SRCS+= spa_errlog.c
SRCS+= spa_history.c
SRCS+= spa_misc.c
SRCS+= space_map.c
+SRCS+= space_reftree.c
+SRCS+= trim_map.c
SRCS+= txg.c
SRCS+= uberblock.c
SRCS+= unique.c
@@ -75,31 +84,38 @@ SRCS+= vdev_root.c
SRCS+= zap.c
SRCS+= zap_leaf.c
SRCS+= zap_micro.c
+SRCS+= zfeature.c
+SRCS+= zfeature_common.c
SRCS+= zfs_byteswap.c
-#SRCS+= zfs_ctldir.c
+SRCS+= zfs_ctldir.c
+SRCS+= zfs_debug.c
SRCS+= zfs_dir.c
-SRCS+= zfs_fuid.c
SRCS+= zfs_fm.c
+SRCS+= zfs_fuid.c
SRCS+= zfs_ioctl.c
+SRCS+= zfs_ioctl_compat.c
SRCS+= zfs_log.c
+SRCS+= zfs_onexit.c
SRCS+= zfs_replay.c
SRCS+= zfs_rlock.c
+SRCS+= zfs_sa.c
SRCS+= zfs_vfsops.c
SRCS+= zfs_vnops.c
SRCS+= zfs_znode.c
-SRCS+= zfs_acl.c
SRCS+= zil.c
SRCS+= zio.c
SRCS+= zio_checksum.c
SRCS+= zio_compress.c
SRCS+= zio_inject.c
+SRCS+= zle.c
+SRCS+= zrlock.c
#SRCS+= zutil.c
SRCS+= zvol.c
-SRCS+= zle.c
+SRCS+= zfs_acl.c
.PATH: ${ZFSDIR}/sys/kern
-SRCS+= zfs_stub.c
+SRCS+= zfs_stub.c
WARNS= 0
NOGCCERROR= yes
@@ -108,12 +124,10 @@ CWARNFLAGS+= -Wall
CWARNFLAGS+= -Wno-unknown-pragmas
CWARNFLAGS+= -Wno-missing-braces
CWARNFLAGS+= -Wno-parentheses
-CWARNFLAGS+= -Wno-uninitialized
CWARNFLAGS+= -Wno-unused
CWARNFLAGS+= -Wno-switch
CWARNFLAGS+= -Wno-strict-prototypes
CWARNFLAGS+= -Wno-missing-prototypes
-CWARNFLAGS+= -Wno-format
CPPFLAGS+= -I${ZFSDIR}/sys
CPPFLAGS+= -I${ZFSDIR}/dist/common
@@ -125,12 +139,6 @@ CPPFLAGS+= -I${ZFSDIR}/dist/uts/common
CPPFLAGS+= -I${ZFSDIR}/dist/uts/common/zfs
CPPFLAGS+= -I${ZFSDIR}/dist/uts/common
-CPPFLAGS+= -Dcaddr_t=__caddr_t "-D__va_list=va_list" -D__NetBSD__
-CPPFLAGS+= -std=c99
-CPPFLAGS+= -D_NFS_NFS_H_
CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
-CPPFLAGS+= -DDIAGNOSTIC
-# -DZFS_DEBUG
-
NEED_ISYSTEM= # duplicate headers, depends on -isystem to build