[3/3] crypto: acomp - Add comp_params helpers

Commit Message

Herbert Xu May 20, 2024, 11:04 a.m. UTC

Add helpers to get compression parameters, including the level
and an optional dictionary.

Note that algorithms do not have to use these helpers and could
come up with its own set of parameters.

Signed-off-by: Herbert Xu <[e-mail]>
---
 crypto/scompress.c                  | 49 +++++++++++++++++++++++++++++
 include/crypto/acompress.h          |  9 ++++++
 include/crypto/internal/scompress.h | 10 ++++++
 3 files changed, 68 insertions(+)

Comments

Sergey Senozhatsky May 31, 2024, 5:49 a.m. UTC | #1

On (24/05/20 19:04), Herbert Xu wrote:
[..]
> +
> +	params->dict = kvmemdup(dict, len, GFP_KERNEL);
> +	if (!params->dict)
> +		return -ENOMEM;
> +	params->dict_sz = len;
> +
> +	return 0;
> +}
> +EXPORT_SYMBOL_GPL(crypto_comp_getparams);
> +
> +void crypto_comp_putparams(struct crypto_comp_params *params)
> +{
> +	kfree(params->dict);

kvfree()?

> +	params->dict = NULL;
> +	params->dict_sz = 0;
> +}
> +EXPORT_SYMBOL_GPL(crypto_comp_putparams);

Herbert Xu May 31, 2024, 8:32 a.m. UTC | #2

On Fri, May 31, 2024 at 02:49:33PM +0900, Sergey Senozhatsky wrote:
> On (24/05/20 19:04), Herbert Xu wrote:
> [..]
> > +
> > +	params->dict = kvmemdup(dict, len, GFP_KERNEL);
> > +	if (!params->dict)
> > +		return -ENOMEM;
> > +	params->dict_sz = len;
> > +
> > +	return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(crypto_comp_getparams);
> > +
> > +void crypto_comp_putparams(struct crypto_comp_params *params)
> > +{
> > +	kfree(params->dict);
> 
> kvfree()?

Thanks.  I'll fix this in the next update.

Patch

diff --git a/crypto/scompress.c b/crypto/scompress.c
index 9117d7c85f31..1c35569df06c 100644
--- a/crypto/scompress.c
+++ b/crypto/scompress.c
@@ -14,6 +14,7 @@ 
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/rtnetlink.h>
 #include <linux/scatterlist.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
@@ -377,5 +378,53 @@  void crypto_unregister_scomps(struct scomp_alg *algs, int count)
 }
 EXPORT_SYMBOL_GPL(crypto_unregister_scomps);
 
+int crypto_comp_getparams(struct crypto_comp_params *params, const u8 *raw,
+			  unsigned int len)
+{
+	struct rtattr *rta = (struct rtattr *)raw;
+	void *dict;
+
+	crypto_comp_putparams(params);
+	params->level = CRYPTO_COMP_NO_LEVEL;
+
+	for (;; rta = RTA_NEXT(rta, len)) {
+		if (!RTA_OK(rta, len))
+			return -EINVAL;
+
+		if (rta->rta_type == CRYPTO_COMP_PARAM_LAST)
+			break;
+
+		switch (rta->rta_type) {
+		case CRYPTO_COMP_PARAM_LEVEL:
+			if (RTA_PAYLOAD(rta) != 4)
+				return -EINVAL;
+			memcpy(&params->level, RTA_DATA(rta), 4);
+			break;
+		default:
+			return -EINVAL;
+		}
+	}
+
+	dict = RTA_NEXT(rta, len);
+	if (!len)
+		return 0;
+
+	params->dict = kvmemdup(dict, len, GFP_KERNEL);
+	if (!params->dict)
+		return -ENOMEM;
+	params->dict_sz = len;
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(crypto_comp_getparams);
+
+void crypto_comp_putparams(struct crypto_comp_params *params)
+{
+	kfree(params->dict);
+	params->dict = NULL;
+	params->dict_sz = 0;
+}
+EXPORT_SYMBOL_GPL(crypto_comp_putparams);
+
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Synchronous compression type");
diff --git a/include/crypto/acompress.h b/include/crypto/acompress.h
index 241d1dc5c883..383a7f16b309 100644
--- a/include/crypto/acompress.h
+++ b/include/crypto/acompress.h
@@ -12,10 +12,19 @@ 
 #include <linux/atomic.h>
 #include <linux/container_of.h>
 #include <linux/crypto.h>
+#include <linux/limits.h>
 
 #define CRYPTO_ACOMP_ALLOC_OUTPUT	0x00000001
 #define CRYPTO_ACOMP_DST_MAX		131072
 
+#define CRYPTO_COMP_NO_LEVEL		INT_MIN
+
+enum {
+	CRYPTO_COMP_PARAM_UNSPEC,
+	CRYPTO_COMP_PARAM_LEVEL,
+	CRYPTO_COMP_PARAM_LAST,
+};
+
 /**
  * struct acomp_req - asynchronous (de)compression request
  *
diff --git a/include/crypto/internal/scompress.h b/include/crypto/internal/scompress.h
index 4a9cf2174c7a..995989a0c1ff 100644
--- a/include/crypto/internal/scompress.h
+++ b/include/crypto/internal/scompress.h
@@ -49,6 +49,12 @@  struct scomp_alg {
 	};
 };
 
+struct crypto_comp_params {
+	int level;
+	unsigned dict_sz;
+	void *dict;
+};
+
 static inline struct scomp_alg *__crypto_scomp_alg(struct crypto_alg *alg)
 {
 	return container_of(alg, struct scomp_alg, base);
@@ -150,4 +156,8 @@  void crypto_unregister_scomp(struct scomp_alg *alg);
 int crypto_register_scomps(struct scomp_alg *algs, int count);
 void crypto_unregister_scomps(struct scomp_alg *algs, int count);
 
+int crypto_comp_getparams(struct crypto_comp_params *params, const u8 *raw,
+			  unsigned int len);
+void crypto_comp_putparams(struct crypto_comp_params *params);
+
 #endif