The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=738a9a78fc92e035eb168b9d0a9ada146a9e9972
commit 738a9a78fc92e035eb168b9d0a9ada146a9e9972
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-06-28 02:32:16 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-06-28 02:32:16 +0000
Revert "FreeBSD: zfs_putpages: don't undirty pages until after write
completes"
This causes async putpages to leave the pages sbusied for a long time,
which hurts concurrency. Revert for now until we have a better
approach.
This reverts commit 238eab7dc16932edbe9bcc990e8e5376bfe5b2ba.
Reported by: Ihor Antonov <n...@hugpoint.tech>
Discussed with: Rob Norris <rob.nor...@klarasystems.com>
---
.../openzfs/include/os/freebsd/spl/sys/vm.h | 1 -
sys/contrib/openzfs/module/os/freebsd/spl/spl_vm.c | 1 -
.../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 60 ++++++----------------
3 files changed, 15 insertions(+), 47 deletions(-)
diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vm.h
b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vm.h
index d36bee881d0b..454078f0fe79 100644
--- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vm.h
+++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vm.h
@@ -35,7 +35,6 @@
extern const int zfs_vm_pagerret_bad;
extern const int zfs_vm_pagerret_error;
extern const int zfs_vm_pagerret_ok;
-extern const int zfs_vm_pagerret_pend;
extern const int zfs_vm_pagerput_sync;
extern const int zfs_vm_pagerput_inval;
diff --git a/sys/contrib/openzfs/module/os/freebsd/spl/spl_vm.c
b/sys/contrib/openzfs/module/os/freebsd/spl/spl_vm.c
index 9d5f025423a1..733c2bd07ebb 100644
--- a/sys/contrib/openzfs/module/os/freebsd/spl/spl_vm.c
+++ b/sys/contrib/openzfs/module/os/freebsd/spl/spl_vm.c
@@ -43,7 +43,6 @@
const int zfs_vm_pagerret_bad = VM_PAGER_BAD;
const int zfs_vm_pagerret_error = VM_PAGER_ERROR;
const int zfs_vm_pagerret_ok = VM_PAGER_OK;
-const int zfs_vm_pagerret_pend = VM_PAGER_PEND;
const int zfs_vm_pagerput_sync = VM_PAGER_PUT_SYNC;
const int zfs_vm_pagerput_inval = VM_PAGER_PUT_INVAL;
diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
index 9ed6053da25a..8a5006c488f3 100644
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
@@ -25,7 +25,6 @@
* Copyright (c) 2012, 2015 by Delphix. All rights reserved.
* Copyright (c) 2014 Integros [integros.com]
* Copyright 2017 Nexenta Systems, Inc.
- * Copyright (c) 2025, Klara, Inc.
*/
/* Portions Copyright 2007 Jeremy Teo */
@@ -4300,33 +4299,6 @@ zfs_freebsd_getpages(struct vop_getpages_args *ap)
ap->a_rahead));
}
-typedef struct {
- uint_t pca_npages;
- vm_page_t pca_pages[];
-} putpage_commit_arg_t;
-
-static void
-zfs_putpage_commit_cb(void *arg)
-{
- putpage_commit_arg_t *pca = arg;
- vm_object_t object = pca->pca_pages[0]->object;
-
- zfs_vmobject_wlock(object);
-
- for (uint_t i = 0; i < pca->pca_npages; i++) {
- vm_page_t pp = pca->pca_pages[i];
- vm_page_undirty(pp);
- vm_page_sunbusy(pp);
- }
-
- vm_object_pip_wakeupn(object, pca->pca_npages);
-
- zfs_vmobject_wunlock(object);
-
- kmem_free(pca,
- offsetof(putpage_commit_arg_t, pca_pages[pca->pca_npages]));
-}
-
static int
zfs_putpages(struct vnode *vp, vm_page_t *ma, size_t len, int flags,
int *rtvals)
@@ -4428,12 +4400,10 @@ zfs_putpages(struct vnode *vp, vm_page_t *ma, size_t
len, int flags,
}
if (zp->z_blksz < PAGE_SIZE) {
- vm_ooffset_t woff = off;
- size_t wlen = len;
- for (i = 0; wlen > 0; woff += tocopy, wlen -= tocopy, i++) {
- tocopy = MIN(PAGE_SIZE, wlen);
+ for (i = 0; len > 0; off += tocopy, len -= tocopy, i++) {
+ tocopy = len > PAGE_SIZE ? PAGE_SIZE : len;
va = zfs_map_page(ma[i], &sf);
- dmu_write(zfsvfs->z_os, zp->z_id, woff, tocopy, va, tx);
+ dmu_write(zfsvfs->z_os, zp->z_id, off, tocopy, va, tx);
zfs_unmap_page(sf);
}
} else {
@@ -4454,19 +4424,19 @@ zfs_putpages(struct vnode *vp, vm_page_t *ma, size_t
len, int flags,
zfs_tstamp_update_setup(zp, CONTENT_MODIFIED, mtime, ctime);
err = sa_bulk_update(zp->z_sa_hdl, bulk, count, tx);
ASSERT0(err);
+ /*
+ * XXX we should be passing a callback to undirty
+ * but that would make the locking messier
+ */
+ zfs_log_write(zfsvfs->z_log, tx, TX_WRITE, zp, off,
+ len, commit, B_FALSE, NULL, NULL);
- putpage_commit_arg_t *pca = kmem_alloc(
- offsetof(putpage_commit_arg_t, pca_pages[ncount]),
- KM_SLEEP);
- pca->pca_npages = ncount;
- memcpy(pca->pca_pages, ma, sizeof (vm_page_t) * ncount);
-
- zfs_log_write(zfsvfs->z_log, tx, TX_WRITE, zp,
- off, len, commit, B_FALSE, zfs_putpage_commit_cb, pca);
-
- for (i = 0; i < ncount; i++)
- rtvals[i] = zfs_vm_pagerret_pend;
-
+ zfs_vmobject_wlock(object);
+ for (i = 0; i < ncount; i++) {
+ rtvals[i] = zfs_vm_pagerret_ok;
+ vm_page_undirty(ma[i]);
+ }
+ zfs_vmobject_wunlock(object);
VM_CNT_INC(v_vnodeout);
VM_CNT_ADD(v_vnodepgsout, ncount);
}
