The branch releng/13.0 has been updated by mm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=3d66df70266822405db0f5eda235e0bca1ba05ec
commit 3d66df70266822405db0f5eda235e0bca1ba05ec
Author: Martin Matuska <m...@freebsd.org>
AuthorDate: 2021-02-22 20:57:22 +0000
Commit: Martin Matuska <m...@freebsd.org>
CommitDate: 2021-02-25 16:20:53 +0000
zfs: restore FreeBSD resource usage accounting
With the switch to OpenZFS 2.0 the platform-dependent resource
usage accounting code got missing.
Patch author: Ryan Moeller <freql...@freebsd.org>
Obtained from: openzfs/zfs@64e0fe14fff465604952d576051ca80c2f1be898
Approved by: re (gjb)
(cherry picked from commit 21269625733f591c998f7d26790179e922ffbde0)
---
cddl/lib/libzpool/Makefile | 1 +
sys/conf/files | 1 +
sys/contrib/openzfs/include/sys/Makefile.am | 1 +
sys/contrib/openzfs/include/sys/zfs_racct.h | 37 +++++++++++++++
sys/contrib/openzfs/lib/libzpool/Makefile.am | 1 +
sys/contrib/openzfs/module/Makefile.bsd | 1 +
.../openzfs/module/os/freebsd/zfs/zfs_racct.c | 55 ++++++++++++++++++++++
.../openzfs/module/os/linux/zfs/Makefile.in | 1 +
.../openzfs/module/os/linux/zfs/zfs_racct.c | 36 ++++++++++++++
sys/contrib/openzfs/module/zfs/arc.c | 2 +
sys/contrib/openzfs/module/zfs/dmu.c | 5 ++
sys/modules/zfs/Makefile | 1 +
12 files changed, 142 insertions(+)
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 0e2cc9456faa..2cb1b0446ade 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -161,6 +161,7 @@ KERNEL_C = \
zfs_debug.c \
zfs_fm.c \
zfs_fuid.c \
+ zfs_racct.c \
zfs_sa.c \
zfs_znode.c \
zfs_ratelimit.c \
diff --git a/sys/conf/files b/sys/conf/files
index f0bf574b3236..1c52f16ff2e1 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -217,6 +217,7 @@ contrib/openzfs/module/os/freebsd/zfs/zfs_dir.c
optional zfs compile-with "${ZF
contrib/openzfs/module/os/freebsd/zfs/zfs_file_os.c optional zfs
compile-with "${ZFS_C}"
contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_compat.c
optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c optional zfs
compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/zfs/zfs_racct.c optional zfs
compile-with "${ZFS_C}"
contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c optional zfs
compile-with "${ZFS_C}"
contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c optional zfs
compile-with "${ZFS_C}"
contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c optional zfs
compile-with "${ZFS_C}"
diff --git a/sys/contrib/openzfs/include/sys/Makefile.am
b/sys/contrib/openzfs/include/sys/Makefile.am
index c3ebf17b5288..385c82c926ae 100644
--- a/sys/contrib/openzfs/include/sys/Makefile.am
+++ b/sys/contrib/openzfs/include/sys/Makefile.am
@@ -111,6 +111,7 @@ COMMON_H = \
zfs_fuid.h \
zfs_project.h \
zfs_quota.h \
+ zfs_racct.h \
zfs_ratelimit.h \
zfs_refcount.h \
zfs_rlock.h \
diff --git a/sys/contrib/openzfs/include/sys/zfs_racct.h
b/sys/contrib/openzfs/include/sys/zfs_racct.h
new file mode 100644
index 000000000000..cfcdd336ea42
--- /dev/null
+++ b/sys/contrib/openzfs/include/sys/zfs_racct.h
@@ -0,0 +1,37 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Portions Copyright 2021 iXsystems, Inc.
+ */
+
+#ifndef _SYS_ZFS_RACCT_H
+#define _SYS_ZFS_RACCT_H
+
+#include <sys/zfs_context.h>
+
+/*
+ * Platform-dependent resource accounting hooks
+ */
+void zfs_racct_read(uint64_t size, uint64_t iops);
+void zfs_racct_write(uint64_t size, uint64_t iops);
+
+#endif /* _SYS_ZFS_RACCT_H */
diff --git a/sys/contrib/openzfs/lib/libzpool/Makefile.am
b/sys/contrib/openzfs/lib/libzpool/Makefile.am
index 7aa7e80985aa..b66e933657ab 100644
--- a/sys/contrib/openzfs/lib/libzpool/Makefile.am
+++ b/sys/contrib/openzfs/lib/libzpool/Makefile.am
@@ -163,6 +163,7 @@ KERNEL_C = \
zfs_debug.c \
zfs_fm.c \
zfs_fuid.c \
+ zfs_racct.c \
zfs_sa.c \
zfs_znode.c \
zfs_ratelimit.c \
diff --git a/sys/contrib/openzfs/module/Makefile.bsd
b/sys/contrib/openzfs/module/Makefile.bsd
index e7cddcc5bb5e..8aa4ed22275e 100644
--- a/sys/contrib/openzfs/module/Makefile.bsd
+++ b/sys/contrib/openzfs/module/Makefile.bsd
@@ -153,6 +153,7 @@ SRCS+= abd_os.c \
zfs_dir.c \
zfs_ioctl_compat.c \
zfs_ioctl_os.c \
+ zfs_racct.c \
zfs_vfsops.c \
zfs_vnops_os.c \
zfs_znode.c \
diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_racct.c
b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_racct.c
new file mode 100644
index 000000000000..b46cc046268e
--- /dev/null
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_racct.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2021 iXsystems, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/zfs_racct.h>
+#include <sys/racct.h>
+
+void
+zfs_racct_read(uint64_t size, uint64_t iops)
+{
+ curthread->td_ru.ru_inblock += iops;
+#ifdef RACCT
+ if (racct_enable) {
+ PROC_LOCK(curproc);
+ racct_add_force(curproc, RACCT_READBPS, size);
+ racct_add_force(curproc, RACCT_READIOPS, iops);
+ PROC_UNLOCK(curproc);
+ }
+#endif /* RACCT */
+}
+
+void
+zfs_racct_write(uint64_t size, uint64_t iops)
+{
+ curthread->td_ru.ru_oublock += iops;
+#ifdef RACCT
+ if (racct_enable) {
+ PROC_LOCK(curproc);
+ racct_add_force(curproc, RACCT_WRITEBPS, size);
+ racct_add_force(curproc, RACCT_WRITEIOPS, iops);
+ PROC_UNLOCK(curproc);
+ }
+#endif /* RACCT */
+}
diff --git a/sys/contrib/openzfs/module/os/linux/zfs/Makefile.in
b/sys/contrib/openzfs/module/os/linux/zfs/Makefile.in
index 75bec52c94e2..fa990776db83 100644
--- a/sys/contrib/openzfs/module/os/linux/zfs/Makefile.in
+++ b/sys/contrib/openzfs/module/os/linux/zfs/Makefile.in
@@ -22,6 +22,7 @@ $(MODULE)-objs += ../os/linux/zfs/zfs_debug.o
$(MODULE)-objs += ../os/linux/zfs/zfs_dir.o
$(MODULE)-objs += ../os/linux/zfs/zfs_file_os.o
$(MODULE)-objs += ../os/linux/zfs/zfs_ioctl_os.o
+$(MODULE)-objs += ../os/linux/zfs/zfs_racct.o
$(MODULE)-objs += ../os/linux/zfs/zfs_sysfs.o
$(MODULE)-objs += ../os/linux/zfs/zfs_uio.o
$(MODULE)-objs += ../os/linux/zfs/zfs_vfsops.o
diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zfs_racct.c
b/sys/contrib/openzfs/module/os/linux/zfs/zfs_racct.c
new file mode 100644
index 000000000000..7897e0f9edc1
--- /dev/null
+++ b/sys/contrib/openzfs/module/os/linux/zfs/zfs_racct.c
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021 iXsystems, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/zfs_racct.h>
+
+void
+zfs_racct_read(uint64_t size, uint64_t iops)
+{
+}
+
+void
+zfs_racct_write(uint64_t size, uint64_t iops)
+{
+}
diff --git a/sys/contrib/openzfs/module/zfs/arc.c
b/sys/contrib/openzfs/module/zfs/arc.c
index fecc752e16ff..b01ccd13a0db 100644
--- a/sys/contrib/openzfs/module/zfs/arc.c
+++ b/sys/contrib/openzfs/module/zfs/arc.c
@@ -308,6 +308,7 @@
#include <sys/aggsum.h>
#include <cityhash.h>
#include <sys/vdev_trim.h>
+#include <sys/zfs_racct.h>
#include <sys/zstd/zstd.h>
#ifndef _KERNEL
@@ -6296,6 +6297,7 @@ top:
ARCSTAT_CONDSTAT(!HDR_PREFETCH(hdr),
demand, prefetch, !HDR_ISTYPE_METADATA(hdr), data,
metadata, misses);
+ zfs_racct_read(size, 1);
}
/* Check if the spa even has l2 configured */
diff --git a/sys/contrib/openzfs/module/zfs/dmu.c
b/sys/contrib/openzfs/module/zfs/dmu.c
index a02f43df13fd..5d6e98d245da 100644
--- a/sys/contrib/openzfs/module/zfs/dmu.c
+++ b/sys/contrib/openzfs/module/zfs/dmu.c
@@ -52,6 +52,7 @@
#include <sys/zfeature.h>
#include <sys/abd.h>
#include <sys/trace_zfs.h>
+#include <sys/zfs_racct.h>
#include <sys/zfs_rlock.h>
#ifdef _KERNEL
#include <sys/vmsystm.h>
@@ -551,6 +552,9 @@ dmu_buf_hold_array_by_dnode(dnode_t *dn, uint64_t offset,
uint64_t length,
dbp[i] = &db->db;
}
+ if (!read)
+ zfs_racct_write(length, nblks);
+
if ((flags & DMU_READ_NO_PREFETCH) == 0 &&
DNODE_META_IS_CACHEABLE(dn) && length <= zfetch_array_rd_sz) {
dmu_zfetch(&dn->dn_zfetch, blkid, nblks,
@@ -1448,6 +1452,7 @@ dmu_assign_arcbuf_by_dnode(dnode_t *dn, uint64_t offset,
arc_buf_t *buf,
* same size as the dbuf.
*/
if (offset == db->db.db_offset && blksz == db->db.db_size) {
+ zfs_racct_write(blksz, 1);
dbuf_assign_arcbuf(db, buf, tx);
dbuf_rele(db, FTAG);
} else {
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index e4b92db764ef..7050a40758a3 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -126,6 +126,7 @@ SRCS+= abd_os.c \
zfs_ioctl_compat.c \
zfs_ioctl_os.c \
zfs_log.c \
+ zfs_racct.c \
zfs_replay.c \
zfs_vfsops.c \
zfs_vnops_os.c \
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
