Page MenuHomeFreeBSD
Differential D4699

Make sys/geom/eli more easily reusable in userspace
ClosedPublic
Actions

Authored by allanjude on Dec 24 2015, 7:48 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Jan 7, 12:47 AM
Unknown Object (File)
Sun, Jan 5, 1:02 AM
Unknown Object (File)
Sat, Dec 28, 11:50 AM
Unknown Object (File)
Fri, Dec 27, 9:09 AM
Unknown Object (File)
Dec 11 2024, 12:00 AM
Unknown Object (File)
Dec 9 2024, 9:14 PM
Unknown Object (File)
Dec 6 2024, 4:35 PM
Unknown Object (File)
Dec 5 2024, 5:07 PM
View All Files
Subscribers
delphij
imp

Details

Reviewers
jmg
delphij
glebius
bapt
cperciva
pjd
Commits
rS293306: Make additional parts of sys/geom/eli more usable in userspace
Summary
  • Break the HMAC parts of geli out into a separate file, so they can be used without requiring openssl or the entire crypto framework
  • some ifdef _KERNEL's to make remaining stuff work in userland
  • Need a better resolution for struct g_eli_softc

Diff Detail

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

Event Timeline

allanjude updated this revision to Diff 11655.Dec 24 2015, 7:48 AM
allanjude retitled this revision from to Make sys/geom/eli more easily reusable in userspace.
allanjude updated this object.
allanjude edited the test plan for this revision. (Show Details)
Herald added a subscriber: imp. · View Herald TranscriptDec 24 2015, 7:48 AM
allanjude added a child revision: D4593: Implement a stripped down version of GELI (AES-XTS and AES-CBC only) in gptboot and gptzfsboot.Dec 24 2015, 7:49 AM
allanjude updated this revision to Diff 11672.Dec 25 2015, 2:44 AM

Add change to sys/conf/files required for when GEOM_ELI is compiled into the kernel (found with LINT kernels during universe build)

allanjude mentioned this in D4710: Fix includes in usr.sbin/fstyp/zfs.c.Dec 26 2015, 2:58 AM
delphij requested changes to this revision.Dec 27 2015, 7:59 AM
delphij added a reviewer: delphij.
delphij added a subscriber: delphij.

Thanks very much for working on this! It looks good overall except the softc definition (I think it would be better if we just ifdef the software crypto portion out, this way we don't have two places to define the same structure, making it easier for future maintenance).

sys/geom/eli/g_eli.h
211

Usually ! _KERNEL for consistency.

213

Can the software portion be #ifdef'ed instead?

This revision now requires changes to proceed.Dec 27 2015, 7:59 AM
delphij added reviewers: pjd, cperciva, jmg, glebius.Dec 27 2015, 7:59 AM
allanjude marked an inline comment as done.Dec 27 2015, 8:22 AM
allanjude added inline comments.
sys/geom/eli/g_eli.h
213

not sure why I didn't do it this way originally. At first I was cutting too much stuff out, like struct mtx, and RB_HEAD, to avoid those includes.

allanjude updated this revision to Diff 11708.Dec 27 2015, 8:23 AM
allanjude edited edge metadata.
allanjude marked an inline comment as done.

do struct g_eli_softc properly

bapt accepted this revision.Dec 27 2015, 5:06 PM
bapt added a reviewer: bapt.
delphij accepted this revision.Dec 27 2015, 5:16 PM
delphij edited edge metadata.

Looks good to me now, thanks!

This revision is now accepted and ready to land.Dec 27 2015, 5:16 PM
pjd edited edge metadata.Dec 29 2015, 12:24 AM

It looks good overall, but please be sure you run GELI regression tests. Thanks!

sys/geom/eli/g_eli.h
178

Maybe we could just use 'bool' now?

allanjude updated this revision to Diff 11831.Dec 31 2015, 8:06 PM
allanjude edited edge metadata.

Add missing reference to g_eli_hmac.c to /lib/geom/geom_eli.so (sbin/geom/class/eli)

This revision now requires review to proceed.Dec 31 2015, 8:06 PM
allanjude added a comment.Dec 31 2015, 8:16 PM

With that fix, it now passed the geom_eli regression suite

Files=20 Tests=14996
Result: PASS

allanjude updated this revision to Diff 11833.Dec 31 2015, 9:33 PM
allanjude edited edge metadata.

Instead of typedef'ing boolean_t in the !_KERNEL case, just use 'int' in that case

Closed by commit rS293306: Make additional parts of sys/geom/eli more usable in userspace (authored by allanjude). · Explain WhyJan 7 2016, 5:47 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
sys/
conf/
1 line
geom/
eli/
118 lines
83 lines
72 lines
g_eli_hmac.c
g_eli_crypto.c
213 lines
30 lines
2 lines
modules/
geom/
geom_eli/
1 line

Diff 11672

View Options

sys/conf/files

Loading...
View Options

sys/geom/eli/g_eli.h

Loading...
View Options

sys/geom/eli/g_eli.c

Loading...
View Options

sys/geom/eli/g_eli_crypto.c

Loading...
View Options

sys/geom/eli/g_eli_hmac.c

Loading...
View Options

sys/geom/eli/g_eli_key_cache.c

Loading...
View Options

sys/geom/eli/pkcs5v2.c

Loading...
View Options

sys/modules/geom/geom_eli/Makefile

Loading...