hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390/pkey: Load pkey kernel module automatically 

With the recent enhancements of the pkey kernel module,
the pkey kernel module should be loaded automatically
during system startup, if MSA is available.

When used for swap device encryption with random protected
keys, pkey must be loaded before /etc/crypttab is processed,
otherwise the sysfs attributes to read the key from are
not available.

Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Reviewed-by: Harald Freudenberger <freude@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Ingo Franzki 2018-10-17 17:24:43 +02:00 committed by Martin Schwidefsky
parent ec0c0bb489
commit 63c19be095
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/s390/crypto/pkey_api.c
View File

@ -17,6 +17,7 @@
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/random.h> #include <linux/random.h>
#include <linux/cpufeature.h>
#include <asm/zcrypt.h> #include <asm/zcrypt.h>
#include <asm/cpacf.h> #include <asm/cpacf.h>
#include <asm/pkey.h> #include <asm/pkey.h>
@ -1704,5 +1705,5 @@ static void __exit pkey_exit(void)
pkey_debug_exit(); pkey_debug_exit();
} }
module_init(pkey_init); module_cpu_feature_match(MSA, pkey_init);
module_exit(pkey_exit); module_exit(pkey_exit);