* GPF in aesni_xts_crypt8 (3.10-rc5) @ 2013-06-11 17:26 Dave Jones 2013-06-11 19:01 ` Jussi Kivilinna 0 siblings, 1 reply; 5+ messages in thread From: Dave Jones @ 2013-06-11 17:26 UTC (permalink / raw) To: Linux Kernel; +Cc: jussi.kivilinna, herbert Just found that 3.10-rc doesn't boot on my laptop with encrypted disk. general protection fault: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC Modules linked in: xfs libcrc32c dm_crypt crc32c_intel ghash_clmulni_intel aesni_intel glue_helper ablk_helper i915 i2c_algo_bit drm_kms_helper drm i2c_core video CPU: 1 PID: 53 Comm: kworker/1:1 Not tainted 3.10.0-rc5+ #5 Hardware name: LENOVO 2356JK8/2356JK8, BIOS G7ET94WW (2.54 ) 04/30/2013 Workqueue: kcryptd kcryptd_crypt [dm_crypt] task: ffff880135c58000 ti: ffff880135c54000 task.ti: ffff880135c54000 RIP: 0010:[<ffffffffa01433a2>] [<ffffffffa01433a2>] aesni_xts_crypt8+0x42/0x1e0 [aesni_intel] RSP: 0018:ffff880135c55b68 EFLAGS: 00010282 RAX: ffffffffa0142eb8 RBX: 0000000000000080 RCX: 00000000000000f0 RDX: ffff8801316eeaa8 RSI: ffff8801316eeaa8 RDI: ffff88012fd84440 RBP: ffff880135c55b70 R08: ffff8801304fe118 R09: 0000000000000020 R10: 00000000000000f0 R11: ffffffffa0142eb8 R12: ffff8801316eeb28 R13: 0000000000000080 R14: ffff8801316eeb28 R15: 0000000000000180 FS: 0000000000000000(0000) GS:ffff880139400000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000039e88bc720 CR3: 0000000001c0b000 CR4: 00000000001407e0 Stack: ffffffffa0143683 ffff880135c55c40 ffffffffa00602fb ffff880135c55c70 ffffffffa0146060 0000000001ad0190 ffffffffa0146060 ffffea0004c5bb80 ffff8801316eeaa8 ffffea0004c5bb80 ffff8801316eeaa8 ffff8801304fe0c0 Call Trace: [<ffffffffa0143683>] ? aesni_xts_dec8+0x13/0x20 [aesni_intel] [<ffffffffa00602fb>] glue_xts_crypt_128bit+0x10b/0x1c0 [glue_helper] [<ffffffffa014358b>] xts_decrypt+0x4b/0x50 [aesni_intel] [<ffffffffa000617f>] ablk_decrypt+0x4f/0xd0 [ablk_helper] [<ffffffffa0067202>] crypt_convert+0x352/0x3b0 [dm_crypt] [<ffffffffa00675b5>] kcryptd_crypt+0x355/0x4e0 [dm_crypt] [<ffffffff81061b35>] ? process_one_work+0x1a5/0x700 [<ffffffff81061ba1>] process_one_work+0x211/0x700 [<ffffffff81061b35>] ? process_one_work+0x1a5/0x700 [<ffffffff810621ab>] worker_thread+0x11b/0x3a0 [<ffffffff81062090>] ? process_one_work+0x700/0x700 [<ffffffff81069f4d>] kthread+0xed/0x100 [<ffffffff81069e60>] ? insert_kthread_work+0x80/0x80 [<ffffffff815fd41c>] ret_from_fork+0x7c/0xb0 [<ffffffff81069e60>] ? insert_kthread_work+0x80/0x80 Code: 8d 04 25 b8 2e 14 a0 41 0f 44 ca 4c 0f 44 d8 66 44 0f 6f 14 25 00 70 14 a0 41 0f 10 18 44 8b 8f e0 01 00 00 48 01 cf 66 0f 6f c3 <66> 0f ef 02 f3 0f 7f 1e 66 44 0f 70 db 13 66 0f d4 db 66 41 0f RIP [<ffffffffa01433a2>] aesni_xts_crypt8+0x42/0x1e0 [aesni_intel] RSP <ffff880135c55b68> 0: 8d 04 25 b8 2e 14 a0 lea 0xffffffffa0142eb8,%eax 7: 41 0f 44 ca cmove %r10d,%ecx b: 4c 0f 44 d8 cmove %rax,%r11 f: 66 44 0f 6f 14 25 00 movdqa 0xffffffffa0147000,%xmm10 16: 70 14 a0 19: 41 0f 10 18 movups (%r8),%xmm3 1d: 44 8b 8f e0 01 00 00 mov 0x1e0(%rdi),%r9d 24: 48 01 cf add %rcx,%rdi 27: 66 0f 6f c3 movdqa %xmm3,%xmm0 2b:* 66 0f ef 02 pxor (%rdx),%xmm0 <-- trapping instruction 2f: f3 0f 7f 1e movdqu %xmm3,(%rsi) 33: 66 44 0f 70 db 13 pshufd $0x13,%xmm3,%xmm11 39: 66 0f d4 db paddq %xmm3,%xmm3 3d: 66 data16 3e: 41 rex.B 3f: ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: GPF in aesni_xts_crypt8 (3.10-rc5) 2013-06-11 17:26 GPF in aesni_xts_crypt8 (3.10-rc5) Dave Jones @ 2013-06-11 19:01 ` Jussi Kivilinna 2013-06-11 19:17 ` Dave Jones 0 siblings, 1 reply; 5+ messages in thread From: Jussi Kivilinna @ 2013-06-11 19:01 UTC (permalink / raw) To: Dave Jones, Linux Kernel, herbert, linux-crypto@vger.kernel.org [-- Attachment #1: Type: text/plain, Size: 3479 bytes --] Hello, Does attached patch help? -Jussi On 11.06.2013 20:26, Dave Jones wrote: > Just found that 3.10-rc doesn't boot on my laptop with encrypted disk. > > > general protection fault: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC > Modules linked in: xfs libcrc32c dm_crypt crc32c_intel ghash_clmulni_intel aesni_intel glue_helper ablk_helper i915 i2c_algo_bit drm_kms_helper drm i2c_core video > CPU: 1 PID: 53 Comm: kworker/1:1 Not tainted 3.10.0-rc5+ #5 > Hardware name: LENOVO 2356JK8/2356JK8, BIOS G7ET94WW (2.54 ) 04/30/2013 > Workqueue: kcryptd kcryptd_crypt [dm_crypt] > task: ffff880135c58000 ti: ffff880135c54000 task.ti: ffff880135c54000 > RIP: 0010:[<ffffffffa01433a2>] [<ffffffffa01433a2>] aesni_xts_crypt8+0x42/0x1e0 [aesni_intel] > RSP: 0018:ffff880135c55b68 EFLAGS: 00010282 > RAX: ffffffffa0142eb8 RBX: 0000000000000080 RCX: 00000000000000f0 > RDX: ffff8801316eeaa8 RSI: ffff8801316eeaa8 RDI: ffff88012fd84440 > RBP: ffff880135c55b70 R08: ffff8801304fe118 R09: 0000000000000020 > R10: 00000000000000f0 R11: ffffffffa0142eb8 R12: ffff8801316eeb28 > R13: 0000000000000080 R14: ffff8801316eeb28 R15: 0000000000000180 > FS: 0000000000000000(0000) GS:ffff880139400000(0000) knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 00000039e88bc720 CR3: 0000000001c0b000 CR4: 00000000001407e0 > Stack: > ffffffffa0143683 ffff880135c55c40 ffffffffa00602fb ffff880135c55c70 > ffffffffa0146060 0000000001ad0190 ffffffffa0146060 ffffea0004c5bb80 > ffff8801316eeaa8 ffffea0004c5bb80 ffff8801316eeaa8 ffff8801304fe0c0 > Call Trace: > [<ffffffffa0143683>] ? aesni_xts_dec8+0x13/0x20 [aesni_intel] > [<ffffffffa00602fb>] glue_xts_crypt_128bit+0x10b/0x1c0 [glue_helper] > [<ffffffffa014358b>] xts_decrypt+0x4b/0x50 [aesni_intel] > [<ffffffffa000617f>] ablk_decrypt+0x4f/0xd0 [ablk_helper] > [<ffffffffa0067202>] crypt_convert+0x352/0x3b0 [dm_crypt] > [<ffffffffa00675b5>] kcryptd_crypt+0x355/0x4e0 [dm_crypt] > [<ffffffff81061b35>] ? process_one_work+0x1a5/0x700 > [<ffffffff81061ba1>] process_one_work+0x211/0x700 > [<ffffffff81061b35>] ? process_one_work+0x1a5/0x700 > [<ffffffff810621ab>] worker_thread+0x11b/0x3a0 > [<ffffffff81062090>] ? process_one_work+0x700/0x700 > [<ffffffff81069f4d>] kthread+0xed/0x100 > [<ffffffff81069e60>] ? insert_kthread_work+0x80/0x80 > [<ffffffff815fd41c>] ret_from_fork+0x7c/0xb0 > [<ffffffff81069e60>] ? insert_kthread_work+0x80/0x80 > Code: 8d 04 25 b8 2e 14 a0 41 0f 44 ca 4c 0f 44 d8 66 44 0f 6f 14 25 00 70 14 a0 41 0f 10 18 44 8b 8f e0 01 00 00 48 01 cf 66 0f 6f c3 <66> 0f ef 02 f3 0f 7f 1e 66 44 0f 70 db 13 66 0f d4 db 66 41 0f > RIP [<ffffffffa01433a2>] aesni_xts_crypt8+0x42/0x1e0 [aesni_intel] > RSP <ffff880135c55b68> > > 0: 8d 04 25 b8 2e 14 a0 lea 0xffffffffa0142eb8,%eax > 7: 41 0f 44 ca cmove %r10d,%ecx > b: 4c 0f 44 d8 cmove %rax,%r11 > f: 66 44 0f 6f 14 25 00 movdqa 0xffffffffa0147000,%xmm10 > 16: 70 14 a0 > 19: 41 0f 10 18 movups (%r8),%xmm3 > 1d: 44 8b 8f e0 01 00 00 mov 0x1e0(%rdi),%r9d > 24: 48 01 cf add %rcx,%rdi > 27: 66 0f 6f c3 movdqa %xmm3,%xmm0 > 2b:* 66 0f ef 02 pxor (%rdx),%xmm0 <-- trapping instruction > 2f: f3 0f 7f 1e movdqu %xmm3,(%rsi) > 33: 66 44 0f 70 db 13 pshufd $0x13,%xmm3,%xmm11 > 39: 66 0f d4 db paddq %xmm3,%xmm3 > 3d: 66 data16 > 3e: 41 rex.B > 3f: > > [-- Attachment #2: 05-aesni_intel-xts-fix-unaligned-mem-access.patch --] [-- Type: text/x-patch, Size: 2876 bytes --] crypto: aesni_intel - fix accessing of unaligned memory From: Jussi Kivilinna <jussi.kivilinna@iki.fi> The new XTS code for aesni_intel uses input buffers directly as memory operands for pxor instructions, which causes crash if those buffers are not aligned to 16 bytes. Patch change XTS code to handle unaligned memory correctly, by loading memory with movdqu instead. Reported-by: Dave Jones <davej@redhat.com> Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> --- arch/x86/crypto/aesni-intel_asm.S | 48 +++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S index 62fe22c..477e9d7 100644 --- a/arch/x86/crypto/aesni-intel_asm.S +++ b/arch/x86/crypto/aesni-intel_asm.S @@ -2681,56 +2681,68 @@ ENTRY(aesni_xts_crypt8) addq %rcx, KEYP movdqa IV, STATE1 - pxor 0x00(INP), STATE1 + movdqu 0x00(INP), INC + pxor INC, STATE1 movdqu IV, 0x00(OUTP) _aesni_gf128mul_x_ble() movdqa IV, STATE2 - pxor 0x10(INP), STATE2 + movdqu 0x10(INP), INC + pxor INC, STATE2 movdqu IV, 0x10(OUTP) _aesni_gf128mul_x_ble() movdqa IV, STATE3 - pxor 0x20(INP), STATE3 + movdqu 0x20(INP), INC + pxor INC, STATE3 movdqu IV, 0x20(OUTP) _aesni_gf128mul_x_ble() movdqa IV, STATE4 - pxor 0x30(INP), STATE4 + movdqu 0x30(INP), INC + pxor INC, STATE4 movdqu IV, 0x30(OUTP) call *%r11 - pxor 0x00(OUTP), STATE1 + movdqu 0x00(OUTP), INC + pxor INC, STATE1 movdqu STATE1, 0x00(OUTP) _aesni_gf128mul_x_ble() movdqa IV, STATE1 - pxor 0x40(INP), STATE1 + movdqu 0x40(INP), INC + pxor INC, STATE1 movdqu IV, 0x40(OUTP) - pxor 0x10(OUTP), STATE2 + movdqu 0x10(OUTP), INC + pxor INC, STATE2 movdqu STATE2, 0x10(OUTP) _aesni_gf128mul_x_ble() movdqa IV, STATE2 - pxor 0x50(INP), STATE2 + movdqu 0x50(INP), INC + pxor INC, STATE2 movdqu IV, 0x50(OUTP) - pxor 0x20(OUTP), STATE3 + movdqu 0x20(OUTP), INC + pxor INC, STATE3 movdqu STATE3, 0x20(OUTP) _aesni_gf128mul_x_ble() movdqa IV, STATE3 - pxor 0x60(INP), STATE3 + movdqu 0x60(INP), INC + pxor INC, STATE3 movdqu IV, 0x60(OUTP) - pxor 0x30(OUTP), STATE4 + movdqu 0x30(OUTP), INC + pxor INC, STATE4 movdqu STATE4, 0x30(OUTP) _aesni_gf128mul_x_ble() movdqa IV, STATE4 - pxor 0x70(INP), STATE4 + movdqu 0x70(INP), INC + pxor INC, STATE4 movdqu IV, 0x70(OUTP) _aesni_gf128mul_x_ble() @@ -2738,16 +2750,20 @@ ENTRY(aesni_xts_crypt8) call *%r11 - pxor 0x40(OUTP), STATE1 + movdqu 0x40(OUTP), INC + pxor INC, STATE1 movdqu STATE1, 0x40(OUTP) - pxor 0x50(OUTP), STATE2 + movdqu 0x50(OUTP), INC + pxor INC, STATE2 movdqu STATE2, 0x50(OUTP) - pxor 0x60(OUTP), STATE3 + movdqu 0x60(OUTP), INC + pxor INC, STATE3 movdqu STATE3, 0x60(OUTP) - pxor 0x70(OUTP), STATE4 + movdqu 0x70(OUTP), INC + pxor INC, STATE4 movdqu STATE4, 0x70(OUTP) ret ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: GPF in aesni_xts_crypt8 (3.10-rc5) 2013-06-11 19:01 ` Jussi Kivilinna @ 2013-06-11 19:17 ` Dave Jones 2013-06-11 19:25 ` [PATCH] crypto: aesni_intel - fix accessing of unaligned memory Jussi Kivilinna 0 siblings, 1 reply; 5+ messages in thread From: Dave Jones @ 2013-06-11 19:17 UTC (permalink / raw) To: Jussi Kivilinna; +Cc: Linux Kernel, herbert, linux-crypto@vger.kernel.org On Tue, Jun 11, 2013 at 10:01:01PM +0300, Jussi Kivilinna wrote: > Hello, > > Does attached patch help? > > crypto: aesni_intel - fix accessing of unaligned memory It does, thanks for the quick turnaround! Dave ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] crypto: aesni_intel - fix accessing of unaligned memory 2013-06-11 19:17 ` Dave Jones @ 2013-06-11 19:25 ` Jussi Kivilinna 2013-06-13 6:58 ` Herbert Xu 0 siblings, 1 reply; 5+ messages in thread From: Jussi Kivilinna @ 2013-06-11 19:25 UTC (permalink / raw) To: linux-crypto; +Cc: Dave Jones, David S. Miller, linux-kernel, Herbert Xu The new XTS code for aesni_intel uses input buffers directly as memory operands for pxor instructions, which causes crash if those buffers are not aligned to 16 bytes. Patch changes XTS code to handle unaligned memory correctly, by loading memory with movdqu instead. Reported-by: Dave Jones <davej@redhat.com> Tested-by: Dave Jones <davej@redhat.com> Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> --- arch/x86/crypto/aesni-intel_asm.S | 48 +++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S index 62fe22c..477e9d7 100644 --- a/arch/x86/crypto/aesni-intel_asm.S +++ b/arch/x86/crypto/aesni-intel_asm.S @@ -2681,56 +2681,68 @@ ENTRY(aesni_xts_crypt8) addq %rcx, KEYP movdqa IV, STATE1 - pxor 0x00(INP), STATE1 + movdqu 0x00(INP), INC + pxor INC, STATE1 movdqu IV, 0x00(OUTP) _aesni_gf128mul_x_ble() movdqa IV, STATE2 - pxor 0x10(INP), STATE2 + movdqu 0x10(INP), INC + pxor INC, STATE2 movdqu IV, 0x10(OUTP) _aesni_gf128mul_x_ble() movdqa IV, STATE3 - pxor 0x20(INP), STATE3 + movdqu 0x20(INP), INC + pxor INC, STATE3 movdqu IV, 0x20(OUTP) _aesni_gf128mul_x_ble() movdqa IV, STATE4 - pxor 0x30(INP), STATE4 + movdqu 0x30(INP), INC + pxor INC, STATE4 movdqu IV, 0x30(OUTP) call *%r11 - pxor 0x00(OUTP), STATE1 + movdqu 0x00(OUTP), INC + pxor INC, STATE1 movdqu STATE1, 0x00(OUTP) _aesni_gf128mul_x_ble() movdqa IV, STATE1 - pxor 0x40(INP), STATE1 + movdqu 0x40(INP), INC + pxor INC, STATE1 movdqu IV, 0x40(OUTP) - pxor 0x10(OUTP), STATE2 + movdqu 0x10(OUTP), INC + pxor INC, STATE2 movdqu STATE2, 0x10(OUTP) _aesni_gf128mul_x_ble() movdqa IV, STATE2 - pxor 0x50(INP), STATE2 + movdqu 0x50(INP), INC + pxor INC, STATE2 movdqu IV, 0x50(OUTP) - pxor 0x20(OUTP), STATE3 + movdqu 0x20(OUTP), INC + pxor INC, STATE3 movdqu STATE3, 0x20(OUTP) _aesni_gf128mul_x_ble() movdqa IV, STATE3 - pxor 0x60(INP), STATE3 + movdqu 0x60(INP), INC + pxor INC, STATE3 movdqu IV, 0x60(OUTP) - pxor 0x30(OUTP), STATE4 + movdqu 0x30(OUTP), INC + pxor INC, STATE4 movdqu STATE4, 0x30(OUTP) _aesni_gf128mul_x_ble() movdqa IV, STATE4 - pxor 0x70(INP), STATE4 + movdqu 0x70(INP), INC + pxor INC, STATE4 movdqu IV, 0x70(OUTP) _aesni_gf128mul_x_ble() @@ -2738,16 +2750,20 @@ ENTRY(aesni_xts_crypt8) call *%r11 - pxor 0x40(OUTP), STATE1 + movdqu 0x40(OUTP), INC + pxor INC, STATE1 movdqu STATE1, 0x40(OUTP) - pxor 0x50(OUTP), STATE2 + movdqu 0x50(OUTP), INC + pxor INC, STATE2 movdqu STATE2, 0x50(OUTP) - pxor 0x60(OUTP), STATE3 + movdqu 0x60(OUTP), INC + pxor INC, STATE3 movdqu STATE3, 0x60(OUTP) - pxor 0x70(OUTP), STATE4 + movdqu 0x70(OUTP), INC + pxor INC, STATE4 movdqu STATE4, 0x70(OUTP) ret ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] crypto: aesni_intel - fix accessing of unaligned memory 2013-06-11 19:25 ` [PATCH] crypto: aesni_intel - fix accessing of unaligned memory Jussi Kivilinna @ 2013-06-13 6:58 ` Herbert Xu 0 siblings, 0 replies; 5+ messages in thread From: Herbert Xu @ 2013-06-13 6:58 UTC (permalink / raw) To: Jussi Kivilinna; +Cc: linux-crypto, Dave Jones, David S. Miller, linux-kernel On Tue, Jun 11, 2013 at 10:25:22PM +0300, Jussi Kivilinna wrote: > The new XTS code for aesni_intel uses input buffers directly as memory operands > for pxor instructions, which causes crash if those buffers are not aligned to > 16 bytes. > > Patch changes XTS code to handle unaligned memory correctly, by loading memory > with movdqu instead. > > Reported-by: Dave Jones <davej@redhat.com> > Tested-by: Dave Jones <davej@redhat.com> > Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> Applied to crypto. 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-06-13 6:58 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-06-11 17:26 GPF in aesni_xts_crypt8 (3.10-rc5) Dave Jones 2013-06-11 19:01 ` Jussi Kivilinna 2013-06-11 19:17 ` Dave Jones 2013-06-11 19:25 ` [PATCH] crypto: aesni_intel - fix accessing of unaligned memory Jussi Kivilinna 2013-06-13 6:58 ` Herbert Xu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox