From nobody Fri Nov 15 22:26:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xqs7p6wxPz5ddRp; Fri, 15 Nov 2024 22:26:46 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xqs7p1kfCz4qLD; Fri, 15 Nov 2024 22:26:46 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 4AFMQc1v000805; Sat, 16 Nov 2024 00:26:42 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 4AFMQc1v000805 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 4AFMQc0Y000804; Sat, 16 Nov 2024 00:26:38 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 16 Nov 2024 00:26:38 +0200 From: Konstantin Belousov To: John Baldwin Cc: Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: ce4dcb97ca43 - main - zfs: merge openzfs/zfs@9c56b8ec7 Message-ID: References: <202408101047.47AAlZxm046555@gitrepo.freebsd.org> <4654dc16-8236-4f17-bed8-27258cce6120@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4654dc16-8236-4f17-bed8-27258cce6120@FreeBSD.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4Xqs7p1kfCz4qLD X-Spamd-Bar: ---- On Fri, Nov 15, 2024 at 12:16:41PM -0500, John Baldwin wrote: > On 8/10/24 03:47, Martin Matuska wrote: > > The branch main has been updated by mm: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=ce4dcb97ca433b2a2f03fbae957dae0ff16f6f51 > > > > commit ce4dcb97ca433b2a2f03fbae957dae0ff16f6f51 > > Merge: 54a543d5ea3a 9c56b8ec7855 > > Author: Martin Matuska > > AuthorDate: 2024-08-10 09:15:30 +0000 > > Commit: Martin Matuska > > CommitDate: 2024-08-10 09:43:43 +0000 > > > > zfs: merge openzfs/zfs@9c56b8ec7 > > Notable upstream pull request merges: > > #15817 5536c0dee Sync AUX label during pool import > > #15889 c7ada64bb ddt: dedup table quota enforcement > > #15890 62e7d3c89 ddt: add support for prefetching tables into the ARC > > #15894 e26b3771e spa_preferred_class: pass the entire zio > > #15894 d54d0fff3 dnode: allow storage class to be overridden by object type > > #16197 55427add3 Several improvements to ARC shrinking > > #16217 -multiple JSON output for various zfs and zpool subcommands > > #16248 24e6585e7 libzfs.h: Set ZFS_MAXPROPLEN and ZPOOL_MAXPROPLEN > > to ZAP_MAXVALUELEN > > #16264 9dfc5c4a0 Fix long_free_dirty accounting for small files > > #16268 ed0db1cc8 Make txg_wait_synced conditional in zfsvfs_teardown, > > for FreeBSD > > #16288 d60debbf5 Fix sa_add_projid to lookup and update SA_ZPL_DXATTR > > #16308 ec580bc52 zfs: add bounds checking to zil_parse > > #16310 c21dc56ea Fix zdb_dump_block for little endian > > #16315 7ddc1f737 zil: add stats for commit failure/fallback > > #16326 b0bf14cdb abd: lift ABD zero scan from zio_compress_data() > > to abd_cmp_zero() > > #16337 c8184d714 Block cloning conditionally destroy ARC buffer > > #16338 dbe07928b Add support for multiple lines to the sharenfs property > > for FreeBSD > > #16374 1a3e32e6a Cleanup DB_DNODE() macros usage > > #16374 ed87d456e Skip dnode handles use when not needed > > #16346 fb6d8cf22 Add some missing vdev properties > > #16364 670147be5 zvol: ensure device minors are properly cleaned up > > #16382 dea8fabf7 FreeBSD: Fix RLIMIT_FSIZE handling for block cloning > > #16387 aef452f10 Improve zfs_blkptr_verify() > > #16395 cbcb52243 Fix the names of some FreeBSD sysctls in > > include/tunables.cfg > > #16401 5b9f3b766 Soften pruning threshold on not evictable metadata > > #16404 cdd53fea1 FreeBSD: Add missing memory reclamation accounting > > #16404 1fdcb653b Once more refactor arc_summary output > > #16419 1f5bf91a8 Fix memory corruption during parallel zpool import > > with -o cachefile > > #16426 cf6e8b218 zstream: remove duplicate highbit64 definition > > Obtained from: OpenZFS > > OpenZFS commit: 9c56b8ec7855119c8948c551ee28086a11465a56 > > This merge reverted the changes from: > > commit b068bb09a1a82d9fef0e939ad6135443a959e290 > Author: Konstantin Belousov > Date: Mon Jan 8 07:18:40 2024 +0200 > > Add vnode_pager_clean_{a,}sync(9) > Bump __FreeBSD_version for ZFS use. > Reviewed by: markj > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Differential revision: https://reviews.freebsd.org/D43356 > > Specifically, it undid this change: > > diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vnode.h b/sys/contri > b/openzfs/include/os/freebsd/spl/sys/vnode.h > index 75c32f221ffd..7a3b38736a58 100644 > --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vnode.h > +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vnode.h > @@ -100,11 +101,11 @@ vn_flush_cached_data(vnode_t *vp, boolean_t sync) > #else > if (vp->v_object->flags & OBJ_MIGHTBEDIRTY) { > #endif > - int flags = sync ? OBJPC_SYNC : 0; > vn_lock(vp, LK_SHARED | LK_RETRY); > - zfs_vmobject_wlock(vp->v_object); > - vm_object_page_clean(vp->v_object, 0, 0, flags); > - zfs_vmobject_wunlock(vp->v_object); > + if (sync) > + vnode_pager_clean_sync(vp); > + else > + vnode_pager_clean_async(vp); > VOP_UNLOCK1(vp); > } > } > > (The addition of the #include from this commit remains as > a local diff in main FWIW) > > It looks like vnode_pager_clean_*sync() are thin wrappers around > vm_object_page_clean() still in main, but I'm curious if this change > needs to be kept in main and/or upstreamed? Better to upstreaam it, of course. It is the simplified KPI brought in mainly for NFS client, but I do not see why other filesystems should be exempt.