Page MenuHomeFreeBSD
Differential D20271

geom_uzip to update zlib version 1.0.4 to 1.2.11.
ClosedPublic
Actions

Authored by delphij on May 16 2019, 4:13 AM.
Tags
None
Referenced Files
F81569279: D20271.id60567.diff
Thu, Apr 18, 6:02 AM
Unknown Object (File)
Sat, Apr 13, 11:37 PM
Unknown Object (File)
Sat, Apr 13, 11:35 PM
Unknown Object (File)
Sat, Apr 13, 11:35 PM
Unknown Object (File)
Fri, Apr 12, 1:41 PM
Unknown Object (File)
Tue, Apr 9, 4:38 PM
Unknown Object (File)
Thu, Mar 28, 9:09 PM
Unknown Object (File)
Wed, Mar 20, 5:13 AM
View All 92 Files
Subscribers
imp
Contributor Reviews (src)

Details

Reviewers
kib
jmg
sobomax
ota_j.email.ne.jp
delphij
Group Reviewers
manpages
Commits
rS350742: Update geom_uzip to use new zlib:
Summary

Update geom_uzip to use newer zlib version.

This change depends on D20193 and D19706.
Based on a new proposal, this also depends on D21156.

Cross reference :
https://reviews.freebsd.org/D19706?id=55444#inline-120590

Test Plan

% kldload geom_uzip
% mdconfig -a -t vnode -f <uzip-file>
% mount -r /dev/md#.uzip /mnt/<path>

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 25635
Build 24228: arc lint + arc unit

Event Timeline

ota_j.email.ne.jp created this revision.May 16 2019, 4:13 AM
Herald added subscribers: Contributor Reviews (src), imp. · View Herald TranscriptMay 16 2019, 4:13 AM
Harbormaster completed remote builds in B24253: Diff 57432.May 16 2019, 4:13 AM
Harbormaster completed remote builds in B24253: Diff 57432.
ota_j.email.ne.jp added reviewers: kib, delphij, jmg.May 16 2019, 4:15 AM
ota_j.email.ne.jp edited the summary of this revision. (Show Details)May 16 2019, 4:17 AM
ota_j.email.ne.jp added a reviewer: sobomax.
sobomax accepted this revision.Jun 5 2019, 5:15 AM

Looks good, as long as it compiles.

This revision is now accepted and ready to land.Jun 5 2019, 5:15 AM
ota_j.email.ne.jp added a comment.Jun 5 2019, 5:28 AM

Thank you for taking a look.

This change-set requires 2 other change-sets, crc32 relocation and dual zlib compilation before ready to land.

I actually didn't expect this is marked as "Buildable 24253"....

delphij requested changes to this revision.Jul 31 2019, 5:43 PM
delphij added inline comments.
sys/geom/uzip/g_uzip_zlib.c
114

I think inflateInit() still expects zfree be set?

This revision now requires changes to proceed.Jul 31 2019, 5:43 PM
ota_j.email.ne.jp added inline comments.Jul 31 2019, 10:38 PM
sys/geom/uzip/g_uzip_zlib.c
111

compressBounce is taken out by -DZ_SOLO.
We will need to adjust zlib side to expose with -DZ_SOLO.

114

I will check. Using -DZ_SOLO changes implementation and don't recall.

ota_j.email.ne.jp updated this revision to Diff 60380.Aug 2 2019, 2:35 AM

Given we added -DZ_SOLO to zlib, pass zfree function explicitly.
Expose compressBound() function even with -DZ_SOLO.
compress2() doesn't work with -DZ_SOLO and not worth exposing as is.
Alternative is improve MY_ZCALLOC conditions along with Z_SOLO for compress2 to work as well.

Herald added a reviewer: manpages. · View Herald TranscriptAug 2 2019, 2:35 AM
Harbormaster completed remote builds in B25635: Diff 60380.Aug 2 2019, 2:36 AM
ota_j.email.ne.jp mentioned this in D20272: if_mxge to update zlib version 1.0.4 to 1.2.11..Aug 2 2019, 3:46 AM
ota_j.email.ne.jp updated this revision to Diff 60384.Aug 2 2019, 12:16 PM

Enhancce MY_ZCALLOC to expose functions in compress.c.
This also allows to use default zfree.

Harbormaster completed remote builds in B25638: Diff 60384.Aug 2 2019, 12:16 PM
ota_j.email.ne.jp updated this revision to Diff 60409.Aug 3 2019, 12:18 AM

Expose functions from compress.c with modified MY_ZCALLC handling.

Harbormaster completed remote builds in B25656: Diff 60409.Aug 3 2019, 12:18 AM
ota_j.email.ne.jp retitled this revision from geom_uzip to update zlib version 1.0.4 to 1.2.11. to Expose functions from compress.c and geom_uzip to update zlib version 1.0.4 to 1.2.11..Aug 3 2019, 12:36 AM
ota_j.email.ne.jp mentioned this in D21156: Expose zlib's utility functions in Z_SOLO library when building kernel. This allows kernel code to reuse zlib's implementation..Aug 4 2019, 3:34 PM
ota_j.email.ne.jp retitled this revision from Expose functions from compress.c and geom_uzip to update zlib version 1.0.4 to 1.2.11. to geom_uzip to update zlib version 1.0.4 to 1.2.11..Aug 4 2019, 3:37 PM
ota_j.email.ne.jp edited the summary of this revision. (Show Details)
ota_j.email.ne.jp added a parent revision: D21156: Expose zlib's utility functions in Z_SOLO library when building kernel. This allows kernel code to reuse zlib's implementation..
delphij commandeered this revision.Aug 7 2019, 1:45 AM
delphij edited reviewers, added: ota_j.email.ne.jp; removed: delphij.
delphij updated this revision to Diff 60529.Aug 7 2019, 1:45 AM

Rebase over D21156.

Harbormaster completed remote builds in B25715: Diff 60529.Aug 7 2019, 1:45 AM
ota_j.email.ne.jp added inline comments.Aug 7 2019, 4:08 AM
sys/geom/uzip/g_uzip_zlib.c
113

Given geom_uzip uses nowait kmalloc,

	zp->zs.zalloc = zcalloc_nowait;

is the equivalent choice.

I am not sure which one provides better system handling and user experiences, though.

It will be nice if we can get file-system and kernel memory experts inputs.

135

geom_uzip uses M_NOWAIT option.

delphij marked 2 inline comments as done.Aug 7 2019, 4:39 AM
delphij added inline comments.
sys/geom/uzip/g_uzip_zlib.c
113

My version of zcalloc was the nowait variant :)

delphij updated this revision to Diff 60567.Aug 8 2019, 6:20 AM
delphij marked an inline comment as done.

Properly initialize zstream structure.

Harbormaster completed remote builds in B25739: Diff 60567.Aug 8 2019, 6:20 AM
delphij accepted this revision.Aug 8 2019, 6:23 AM
This revision is now accepted and ready to land.Aug 8 2019, 6:23 AM
Closed by commit rS350742: Update geom_uzip to use new zlib: (authored by delphij). · Explain WhyAug 8 2019, 6:27 AM
This revision was automatically updated to reflect the committed changes.
delphij added a commit: rS350742: Update geom_uzip to use new zlib:.
ota_j.email.ne.jp added inline comments.Aug 9 2019, 6:54 AM
sys/geom/uzip/g_uzip_zlib.c
113

Yes, that was the case.
I somehow got confused and mixed up.

Revision Contents
Changeset List

PathSize
share/
man/
man4/
1 line
sys/
conf/
6 lines
contrib/
zlib/
4 lines
2 lines
4 lines
geom/
uzip/
35 lines
modules/
geom/
geom_uzip/
3 lines
zlib/
1 line

Diff 60380

View Options

share/man/man4/geom_uzip.4

Loading...
View Options

sys/conf/files

Loading...
View Options

sys/contrib/zlib/compress.c

Loading...
View Options

sys/contrib/zlib/zconf.h

Loading...
View Options

sys/contrib/zlib/zlib.h

Loading...
View Options

sys/geom/uzip/g_uzip_zlib.c

Loading...
View Options

sys/modules/geom/geom_uzip/Makefile

Loading...
View Options

sys/modules/zlib/Makefile

Loading...