Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

ICP: Add missing stack frame info to SHA asm files 

Since the assembly routines calculating SHA checksums don't use
a standard stack layout, CFI directives are needed to unroll the
stack.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Attila Fülöp <attila@fueloep.org>
Closes #11733
This commit is contained in:
Attila Fülöp 2021-04-17 00:11:26 +02:00 committed by Brian Behlendorf
parent d2ff2196a5
commit b9d862f2db
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
module/icp/asm-x86_64/sha2/sha256_impl.S
View File

@ -83,12 +83,21 @@ SHA256TransformBlocks(SHA2_CTX *ctx, const void *in, size_t num)
#include <sys/asm_linkage.h> #include <sys/asm_linkage.h>
ENTRY_NP(SHA256TransformBlocks) ENTRY_NP(SHA256TransformBlocks)
.cfi_startproc
movq %rsp, %rax
.cfi_def_cfa_register %rax
push %rbx push %rbx
.cfi_offset %rbx,-16
push %rbp push %rbp
.cfi_offset %rbp,-24
push %r12 push %r12
.cfi_offset %r12,-32
push %r13 push %r13
.cfi_offset %r13,-40
push %r14 push %r14
.cfi_offset %r14,-48
push %r15 push %r15
.cfi_offset %r15,-56
mov %rsp,%rbp # copy %rsp mov %rsp,%rbp # copy %rsp
shl $4,%rdx # num*16 shl $4,%rdx # num*16
sub $16*4+4*8,%rsp sub $16*4+4*8,%rsp
@ -99,6 +108,9 @@ ENTRY_NP(SHA256TransformBlocks)
mov %rsi,16*4+1*8(%rsp) # save inp, 2nd arg mov %rsi,16*4+1*8(%rsp) # save inp, 2nd arg
mov %rdx,16*4+2*8(%rsp) # save end pointer, "3rd" arg mov %rdx,16*4+2*8(%rsp) # save end pointer, "3rd" arg
mov %rbp,16*4+3*8(%rsp) # save copy of %rsp mov %rbp,16*4+3*8(%rsp) # save copy of %rsp
# echo ".cfi_cfa_expression %rsp+88,deref,+56" |
# openssl/crypto/perlasm/x86_64-xlate.pl
.cfi_escape 0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x38
#.picmeup %rbp #.picmeup %rbp
# The .picmeup pseudo-directive, from perlasm/x86_64_xlate.pl, puts # The .picmeup pseudo-directive, from perlasm/x86_64_xlate.pl, puts
@ -2026,14 +2038,28 @@ ENTRY_NP(SHA256TransformBlocks)
jb .Lloop jb .Lloop
mov 16*4+3*8(%rsp),%rsp mov 16*4+3*8(%rsp),%rsp
.cfi_def_cfa %rsp,56
pop %r15 pop %r15
.cfi_adjust_cfa_offset -8
.cfi_restore %r15
pop %r14 pop %r14
.cfi_adjust_cfa_offset -8
.cfi_restore %r14
pop %r13 pop %r13
.cfi_adjust_cfa_offset -8
.cfi_restore %r13
pop %r12 pop %r12
.cfi_adjust_cfa_offset -8
.cfi_restore %r12
pop %rbp pop %rbp
.cfi_adjust_cfa_offset -8
.cfi_restore %rbp
pop %rbx pop %rbx
.cfi_adjust_cfa_offset -8
.cfi_restore %rbx
ret ret
.cfi_endproc
SET_SIZE(SHA256TransformBlocks) SET_SIZE(SHA256TransformBlocks)
.data .data

26
module/icp/asm-x86_64/sha2/sha512_impl.S
View File

@ -84,12 +84,21 @@ SHA512TransformBlocks(SHA2_CTX *ctx, const void *in, size_t num)
#include <sys/asm_linkage.h> #include <sys/asm_linkage.h>
ENTRY_NP(SHA512TransformBlocks) ENTRY_NP(SHA512TransformBlocks)
.cfi_startproc
movq %rsp, %rax
.cfi_def_cfa_register %rax
push %rbx push %rbx
.cfi_offset %rbx,-16
push %rbp push %rbp
.cfi_offset %rbp,-24
push %r12 push %r12
.cfi_offset %r12,-32
push %r13 push %r13
.cfi_offset %r13,-40
push %r14 push %r14
.cfi_offset %r14,-48
push %r15 push %r15
.cfi_offset %r15,-56
mov %rsp,%rbp # copy %rsp mov %rsp,%rbp # copy %rsp
shl $4,%rdx # num*16 shl $4,%rdx # num*16
sub $16*8+4*8,%rsp sub $16*8+4*8,%rsp
@ -100,6 +109,9 @@ ENTRY_NP(SHA512TransformBlocks)
mov %rsi,16*8+1*8(%rsp) # save inp, 2nd arg mov %rsi,16*8+1*8(%rsp) # save inp, 2nd arg
mov %rdx,16*8+2*8(%rsp) # save end pointer, "3rd" arg mov %rdx,16*8+2*8(%rsp) # save end pointer, "3rd" arg
mov %rbp,16*8+3*8(%rsp) # save copy of %rsp mov %rbp,16*8+3*8(%rsp) # save copy of %rsp
# echo ".cfi_cfa_expression %rsp+152,deref,+56" |
# openssl/crypto/perlasm/x86_64-xlate.pl
.cfi_escape 0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x38
#.picmeup %rbp #.picmeup %rbp
# The .picmeup pseudo-directive, from perlasm/x86_64_xlate.pl, puts # The .picmeup pseudo-directive, from perlasm/x86_64_xlate.pl, puts
@ -2027,14 +2039,28 @@ ENTRY_NP(SHA512TransformBlocks)
jb .Lloop jb .Lloop
mov 16*8+3*8(%rsp),%rsp mov 16*8+3*8(%rsp),%rsp
.cfi_def_cfa %rsp,56
pop %r15 pop %r15
.cfi_adjust_cfa_offset -8
.cfi_restore %r15
pop %r14 pop %r14
.cfi_adjust_cfa_offset -8
.cfi_restore %r14
pop %r13 pop %r13
.cfi_adjust_cfa_offset -8
.cfi_restore %r13
pop %r12 pop %r12
.cfi_adjust_cfa_offset -8
.cfi_restore %r12
pop %rbp pop %rbp
.cfi_adjust_cfa_offset -8
.cfi_restore %rbp
pop %rbx pop %rbx
.cfi_adjust_cfa_offset -8
.cfi_restore %rbx
ret ret
.cfi_endproc
SET_SIZE(SHA512TransformBlocks) SET_SIZE(SHA512TransformBlocks)
.data .data