Differential D35750

Make blake3 work
ClosedPublic
Actions

Authored by imp on Jul 7 2022, 11:58 PM.

Tags

None

Referenced Files

	F102720890: D35750.diff
	Sat, Nov 16, 8:26 AM

	F102707587: D35750.id107901.diff
	Sat, Nov 16, 3:54 AM

	Unknown Object (File)
	Oct 11 2024, 5:54 PM

	Unknown Object (File)
	Oct 10 2024, 9:59 AM

	Unknown Object (File)
	Oct 4 2024, 8:38 AM

	Unknown Object (File)
	Oct 4 2024, 3:55 AM

	Unknown Object (File)
	Oct 3 2024, 7:43 PM

	Unknown Object (File)
	Oct 3 2024, 6:20 AM

View All 100 Files

Subscribers

Details

Reviewers

manu
tsoome
mm
kevans

Commits

rGa61eb269dec4: stand: Fix inclusion of sys/blake3.h
rGf05568d2cae6: stand: For ZFS build, add new directory
rG75ad24775b68: stand: Add blake3 support to boot loader
rGdf76778ad5e0: stand: delete zstd_shim.c
rG119c786f7b5a: stand: Compile zfs_zstd.c directly now
rGb0a337d50192: stand: Fix inclusion of sys/blake3.h
rGfaf25f48d601: stand: Work around upstream issues in the standalone environment
rG87d3aa53973f: stand: For ZFS build, add new directory

Summary

do not push this, for review only.

Fixups needed for blake3 compiling in the standalone envorinment

As an alternative to D35592

Sponsored by: Netflix

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 46333
Build 43222: arc lint + arc unit

Event Timeline

imp created this revision.Jul 7 2022, 11:58 PM

Herald added a reviewer: manu. · View Herald TranscriptJul 7 2022, 11:58 PM

Herald added subscribers: dab, delphij. · View Herald Transcript

imp requested review of this revision.Jul 7 2022, 11:58 PM

Harbormaster completed remote builds in B46315: Diff 107899.Jul 7 2022, 11:58 PM

imp edited the summary of this revision. (Show Details)Jul 8 2022, 12:00 AM

imp added a reviewer: tsoome.

imp mentioned this in D35592: loader: add blake3 checksum support.

This should likely be marked co-authored by tsoome since I started with his patches and didn't change much except not having the blake3* files copied.

imp added inline comments.Jul 8 2022, 12:52 AM

sys/contrib/openzfs/include/os/freebsd/spl/sys/types.h
81 ↗	(On Diff #107899)	I think I reviewed this change for upstream, but I'm not 100% sure. It seemed awful familiar as I was making it...
sys/contrib/openzfs/include/sys/blake3.h
31 ↗	(On Diff #107899)	This might be better as \|\| defined(_STANDALONE) and leaving the #else clause unchanged.
sys/contrib/openzfs/include/sys/zfs_context.h
46 ↗	(On Diff #107899)	this one is weird and I don't completely understand it, but it's needed because machine/atomic.h is now included in sys/sysmacros.h. Maybe we should include sys/atomic.h there instead, but I'm not sure that wouldn't break something.

imp added inline comments.Jul 8 2022, 12:54 AM

stand/libsa/zfs/zstd_shim.c
0	This likely can be removed since I added it to sys/zfs_context.h
38	This was due to a bug that the types.h changes fix, and likely would hit anybody that's landing changes.

add forgotten files

Harbormaster completed remote builds in B46316: Diff 107900.Jul 8 2022, 12:58 AM

Simplify a bit still... And include the zfs_zstd.c changes.

Harbormaster completed remote builds in B46317: Diff 107901.Jul 8 2022, 1:25 AM

one last set of cleanups

Harbormaster completed remote builds in B46318: Diff 107902.Jul 8 2022, 1:30 AM

imp added a reviewer: mm.Jul 8 2022, 4:45 AM

Rebase on changes I'm pushing to main...

Harbormaster completed remote builds in B46330: Diff 107933.Jul 8 2022, 5:48 PM

Add blake3_zfs.c from tsoome's review...

Harbormaster completed remote builds in B46331: Diff 107935.Jul 8 2022, 6:44 PM

It does look good, thanks! (waiting for update as noted in chat).

be extra sleezy.... and add a layer where the boot loader can interpose its .h
files to work around issues with upstream so we can bring blake3 in with
upstream files unchanged while we work to fix the warts in them...

Harbormaster completed remote builds in B46333: Diff 107938.Jul 8 2022, 10:03 PM

imp added inline comments.Jul 8 2022, 10:12 PM

stand/libsa/zfs/Makefile.inc
12	The zstd_shim.c -> zfs_zstd.c thing is arguably separate.
36	Adding this and this define is separate. This is what adds the layer we need.

I have this sliced up into 6 commits, but will reply here and add 'reviewed by' if people approve here.

The header shims are a bit ugly, but given the context I agree that this is a reasonable stopgap...

This revision is now accepted and ready to land.Jul 8 2022, 11:33 PM

Closed by commit rG87d3aa53973f: stand: For ZFS build, add new directory (authored by imp). · Explain WhyJul 9 2022, 5:03 AM

This revision was automatically updated to reflect the committed changes.

imp added a commit: rG87d3aa53973f: stand: For ZFS build, add new directory.

imp added a commit: rGfaf25f48d601: stand: Work around upstream issues in the standalone environment.

imp added a commit: rGb0a337d50192: stand: Fix inclusion of sys/blake3.h.

imp added a commit: rG119c786f7b5a: stand: Compile zfs_zstd.c directly now.

imp added a commit: rGdf76778ad5e0: stand: delete zstd_shim.c.

imp added a commit: rG75ad24775b68: stand: Add blake3 support to boot loader.

imp added a commit: rGf05568d2cae6: stand: For ZFS build, add new directory.Jan 24 2023, 10:14 PM

imp added a commit: rGa61eb269dec4: stand: Fix inclusion of sys/blake3.h.

Revision Contents
Changeset List

Path

Size

stand/

libsa/

zfs/

18 lines

spl/

sys/

17 lines

32 lines

1 line

sys/

cddl/

boot/

zfs/

97 lines

1 line

7 lines

Diff 107938

stand/libsa/zfs/Makefile.inc

Loading...

stand/libsa/zfs/spl/sys/blake3.h

Loading...

stand/libsa/zfs/spl/sys/zfs_context.h

Loading...

stand/libsa/zfs/zfsimpl.c

Loading...

stand/libsa/zfs/zstd_shim.c

Loading...

sys/cddl/boot/zfs/blake3_zfs.c

Loading...

sys/cddl/boot/zfs/zfsimpl.h

Loading...

sys/cddl/boot/zfs/zfssubr.c

Loading...