diff options
| author | Tom Caputi <[email protected]> | 2016-05-12 10:51:24 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-07-20 10:43:30 -0700 |
| commit | 0b04990a5de594659d2cf20458965277dd6efeb1 (patch) | |
| tree | 74369a3236e03359f7276cb9b19687e28c7f6d59 /module/Makefile.in | |
| parent | be88e733a634ad0d7f20350e1a17ede51922d3ff (diff) | |
Illumos Crypto Port module added to enable native encryption in zfs
A port of the Illumos Crypto Framework to a Linux kernel module (found
in module/icp). This is needed to do the actual encryption work. We cannot
use the Linux kernel's built in crypto api because it is only exported to
GPL-licensed modules. Having the ICP also means the crypto code can run on
any of the other kernels under OpenZFS. I ended up porting over most of the
internals of the framework, which means that porting over other API calls (if
we need them) should be fairly easy. Specifically, I have ported over the API
functions related to encryption, digests, macs, and crypto templates. The ICP
is able to use assembly-accelerated encryption on amd64 machines and AES-NI
instructions on Intel chips that support it. There are place-holder
directories for similar assembly optimizations for other architectures
(although they have not been written).
Signed-off-by: Tom Caputi <[email protected]>
Signed-off-by: Tony Hutter <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #4329
Diffstat (limited to 'module/Makefile.in')
| -rw-r--r-- | module/Makefile.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/module/Makefile.in b/module/Makefile.in index d4ddee2f4..e4f06a6e8 100644 --- a/module/Makefile.in +++ b/module/Makefile.in @@ -4,6 +4,7 @@ subdir-m += unicode subdir-m += zcommon subdir-m += zfs subdir-m += zpios +subdir-m += icp INSTALL_MOD_DIR ?= extra @@ -12,6 +13,8 @@ ZFS_MODULE_CFLAGS += -include @abs_top_builddir@/zfs_config.h ZFS_MODULE_CFLAGS += -I@abs_top_srcdir@/include -I@SPL@/include -I@SPL@ export ZFS_MODULE_CFLAGS +SUBDIR_TARGETS = icp + modules: @# Make the exported SPL symbols available to these modules. @# They may be in the root of SPL_OBJ when building against @@ -28,6 +31,9 @@ modules: "*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \ exit 1; \ fi + list='$(SUBDIR_TARGETS)'; for targetdir in $$list; do \ + $(MAKE) -C $$targetdir; \ + done $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@ clean: @@ -64,8 +70,8 @@ modules_uninstall: distdir: list='$(subdir-m)'; for subdir in $$list; do \ - (find @top_srcdir@/module/$$subdir -name '*.c' -o -name '*.h' |\ - xargs /bin/cp -t $$distdir/$$subdir); \ + (cd @top_srcdir@/module && find $$subdir -name '*.c' -o -name '*.h' -o -name '*.S' |\ + xargs /bin/cp --parents -t $$distdir); \ done distclean maintainer-clean: clean |