From patchwork Tue Sep 13 12:49:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Cabiddu, Giovanni" X-Patchwork-Id: 9328959 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 401536077F for ; Tue, 13 Sep 2016 12:50:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34AE828531 for ; Tue, 13 Sep 2016 12:50:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 28CAE28E5B; Tue, 13 Sep 2016 12:50:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABBB028531 for ; Tue, 13 Sep 2016 12:50:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754071AbcIMMuA (ORCPT ); Tue, 13 Sep 2016 08:50:00 -0400 Received: from mga06.intel.com ([134.134.136.31]:29789 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755031AbcIMMt6 (ORCPT ); Tue, 13 Sep 2016 08:49:58 -0400 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP; 13 Sep 2016 05:49:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,328,1470726000"; d="scan'208";a="7987443" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga005.jf.intel.com with ESMTP; 13 Sep 2016 05:49:54 -0700 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u8DCnrKL020660; Tue, 13 Sep 2016 13:49:53 +0100 Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id u8DCnrCC012253; Tue, 13 Sep 2016 13:49:53 +0100 Received: (from gcabiddu@localhost) by sivswdev01.ir.intel.com with id u8DCnrKl012249; Tue, 13 Sep 2016 13:49:53 +0100 From: Giovanni Cabiddu To: herbert@gondor.apana.org.au Cc: linux-crypto@vger.kernel.org, Giovanni Cabiddu Subject: [PATCH v7 7/9] crypto: acomp - add support for 842 via scomp Date: Tue, 13 Sep 2016 13:49:39 +0100 Message-Id: <1473770981-9869-8-git-send-email-giovanni.cabiddu@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1473770981-9869-1-git-send-email-giovanni.cabiddu@intel.com> References: <1473770981-9869-1-git-send-email-giovanni.cabiddu@intel.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add scomp backend for 842 compression algorithm Signed-off-by: Giovanni Cabiddu --- crypto/842.c | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- crypto/Kconfig | 1 + 2 files changed, 134 insertions(+), 2 deletions(-) diff --git a/crypto/842.c b/crypto/842.c index 98e387e..d0894e2 100644 --- a/crypto/842.c +++ b/crypto/842.c @@ -30,12 +30,53 @@ #include #include #include +#include #include +#include + +#define SW842_SCRATCH_SIZE 131072 struct crypto842_ctx { - char wmem[SW842_MEM_COMPRESS]; /* working memory for compress */ + void *wmem; /* working memory for compress */ }; +static void * __percpu *sw842_src_scratches; +static void * __percpu *sw842_dst_scratches; + +static void *crypto842_alloc_ctx(struct crypto_scomp *tfm) +{ + void *ctx; + + ctx = kmalloc(SW842_MEM_COMPRESS, GFP_KERNEL); + if (!ctx) + return ERR_PTR(-ENOMEM); + + return ctx; +} + +static int crypto842_init(struct crypto_tfm *tfm) +{ + struct crypto842_ctx *ctx = crypto_tfm_ctx(tfm); + + ctx->wmem = crypto842_alloc_ctx(NULL); + if (IS_ERR(ctx->wmem)) + return -ENOMEM; + + return 0; +} + +static void crypto842_free_ctx(struct crypto_scomp *tfm, void *ctx) +{ + kfree(ctx); +} + +static void crypto842_exit(struct crypto_tfm *tfm) +{ + struct crypto842_ctx *ctx = crypto_tfm_ctx(tfm); + + crypto842_free_ctx(NULL, ctx->wmem); +} + static int crypto842_compress(struct crypto_tfm *tfm, const u8 *src, unsigned int slen, u8 *dst, unsigned int *dlen) @@ -52,6 +93,51 @@ static int crypto842_decompress(struct crypto_tfm *tfm, return sw842_decompress(src, slen, dst, dlen); } +static int sw842_scomp_comp_decomp(struct crypto_scomp *tfm, + struct scatterlist *src, unsigned int slen, + struct scatterlist *dst, unsigned int *dlen, + void *ctx, int dir) +{ + const int cpu = get_cpu(); + u8 *scratch_src = *per_cpu_ptr(sw842_src_scratches, cpu); + u8 *scratch_dst = *per_cpu_ptr(sw842_dst_scratches, cpu); + int ret; + + if (slen > SW842_SCRATCH_SIZE || *dlen > SW842_SCRATCH_SIZE) { + ret = -EINVAL; + goto out; + } + + scatterwalk_map_and_copy(scratch_src, src, 0, slen, 0); + if (dir) + ret = sw842_compress(scratch_src, slen, scratch_dst, dlen, + ctx); + else + ret = sw842_decompress(scratch_src, slen, scratch_dst, dlen); + if (!ret) + scatterwalk_map_and_copy(scratch_dst, dst, 0, *dlen, 1); + +out: + put_cpu(); + return ret; +} + +static int sw842_scomp_compress(struct crypto_scomp *tfm, + struct scatterlist *src, unsigned int slen, + struct scatterlist *dst, unsigned int *dlen, + void *ctx) +{ + return sw842_scomp_comp_decomp(tfm, src, slen, dst, dlen, ctx, 1); +} + +static int sw842_scomp_decompress(struct crypto_scomp *tfm, + struct scatterlist *src, unsigned int slen, + struct scatterlist *dst, unsigned int *dlen, + void *ctx) +{ + return sw842_scomp_comp_decomp(tfm, src, slen, dst, dlen, ctx, 0); +} + static struct crypto_alg alg = { .cra_name = "842", .cra_driver_name = "842-generic", @@ -59,20 +145,65 @@ static struct crypto_alg alg = { .cra_flags = CRYPTO_ALG_TYPE_COMPRESS, .cra_ctxsize = sizeof(struct crypto842_ctx), .cra_module = THIS_MODULE, + .cra_init = crypto842_init, + .cra_exit = crypto842_exit, .cra_u = { .compress = { .coa_compress = crypto842_compress, .coa_decompress = crypto842_decompress } } }; +static struct scomp_alg scomp = { + .alloc_ctx = crypto842_alloc_ctx, + .free_ctx = crypto842_free_ctx, + .compress = sw842_scomp_compress, + .decompress = sw842_scomp_decompress, + .base = { + .cra_name = "842", + .cra_driver_name = "842-scomp", + .cra_priority = 100, + .cra_module = THIS_MODULE, + } +}; + static int __init crypto842_mod_init(void) { - return crypto_register_alg(&alg); + int ret; + + sw842_src_scratches = crypto_scomp_alloc_scratches(SW842_SCRATCH_SIZE); + if (!sw842_src_scratches) + return -ENOMEM; + + sw842_dst_scratches = crypto_scomp_alloc_scratches(SW842_SCRATCH_SIZE); + if (!sw842_dst_scratches) { + ret = -ENOMEM; + goto error; + } + + ret = crypto_register_alg(&alg); + if (ret) + goto error; + + ret = crypto_register_scomp(&scomp); + if (ret) { + crypto_unregister_alg(&alg); + goto error; + } + + return ret; + +error: + crypto_scomp_free_scratches(sw842_src_scratches); + crypto_scomp_free_scratches(sw842_dst_scratches); + return ret; } module_init(crypto842_mod_init); static void __exit crypto842_mod_exit(void) { crypto_unregister_alg(&alg); + crypto_unregister_scomp(&scomp); + crypto_scomp_free_scratches(sw842_src_scratches); + crypto_scomp_free_scratches(sw842_dst_scratches); } module_exit(crypto842_mod_exit); diff --git a/crypto/Kconfig b/crypto/Kconfig index 4258e85..ac7b519 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -1598,6 +1598,7 @@ config CRYPTO_LZO config CRYPTO_842 tristate "842 compression algorithm" select CRYPTO_ALGAPI + select CRYPTO_ACOMP2 select 842_COMPRESS select 842_DECOMPRESS help