lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Fri, 17 Jul 2020 08:27:27 +0200
From:   Uros Bizjak <ubizjak@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Herbert Xu <herbert@...dor.apana.org.au>,
        Linux Crypto List <linux-crypto@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        "Chang S. Bae" <chang.seok.bae@...el.com>,
        Sasha Levin <sashal@...nel.org>
Subject: Re: linux-next: manual merge of the tip tree with the crypto tree

On Fri, Jul 17, 2020 at 6:47 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
>   arch/x86/include/asm/inst.h
>
> between commit:
>
>   d7866e503bdc ("crypto: x86 - Remove include/asm/inst.h")
>
> from the crypto tree and commit:
>
>   eaad981291ee ("x86/entry/64: Introduce the FIND_PERCPU_BASE macro")
>
> from the tip tree.
>
> I fixed it up (I brought the file back but removed what the crypto tree
> no longer needed - see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> I think if the crypto tree brought back this file as well (even without
> the RDPID macro, it would make this conflict much more manageable.

I will prepare a v2 that leaves needed part of inst.h.

Uros.

> /* SPDX-License-Identifier: GPL-2.0 */
> /*
>  * Generate .byte code for some instructions not supported by old
>  * binutils.
>  */
> #ifndef X86_ASM_INST_H
> #define X86_ASM_INST_H
>
> #ifdef __ASSEMBLY__
>
> #define REG_NUM_INVALID         100
>
> #define REG_TYPE_R32            0
> #define REG_TYPE_R64            1
> #define REG_TYPE_XMM            2
> #define REG_TYPE_INVALID        100
>
>         .macro R32_NUM opd r32
>         \opd = REG_NUM_INVALID
>         .ifc \r32,%eax
>         \opd = 0
>         .endif
>         .ifc \r32,%ecx
>         \opd = 1
>         .endif
>         .ifc \r32,%edx
>         \opd = 2
>         .endif
>         .ifc \r32,%ebx
>         \opd = 3
>         .endif
>         .ifc \r32,%esp
>         \opd = 4
>         .endif
>         .ifc \r32,%ebp
>         \opd = 5
>         .endif
>         .ifc \r32,%esi
>         \opd = 6
>         .endif
>         .ifc \r32,%edi
>         \opd = 7
>         .endif
> #ifdef CONFIG_X86_64
>         .ifc \r32,%r8d
>         \opd = 8
>         .endif
>         .ifc \r32,%r9d
>         \opd = 9
>         .endif
>         .ifc \r32,%r10d
>         \opd = 10
>         .endif
>         .ifc \r32,%r11d
>         \opd = 11
>         .endif
>         .ifc \r32,%r12d
>         \opd = 12
>         .endif
>         .ifc \r32,%r13d
>         \opd = 13
>         .endif
>         .ifc \r32,%r14d
>         \opd = 14
>         .endif
>         .ifc \r32,%r15d
>         \opd = 15
>         .endif
> #endif
>         .endm
>
>         .macro R64_NUM opd r64
>         \opd = REG_NUM_INVALID
> #ifdef CONFIG_X86_64
>         .ifc \r64,%rax
>         \opd = 0
>         .endif
>         .ifc \r64,%rcx
>         \opd = 1
>         .endif
>         .ifc \r64,%rdx
>         \opd = 2
>         .endif
>         .ifc \r64,%rbx
>         \opd = 3
>         .endif
>         .ifc \r64,%rsp
>         \opd = 4
>         .endif
>         .ifc \r64,%rbp
>         \opd = 5
>         .endif
>         .ifc \r64,%rsi
>         \opd = 6
>         .endif
>         .ifc \r64,%rdi
>         \opd = 7
>         .endif
>         .ifc \r64,%r8
>         \opd = 8
>         .endif
>         .ifc \r64,%r9
>         \opd = 9
>         .endif
>         .ifc \r64,%r10
>         \opd = 10
>         .endif
>         .ifc \r64,%r11
>         \opd = 11
>         .endif
>         .ifc \r64,%r12
>         \opd = 12
>         .endif
>         .ifc \r64,%r13
>         \opd = 13
>         .endif
>         .ifc \r64,%r14
>         \opd = 14
>         .endif
>         .ifc \r64,%r15
>         \opd = 15
>         .endif
> #endif
>         .endm
>
>         .macro XMM_NUM opd xmm
>         \opd = REG_NUM_INVALID
>         .ifc \xmm,%xmm0
>         \opd = 0
>         .endif
>         .ifc \xmm,%xmm1
>         \opd = 1
>         .endif
>         .ifc \xmm,%xmm2
>         \opd = 2
>         .endif
>         .ifc \xmm,%xmm3
>         \opd = 3
>         .endif
>         .ifc \xmm,%xmm4
>         \opd = 4
>         .endif
>         .ifc \xmm,%xmm5
>         \opd = 5
>         .endif
>         .ifc \xmm,%xmm6
>         \opd = 6
>         .endif
>         .ifc \xmm,%xmm7
>         \opd = 7
>         .endif
>         .ifc \xmm,%xmm8
>         \opd = 8
>         .endif
>         .ifc \xmm,%xmm9
>         \opd = 9
>         .endif
>         .ifc \xmm,%xmm10
>         \opd = 10
>         .endif
>         .ifc \xmm,%xmm11
>         \opd = 11
>         .endif
>         .ifc \xmm,%xmm12
>         \opd = 12
>         .endif
>         .ifc \xmm,%xmm13
>         \opd = 13
>         .endif
>         .ifc \xmm,%xmm14
>         \opd = 14
>         .endif
>         .ifc \xmm,%xmm15
>         \opd = 15
>         .endif
>         .endm
>
>         .macro REG_TYPE type reg
>         R32_NUM reg_type_r32 \reg
>         R64_NUM reg_type_r64 \reg
>         XMM_NUM reg_type_xmm \reg
>         .if reg_type_r64 <> REG_NUM_INVALID
>         \type = REG_TYPE_R64
>         .elseif reg_type_r32 <> REG_NUM_INVALID
>         \type = REG_TYPE_R32
>         .elseif reg_type_xmm <> REG_NUM_INVALID
>         \type = REG_TYPE_XMM
>         .else
>         \type = REG_TYPE_INVALID
>         .endif
>         .endm
>
>         .macro PFX_OPD_SIZE
>         .byte 0x66
>         .endm
>
>         .macro PFX_REX opd1 opd2 W=0
>         .if ((\opd1 | \opd2) & 8) || \W
>         .byte 0x40 | ((\opd1 & 8) >> 3) | ((\opd2 & 8) >> 1) | (\W << 3)
>         .endif
>         .endm
>
>         .macro MODRM mod opd1 opd2
>         .byte \mod | (\opd1 & 7) | ((\opd2 & 7) << 3)
>         .endm
>
> .macro RDPID opd
>         REG_TYPE rdpid_opd_type \opd
>         .if rdpid_opd_type == REG_TYPE_R64
>         R64_NUM rdpid_opd \opd
>         .else
>         R32_NUM rdpid_opd \opd
>         .endif
>         .byte 0xf3
>         .if rdpid_opd > 7
>         PFX_REX rdpid_opd 0
>         .endif
>         .byte 0x0f, 0xc7
>         MODRM 0xc0 rdpid_opd 0x7
> .endm
> #endif
>
> #endif
>
> --
> Cheers,
> Stephen Rothwell

Powered by blists - more mailing lists