[PATCH v3 0/3] ARM: NEON based fast(er) AES in CBC/CTR/XTS modes

[PATCH v3 0/3] ARM: NEON based fast(er) AES in CBC/CTR/XTS modes

[Ard Biesheuvel]

This is v3 of a series implementing a faster and more secure AES implementation
based on bit slicing using NEON instructions.

Changes since v2:
- included the Perl script that generates the .S file, and added some make
  rules so that modifications to the Perl script will carry over to the .S file
  automatically without imposing Perl for all users;

Changes since v1:
- implemented a suggestion by Jussi Kivilinna which substantially improves
  decryption performance, decryption speedup is now 25% on Cortex-A15 (up from
  5 - 10%), encryption speedup is still at 45%;
- fixed a potential issue with tail blocks in CTR mode;
- copied some comments about the origin of this code and the expected power
  efficiency from the cover letter to the commit log of patch 3;
- some cosmetic changes.

This code passes the builtin test 'modprobe tcrypt.ko mode=10' in both ARM and
Thumb-2 modes.

The core code has been adopted from the OpenSSL project (in collaboration
with the original author, on cc). For ease of maintenance, this version is
identical to the upstream OpenSSL code, i.e., all modifications that were
required to make it suitable for inclusion into the kernel have been made
upstream.

This series still depends on commit a62b01cd (crypto: create generic version of
ablk_helper) which I omitted this time but which can be found in the cryptodev
tree or in linux-next.

Ard Biesheuvel (3):
  ARM: pull in <asm/simd.h> from asm-generic
  ARM: move AES typedefs and function prototypes to separate header
  ARM: add support for bit sliced AES using NEON instructions

 arch/arm/crypto/Makefile             |   14 +-
 arch/arm/crypto/aes_glue.c           |   22 +-
 arch/arm/crypto/aes_glue.h           |   19 +
 arch/arm/crypto/aesbs-core.S_shipped | 2544 ++++++++++++++++++++++++++++++++++
 arch/arm/crypto/aesbs-glue.c         |  434 ++++++
 arch/arm/crypto/bsaes-armv7.pl       | 2467 +++++++++++++++++++++++++++++++++
 arch/arm/include/asm/Kbuild          |    1 +
 crypto/Kconfig                       |   16 +
 8 files changed, 5499 insertions(+), 18 deletions(-)
 create mode 100644 arch/arm/crypto/aes_glue.h
 create mode 100644 arch/arm/crypto/aesbs-core.S_shipped
 create mode 100644 arch/arm/crypto/aesbs-glue.c
 create mode 100644 arch/arm/crypto/bsaes-armv7.pl

-- 
1.8.1.2

[PATCH v3 1/3] ARM: pull in <asm/simd.h> from asm-generic

[Ard Biesheuvel]

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 arch/arm/include/asm/Kbuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index d3db398..6577b8a 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -24,6 +24,7 @@ generic-y += sembuf.h
 generic-y += serial.h
 generic-y += shmbuf.h
 generic-y += siginfo.h
+generic-y += simd.h
 generic-y += sizes.h
 generic-y += socket.h
 generic-y += sockios.h
-- 
1.8.1.2

[PATCH v3 2/3] ARM: move AES typedefs and function prototypes to separate header

[Ard Biesheuvel]

Put the struct definitions for AES keys and the asm function prototypes in a
separate header and export the asm functions from the module.
This allows other drivers to use them directly.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 arch/arm/crypto/aes_glue.c | 22 ++++++----------------
 arch/arm/crypto/aes_glue.h | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 arch/arm/crypto/aes_glue.h

diff --git a/arch/arm/crypto/aes_glue.c b/arch/arm/crypto/aes_glue.c
index 59f7877..3003fa1 100644
--- a/arch/arm/crypto/aes_glue.c
+++ b/arch/arm/crypto/aes_glue.c
@@ -6,22 +6,12 @@
 #include <linux/crypto.h>
 #include <crypto/aes.h>
 
-#define AES_MAXNR 14
+#include "aes_glue.h"
 
-typedef struct {
-	unsigned int rd_key[4 *(AES_MAXNR + 1)];
-	int rounds;
-} AES_KEY;
-
-struct AES_CTX {
-	AES_KEY enc_key;
-	AES_KEY dec_key;
-};
-
-asmlinkage void AES_encrypt(const u8 *in, u8 *out, AES_KEY *ctx);
-asmlinkage void AES_decrypt(const u8 *in, u8 *out, AES_KEY *ctx);
-asmlinkage int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key);
-asmlinkage int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key);
+EXPORT_SYMBOL(AES_encrypt);
+EXPORT_SYMBOL(AES_decrypt);
+EXPORT_SYMBOL(private_AES_set_encrypt_key);
+EXPORT_SYMBOL(private_AES_set_decrypt_key);
 
 static void aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
@@ -81,7 +71,7 @@ static struct crypto_alg aes_alg = {
 		.cipher	= {
 			.cia_min_keysize	= AES_MIN_KEY_SIZE,
 			.cia_max_keysize	= AES_MAX_KEY_SIZE,
-			.cia_setkey			= aes_set_key,
+			.cia_setkey		= aes_set_key,
 			.cia_encrypt		= aes_encrypt,
 			.cia_decrypt		= aes_decrypt
 		}
diff --git a/arch/arm/crypto/aes_glue.h b/arch/arm/crypto/aes_glue.h
new file mode 100644
index 0000000..cca3e51
--- /dev/null
+++ b/arch/arm/crypto/aes_glue.h
@@ -0,0 +1,19 @@
+
+#define AES_MAXNR 14
+
+struct AES_KEY {
+	unsigned int rd_key[4 * (AES_MAXNR + 1)];
+	int rounds;
+};
+
+struct AES_CTX {
+	struct AES_KEY enc_key;
+	struct AES_KEY dec_key;
+};
+
+asmlinkage void AES_encrypt(const u8 *in, u8 *out, struct AES_KEY *ctx);
+asmlinkage void AES_decrypt(const u8 *in, u8 *out, struct AES_KEY *ctx);
+asmlinkage int private_AES_set_decrypt_key(const unsigned char *userKey,
+					   const int bits, struct AES_KEY *key);
+asmlinkage int private_AES_set_encrypt_key(const unsigned char *userKey,
+					   const int bits, struct AES_KEY *key);
-- 
1.8.1.2

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Russell King - ARM Linux]

On Fri, Oct 04, 2013 at 09:03:39PM +0200, Ard Biesheuvel wrote:
> diff --git a/arch/arm/crypto/aesbs-glue.c b/arch/arm/crypto/aesbs-glue.c
> new file mode 100644
> index 0000000..4522366
> --- /dev/null
> +++ b/arch/arm/crypto/aesbs-glue.c
> @@ -0,0 +1,434 @@
> +/*
> + * linux/arch/arm/crypto/aesbs-glue.c - glue code for NEON bit sliced AES
> + *
> + * Copyright (C) 2013 Linaro Ltd <ard.biesheuvel@linaro.org>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <asm/neon.h>
> +#include <crypto/aes.h>
> +#include <crypto/ablk_helper.h>

This header file doesn't appear to exist, and so causes this build error:

  CC      arch/arm/crypto/aesbs-glue.o
arch/arm/crypto/aesbs-glue.c:13:32: fatal error: crypto/ablk_helper.h: No such fcompilation terminated.
make[2]: *** [arch/arm/crypto/aesbs-glue.o] Error 1
make[2]: Target `__build' not remade because of errors.
make[1]: *** [arch/arm/crypto] Error 2

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Ard Biesheuvel]

On 13 October 2013 12:03, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Fri, Oct 04, 2013 at 09:03:39PM +0200, Ard Biesheuvel wrote:

[...]

>> +#include <asm/neon.h>
>> +#include <crypto/aes.h>
>> +#include <crypto/ablk_helper.h>
>
> This header file doesn't appear to exist, and so causes this build error:
>

Hi Russell,

This is expected.

Perhaps I should have addressed this differently, but I had put the
following in my pull request

!! NOTE !!: this series build-depends on patch a62b01cd (crypto: create generic
version of ablk_helper) which is in linux-next but not yet in mainline.

expecting you to either defer pulling it or handle the
cross-dependency in some other way.

My apologies for the inconvenience.

-- 
Ard.

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Russell King - ARM Linux]

On Sun, Oct 13, 2013 at 12:21:49PM +0200, Ard Biesheuvel wrote:
> On 13 October 2013 12:03, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
> > On Fri, Oct 04, 2013 at 09:03:39PM +0200, Ard Biesheuvel wrote:
> 
> [...]
> 
> >> +#include <asm/neon.h>
> >> +#include <crypto/aes.h>
> >> +#include <crypto/ablk_helper.h>
> >
> > This header file doesn't appear to exist, and so causes this build error:
> >
> 
> Hi Russell,
> 
> This is expected.
> 
> Perhaps I should have addressed this differently, but I had put the
> following in my pull request
> 
> !! NOTE !!: this series build-depends on patch a62b01cd (crypto: create generic
> version of ablk_helper) which is in linux-next but not yet in mainline.
> 
> expecting you to either defer pulling it or handle the
> cross-dependency in some other way.

Where can I find that commit?

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Ard Biesheuvel]

On 13 October 2013 13:14, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Sun, Oct 13, 2013 at 12:21:49PM +0200, Ard Biesheuvel wrote:
>> On 13 October 2013 12:03, Russell King - ARM Linux
>> <linux@arm.linux.org.uk> wrote:
>> > On Fri, Oct 04, 2013 at 09:03:39PM +0200, Ard Biesheuvel wrote:
>>
>> [...]
>>
>> >> +#include <asm/neon.h>
>> >> +#include <crypto/aes.h>
>> >> +#include <crypto/ablk_helper.h>
>> >
>> > This header file doesn't appear to exist, and so causes this build error:
>> >
>>
>> Hi Russell,
>>
>> This is expected.
>>
>> Perhaps I should have addressed this differently, but I had put the
>> following in my pull request
>>
>> !! NOTE !!: this series build-depends on patch a62b01cd (crypto: create generic
>> version of ablk_helper) which is in linux-next but not yet in mainline.
>>
>> expecting you to either defer pulling it or handle the
>> cross-dependency in some other way.
>
> Where can I find that commit?

https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/crypto?id=a62b01cd6cc1feb5e80d64d6937c291473ed82cb

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Russell King - ARM Linux]

On Sun, Oct 13, 2013 at 01:19:29PM +0200, Ard Biesheuvel wrote:
> On 13 October 2013 13:14, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
> > On Sun, Oct 13, 2013 at 12:21:49PM +0200, Ard Biesheuvel wrote:
> >> On 13 October 2013 12:03, Russell King - ARM Linux
> >> <linux@arm.linux.org.uk> wrote:
> >> > On Fri, Oct 04, 2013 at 09:03:39PM +0200, Ard Biesheuvel wrote:
> >>
> >> [...]
> >>
> >> >> +#include <asm/neon.h>
> >> >> +#include <crypto/aes.h>
> >> >> +#include <crypto/ablk_helper.h>
> >> >
> >> > This header file doesn't appear to exist, and so causes this build error:
> >> >
> >>
> >> Hi Russell,
> >>
> >> This is expected.
> >>
> >> Perhaps I should have addressed this differently, but I had put the
> >> following in my pull request
> >>
> >> !! NOTE !!: this series build-depends on patch a62b01cd (crypto: create generic
> >> version of ablk_helper) which is in linux-next but not yet in mainline.
> >>
> >> expecting you to either defer pulling it or handle the
> >> cross-dependency in some other way.
> >
> > Where can I find that commit?
> 
> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/crypto?id=a62b01cd6cc1feb5e80d64d6937c291473ed82cb

I need a git tree I can pull with this commit in (and preferably without
much in the way of dependencies.)  Commits in linux-next are not deemed
to be stable.

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Ard Biesheuvel]

On 13 October 2013 13:22, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Sun, Oct 13, 2013 at 01:19:29PM +0200, Ard Biesheuvel wrote:
>> On 13 October 2013 13:14, Russell King - ARM Linux
>> <linux@arm.linux.org.uk> wrote:
>> > On Sun, Oct 13, 2013 at 12:21:49PM +0200, Ard Biesheuvel wrote:
>> >> On 13 October 2013 12:03, Russell King - ARM Linux
>> >> <linux@arm.linux.org.uk> wrote:
>> >> > On Fri, Oct 04, 2013 at 09:03:39PM +0200, Ard Biesheuvel wrote:
>> >>
>> >> [...]
>> >>
>> >> >> +#include <asm/neon.h>
>> >> >> +#include <crypto/aes.h>
>> >> >> +#include <crypto/ablk_helper.h>
>> >> >
>> >> > This header file doesn't appear to exist, and so causes this build error:
>> >> >
>> >>
>> >> Hi Russell,
>> >>
>> >> This is expected.
>> >>
>> >> Perhaps I should have addressed this differently, but I had put the
>> >> following in my pull request
>> >>
>> >> !! NOTE !!: this series build-depends on patch a62b01cd (crypto: create generic
>> >> version of ablk_helper) which is in linux-next but not yet in mainline.
>> >>
>> >> expecting you to either defer pulling it or handle the
>> >> cross-dependency in some other way.
>> >
>> > Where can I find that commit?
>>
>> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/crypto?id=a62b01cd6cc1feb5e80d64d6937c291473ed82cb
>
> I need a git tree I can pull with this commit in (and preferably without
> much in the way of dependencies.)  Commits in linux-next are not deemed
> to be stable.

This one perhaps?

https://git.kernel.org/cgit/linux/kernel/git/herbert/cryptodev-2.6.git/commit/?id=a62b01cd6cc1feb5e80d64d6937c291473ed82cb

Unfortunately, it has a string of unrelated commits between this one
and the first one already appearing in mainline.
However, as it originates in Herbert's tree (including Herbert's
signoff) and it mostly only adds files, cherry-picking should be
relatively trouble free in this case (if that is an option at all)

-- 
Ard.

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Russell King - ARM Linux]

On Sun, Oct 13, 2013 at 01:28:01PM +0200, Ard Biesheuvel wrote:
> On 13 October 2013 13:22, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
> > On Sun, Oct 13, 2013 at 01:19:29PM +0200, Ard Biesheuvel wrote:
> >> On 13 October 2013 13:14, Russell King - ARM Linux
> >> <linux@arm.linux.org.uk> wrote:
> >> > On Sun, Oct 13, 2013 at 12:21:49PM +0200, Ard Biesheuvel wrote:
> >> >> On 13 October 2013 12:03, Russell King - ARM Linux
> >> >> <linux@arm.linux.org.uk> wrote:
> >> >> > On Fri, Oct 04, 2013 at 09:03:39PM +0200, Ard Biesheuvel wrote:
> >> >>
> >> >> [...]
> >> >>
> >> >> >> +#include <asm/neon.h>
> >> >> >> +#include <crypto/aes.h>
> >> >> >> +#include <crypto/ablk_helper.h>
> >> >> >
> >> >> > This header file doesn't appear to exist, and so causes this build error:
> >> >> >
> >> >>
> >> >> Hi Russell,
> >> >>
> >> >> This is expected.
> >> >>
> >> >> Perhaps I should have addressed this differently, but I had put the
> >> >> following in my pull request
> >> >>
> >> >> !! NOTE !!: this series build-depends on patch a62b01cd (crypto: create generic
> >> >> version of ablk_helper) which is in linux-next but not yet in mainline.
> >> >>
> >> >> expecting you to either defer pulling it or handle the
> >> >> cross-dependency in some other way.
> >> >
> >> > Where can I find that commit?
> >>
> >> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/crypto?id=a62b01cd6cc1feb5e80d64d6937c291473ed82cb
> >
> > I need a git tree I can pull with this commit in (and preferably without
> > much in the way of dependencies.)  Commits in linux-next are not deemed
> > to be stable.
> 
> This one perhaps?
> 
> https://git.kernel.org/cgit/linux/kernel/git/herbert/cryptodev-2.6.git/commit/?id=a62b01cd6cc1feb5e80d64d6937c291473ed82cb
> 
> Unfortunately, it has a string of unrelated commits between this one
> and the first one already appearing in mainline.
> However, as it originates in Herbert's tree (including Herbert's
> signoff) and it mostly only adds files, cherry-picking should be
> relatively trouble free in this case (if that is an option at all)

Herbert,

Could I have a git URL to pull the above commit please?

Thanks.

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Herbert Xu]

On Sun, Oct 13, 2013 at 12:30:49PM +0100, Russell King - ARM Linux wrote:
> On Sun, Oct 13, 2013 at 01:28:01PM +0200, Ard Biesheuvel wrote:
> > On 13 October 2013 13:22, Russell King - ARM Linux
> > <linux@arm.linux.org.uk> wrote:
> > > On Sun, Oct 13, 2013 at 01:19:29PM +0200, Ard Biesheuvel wrote:
> > >> On 13 October 2013 13:14, Russell King - ARM Linux
> > >> <linux@arm.linux.org.uk> wrote:
> > >> > On Sun, Oct 13, 2013 at 12:21:49PM +0200, Ard Biesheuvel wrote:
> > >> >> On 13 October 2013 12:03, Russell King - ARM Linux
> > >> >> <linux@arm.linux.org.uk> wrote:
> > >> >> > On Fri, Oct 04, 2013 at 09:03:39PM +0200, Ard Biesheuvel wrote:
> > >> >>
> > >> >> [...]
> > >> >>
> > >> >> >> +#include <asm/neon.h>
> > >> >> >> +#include <crypto/aes.h>
> > >> >> >> +#include <crypto/ablk_helper.h>
> > >> >> >
> > >> >> > This header file doesn't appear to exist, and so causes this build error:
> > >> >> >
> > >> >>
> > >> >> Hi Russell,
> > >> >>
> > >> >> This is expected.
> > >> >>
> > >> >> Perhaps I should have addressed this differently, but I had put the
> > >> >> following in my pull request
> > >> >>
> > >> >> !! NOTE !!: this series build-depends on patch a62b01cd (crypto: create generic
> > >> >> version of ablk_helper) which is in linux-next but not yet in mainline.
> > >> >>
> > >> >> expecting you to either defer pulling it or handle the
> > >> >> cross-dependency in some other way.
> > >> >
> > >> > Where can I find that commit?
> > >>
> > >> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/crypto?id=a62b01cd6cc1feb5e80d64d6937c291473ed82cb
> > >
> > > I need a git tree I can pull with this commit in (and preferably without
> > > much in the way of dependencies.)  Commits in linux-next are not deemed
> > > to be stable.
> > 
> > This one perhaps?
> > 
> > https://git.kernel.org/cgit/linux/kernel/git/herbert/cryptodev-2.6.git/commit/?id=a62b01cd6cc1feb5e80d64d6937c291473ed82cb
> > 
> > Unfortunately, it has a string of unrelated commits between this one
> > and the first one already appearing in mainline.
> > However, as it originates in Herbert's tree (including Herbert's
> > signoff) and it mostly only adds files, cherry-picking should be
> > relatively trouble free in this case (if that is an option at all)
> 
> Herbert,
> 
> Could I have a git URL to pull the above commit please?

Russell, do you want me to revert this patch from cryptodev?
Otherwise I'm not quite sure what you want me to do here.

Cheers,
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Russell King - ARM Linux]

On Mon, Oct 14, 2013 at 07:29:21PM +0800, Herbert Xu wrote:
> On Sun, Oct 13, 2013 at 12:30:49PM +0100, Russell King - ARM Linux wrote:
> > Herbert,
> > 
> > Could I have a git URL to pull the above commit please?
> 
> Russell, do you want me to revert this patch from cryptodev?
> Otherwise I'm not quite sure what you want me to do here.

I'd like to pull a branch from you containing this commit to solve the
build error I'm getting with my tree, so I can continue testing my tree.
At the moment, this is an additional unnecessary cause of randconfig
build failures.

The problem I have is that Ard's crypto patches got put into a public
stable branch so I can't drop them.

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Herbert Xu]

On Mon, Oct 14, 2013 at 01:08:37PM +0100, Russell King - ARM Linux wrote:
> On Mon, Oct 14, 2013 at 07:29:21PM +0800, Herbert Xu wrote:
> > On Sun, Oct 13, 2013 at 12:30:49PM +0100, Russell King - ARM Linux wrote:
> > > Herbert,
> > > 
> > > Could I have a git URL to pull the above commit please?
> > 
> > Russell, do you want me to revert this patch from cryptodev?
> > Otherwise I'm not quite sure what you want me to do here.
> 
> I'd like to pull a branch from you containing this commit to solve the
> build error I'm getting with my tree, so I can continue testing my tree.
> At the moment, this is an additional unnecessary cause of randconfig
> build failures.

I don't have a branch that contains just this patch so perhaps it
would be easiest if I just reverted it?

Cheers,
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Russell King - ARM Linux]

On Mon, Oct 14, 2013 at 08:10:21PM +0800, Herbert Xu wrote:
> On Mon, Oct 14, 2013 at 01:08:37PM +0100, Russell King - ARM Linux wrote:
> > On Mon, Oct 14, 2013 at 07:29:21PM +0800, Herbert Xu wrote:
> > > On Sun, Oct 13, 2013 at 12:30:49PM +0100, Russell King - ARM Linux wrote:
> > > > Herbert,
> > > > 
> > > > Could I have a git URL to pull the above commit please?
> > > 
> > > Russell, do you want me to revert this patch from cryptodev?
> > > Otherwise I'm not quite sure what you want me to do here.
> > 
> > I'd like to pull a branch from you containing this commit to solve the
> > build error I'm getting with my tree, so I can continue testing my tree.
> > At the moment, this is an additional unnecessary cause of randconfig
> > build failures.
> 
> I don't have a branch that contains just this patch so perhaps it
> would be easiest if I just reverted it?

Well, I don't have it either.

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Herbert Xu]

On Mon, Oct 14, 2013 at 01:19:26PM +0100, Russell King - ARM Linux wrote:
> On Mon, Oct 14, 2013 at 08:10:21PM +0800, Herbert Xu wrote:
> > On Mon, Oct 14, 2013 at 01:08:37PM +0100, Russell King - ARM Linux wrote:
> > > On Mon, Oct 14, 2013 at 07:29:21PM +0800, Herbert Xu wrote:
> > > > On Sun, Oct 13, 2013 at 12:30:49PM +0100, Russell King - ARM Linux wrote:
> > > > > Herbert,
> > > > > 
> > > > > Could I have a git URL to pull the above commit please?
> > > > 
> > > > Russell, do you want me to revert this patch from cryptodev?
> > > > Otherwise I'm not quite sure what you want me to do here.
> > > 
> > > I'd like to pull a branch from you containing this commit to solve the
> > > build error I'm getting with my tree, so I can continue testing my tree.
> > > At the moment, this is an additional unnecessary cause of randconfig
> > > build failures.
> > 
> > I don't have a branch that contains just this patch so perhaps it
> > would be easiest if I just reverted it?
> 
> Well, I don't have it either.

Oh you were talking about the ablk_helper patch, and not some ARM
patch that sneaked into the crypto tree.

As it's a crypto driver that's being added then it should go
through the crypto tree.  If it depends on some ARM bits that's
only in linux-next then I could try to merge that, assuming the
underlying ARM tree is stable.

Thanks,
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Russell King - ARM Linux]

On Mon, Oct 14, 2013 at 08:47:00PM +0800, Herbert Xu wrote:
> On Mon, Oct 14, 2013 at 01:19:26PM +0100, Russell King - ARM Linux wrote:
> > On Mon, Oct 14, 2013 at 08:10:21PM +0800, Herbert Xu wrote:
> > > On Mon, Oct 14, 2013 at 01:08:37PM +0100, Russell King - ARM Linux wrote:
> > > > On Mon, Oct 14, 2013 at 07:29:21PM +0800, Herbert Xu wrote:
> > > > > On Sun, Oct 13, 2013 at 12:30:49PM +0100, Russell King - ARM Linux wrote:
> > > > > > Herbert,
> > > > > > 
> > > > > > Could I have a git URL to pull the above commit please?
> > > > > 
> > > > > Russell, do you want me to revert this patch from cryptodev?
> > > > > Otherwise I'm not quite sure what you want me to do here.
> > > > 
> > > > I'd like to pull a branch from you containing this commit to solve the
> > > > build error I'm getting with my tree, so I can continue testing my tree.
> > > > At the moment, this is an additional unnecessary cause of randconfig
> > > > build failures.
> > > 
> > > I don't have a branch that contains just this patch so perhaps it
> > > would be easiest if I just reverted it?
> > 
> > Well, I don't have it either.
> 
> Oh you were talking about the ablk_helper patch, and not some ARM
> patch that sneaked into the crypto tree.
> 
> As it's a crypto driver that's being added then it should go
> through the crypto tree.  If it depends on some ARM bits that's
> only in linux-next then I could try to merge that, assuming the
> underlying ARM tree is stable.

You're not listening to me.  I've had enough of trying to discuss this
sensibly.  I'm reverting all of Ard's work, and my commit to fix up a
missing .gitignore entry afterwards.  Congratuations.

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Russell King - ARM Linux]

On Mon, Oct 14, 2013 at 01:50:19PM +0100, Russell King - ARM Linux wrote:
> On Mon, Oct 14, 2013 at 08:47:00PM +0800, Herbert Xu wrote:
> > On Mon, Oct 14, 2013 at 01:19:26PM +0100, Russell King - ARM Linux wrote:
> > > On Mon, Oct 14, 2013 at 08:10:21PM +0800, Herbert Xu wrote:
> > > > On Mon, Oct 14, 2013 at 01:08:37PM +0100, Russell King - ARM Linux wrote:
> > > > > On Mon, Oct 14, 2013 at 07:29:21PM +0800, Herbert Xu wrote:
> > > > > > On Sun, Oct 13, 2013 at 12:30:49PM +0100, Russell King - ARM Linux wrote:
> > > > > > > Herbert,
> > > > > > > 
> > > > > > > Could I have a git URL to pull the above commit please?
> > > > > > 
> > > > > > Russell, do you want me to revert this patch from cryptodev?
> > > > > > Otherwise I'm not quite sure what you want me to do here.
> > > > > 
> > > > > I'd like to pull a branch from you containing this commit to solve the
> > > > > build error I'm getting with my tree, so I can continue testing my tree.
> > > > > At the moment, this is an additional unnecessary cause of randconfig
> > > > > build failures.
> > > > 
> > > > I don't have a branch that contains just this patch so perhaps it
> > > > would be easiest if I just reverted it?
> > > 
> > > Well, I don't have it either.
> > 
> > Oh you were talking about the ablk_helper patch, and not some ARM
> > patch that sneaked into the crypto tree.
> > 
> > As it's a crypto driver that's being added then it should go
> > through the crypto tree.  If it depends on some ARM bits that's
> > only in linux-next then I could try to merge that, assuming the
> > underlying ARM tree is stable.
> 
> You're not listening to me.  I've had enough of trying to discuss this
> sensibly.  I'm reverting all of Ard's work, and my commit to fix up a
> missing .gitignore entry afterwards.  Congratuations.

Scrap that, I can't revert the merge resulting from the pull, because it
brought in everything between -rc1 and rc3, and git is trying to revert
everything in mainline between those two when I try and re-merge this
branch.

So I can't revert this.

[PATCH v3 3/3] ARM: add support for bit sliced AES using NEON instructions

[Ard Biesheuvel]

Hi Russell,

If you're still interested, I have cherry-picked the commit from
Herbert's tree on top of the branch you pulled from me.

git://git.linaro.org/people/ardbiesheuvel/linux-arm.git arm-aesbs


Regards,
Ard.



On 14 October 2013 17:28, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Mon, Oct 14, 2013 at 01:50:19PM +0100, Russell King - ARM Linux wrote:
>> On Mon, Oct 14, 2013 at 08:47:00PM +0800, Herbert Xu wrote:
>> > On Mon, Oct 14, 2013 at 01:19:26PM +0100, Russell King - ARM Linux wrote:
>> > > On Mon, Oct 14, 2013 at 08:10:21PM +0800, Herbert Xu wrote:
>> > > > On Mon, Oct 14, 2013 at 01:08:37PM +0100, Russell King - ARM Linux wrote:
>> > > > > On Mon, Oct 14, 2013 at 07:29:21PM +0800, Herbert Xu wrote:
>> > > > > > On Sun, Oct 13, 2013 at 12:30:49PM +0100, Russell King - ARM Linux wrote:
>> > > > > > > Herbert,
>> > > > > > >
>> > > > > > > Could I have a git URL to pull the above commit please?
>> > > > > >
>> > > > > > Russell, do you want me to revert this patch from cryptodev?
>> > > > > > Otherwise I'm not quite sure what you want me to do here.
>> > > > >
>> > > > > I'd like to pull a branch from you containing this commit to solve the
>> > > > > build error I'm getting with my tree, so I can continue testing my tree.
>> > > > > At the moment, this is an additional unnecessary cause of randconfig
>> > > > > build failures.
>> > > >
>> > > > I don't have a branch that contains just this patch so perhaps it
>> > > > would be easiest if I just reverted it?
>> > >
>> > > Well, I don't have it either.
>> >
>> > Oh you were talking about the ablk_helper patch, and not some ARM
>> > patch that sneaked into the crypto tree.
>> >
>> > As it's a crypto driver that's being added then it should go
>> > through the crypto tree.  If it depends on some ARM bits that's
>> > only in linux-next then I could try to merge that, assuming the
>> > underlying ARM tree is stable.
>>
>> You're not listening to me.  I've had enough of trying to discuss this
>> sensibly.  I'm reverting all of Ard's work, and my commit to fix up a
>> missing .gitignore entry afterwards.  Congratuations.
>
> Scrap that, I can't revert the merge resulting from the pull, because it
> brought in everything between -rc1 and rc3, and git is trying to revert
> everything in mainline between those two when I try and re-merge this
> branch.
>
> So I can't revert this.