Commit ed6776c9 authored Feb 08, 2024 by Harald Freudenberger Committed by Heiko Carstens Mar 07, 2024

s390/crypto: remove retry loop with sleep from PAES pkey invocation



Upon calling the pkey module to (re-)derive an protected
key from a secure key the PAES implementation did a retry
3 times with an 1000 ms sleep after each failure. This
patch removes this retry loop - retries should be done
if needed in a lower layer but the consumer of the pkey
module functions should not be bothered with retries.

Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
Reviewed-by: Holger Dengler <dengler@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

parent 5dabfeca

arch/s390/crypto/paes_s390.c

+2 −14

Original line number	Diff line number	Diff line
		@@ -125,20 +125,8 @@ struct s390_pxts_ctx {
		static inline int __paes_keyblob2pkey(struct key_blob *kb,
		struct pkey_protkey *pk)
		{
		int i, ret;

		/* try three times in case of failure */
		for (i = 0; i < 3; i++) {
		if (i > 0 && ret == -EAGAIN && in_task())
		if (msleep_interruptible(1000))
		return -EINTR;
		ret = pkey_keyblob2pkey(kb->key, kb->keylen,
		return pkey_keyblob2pkey(kb->key, kb->keylen,
		pk->protkey, &pk->len, &pk->type);
		if (ret == 0)
		break;
		}

		return ret;
		}

		static inline int __paes_convert_key(struct s390_paes_ctx *ctx)