Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Arvind Sankar <nivedita@alum.mit.edu>
Date:   Sun, 12 Jul 2020 22:54:29 -0400
To:     Jian Cai <caij2003@gmail.com>
Cc:     jiancai@google.com, ndesaulniers@google.com, manojgupta@google.com,
        sedat.dilek@gmail.com, Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
        Andy Lutomirski <luto@kernel.org>,
        Peter Zijlstra <peterz@infradead.org>,
        Alexandre Chartre <alexandre.chartre@oracle.com>,
        linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com
Subject: Re: [PATCH] x86/entry: add compatibility with IAS
Message-ID: <20200713025429.GA704795@rani.riverdale.lan>
References: <20200713012428.1039487-1-caij2003@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20200713012428.1039487-1-caij2003@gmail.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Sun, Jul 12, 2020 at 06:24:22PM -0700, Jian Cai wrote:
> Clang's integrated assembler does not allow symbols with non-absolute
> values to be reassigned. This patch allows the affected code to be
> compatible with IAS.
> 
> Link: https://github.com/ClangBuiltLinux/linux/issues/1043
> Reported-by: Nick Desaulniers <ndesaulniers@google.com>
> Reported-by: Sedat Dilek <sedat.dilek@gmail.com>
> Suggested-by: Nick Desaulniers <ndesaulniers@google.com>
> Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
> Signed-off-by: Jian Cai <caij2003@gmail.com>
> ---
>  arch/x86/include/asm/idtentry.h | 22 ++++++++++------------
>  1 file changed, 10 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h
> index f3d70830bf2a..77beed2cd6d9 100644
> --- a/arch/x86/include/asm/idtentry.h
> +++ b/arch/x86/include/asm/idtentry.h
> @@ -468,34 +468,32 @@ __visible noinstr void func(struct pt_regs *regs,			\
>   */
>  	.align 8
>  SYM_CODE_START(irq_entries_start)
> -    vector=FIRST_EXTERNAL_VECTOR
> -    pos = .
> +    i = 1
> +    pos1 = .
>      .rept (FIRST_SYSTEM_VECTOR - FIRST_EXTERNAL_VECTOR)
>  	UNWIND_HINT_IRET_REGS
> -	.byte	0x6a, vector
> +	.byte	0x6a, FIRST_EXTERNAL_VECTOR + i - 1
>  	jmp	asm_common_interrupt
>  	nop
>  	/* Ensure that the above is 8 bytes max */
> -	. = pos + 8
> -    pos=pos+8
> -    vector=vector+1
> +	. = pos1 + 8 * i
> +	i = i + 1
>      .endr
>  SYM_CODE_END(irq_entries_start)

I think it would be a little cleaner to initialize i to 0, and drop pos.
i.e. couldn't we do
	i = 0
	...
	.byte	0x6a, FIRST_EXTERNAL_VECTOR + i
	...
	i = i + 1
	. = irq_entries_start + 8 * i

>  
>  #ifdef CONFIG_X86_LOCAL_APIC
>  	.align 8
>  SYM_CODE_START(spurious_entries_start)
> -    vector=FIRST_SYSTEM_VECTOR
> -    pos = .
> +    i = 1
> +    pos2 = .
>      .rept (NR_VECTORS - FIRST_SYSTEM_VECTOR)
>  	UNWIND_HINT_IRET_REGS
> -	.byte	0x6a, vector
> +	.byte	0x6a, FIRST_SYSTEM_VECTOR + i - 1
>  	jmp	asm_spurious_interrupt
>  	nop
>  	/* Ensure that the above is 8 bytes max */
> -	. = pos + 8
> -    pos=pos+8
> -    vector=vector+1
> +	. = pos2 + 8 * i
> +	i = i + 1
>      .endr
>  SYM_CODE_END(spurious_entries_start)
>  #endif
> -- 
> 2.27.0.383.g050319c2ae-goog
>