Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755916AbZCECZ5 (ORCPT ); Wed, 4 Mar 2009 21:25:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752642AbZCECZq (ORCPT ); Wed, 4 Mar 2009 21:25:46 -0500 Received: from mga02.intel.com ([134.134.136.20]:14426 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754832AbZCECZp (ORCPT ); Wed, 4 Mar 2009 21:25:45 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,304,1233561600"; d="asc'?scan'208";a="495061295" Subject: [PATCH 2/3] crypto: Add fpu template, a wrapper for blkcipher touching FPU From: Huang Ying To: Herbert Xu Cc: linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-fFx+Q5Idy06Pek/YlFVb" Date: Thu, 05 Mar 2009 10:25:41 +0800 Message-Id: <1236219941.24215.38.camel@yhuang-dev.sh.intel.com> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6902 Lines: 239 --=-fFx+Q5Idy06Pek/YlFVb Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Blkcipher touching FPU need to be enclosed by kernel_fpu_begin() and kernel_fpu_end(). If they are invoked in cipher algorithm implementation, they will be invoked for each block, so that performance will be hurt, because they are "slow" operations. This patch implements "fpu" template, which makes these operations to be invoked for each request. Signed-off-by: Huang Ying --- crypto/Kconfig | 7 ++ crypto/Makefile | 1=20 crypto/fpu.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++= +++++ 3 files changed, 174 insertions(+) --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -236,6 +236,13 @@ config CRYPTO_XTS key size 256, 384 or 512 bits. This implementation currently can't handle a sectorsize which is not a multiple of 16 bytes. =20 +config CRYPTO_FPU + tristate "FPU wrapper" + select CRYPTO_BLKCIPHER + select CRYPTO_MANAGER + help + FPU: Wrapper for blkcipher touching FPU. + comment "Hash modes" =20 config CRYPTO_HMAC --- a/crypto/Makefile +++ b/crypto/Makefile @@ -51,6 +51,7 @@ obj-$(CONFIG_CRYPTO_PCBC) +=3D pcbc.o obj-$(CONFIG_CRYPTO_CTS) +=3D cts.o obj-$(CONFIG_CRYPTO_LRW) +=3D lrw.o obj-$(CONFIG_CRYPTO_XTS) +=3D xts.o +obj-$(CONFIG_CRYPTO_FPU) +=3D fpu.o obj-$(CONFIG_CRYPTO_CTR) +=3D ctr.o obj-$(CONFIG_CRYPTO_GCM) +=3D gcm.o obj-$(CONFIG_CRYPTO_CCM) +=3D ccm.o --- /dev/null +++ b/crypto/fpu.c @@ -0,0 +1,166 @@ +/* + * FPU: Wrapper for blkcipher touching fpu + * + * Copyright (c) Intel Corp. + * Author: Huang Ying + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the F= ree + * Software Foundation; either version 2 of the License, or (at your optio= n) + * any later version. + * + */ + +#include +#include +#include +#include +#include +#include + +struct crypto_fpu_ctx { + struct crypto_blkcipher *child; +}; + +static int crypto_fpu_setkey(struct crypto_tfm *parent, const u8 *key, + unsigned int keylen) +{ + struct crypto_fpu_ctx *ctx =3D crypto_tfm_ctx(parent); + struct crypto_blkcipher *child =3D ctx->child; + int err; + + crypto_blkcipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); + crypto_blkcipher_set_flags(child, crypto_tfm_get_flags(parent) & + CRYPTO_TFM_REQ_MASK); + err =3D crypto_blkcipher_setkey(child, key, keylen); + crypto_tfm_set_flags(parent, crypto_blkcipher_get_flags(child) & + CRYPTO_TFM_RES_MASK); + return err; +} + +static int crypto_fpu_encrypt(struct blkcipher_desc *desc_in, + struct scatterlist *dst, struct scatterlist *src, + unsigned int nbytes) +{ + int err; + struct crypto_fpu_ctx *ctx =3D crypto_blkcipher_ctx(desc_in->tfm); + struct crypto_blkcipher *child =3D ctx->child; + struct blkcipher_desc desc =3D { + .tfm =3D child, + .info =3D desc_in->info, + .flags =3D desc_in->flags, + }; + + kernel_fpu_begin(); + err =3D crypto_blkcipher_crt(desc.tfm)->encrypt(&desc, dst, src, nbytes); + kernel_fpu_end(); + return err; +} + +static int crypto_fpu_decrypt(struct blkcipher_desc *desc_in, + struct scatterlist *dst, struct scatterlist *src, + unsigned int nbytes) +{ + int err; + struct crypto_fpu_ctx *ctx =3D crypto_blkcipher_ctx(desc_in->tfm); + struct crypto_blkcipher *child =3D ctx->child; + struct blkcipher_desc desc =3D { + .tfm =3D child, + .info =3D desc_in->info, + .flags =3D desc_in->flags, + }; + + kernel_fpu_begin(); + err =3D crypto_blkcipher_crt(desc.tfm)->decrypt(&desc, dst, src, nbytes); + kernel_fpu_end(); + return err; +} + +static int crypto_fpu_init_tfm(struct crypto_tfm *tfm) +{ + struct crypto_instance *inst =3D crypto_tfm_alg_instance(tfm); + struct crypto_spawn *spawn =3D crypto_instance_ctx(inst); + struct crypto_fpu_ctx *ctx =3D crypto_tfm_ctx(tfm); + struct crypto_blkcipher *cipher; + + cipher =3D crypto_spawn_blkcipher(spawn); + if (IS_ERR(cipher)) + return PTR_ERR(cipher); + + ctx->child =3D cipher; + return 0; +} + +static void crypto_fpu_exit_tfm(struct crypto_tfm *tfm) +{ + struct crypto_fpu_ctx *ctx =3D crypto_tfm_ctx(tfm); + crypto_free_blkcipher(ctx->child); +} + +static struct crypto_instance *crypto_fpu_alloc(struct rtattr **tb) +{ + struct crypto_instance *inst; + struct crypto_alg *alg; + int err; + + err =3D crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_BLKCIPHER); + if (err) + return ERR_PTR(err); + + alg =3D crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_BLKCIPHER, + CRYPTO_ALG_TYPE_MASK); + if (IS_ERR(alg)) + return ERR_CAST(alg); + + inst =3D crypto_alloc_instance("fpu", alg); + if (IS_ERR(inst)) + goto out_put_alg; + + inst->alg.cra_flags =3D alg->cra_flags; + inst->alg.cra_priority =3D alg->cra_priority; + inst->alg.cra_blocksize =3D alg->cra_blocksize; + inst->alg.cra_alignmask =3D alg->cra_alignmask; + inst->alg.cra_type =3D alg->cra_type; + inst->alg.cra_blkcipher.ivsize =3D alg->cra_blkcipher.ivsize; + inst->alg.cra_blkcipher.min_keysize =3D alg->cra_blkcipher.min_keysize; + inst->alg.cra_blkcipher.max_keysize =3D alg->cra_blkcipher.max_keysize; + inst->alg.cra_ctxsize =3D sizeof(struct crypto_fpu_ctx); + inst->alg.cra_init =3D crypto_fpu_init_tfm; + inst->alg.cra_exit =3D crypto_fpu_exit_tfm; + inst->alg.cra_blkcipher.setkey =3D crypto_fpu_setkey; + inst->alg.cra_blkcipher.encrypt =3D crypto_fpu_encrypt; + inst->alg.cra_blkcipher.decrypt =3D crypto_fpu_decrypt; + +out_put_alg: + crypto_mod_put(alg); + return inst; +} + +static void crypto_fpu_free(struct crypto_instance *inst) +{ + crypto_drop_spawn(crypto_instance_ctx(inst)); + kfree(inst); +} + +static struct crypto_template crypto_fpu_tmpl =3D { + .name =3D "fpu", + .alloc =3D crypto_fpu_alloc, + .free =3D crypto_fpu_free, + .module =3D THIS_MODULE, +}; + +static int __init crypto_fpu_module_init(void) +{ + return crypto_register_template(&crypto_fpu_tmpl); +} + +static void __exit crypto_fpu_module_exit(void) +{ + crypto_unregister_template(&crypto_fpu_tmpl); +} + +module_init(crypto_fpu_module_init); +module_exit(crypto_fpu_module_exit); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("FPU block cipher wrapper"); --=-fFx+Q5Idy06Pek/YlFVb Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAkmvOCIACgkQKhFGF+eHlpipWACffhOMGyW5xLOUdLV+6MnI16Ql UAgAn1OYVjITGViAyK4coT0kMCXGZpWS =MKnu -----END PGP SIGNATURE----- --=-fFx+Q5Idy06Pek/YlFVb-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/