s390/crypto: Use -ENODEV instead of -EOPNOTSUPP
Subsystems (4)
v2 cover s390/crypto: Use -ENODEV instead of -EOPNOTSUPP
s390x crypto is one of the rare modules that returns -EOPNOTSUPP instead of -ENODEV in case HW support is not available.
Convert to -ENODEV, so e.g., systemd's systemd-modules-load.service ignores this error properly.
v1 -> v2:
- Include
-- "s390/crypto: ghash: Use -ENODEV instead of -EOPNOTSUPP" -- "s390/crypto: prng: Use -ENODEV instead of -EOPNOTSUPP" -- "s390/crypto: sha: Use -ENODEV instead of -EOPNOTSUPP"
David Hildenbrand (4):
s390/pkey: Use -ENODEV instead of -EOPNOTSUPP s390/crypto: ghash: Use -ENODEV instead of -EOPNOTSUPP s390/crypto: prng: Use -ENODEV instead of -EOPNOTSUPP s390/crypto: sha: Use -ENODEV instead of -EOPNOTSUPP
arch/s390/crypto/ghash_s390.c | 2 +- arch/s390/crypto/prng.c | 4 ++-- arch/s390/crypto/sha1_s390.c | 2 +- arch/s390/crypto/sha256_s390.c | 2 +- arch/s390/crypto/sha512_s390.c | 2 +- drivers/s390/crypto/pkey_api.c | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-)
Signature · 1 line
2.21.0
PATCH v2 1/4 s390/pkey: Use -ENODEV instead of -EOPNOTSUPP
systemd-modules-load.service automatically tries to load the pkey module on systems that have MSA.
Pkey also requires the MSA3 facility and a bunch of subfunctions. Failing with -EOPNOTSUPP makes "systemd-modules-load.service" fail on any system that does not have all needed subfunctions. For example, when running under QEMU TCG (but also on systems where protected keys are disabled via the HMC).
Let's use -ENODEV, so systemd-modules-load.service properly ignores failing to load the pkey module because of missing HW functionality.
--- drivers/s390/crypto/pkey_api.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/s390/crypto/pkey_api.c +3 -3
@@ -1695,15 +1695,15 @@ static int __init pkey_init(void)* are able to work with protected keys. */ if (!cpacf_query (CPACF_PCKMO , &pckmo_functions)) -return -EOPNOTSUPP ; +return -ENODEV ;/* check for kmc instructions available */ if (!cpacf_query (CPACF_KMC , &kmc_functions)) -return -EOPNOTSUPP ; +return -ENODEV ;if (!cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_128 ) || !cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_192 ) || !cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_256 )) -return -EOPNOTSUPP ; +return -ENODEV ;pkey_debug_init ();
Signature · 1 line
2.21.0
Re: [PATCH v2 1/4] s390/pkey: Use -ENODEV instead of -EOPNOTSUPP
Quoted 31 lines · David Hildenbrand
systemd-modules-load.service automatically tries to load the pkey module on systems that have MSA.
Pkey also requires the MSA3 facility and a bunch of subfunctions. Failing with
-EOPNOTSUPPmakes "systemd-modules-load.service" fail on any system that does not have all needed subfunctions. For example, when running under QEMU TCG (but also on systems where protected keys are disabled via the HMC).Let's use
-ENODEV, so systemd-modules-load.service properly ignores failing to load the pkey module because of missing HW functionality.Reviewed-by Cornelia Huck <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- drivers/s390/crypto/pkey_api.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/s390/crypto/pkey_api.c +1
-1@@ -1695,15 +1695,15 @@ static int __init pkey_init(void)* are able to work with protected keys. */ if (!cpacf_query (CPACF_PCKMO , &pckmo_functions)) -return -EOPNOTSUPP ; +return -ENODEV ;/* check for kmc instructions available */ if (!cpacf_query (CPACF_KMC , &kmc_functions))
drivers/s390/crypto/pkey_api.c static int __init pkey_init(void) · line 1709
Quoted 10 lines
drivers/s390/crypto/pkey_api.c +2
-2-return -EOPNOTSUPP ; +return -ENODEV ;if (!cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_128 ) || !cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_192 ) || !cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_256 )) -return -EOPNOTSUPP ; +return -ENODEV ;pkey_debug_init ();
You missed one match in this file. Function pkey_clr2protkey() also does a cpacf_test_func() and may return -EOPNOTSUPP.
I checked the call chain, it's save to change the returncode there also. If done, Thanks and add my
Re: [PATCH v2 1/4] s390/pkey: Use -ENODEV instead of -EOPNOTSUPP
Quoted 40 lines · Harald Freudenberger
Quoted 39 lines · David Hildenbrand
systemd-modules-load.service automatically tries to load the pkey module on systems that have MSA.
Pkey also requires the MSA3 facility and a bunch of subfunctions. Failing with
-EOPNOTSUPPmakes "systemd-modules-load.service" fail on any system that does not have all needed subfunctions. For example, when running under QEMU TCG (but also on systems where protected keys are disabled via the HMC).Let's use
-ENODEV, so systemd-modules-load.service properly ignores failing to load the pkey module because of missing HW functionality.Reviewed-by Cornelia Huck <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- drivers/s390/crypto/pkey_api.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/s390/crypto/pkey_api.c +3
-3@@ -1695,15 +1695,15 @@ static int __init pkey_init(void)* are able to work with protected keys. */ if (!cpacf_query (CPACF_PCKMO , &pckmo_functions)) -return -EOPNOTSUPP ; +return -ENODEV ;/* check for kmc instructions available */ if (!cpacf_query (CPACF_KMC , &kmc_functions)) -return -EOPNOTSUPP ; +return -ENODEV ;if (!cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_128 ) || !cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_192 ) || !cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_256 )) -return -EOPNOTSUPP ; +return -ENODEV ;
Quoted 5 lines
drivers/s390/crypto/pkey_api.c static int __init pkey_init(void) · line 1709
Quoted 2 lines
drivers/s390/crypto/pkey_api.c +0
-0pkey_debug_init ();You missed one match in this file. Function
pkey_clr2protkey()also does acpacf_test_func()and may return-EOPNOTSUPP.
I checked the call chain, it's save to change the returncode there also.
That's unrelated to module loading (if I am not wrong), shall we still include this change here?
Thanks!
Quoted 3 lines
If done, Thanks and add my
Reviewed-by Harald Freudenberger <[email protected]>
Signature · 3 lines
Thanks, David / dhildenb
Harald Freudenberger
maintainerRe: [PATCH v2 1/4] s390/pkey: Use -ENODEV instead of -EOPNOTSUPP
Quoted 46 lines · David Hildenbrand
Quoted 40 lines · Harald Freudenberger
Quoted 39 lines · David Hildenbrand
systemd-modules-load.service automatically tries to load the pkey module on systems that have MSA.
Pkey also requires the MSA3 facility and a bunch of subfunctions. Failing with
-EOPNOTSUPPmakes "systemd-modules-load.service" fail on any system that does not have all needed subfunctions. For example, when running under QEMU TCG (but also on systems where protected keys are disabled via the HMC).Let's use
-ENODEV, so systemd-modules-load.service properly ignores failing to load the pkey module because of missing HW functionality.Reviewed-by Cornelia Huck <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- drivers/s390/crypto/pkey_api.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/s390/crypto/pkey_api.c +3
-3@@ -1695,15 +1695,15 @@ static int __init pkey_init(void)* are able to work with protected keys. */ if (!cpacf_query (CPACF_PCKMO , &pckmo_functions)) -return -EOPNOTSUPP ; +return -ENODEV ;/* check for kmc instructions available */ if (!cpacf_query (CPACF_KMC , &kmc_functions)) -return -EOPNOTSUPP ; +return -ENODEV ;if (!cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_128 ) || !cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_192 ) || !cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_256 )) -return -EOPNOTSUPP ; +return -ENODEV ;Quoted 5 lines
drivers/s390/crypto/pkey_api.c static int __init pkey_init(void) · line 1709
Quoted 2 lines
drivers/s390/crypto/pkey_api.c +0
-0pkey_debug_init ();You missed one match in this file. Function
pkey_clr2protkey()also does acpacf_test_func()and may return-EOPNOTSUPP.
I checked the call chain, it's save to change the returncode there also.
Quoted 4 lines
That's unrelated to module loading (if I am not wrong), shall we still include this change here?
Thanks!
That would be nice.
However, I agree it is not related to module loading.
Quoted 5 lines
Quoted 4 lines
If done, Thanks and add my
Reviewed-by Harald Freudenberger <[email protected]>
Re: [PATCH v2 1/4] s390/pkey: Use -ENODEV instead of -EOPNOTSUPP
Quoted 47 lines · Harald Freudenberger
Quoted 46 lines · David Hildenbrand
Quoted 45 lines · Harald Freudenberger
Quoted 31 lines · David Hildenbrand
systemd-modules-load.service automatically tries to load the pkey module on systems that have MSA.
Pkey also requires the MSA3 facility and a bunch of subfunctions. Failing with
-EOPNOTSUPPmakes "systemd-modules-load.service" fail on any system that does not have all needed subfunctions. For example, when running under QEMU TCG (but also on systems where protected keys are disabled via the HMC).Let's use
-ENODEV, so systemd-modules-load.service properly ignores failing to load the pkey module because of missing HW functionality.Reviewed-by Cornelia Huck <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- drivers/s390/crypto/pkey_api.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/s390/crypto/pkey_api.c +1
-1@@ -1695,15 +1695,15 @@ static int __init pkey_init(void)* are able to work with protected keys. */ if (!cpacf_query (CPACF_PCKMO , &pckmo_functions)) -return -EOPNOTSUPP ; +return -ENODEV ;/* check for kmc instructions available */ if (!cpacf_query (CPACF_KMC , &kmc_functions))drivers/s390/crypto/pkey_api.c static int __init pkey_init(void) · line 1709
Quoted 10 lines
drivers/s390/crypto/pkey_api.c +2
-2-return -EOPNOTSUPP ; +return -ENODEV ;if (!cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_128 ) || !cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_192 ) || !cpacf_test_func (&kmc_functions,CPACF_KMC_PAES_256 )) -return -EOPNOTSUPP ; +return -ENODEV ;pkey_debug_init ();You missed one match in this file. Function
pkey_clr2protkey()also does acpacf_test_func()and may return-EOPNOTSUPP.
I checked the call chain, it's save to change the returncode there also.
Quoted 6 lines
Quoted 4 lines
That's unrelated to module loading (if I am not wrong), shall we still include this change here?
Thanks!
That would be nice.
However, I agree it is not related to module loading.
I can include that, thanks!
Signature · 3 lines
Thanks, David / dhildenb
PATCH v2 2/4 s390/crypto: ghash: Use -ENODEV instead of -EOPNOTSUPP
In reply to David HildenbrandLet's use the error value that is typically used if HW support is not available when trying to load a module - this is also what systemd's systemd-modules-load.service expects.
--- arch/s390/crypto/ghash_s390.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/crypto/ghash_s390.c +1 -1
@@ -137,7 +137,7 @@ static struct shash_alg ghash_alg = {static int __init ghash_mod_init (void ) {if (!cpacf_query_func (CPACF_KIMD ,CPACF_KIMD_GHASH )) -return -EOPNOTSUPP ; +return -ENODEV ;return crypto_register_shash (&ghash_alg); }
Signature · 1 line
2.21.0
Re: [PATCH v2 2/4] s390/crypto: ghash: Use -ENODEV instead of -EOPNOTSUPP
Quoted 14 lines · David Hildenbrand
Let's use the error value that is typically used if HW support is not available when trying to load a module - this is also what systemd's systemd-modules-load.service expects.
Signed-off-by David Hildenbrand <[email protected]>--- arch/s390/crypto/ghash_s390.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/s390/crypto/ghash_s390.c +0
-0
arch/s390/crypto/ghash_s390.c static struct shash_alg ghash_alg = { · line 143
Quoted 8 lines
arch/s390/crypto/ghash_s390.c +1
-1@@ -137,7 +137,7 @@ static struct shash_alg ghash_alg = {static int __init ghash_mod_init (void ) {if (!cpacf_query_func (CPACF_KIMD ,CPACF_KIMD_GHASH )) -return -EOPNOTSUPP ; +return -ENODEV ;return crypto_register_shash (&ghash_alg); }
fine with me
Re: [PATCH v2 2/4] s390/crypto: ghash: Use -ENODEV instead of -EOPNOTSUPP
In reply to David HildenbrandQuoted 9 lines · On Wed, 12 Jun 2019 12:22:46 +0200 David Hildenbrand <[email protected]> wrote:
Let's use the error value that is typically used if HW support is not available when trying to load a module - this is also what systemd's systemd-modules-load.service expects.
Signed-off-by David Hildenbrand <[email protected]>--- arch/s390/crypto/ghash_s390.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH v2 3/4 s390/crypto: prng: Use -ENODEV instead of -EOPNOTSUPP
In reply to David HildenbrandLet's use the error value that is typically used if HW support is not available when trying to load a module - this is also what systemd's systemd-modules-load.service expects.
--- arch/s390/crypto/prng.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/crypto/prng.c +2 -2
@@ -824,7 +824,7 @@ static int __init prng_init(void)/* check if the CPU has a PRNG */ if (!cpacf_query_func (CPACF_KMC ,CPACF_KMC_PRNG )) -return -EOPNOTSUPP ; +return -ENODEV ;/* check if TRNG subfunction is available */ if (cpacf_query_func (CPACF_PRNO ,CPACF_PRNO_TRNG ))
@@ -837,7 +837,7 @@ static int __init prng_init(void)if (prng_mode ==PRNG_MODE_SHA512 ) {pr_err ("The prng module cannot " "start in SHA-512 mode\n" ); -return -EOPNOTSUPP ; +return -ENODEV ; } prng_mode =PRNG_MODE_TDES ; }else
Signature · 1 line
2.21.0
Re: [PATCH v2 3/4] s390/crypto: prng: Use -ENODEV instead of -EOPNOTSUPP
Quoted 23 lines · David Hildenbrand
Let's use the error value that is typically used if HW support is not available when trying to load a module - this is also what systemd's systemd-modules-load.service expects.
Signed-off-by David Hildenbrand <[email protected]>--- arch/s390/crypto/prng.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/s390/crypto/prng.c +1
-1@@ -824,7 +824,7 @@ static int __init prng_init(void)/* check if the CPU has a PRNG */ if (!cpacf_query_func (CPACF_KMC ,CPACF_KMC_PRNG )) -return -EOPNOTSUPP ; +return -ENODEV ;/* check if TRNG subfunction is available */ if (cpacf_query_func (CPACF_PRNO ,CPACF_PRNO_TRNG ))
arch/s390/crypto/prng.c static int __init prng_init(void) · line 843
Quoted 8 lines
arch/s390/crypto/prng.c +1
-1@@ -837,7 +837,7 @@ static int __init prng_init(void)if (prng_mode ==PRNG_MODE_SHA512 ) {pr_err ("The prng module cannot " "start in SHA-512 mode\n" ); -return -EOPNOTSUPP ; +return -ENODEV ; } prng_mode =PRNG_MODE_TDES ; }else
fine with me
Re: [PATCH v2 3/4] s390/crypto: prng: Use -ENODEV instead of -EOPNOTSUPP
In reply to David HildenbrandQuoted 9 lines · On Wed, 12 Jun 2019 12:22:47 +0200 David Hildenbrand <[email protected]> wrote:
Let's use the error value that is typically used if HW support is not available when trying to load a module - this is also what systemd's systemd-modules-load.service expects.
Signed-off-by David Hildenbrand <[email protected]>--- arch/s390/crypto/prng.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
PATCH v2 4/4 s390/crypto: sha: Use -ENODEV instead of -EOPNOTSUPP
In reply to David HildenbrandLet's use the error value that is typically used if HW support is not available when trying to load a module - this is also what systemd's systemd-modules-load.service expects.
--- arch/s390/crypto/sha1_s390.c | 2 +- arch/s390/crypto/sha256_s390.c | 2 +- arch/s390/crypto/sha512_s390.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/s390/crypto/sha1_s390.c +1 -1
@@ -86,7 +86,7 @@ static struct shash_alg alg = {static int __init sha1_s390_init (void ) {if (!cpacf_query_func (CPACF_KIMD ,CPACF_KIMD_SHA_1 )) -return -EOPNOTSUPP ; +return -ENODEV ;return crypto_register_shash (&alg); }
arch/s390/crypto/sha256_s390.c +1 -1
@@ -117,7 +117,7 @@ static int __init sha256_s390_init(void)int ret;if (!cpacf_query_func (CPACF_KIMD ,CPACF_KIMD_SHA_256 )) -return -EOPNOTSUPP ; +return -ENODEV ; ret =crypto_register_shash (&sha256_alg);if (ret <0 ) goto out;
arch/s390/crypto/sha512_s390.c +1 -1
@@ -127,7 +127,7 @@ static int __init init(void)int ret;if (!cpacf_query_func (CPACF_KIMD ,CPACF_KIMD_SHA_512 )) -return -EOPNOTSUPP ; +return -ENODEV ;if ((ret =crypto_register_shash (&sha512_alg)) <0 ) goto out;if ((ret =crypto_register_shash (&sha384_alg)) <0 )
Signature · 1 line
2.21.0
Re: [PATCH v2 4/4] s390/crypto: sha: Use -ENODEV instead of -EOPNOTSUPP
Quoted 42 lines · David Hildenbrand
Let's use the error value that is typically used if HW support is not available when trying to load a module - this is also what systemd's systemd-modules-load.service expects.
Signed-off-by David Hildenbrand <[email protected]>--- arch/s390/crypto/sha1_s390.c | 2 +- arch/s390/crypto/sha256_s390.c | 2 +- arch/s390/crypto/sha512_s390.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)arch/s390/crypto/sha1_s390.c +1
-1@@ -86,7 +86,7 @@ static struct shash_alg alg = {static int __init sha1_s390_init (void ) {if (!cpacf_query_func (CPACF_KIMD ,CPACF_KIMD_SHA_1 )) -return -EOPNOTSUPP ; +return -ENODEV ;return crypto_register_shash (&alg); }arch/s390/crypto/sha256_s390.c +1
-1@@ -117,7 +117,7 @@ static int __init sha256_s390_init(void)int ret;if (!cpacf_query_func (CPACF_KIMD ,CPACF_KIMD_SHA_256 )) -return -EOPNOTSUPP ; +return -ENODEV ; ret =crypto_register_shash (&sha256_alg);if (ret <0 ) goto out;arch/s390/crypto/sha512_s390.c +0
-0
arch/s390/crypto/sha512_s390.c static int __init init(void) · line 133
Quoted 8 lines
arch/s390/crypto/sha512_s390.c +1
-1@@ -127,7 +127,7 @@ static int __init init(void)int ret;if (!cpacf_query_func (CPACF_KIMD ,CPACF_KIMD_SHA_512 )) -return -EOPNOTSUPP ; +return -ENODEV ;if ((ret =crypto_register_shash (&sha512_alg)) <0 ) goto out;if ((ret =crypto_register_shash (&sha384_alg)) <0 )
fine with me
Re: [PATCH v2 4/4] s390/crypto: sha: Use -ENODEV instead of -EOPNOTSUPP
In reply to David HildenbrandQuoted 11 lines · On Wed, 12 Jun 2019 12:22:48 +0200 David Hildenbrand <[email protected]> wrote:
Let's use the error value that is typically used if HW support is not available when trying to load a module - this is also what systemd's systemd-modules-load.service expects.
Signed-off-by David Hildenbrand <[email protected]>--- arch/s390/crypto/sha1_s390.c | 2 +- arch/s390/crypto/sha256_s390.c | 2 +- arch/s390/crypto/sha512_s390.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)