[OE-core] [PATCH] cryptodev-module: Fix build failure with kernel v5.5

[He Zhe]

Ping.

Zhe

On 2/10/20 9:11 PM, zhe.he at windriver.com wrote:
> From: He Zhe <zhe.he at windriver.com>
>
> Backport from upstream to fix the following build failure.
>
> cryptlib.c:162:37: error: 'crypto_ablkcipher_type' undeclared
> (first use in this function); did you mean 'crypto_skcipher_tfm'?
> 162 |   if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type)
>     |                                     ^~~~~~~~~~~~~~~~~~~~~~
>     |                                     crypto_skcipher_tfm
> cryptlib.c:169:25: error: 'struct crypto_alg' has no member named
> 'cra_ablkcipher'
> 169 |    alg = &tfm->__crt_alg->cra_ablkcipher;
>     |                         ^~
> cryptlib.c:170:21: error: dereferencing pointer to incomplete type
> 'struct ablkcipher_alg'
> 170 |    min_keysize = alg->min_keysize;
>     |                     ^~
>
> Signed-off-by: He Zhe <zhe.he at windriver.com>
> ---
>  .../cryptodev/cryptodev-module_1.10.bb        |  1 +
>  ...-cryptlib.c-fix-build-on-kernel-v5.5.patch | 49 +++++++++++++++++++
>  2 files changed, 50 insertions(+)
>  create mode 100644 meta/recipes-kernel/cryptodev/files/0001-cryptlib.c-fix-build-on-kernel-v5.5.patch
>
> diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb
> index 552eb6abaa..89b52d8d95 100644
> --- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb
> +++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb
> @@ -9,6 +9,7 @@ DEPENDS += "cryptodev-linux"
>  
>  SRC_URI += " \
>  file://0001-Disable-installing-header-file-provided-by-another-p.patch \
> +file://0001-cryptlib.c-fix-build-on-kernel-v5.5.patch \
>  "
>  
>  EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
> diff --git a/meta/recipes-kernel/cryptodev/files/0001-cryptlib.c-fix-build-on-kernel-v5.5.patch b/meta/recipes-kernel/cryptodev/files/0001-cryptlib.c-fix-build-on-kernel-v5.5.patch
> new file mode 100644
> index 0000000000..1af9aed8d8
> --- /dev/null
> +++ b/meta/recipes-kernel/cryptodev/files/0001-cryptlib.c-fix-build-on-kernel-v5.5.patch
> @@ -0,0 +1,49 @@
> +From 98b163a23f6b9fbdc18c3644cf94a75cdcd0cc80 Mon Sep 17 00:00:00 2001
> +From: Andrei Botila <andrei.botila at nxp.com>
> +Date: Wed, 27 Nov 2019 09:53:37 +0200
> +Subject: [PATCH] cryptlib.c: fix build on kernel v5.5+
> +
> +Starting with kernel v5.5-rc1 ablkcipher and blkcipher are removed and
> +symmetric key operations will rely solely on skcipher:
> +commit d63007eb954 ("crypto: ablkcipher - remove deprecated and unused ablkcipher support").
> +
> +When cryptodev will use higher kernel versions > 5.4 will need to use the
> +skcipher interface instead.
> +
> +Signed-off-by: Andrei Botila <andrei.botila at nxp.com>
> +
> +Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/
> +commit/98b163a23f6b9fbdc18c3644cf94a75cdcd0cc80]
> +
> +Signed-off-by: He Zhe <zhe.he at windriver.com>
> +
> +---
> + cryptlib.c | 5 ++++-
> + 1 file changed, 4 insertions(+), 1 deletion(-)
> +
> +diff --git a/cryptlib.c b/cryptlib.c
> +index 4a87037..e2a4198 100644
> +--- a/cryptlib.c
> ++++ b/cryptlib.c
> +@@ -159,6 +159,7 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name,
> + 
> + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0))
> + 		tfm = crypto_skcipher_tfm(out->async.s);
> ++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(5, 4, 0))
> + 		if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type)
> + #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0))
> + 		    || (tfm->__crt_alg->cra_type == &crypto_givcipher_type)
> +@@ -169,7 +170,9 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name,
> + 			alg = &tfm->__crt_alg->cra_ablkcipher;
> + 			min_keysize = alg->min_keysize;
> + 			max_keysize = alg->max_keysize;
> +-		} else {
> ++		} else
> ++#endif
> ++		{
> + 			struct skcipher_alg *alg;
> + 
> + 			alg = crypto_skcipher_alg(out->async.s);
> +-- 
> +2.7.4
> +