[RFC PATCH crypto 1/4] AES-NI: Move key_length in struct crypto_aes_ctx to be the last field

[RFC PATCH crypto 1/4] AES-NI: Move key_length in struct crypto_aes_ctx to be the last field

[Huang Ying]

[-- Attachment #1: Type: text/plain, Size: 1769 bytes --]

The Intel AES-NI AES acceleration instructions need key_enc, key_dec
in struct crypto_aes_ctx to be 16 byte aligned, it make this easier to
move key_length to be the last one.

Signed-off-by: Huang Ying <ying.huang@intel.com>

---
 arch/x86/crypto/aes-i586-asm_32.S   |    6 +++---
 arch/x86/crypto/aes-x86_64-asm_64.S |    4 ++--
 include/crypto/aes.h                |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

--- a/arch/x86/crypto/aes-i586-asm_32.S
+++ b/arch/x86/crypto/aes-i586-asm_32.S
@@ -46,9 +46,9 @@
 #define in_blk 16
 
 /* offsets in crypto_tfm structure */
-#define klen (crypto_tfm_ctx_offset + 0)
-#define ekey (crypto_tfm_ctx_offset + 4)
-#define dkey (crypto_tfm_ctx_offset + 244)
+#define klen (crypto_tfm_ctx_offset + 480)
+#define ekey (crypto_tfm_ctx_offset + 0)
+#define dkey (crypto_tfm_ctx_offset + 240)
 
 // register mapping for encrypt and decrypt subroutines
 
--- a/arch/x86/crypto/aes-x86_64-asm_64.S
+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
@@ -56,13 +56,13 @@
 	.align	8;			\
 FUNC:	movq	r1,r2;			\
 	movq	r3,r4;			\
-	leaq	BASE+KEY+48+4(r8),r9;	\
+	leaq	BASE+KEY+48(r8),r9;	\
 	movq	r10,r11;		\
 	movl	(r7),r5 ## E;		\
 	movl	4(r7),r1 ## E;		\
 	movl	8(r7),r6 ## E;		\
 	movl	12(r7),r7 ## E;		\
-	movl	BASE+0(r8),r10 ## E;	\
+	movl	BASE+480(r8),r10 ## E;	\
 	xorl	-48(r9),r5 ## E;	\
 	xorl	-44(r9),r1 ## E;	\
 	xorl	-40(r9),r6 ## E;	\
--- a/include/crypto/aes.h
+++ b/include/crypto/aes.h
@@ -18,9 +18,9 @@
 #define AES_MAX_KEYLENGTH_U32	(AES_MAX_KEYLENGTH / sizeof(u32))
 
 struct crypto_aes_ctx {
-	u32 key_length;
 	u32 key_enc[AES_MAX_KEYLENGTH_U32];
 	u32 key_dec[AES_MAX_KEYLENGTH_U32];
+	u32 key_length;
 };
 
 extern const u32 crypto_ft_tab[4][256];


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: [RFC PATCH crypto 1/4] AES-NI: Move key_length in struct crypto_aes_ctx to be the last field

[Herbert Xu]

On Mon, Jan 05, 2009 at 10:02:07AM +0800, Huang Ying wrote:
> The Intel AES-NI AES acceleration instructions need key_enc, key_dec
> in struct crypto_aes_ctx to be 16 byte aligned, it make this easier to
> move key_length to be the last one.
> 
> Signed-off-by: Huang Ying <ying.huang@intel.com>

Patch applied.
  
>  struct crypto_aes_ctx {
> -	u32 key_length;
>  	u32 key_enc[AES_MAX_KEYLENGTH_U32];
>  	u32 key_dec[AES_MAX_KEYLENGTH_U32];
> +	u32 key_length;
>  };

I added a comment here so people don't break this down the track.

+/*
+ * Please ensure that the first two fields are 16-byte aligned
+ * relative to the start of the structure, i.e., don't move them!
+ */

Thanks,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt