Skip to content

Commit 94330fb

Browse files
ardbiesheuvelherbertx
ardbiesheuvel
authored and
herbertx
committed
crypto: x86/sha - Use local .L symbols for code
Avoid cluttering up the kallsyms symbol table with entries that should not end up in things like backtraces, as they have undescriptive and generated identifiers. Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
1 parent 9ac589c commit 94330fb

File tree

7 files changed

+57
-68
lines changed

7 files changed

+57
-68
lines changed

‎arch/x86/crypto/sha1_avx2_x86_64_asm.S

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -485,18 +485,18 @@
485485
xchg WK_BUF, PRECALC_BUF
486486

487487
.align 32
488-
_loop:
488+
.L_loop:
489489
/*
490490
* code loops through more than one block
491491
* we use K_BASE value as a signal of a last block,
492492
* it is set below by: cmovae BUFFER_PTR, K_BASE
493493
*/
494494
test BLOCKS_CTR, BLOCKS_CTR
495-
jnz _begin
495+
jnz .L_begin
496496
.align 32
497-
jmp _end
497+
jmp .L_end
498498
.align 32
499-
_begin:
499+
.L_begin:
500500

501501
/*
502502
* Do first block
@@ -508,9 +508,6 @@ _begin:
508508
.set j, j+2
509509
.endr
510510

511-
jmp _loop0
512-
_loop0:
513-
514511
/*
515512
* rounds:
516513
* 10,12,14,16,18
@@ -545,7 +542,7 @@ _loop0:
545542
UPDATE_HASH 16(HASH_PTR), E
546543

547544
test BLOCKS_CTR, BLOCKS_CTR
548-
jz _loop
545+
jz .L_loop
549546

550547
mov TB, B
551548

@@ -562,8 +559,6 @@ _loop0:
562559
.set j, j+2
563560
.endr
564561

565-
jmp _loop1
566-
_loop1:
567562
/*
568563
* rounds
569564
* 20+80,22+80,24+80,26+80,28+80
@@ -574,9 +569,6 @@ _loop1:
574569
.set j, j+2
575570
.endr
576571

577-
jmp _loop2
578-
_loop2:
579-
580572
/*
581573
* rounds
582574
* 40+80,42+80,44+80,46+80,48+80
@@ -592,9 +584,6 @@ _loop2:
592584
/* Move to the next block only if needed*/
593585
ADD_IF_GE BUFFER_PTR2, BLOCKS_CTR, 4, 128
594586

595-
jmp _loop3
596-
_loop3:
597-
598587
/*
599588
* rounds
600589
* 60+80,62+80,64+80,66+80,68+80
@@ -623,10 +612,10 @@ _loop3:
623612

624613
xchg WK_BUF, PRECALC_BUF
625614

626-
jmp _loop
615+
jmp .L_loop
627616

628617
.align 32
629-
_end:
618+
.L_end:
630619

631620
.endm
632621
/*

‎arch/x86/crypto/sha256-avx-asm.S

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ SYM_TYPED_FUNC_START(sha256_transform_avx)
360360
and $~15, %rsp # align stack pointer
361361

362362
shl $6, NUM_BLKS # convert to bytes
363-
jz done_hash
363+
jz .Ldone_hash
364364
add INP, NUM_BLKS # pointer to end of data
365365
mov NUM_BLKS, _INP_END(%rsp)
366366

@@ -377,7 +377,7 @@ SYM_TYPED_FUNC_START(sha256_transform_avx)
377377
vmovdqa PSHUFFLE_BYTE_FLIP_MASK(%rip), BYTE_FLIP_MASK
378378
vmovdqa _SHUF_00BA(%rip), SHUF_00BA
379379
vmovdqa _SHUF_DC00(%rip), SHUF_DC00
380-
loop0:
380+
.Lloop0:
381381
lea K256(%rip), TBL
382382

383383
## byte swap first 16 dwords
@@ -391,7 +391,7 @@ loop0:
391391
## schedule 48 input dwords, by doing 3 rounds of 16 each
392392
mov $3, SRND
393393
.align 16
394-
loop1:
394+
.Lloop1:
395395
vpaddd (TBL), X0, XFER
396396
vmovdqa XFER, _XFER(%rsp)
397397
FOUR_ROUNDS_AND_SCHED
@@ -410,10 +410,10 @@ loop1:
410410
FOUR_ROUNDS_AND_SCHED
411411

412412
sub $1, SRND
413-
jne loop1
413+
jne .Lloop1
414414

415415
mov $2, SRND
416-
loop2:
416+
.Lloop2:
417417
vpaddd (TBL), X0, XFER
418418
vmovdqa XFER, _XFER(%rsp)
419419
DO_ROUND 0
@@ -433,7 +433,7 @@ loop2:
433433
vmovdqa X3, X1
434434

435435
sub $1, SRND
436-
jne loop2
436+
jne .Lloop2
437437

438438
addm (4*0)(CTX),a
439439
addm (4*1)(CTX),b
@@ -447,9 +447,9 @@ loop2:
447447
mov _INP(%rsp), INP
448448
add $64, INP
449449
cmp _INP_END(%rsp), INP
450-
jne loop0
450+
jne .Lloop0
451451

452-
done_hash:
452+
.Ldone_hash:
453453

454454
mov %rbp, %rsp
455455
popq %rbp

‎arch/x86/crypto/sha256-avx2-asm.S

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -538,12 +538,12 @@ SYM_TYPED_FUNC_START(sha256_transform_rorx)
538538
and $-32, %rsp # align rsp to 32 byte boundary
539539

540540
shl $6, NUM_BLKS # convert to bytes
541-
jz done_hash
541+
jz .Ldone_hash
542542
lea -64(INP, NUM_BLKS), NUM_BLKS # pointer to last block
543543
mov NUM_BLKS, _INP_END(%rsp)
544544

545545
cmp NUM_BLKS, INP
546-
je only_one_block
546+
je .Lonly_one_block
547547

548548
## load initial digest
549549
mov (CTX), a
@@ -561,7 +561,7 @@ SYM_TYPED_FUNC_START(sha256_transform_rorx)
561561

562562
mov CTX, _CTX(%rsp)
563563

564-
loop0:
564+
.Lloop0:
565565
## Load first 16 dwords from two blocks
566566
VMOVDQ 0*32(INP),XTMP0
567567
VMOVDQ 1*32(INP),XTMP1
@@ -580,15 +580,15 @@ loop0:
580580
vperm2i128 $0x20, XTMP3, XTMP1, X2
581581
vperm2i128 $0x31, XTMP3, XTMP1, X3
582582

583-
last_block_enter:
583+
.Llast_block_enter:
584584
add $64, INP
585585
mov INP, _INP(%rsp)
586586

587587
## schedule 48 input dwords, by doing 3 rounds of 12 each
588588
xor SRND, SRND
589589

590590
.align 16
591-
loop1:
591+
.Lloop1:
592592
leaq K256+0*32(%rip), INP ## reuse INP as scratch reg
593593
vpaddd (INP, SRND), X0, XFER
594594
vmovdqa XFER, 0*32+_XFER(%rsp, SRND)
@@ -611,9 +611,9 @@ loop1:
611611

612612
add $4*32, SRND
613613
cmp $3*4*32, SRND
614-
jb loop1
614+
jb .Lloop1
615615

616-
loop2:
616+
.Lloop2:
617617
## Do last 16 rounds with no scheduling
618618
leaq K256+0*32(%rip), INP
619619
vpaddd (INP, SRND), X0, XFER
@@ -630,7 +630,7 @@ loop2:
630630
vmovdqa X3, X1
631631

632632
cmp $4*4*32, SRND
633-
jb loop2
633+
jb .Lloop2
634634

635635
mov _CTX(%rsp), CTX
636636
mov _INP(%rsp), INP
@@ -645,17 +645,17 @@ loop2:
645645
addm (4*7)(CTX),h
646646

647647
cmp _INP_END(%rsp), INP
648-
ja done_hash
648+
ja .Ldone_hash
649649

650650
#### Do second block using previously scheduled results
651651
xor SRND, SRND
652652
.align 16
653-
loop3:
653+
.Lloop3:
654654
DO_4ROUNDS _XFER + 0*32 + 16
655655
DO_4ROUNDS _XFER + 1*32 + 16
656656
add $2*32, SRND
657657
cmp $4*4*32, SRND
658-
jb loop3
658+
jb .Lloop3
659659

660660
mov _CTX(%rsp), CTX
661661
mov _INP(%rsp), INP
@@ -671,10 +671,10 @@ loop3:
671671
addm (4*7)(CTX),h
672672

673673
cmp _INP_END(%rsp), INP
674-
jb loop0
675-
ja done_hash
674+
jb .Lloop0
675+
ja .Ldone_hash
676676

677-
do_last_block:
677+
.Ldo_last_block:
678678
VMOVDQ 0*16(INP),XWORD0
679679
VMOVDQ 1*16(INP),XWORD1
680680
VMOVDQ 2*16(INP),XWORD2
@@ -685,9 +685,9 @@ do_last_block:
685685
vpshufb X_BYTE_FLIP_MASK, XWORD2, XWORD2
686686
vpshufb X_BYTE_FLIP_MASK, XWORD3, XWORD3
687687

688-
jmp last_block_enter
688+
jmp .Llast_block_enter
689689

690-
only_one_block:
690+
.Lonly_one_block:
691691

692692
## load initial digest
693693
mov (4*0)(CTX),a
@@ -704,9 +704,9 @@ only_one_block:
704704
vmovdqa _SHUF_DC00(%rip), SHUF_DC00
705705

706706
mov CTX, _CTX(%rsp)
707-
jmp do_last_block
707+
jmp .Ldo_last_block
708708

709-
done_hash:
709+
.Ldone_hash:
710710

711711
mov %rbp, %rsp
712712
pop %rbp

‎arch/x86/crypto/sha256-ssse3-asm.S

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ SYM_TYPED_FUNC_START(sha256_transform_ssse3)
369369
and $~15, %rsp
370370

371371
shl $6, NUM_BLKS # convert to bytes
372-
jz done_hash
372+
jz .Ldone_hash
373373
add INP, NUM_BLKS
374374
mov NUM_BLKS, _INP_END(%rsp) # pointer to end of data
375375

@@ -387,7 +387,7 @@ SYM_TYPED_FUNC_START(sha256_transform_ssse3)
387387
movdqa _SHUF_00BA(%rip), SHUF_00BA
388388
movdqa _SHUF_DC00(%rip), SHUF_DC00
389389

390-
loop0:
390+
.Lloop0:
391391
lea K256(%rip), TBL
392392

393393
## byte swap first 16 dwords
@@ -401,7 +401,7 @@ loop0:
401401
## schedule 48 input dwords, by doing 3 rounds of 16 each
402402
mov $3, SRND
403403
.align 16
404-
loop1:
404+
.Lloop1:
405405
movdqa (TBL), XFER
406406
paddd X0, XFER
407407
movdqa XFER, _XFER(%rsp)
@@ -424,10 +424,10 @@ loop1:
424424
FOUR_ROUNDS_AND_SCHED
425425

426426
sub $1, SRND
427-
jne loop1
427+
jne .Lloop1
428428

429429
mov $2, SRND
430-
loop2:
430+
.Lloop2:
431431
paddd (TBL), X0
432432
movdqa X0, _XFER(%rsp)
433433
DO_ROUND 0
@@ -446,7 +446,7 @@ loop2:
446446
movdqa X3, X1
447447

448448
sub $1, SRND
449-
jne loop2
449+
jne .Lloop2
450450

451451
addm (4*0)(CTX),a
452452
addm (4*1)(CTX),b
@@ -460,9 +460,9 @@ loop2:
460460
mov _INP(%rsp), INP
461461
add $64, INP
462462
cmp _INP_END(%rsp), INP
463-
jne loop0
463+
jne .Lloop0
464464

465-
done_hash:
465+
.Ldone_hash:
466466

467467
mov %rbp, %rsp
468468
popq %rbp

‎arch/x86/crypto/sha512-avx-asm.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ frame_size = frame_WK + WK_SIZE
276276
########################################################################
277277
SYM_TYPED_FUNC_START(sha512_transform_avx)
278278
test msglen, msglen
279-
je nowork
279+
je .Lnowork
280280

281281
# Save GPRs
282282
push %rbx
@@ -291,7 +291,7 @@ SYM_TYPED_FUNC_START(sha512_transform_avx)
291291
sub $frame_size, %rsp
292292
and $~(0x20 - 1), %rsp
293293

294-
updateblock:
294+
.Lupdateblock:
295295

296296
# Load state variables
297297
mov DIGEST(0), a_64
@@ -348,7 +348,7 @@ updateblock:
348348
# Advance to next message block
349349
add $16*8, msg
350350
dec msglen
351-
jnz updateblock
351+
jnz .Lupdateblock
352352

353353
# Restore Stack Pointer
354354
mov %rbp, %rsp
@@ -361,7 +361,7 @@ updateblock:
361361
pop %r12
362362
pop %rbx
363363

364-
nowork:
364+
.Lnowork:
365365
RET
366366
SYM_FUNC_END(sha512_transform_avx)
367367

0 commit comments

Comments
 (0)