zfs-2.3.5 patch set #17857

tonyhutter · 2025-10-20T22:34:48Z

Motivation and Context

Proposed patch set for zfs-2.3.5.

Description

Add 6.17 kernel support, and a few fixes. Also update CI code to latest version.

How Has This Been Tested?

CI will test

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Performance enhancement (non-breaking change which improves efficiency)
Code cleanup (non-breaking change which makes code smaller or more readable)
Quality assurance (non-breaking change which makes the code more robust against bugs)
Breaking change (fix or feature that would cause existing functionality to change)
Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
Documentation (a change to man pages or other documentation)

Checklist:

My code follows the OpenZFS code style requirements.
I have updated the documentation accordingly.
I have read the contributing document.
I have added tests to cover my changes.
I have run the ZFS Test Suite with this change applied.
All commit messages are properly formatted and contain Signed-off-by.

devsk · 2025-10-20T23:53:29Z

👍

I guess these two are the ones I need for 6.17?

Linux 6.17: d_set_d_op() is no longer available
bfcbf9c

Linux 6.17 compat: META
69ff925

We've seen Fedora 42 still setting up after 10 min. Change the timeout to 15 min. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: George Melikov <[email protected]> Signed-off-by: Tony Hutter <[email protected]> Closes openzfs#17697

Because GitHub creates a merge commit on top of real head, so the check on HEAD will fail regardlessly. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Tony Hutter <[email protected]> Signed-off-by: Shengqi Chen <[email protected]> Closes openzfs#17695

Otherwise it might become `if [ == "" ]` which is ill-formed. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Tony Hutter <[email protected]> Signed-off-by: Shengqi Chen <[email protected]> Closes openzfs#17695

- Increase qemu-1-setup.sh timeout to 20min since it sometimes fails to complete after 15min. - Timestamp all qemu-1-setup.sh lines to look for hangs. - Add a 'watchdog' process to print out the top running process every 30sec to help with debugging. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tony Hutter <[email protected]> Closes openzfs#17714

Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Tony Hutter <[email protected]> Signed-off-by: Alexander Motin <[email protected]> Closes openzfs#17749

When updating a Fedora instance to an experimental kernel make sure to include the matching versioned perf and bpftool packages. This helps ensure there are no unexpected conflicts which would prevent the new packages from being installed. Reviewed-by: Tony Hutter <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes openzfs#17791

The Buildbot CI infrastructure has been fully replaced by GitHub Actions. Remove any lingering references from the repository. Reviewed-by: Alexander Motin <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes openzfs#17794

Signed-off-by: Brian Behlendorf <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Closes openzfs#17795

Add a -O option to zfs-test.sh to dump debug information on test timeout. The debug info includes: - 30 lines from 'top' - /proc/<PID>/stack output of process with highest CPU usage - Last lines strace-ing process with highest CPU usage - /proc/sysrq-trigger kernel stack traces All debug information gets dumped to /dev/kmsg (Linux only). In addition, print out the VM console lines from the "Setup Testing Machines" step. We have often see VMs timeout at this step and don't know why. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tony Hutter <[email protected]> Closes openzfs#17753

Signed-off-by: Shreshth Srivastava <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: George Melikov <[email protected]> Reviewed-by: Tony Hutter <[email protected]>

Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Tony Hutter <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tino Reichardt <[email protected]> Closes openzfs#17815

FreeBSD 15.0-ALPHA5 image fails to boot on cloud VMs due to missing /boot/efi mount point, causing the system to drop to single user mode where SSH cannot start. Work around this by staying on ALPHA4 and setting IGNORE_OSVERSION=yes to bypass pkg's kernel version mismatch prompt during bootstrap. This allows CI to proceed with ALPHA4 until we have a stable FreeBSD 15.0 image. Signed-off-by: Ameer Hamza <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Closes openzfs#17846

We only have extremely narrow uses, so move it all into a single function that does only what we need, with and without d_set_d_op(). Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Tony Hutter <[email protected]> Signed-off-by: Rob Norris <[email protected]> Closes openzfs#17621

Three cases were discovered where 'zpool add' would fail to warn when adding vdevs to a pool with a mismatched replication level. These are: 1. When a pool contains mixed file and disk vdevs. 2. When a pool contains an active dRAID distributed spare 3. When a pool contains an active hot spare The lack of warnings are caused by get_replication() assessing the current pool configuration an inconsistent and disabling the mismatched replication check for the new pool configuration after 'zpool add'. This change updates get_replication() to be slightly more tolerant in the non-fatal case. The zpool_add_010_pos.ksh test case was split in to separate tests: zpool_add_warn_create.ksh, pool_add_warn_degraded.ksh, and zpool_add_warn_removal. These test were extended to include coverage for dRAID pools and the three scenarios described above. Reviewed-by: Tony Hutter <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes openzfs#17780

I got a newer shellcheck, and it pointed out that read without a target variable is not POSIXly. The var was removed in c3ef9f7, so I put it back, and now shellcheck complains about an unused var. That's actually correct, but necessary, so I've added a suppression for that, probably better. Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: George Melikov <[email protected]> Signed-off-by: Rob Norris <[email protected]> Closes openzfs#17626

Provide an interface to retrieve the lowest and highest minimum allocation size for the normal allocation class. This can be used by external consumers of the DMU to estimate potential wasted capacity when setting the recordsize for an object. The new "min_alloc" and "max_alloc" keys are added to the pool configuration and used by default_volblocksize() to warn when an ineffecient block size is requested. For older kmods which don't yet include the new keys fallback to the previous logic. Reviewed-by: Tony Hutter <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes openzfs#17758

Update the META file to reflect compatibility with the 6.17 kernel. Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Rob Norris <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes openzfs#17789

The zvol blk-mq codepaths would erroneously send FLUSH and TRIM commands down the read codepath, rather than write. This fixes the issue, and updates the zvol_misc_fua test to verify that sync writes are actually happening. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Ameer Hamza <[email protected]> Signed-off-by: Tony Hutter <[email protected]> Closes openzfs#17761 Closes openzfs#17765

ZVOLs don't support all block layer IO request types. Add a check for the IO types we do support. Also, remove references to io_is_secure_erase() since they are not supported on ZVOLs. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Signed-off-by: Tony Hutter <[email protected]> Closes openzfs#17803

This changes the basic search algorithm from a single search up and down the tree to a full depth-first traversal to handle conditions where the tree matches at a higher level but not a lower level. Normally higher level blocks always point to matching blocks, but there are cases where this does not happen: 1. Racing block pointer updates from dbuf_write_ready. Before f664f1e (openzfs#8946), both dbuf_write_ready and dnode_next_offset held dn_struct_rwlock which protected against pointer writes from concurrent syncs. This no longer applies, so sync context can f.e. clear or fill all L1->L0 BPs before the L2->L1 BP and higher BP's are updated. dnode_free_range in particular can reach this case and skip over L1 blocks that need to be dirtied. Later, sync will panic in free_children when trying to clear a non-dirty indirect block. This case was found with ztest. 2. txg > 0, non-hole case. This is openzfs#11196. Freeing blocks/dnodes breaks the assumption that a match at a higher level implies a match at a lower level when filtering txg > 0. Whenever some but not all L0 blocks are freed, the parent L1 block is rewritten. Its updated L2->L1 BP reflects a newer birth txg. Later when searching by txg, if the L1 block matches since the txg is newer, it is possible that none of the remaining L1->L0 BPs match if none have been updated. The same behavior is possible with dnode search at L0. This is reachable from dsl_destroy_head for synchronous freeing. When this happens open context fails to free objects leaving sync context stuck freeing potentially many objects. This is also reachable from traverse_pool for extreme rewind where it is theoretically possible that datasets not dirtied after txg are skipped if the MOS has high enough indirection to trigger this case. In both of these cases, without backtracking the search ends prematurely as ESRCH result implies no more matches in the entire object. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Akash B <[email protected]> Signed-off-by: Robert Evans <[email protected]> Closes openzfs#16025 Closes openzfs#11196

amotin · 2025-10-22T16:19:13Z

I propose to include also: 3f4312a and ea37c30.

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Alexander Motin <[email protected]> Closes openzfs#17692 Closes openzfs#17729

devsk · 2025-10-24T21:44:50Z

@tonyhutter : May I request you to please list the commit IDs that are strictly required for 6.17 support only? I have to manually patch until 2.3.5 comes out. Upstream has stopped updating 6.16.xx and forced my hand.

tonyhutter · 2025-10-24T22:47:04Z

@devsk if you just want to get it to build:
Linux 6.17 compat: META
Linux 6.17: d_set_d_op() is no longer available

That said, projectquota is currently broken on ZFS w/6.17 kernel: #17869.
That issue is a blocker for getting this release out.

pharshalp · 2025-11-02T12:50:01Z

Could you please include #17632?
(reference: #17184 (comment))

roedie · 2025-11-05T12:09:48Z

Could you please include #17632? (reference: #17184 (comment))

+1

The concurrent execution of feature_sync() can lead to a panic due to an unprotected update of the feature refcount. Resolve this by using the spa->spa_feat_stats_lock to synchronize the update of the refcount. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Youzhong Yang <[email protected]> Closes openzfs#17184 Closes openzfs#17632

tonyhutter · 2025-11-05T16:53:49Z

@pharshalp I included it in my latest push.

justinpryzby · 2025-11-07T15:53:34Z

Just saw this. Note sure what the criteria are, but I would've suggested #17839
edit: nevermind, I think I just noticed an issue with that patch...

mabod · 2025-11-10T10:33:23Z

Should PR #17915 be included as well?

adamdmoss · 2025-11-11T00:31:30Z

Should PR #17915 be included as well?

IMHO: yes, definitely. And in 2.2, if that's still getting incremental releases.

behlendorf · 2025-11-11T00:42:10Z

Yes, we'll pull it in for 2.3.5 and 2.2.9.

stuartthebruce · 2025-11-11T22:42:43Z

Would be great if the EL kmod builds for this worked with EL9.7 and EL10.1 (anyone tested this with Almalinx 10.1 Beta or RHEL 10.1?) out of the box.

We need to specifically use the FX_XFLAG_* macros in zpl_ioctl_*attr() codepaths, and the FS_*_FL macros in the zpl_ioctl_*flags() codepaths. The earlier code just assumes the FS_*_FL macros for both codepaths. The 6.17 kernel add a bitmask check in copy_fsxattr_from_user() that exposed this error via failing 'projectquota' ZTS tests. Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tony Hutter <[email protected]> Closes openzfs#17884 Closes openzfs#17869

Disable the aarch64 NEON SIMD intrinsics for kernel builds. Safely using them in the kernel context requires saving/restoring the FPU registers which is not currently done. Additionally, remove the aarch64 optimized PREFETCH_L1 and PREFETCH_L2 instruction. Rely on the more portable compiler built ins. This lets us remove the problematic workaround in the aarch64_compat.h header which undefines the __aarch64__ macro. Reviewed-by: Rob Norris <[email protected]> Reviewed-by: Tino Reichardt <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes openzfs#17904 Closes openzfs#17852

BRT_RANGESIZE_TO_NBLOCKS() takes number of ranges as its argument. To get number of blocks we should multiply it by the entry size, not divide by it, as it was due to missing parentheses. Before openzfs#17875 this could cause small memory corruptions for vdevs bigger than 64TB, but the change made the bug more noticeable. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Alexander Motin <[email protected]> Closes openzfs#17886 Closes openzfs#17915

Update FreeBSD versions: - add FreeBSD 15.0-STABLE - add FreeBSD 16.0-CURRENT So we use the latest versions of each line now: - Freebsd 14.3 (RELEASE) - FreeBSD 15.0 (STABLE) - FreeBSD 16.0 (CURRENT) In commits - you may specify which type of CI should run: - ZFS-CI-Type: quick - ZFS-CI-Type: linux - ZFS-CI-Type: freebsd - ZFS-CI-Type: full Reviewed-by: Alexx Saver <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tino Reichardt <[email protected]> Closes openzfs#17896

clhedrick · 2025-11-12T19:08:12Z

Would be great if the EL kmod builds for this worked with EL9.7 and EL10.1 (anyone tested this with Almalinx 10.1 Beta or RHEL 10.1?) out of the box.

I am running 2.3.4 kabi-tracking on EL 9.7 in production with a small user group. 2.3.4 on 10.1 builds and loads. The projectquota test works. I trust 2.3.5 will work if 2.3.4 does.

amotin · 2025-11-13T05:41:03Z

Considering CI crashes on FreeBSD 16-current we should probably include also #17722, at least in parts that apply without projects support patch.

zfs_aclset_common() might be called for newly created or not even created vnodes, that triggers assertions on newer FreeBSD versions with DEBUG_VFS_LOCKS included into INVARIANTS. In the first case make sure to call vn_seqc_write_begin()/_end(), in the second just skip the assertion. The similar has to be done for project management IOCTL and file- bases extended attributes, since those are not going through VFS. Signed-off-by: Alexander Motin <[email protected]> Closes openzfs#17722

META file and changelog updated. Signed-off-by: Tony Hutter <[email protected]>

tonyhutter · 2025-11-13T17:19:22Z

@amotin thanks, I just pulled a modified version of that commit in. Hopefully that's the last commit we need.

tonyhutter mentioned this pull request Oct 20, 2025

Linux 6.17 compat: META #17789

Merged

tonyhutter and others added 13 commits October 21, 2025 10:35

ci: fix syntax issues in zfs-qemu.yml

f4a85d6

Otherwise it might become `if [ == "" ]` which is ill-formed. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Tony Hutter <[email protected]> Signed-off-by: Shengqi Chen <[email protected]> Closes openzfs#17695

CI: Switch FreeBSD 15 to 15.0-ALPHA2

a83eefe

Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Tony Hutter <[email protected]> Signed-off-by: Alexander Motin <[email protected]> Closes openzfs#17749

CI: Remove Buildbot references

395f099

The Buildbot CI infrastructure has been fully replaced by GitHub Actions. Remove any lingering references from the repository. Reviewed-by: Alexander Motin <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes openzfs#17794

CI: Switch FreeBSD 15 to 15.0-ALPHA3

39b9b62

Signed-off-by: Brian Behlendorf <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Closes openzfs#17795

docs: fix a few small typos (openzfs#17804)

03c956e

Signed-off-by: Shreshth Srivastava <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: George Melikov <[email protected]> Reviewed-by: Tony Hutter <[email protected]>

CI: Switch FreeBSD 15 to 15.0-ALPHA4 and add FreeBSD 16

007f325

Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Tony Hutter <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tino Reichardt <[email protected]> Closes openzfs#17815

tonyhutter force-pushed the zfs-2.3.5-hutter branch from b0c40c0 to f6c0306 Compare October 21, 2025 17:51

behlendorf and others added 6 commits October 21, 2025 11:02

Linux 6.17 compat: META

1baecd3

Update the META file to reflect compatibility with the 6.17 kernel. Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Rob Norris <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes openzfs#17789

tonyhutter force-pushed the zfs-2.3.5-hutter branch from f6c0306 to 95e50d6 Compare October 21, 2025 18:02

tonyhutter force-pushed the zfs-2.3.5-hutter branch from 95e50d6 to 3030777 Compare October 21, 2025 18:31

amotin approved these changes Oct 22, 2025

View reviewed changes

amotin added the Status: Code Review Needed Ready for review and testing label Oct 22, 2025

behlendorf approved these changes Oct 22, 2025

View reviewed changes

Fix two infinite loops if dmu_prefetch_max set to zero

81ceee0

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Alexander Motin <[email protected]> Closes openzfs#17692 Closes openzfs#17729

almereyda mentioned this pull request Oct 27, 2025

Fedora 43 will release next week, there is no package for it #17871

Open

tonyhutter force-pushed the zfs-2.3.5-hutter branch from 10c460b to 974f0ba Compare November 5, 2025 16:53

bsherman mentioned this pull request Nov 12, 2025

chore(ci): enable F43 coreOS stable builds ublue-os/akmods#418

Merged

tonyhutter and others added 3 commits November 12, 2025 09:52

tonyhutter force-pushed the zfs-2.3.5-hutter branch from 974f0ba to 182c543 Compare November 12, 2025 17:55

tonyhutter force-pushed the zfs-2.3.5-hutter branch from 182c543 to ad5ab6e Compare November 12, 2025 18:59

inffy mentioned this pull request Nov 12, 2025

fix: fix Justfile to work with coreOS 43 builds ublue-os/aurora#1293

Draft

amotin and others added 2 commits November 13, 2025 09:13

Tag zfs-2.3.5

ab38521

META file and changelog updated. Signed-off-by: Tony Hutter <[email protected]>

tonyhutter force-pushed the zfs-2.3.5-hutter branch from ad5ab6e to ab38521 Compare November 13, 2025 17:15

behlendorf approved these changes Nov 13, 2025

View reviewed changes

behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Nov 13, 2025

zfs-2.3.5 patch set #17857

Are you sure you want to change the base?

zfs-2.3.5 patch set #17857

Conversation

tonyhutter commented Oct 20, 2025 • edited by behlendorf Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Motivation and Context

Description

How Has This Been Tested?

Types of changes

Checklist:

Uh oh!

devsk commented Oct 20, 2025

Uh oh!

amotin commented Oct 22, 2025

Uh oh!

devsk commented Oct 24, 2025

Uh oh!

tonyhutter commented Oct 24, 2025

Uh oh!

pharshalp commented Nov 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

roedie commented Nov 5, 2025

Uh oh!

tonyhutter commented Nov 5, 2025

Uh oh!

justinpryzby commented Nov 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mabod commented Nov 10, 2025

Uh oh!

adamdmoss commented Nov 11, 2025

Uh oh!

behlendorf commented Nov 11, 2025

Uh oh!

stuartthebruce commented Nov 11, 2025

Uh oh!

clhedrick commented Nov 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

amotin commented Nov 13, 2025

Uh oh!

tonyhutter commented Nov 13, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

18 participants

tonyhutter commented Oct 20, 2025 •

edited by behlendorf

Loading

pharshalp commented Nov 2, 2025 •

edited

Loading

justinpryzby commented Nov 7, 2025 •

edited

Loading

clhedrick commented Nov 12, 2025 •

edited

Loading