On Mon, Apr 8, 2019 at 4:42 PM Denys Vlasenko <dvlas...@redhat.com> wrote: > > On 4/8/19 4:34 PM, Sedat Dilek wrote: > > v2: > > > > sdi@iniza:~/src/linux-kernel/linux$ git --no-pager diff > > diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S > > b/arch/x86/crypto/camellia-aesni-avx-asm_64.S > > index a14af6eb09cb..712d6a7e8b8f 100644 > > --- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S > > +++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S > > @@ -573,8 +573,12 @@ > > ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab) > > vmovdqu y7, 15 * 16(rio); > > > > > > -/* NB: section is mergeable, all elements must be aligned 16-byte blocks */ > > -.section .rodata.cst16, "aM", @progbits, 16 > > +/* > > + * NB: section is mergeable, all elements must be aligned 16-byte blocks > > + * There is more than one object in this section, let's use module name > > + * instead of object name as unique suffix > > + */ > > +.section .rodata.cst16.camellia_aesni_avx_asm_64, "aM", @progbits, > > 16 > > .align 16 > > > > #define SHUFB_BYTES(idx) \ > > diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S > > b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S > > index b66bbfa62f50..34f6b0c4196d 100644 > > --- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S > > +++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S > > @@ -626,8 +626,12 @@ > > ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab) > > .long 0x00010203, 0x04050607, 0x80808080, 0x80808080 > > .long 0x00010203, 0x04050607, 0x80808080, 0x80808080 > > > > -/* NB: section is mergeable, all elements must be aligned 16-byte blocks */ > > -.section .rodata.cst16, "aM", @progbits, 16 > > +/* > > + * NB: section is mergeable, all elements must be aligned 16-byte blocks > > + * There is more than one object in this section, let's use module name > > + * instead of object name as unique suffix > > +*/ > > +.section .rodata.cst16.ccamellia_aesni_avx2_asm_64, "aM", > > @progbits, 16 > > why "ccamellia", not "camellia"? >
Grrr. > > I tried to check for the .rodata.cst32 case, how do I identify the *.S > > files? > > ? > > Looks like all .rodata.cst32 sections have suffixes, nothing to fix. $ for i in .rodata.cst32.pack_bswap .rodata.cst32.shufb_16x16b .rodata.cst32.CTR2BL .rodata.cst32.CTR4BL .rodata.cst32.CTRINC .rodata.cst32.ROT16 .rodata.cst32.ROT8 .rodata.cst32.CTR2BL .rodata.cst32.CTR4BL .rodata.cst32.CTR8BL .rodata.cst32.pshufb_shf_table .rodata.cst32.morus1280_const .rodata.cst32.morus1280_counter .rodata.cst32.ANMASK .rodata.cst32.ORMASK .rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK .rodata.cst32._SHUF_00BA .rodata.cst32._SHUF_DC00 .rodata.cst32.MASK_YMM_LO .rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK ; do echo [ "$i" ] ; git grep $i arch/x86 ; echo [ "/$i" ] ; echo "" ; done [ .rodata.cst32.pack_bswap ] arch/x86/crypto/camellia-aesni-avx2-asm_64.S:.section .rodata.cst32.pack_bswap, "aM", @progbits, 32 [ /.rodata.cst32.pack_bswap ] [ .rodata.cst32.shufb_16x16b ] arch/x86/crypto/camellia-aesni-avx2-asm_64.S:.section .rodata.cst32.shufb_16x16b, "aM", @progbits, 32 [ /.rodata.cst32.shufb_16x16b ] [ .rodata.cst32.CTR2BL ] arch/x86/crypto/chacha-avx2-x86_64.S:.section .rodata.cst32.CTR2BL, "aM", @progbits, 32 arch/x86/crypto/chacha-avx512vl-x86_64.S:.section .rodata.cst32.CTR2BL, "aM", @progbits, 32 [ /.rodata.cst32.CTR2BL ] [ .rodata.cst32.CTR4BL ] arch/x86/crypto/chacha-avx2-x86_64.S:.section .rodata.cst32.CTR4BL, "aM", @progbits, 32 arch/x86/crypto/chacha-avx512vl-x86_64.S:.section .rodata.cst32.CTR4BL, "aM", @progbits, 32 [ /.rodata.cst32.CTR4BL ] [ .rodata.cst32.CTRINC ] arch/x86/crypto/chacha-avx2-x86_64.S:.section .rodata.cst32.CTRINC, "aM", @progbits, 32 [ /.rodata.cst32.CTRINC ] [ .rodata.cst32.ROT16 ] arch/x86/crypto/chacha-avx2-x86_64.S:.section .rodata.cst32.ROT16, "aM", @progbits, 32 [ /.rodata.cst32.ROT16 ] [ .rodata.cst32.ROT8 ] arch/x86/crypto/chacha-avx2-x86_64.S:.section .rodata.cst32.ROT8, "aM", @progbits, 32 [ /.rodata.cst32.ROT8 ] [ .rodata.cst32.CTR2BL ] arch/x86/crypto/chacha-avx2-x86_64.S:.section .rodata.cst32.CTR2BL, "aM", @progbits, 32 arch/x86/crypto/chacha-avx512vl-x86_64.S:.section .rodata.cst32.CTR2BL, "aM", @progbits, 32 [ /.rodata.cst32.CTR2BL ] [ .rodata.cst32.CTR4BL ] arch/x86/crypto/chacha-avx2-x86_64.S:.section .rodata.cst32.CTR4BL, "aM", @progbits, 32 arch/x86/crypto/chacha-avx512vl-x86_64.S:.section .rodata.cst32.CTR4BL, "aM", @progbits, 32 [ /.rodata.cst32.CTR4BL ] [ .rodata.cst32.CTR8BL ] arch/x86/crypto/chacha-avx512vl-x86_64.S:.section .rodata.cst32.CTR8BL, "aM", @progbits, 32 [ /.rodata.cst32.CTR8BL ] [ .rodata.cst32.pshufb_shf_table ] arch/x86/crypto/crct10dif-pcl-asm_64.S:.section .rodata.cst32.pshufb_shf_table, "aM", @progbits, 32 [ /.rodata.cst32.pshufb_shf_table ] [ .rodata.cst32.morus1280_const ] arch/x86/crypto/morus1280-avx2-asm.S:.section .rodata.cst32.morus1280_const, "aM", @progbits, 32 [ /.rodata.cst32.morus1280_const ] [ .rodata.cst32.morus1280_counter ] arch/x86/crypto/morus1280-avx2-asm.S:.section .rodata.cst32.morus1280_counter, "aM", @progbits, 32 [ /.rodata.cst32.morus1280_counter ] [ .rodata.cst32.ANMASK ] arch/x86/crypto/poly1305-avx2-x86_64.S:.section .rodata.cst32.ANMASK, "aM", @progbits, 32 [ /.rodata.cst32.ANMASK ] [ .rodata.cst32.ORMASK ] arch/x86/crypto/poly1305-avx2-x86_64.S:.section .rodata.cst32.ORMASK, "aM", @progbits, 32 [ /.rodata.cst32.ORMASK ] [ .rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK ] arch/x86/crypto/sha256-avx2-asm.S:.section .rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 32 arch/x86/crypto/sha512-avx2-asm.S:.section .rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 32 [ /.rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK ] [ .rodata.cst32._SHUF_00BA ] arch/x86/crypto/sha256-avx2-asm.S:.section .rodata.cst32._SHUF_00BA, "aM", @progbits, 32 [ /.rodata.cst32._SHUF_00BA ] [ .rodata.cst32._SHUF_DC00 ] arch/x86/crypto/sha256-avx2-asm.S:.section .rodata.cst32._SHUF_DC00, "aM", @progbits, 32 [ /.rodata.cst32._SHUF_DC00 ] [ .rodata.cst32.MASK_YMM_LO ] arch/x86/crypto/sha512-avx2-asm.S:.section .rodata.cst32.MASK_YMM_LO, "aM", @progbits, 32 [ /.rodata.cst32.MASK_YMM_LO ] [ .rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK ] arch/x86/crypto/sha256-avx2-asm.S:.section .rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 32 arch/x86/crypto/sha512-avx2-asm.S:.section .rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK, "aM", @progbits, 32 [ /.rodata.cst32.PSHUFFLE_BYTE_FLIP_MASK ] - Sedat -
