diff mbox series

[1/2] x86/fred: Fix build with clang

Message ID 20240127093728.1323-2-xin3.li@intel.com
State New
Headers
Series x86/fred: Fix two build issues |

Commit Message

Li, Xin3 Jan. 27, 2024, 9:37 a.m. UTC 
  As clang doesn't allow .fill to refernece a symbol before it's defined,
use asm_fred_entrypoint_user instead of asm_fred_entrypoint_kernel.

Fixes: 5e0636a41485 ("x86/fred: FRED entry/exit and dispatch code")
Reported-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/lkml/20240126100050.GAZbOC0g3Rlr6otZcT@fat_crate.local/
Signed-off-by: Xin Li <xin3.li@intel.com>
---
 arch/x86/entry/entry_64_fred.S | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

H. Peter Anvin Jan. 27, 2024, 6:14 p.m. UTC | #1 
On January 27, 2024 1:37:27 AM PST, Xin Li <xin3.li@intel.com> wrote:
>As clang doesn't allow .fill to refernece a symbol before it's defined,
>use asm_fred_entrypoint_user instead of asm_fred_entrypoint_kernel.
>
>Fixes: 5e0636a41485 ("x86/fred: FRED entry/exit and dispatch code")
>Reported-by: Borislav Petkov (AMD) <bp@alien8.de>
>Link: https://lore.kernel.org/lkml/20240126100050.GAZbOC0g3Rlr6otZcT@fat_crate.local/
>Signed-off-by: Xin Li <xin3.li@intel.com>
>---
> arch/x86/entry/entry_64_fred.S | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
>diff --git a/arch/x86/entry/entry_64_fred.S b/arch/x86/entry/entry_64_fred.S
>index eedf98de7538..5427e0da190d 100644
>--- a/arch/x86/entry/entry_64_fred.S
>+++ b/arch/x86/entry/entry_64_fred.S
>@@ -43,13 +43,12 @@ SYM_INNER_LABEL(asm_fred_exit_user, SYM_L_GLOBAL)
> 	_ASM_EXTABLE_TYPE(1b, asm_fred_entrypoint_user, EX_TYPE_ERETU)
> SYM_CODE_END(asm_fred_entrypoint_user)
> 
>-.fill asm_fred_entrypoint_kernel - ., 1, 0xcc
>-
> /*
>  * The new RIP value that FRED event delivery establishes is
>  * (IA32_FRED_CONFIG & ~FFFH) + 256 for events that occur in
>  * ring 0, i.e., asm_fred_entrypoint_user + 256.
>  */
>+	.fill asm_fred_entrypoint_user + 256 - ., 1, 0xcc
> 	.org asm_fred_entrypoint_user + 256
> SYM_CODE_START_NOALIGN(asm_fred_entrypoint_kernel)
> 	FRED_ENTER

.fill and .org here are redundant; in fact, there two directives mean exactly the same thing except that .org implicitly subtracts the current offset.
Li, Xin3 Jan. 27, 2024, 7:46 p.m. UTC | #2 
> >diff --git a/arch/x86/entry/entry_64_fred.S
> >b/arch/x86/entry/entry_64_fred.S index eedf98de7538..5427e0da190d
> >100644
> >--- a/arch/x86/entry/entry_64_fred.S
> >+++ b/arch/x86/entry/entry_64_fred.S
> >@@ -43,13 +43,12 @@ SYM_INNER_LABEL(asm_fred_exit_user,
> SYM_L_GLOBAL)
> > 	_ASM_EXTABLE_TYPE(1b, asm_fred_entrypoint_user, EX_TYPE_ERETU)
> > SYM_CODE_END(asm_fred_entrypoint_user)
> >
> >-.fill asm_fred_entrypoint_kernel - ., 1, 0xcc
> >-
> > /*
> >  * The new RIP value that FRED event delivery establishes is
> >  * (IA32_FRED_CONFIG & ~FFFH) + 256 for events that occur in
> >  * ring 0, i.e., asm_fred_entrypoint_user + 256.
> >  */
> >+	.fill asm_fred_entrypoint_user + 256 - ., 1, 0xcc
> > 	.org asm_fred_entrypoint_user + 256
> > SYM_CODE_START_NOALIGN(asm_fred_entrypoint_kernel)
> > 	FRED_ENTER
> 
> .fill and .org here are redundant; in fact, there two directives mean exactly the
> same thing except that .org implicitly subtracts the current offset.

Ah, right, .fill already does the job!

I will remove .org.
H. Peter Anvin Jan. 28, 2024, 7:33 p.m. UTC | #3 
On 1/27/24 11:46, Li, Xin3 wrote:
>>> diff --git a/arch/x86/entry/entry_64_fred.S
>>> b/arch/x86/entry/entry_64_fred.S index eedf98de7538..5427e0da190d
>>> 100644
>>> --- a/arch/x86/entry/entry_64_fred.S
>>> +++ b/arch/x86/entry/entry_64_fred.S
>>> @@ -43,13 +43,12 @@ SYM_INNER_LABEL(asm_fred_exit_user,
>> SYM_L_GLOBAL)
>>> 	_ASM_EXTABLE_TYPE(1b, asm_fred_entrypoint_user, EX_TYPE_ERETU)
>>> SYM_CODE_END(asm_fred_entrypoint_user)
>>>
>>> -.fill asm_fred_entrypoint_kernel - ., 1, 0xcc
>>> -
>>> /*
>>>   * The new RIP value that FRED event delivery establishes is
>>>   * (IA32_FRED_CONFIG & ~FFFH) + 256 for events that occur in
>>>   * ring 0, i.e., asm_fred_entrypoint_user + 256.
>>>   */
>>> +	.fill asm_fred_entrypoint_user + 256 - ., 1, 0xcc
>>> 	.org asm_fred_entrypoint_user + 256
>>> SYM_CODE_START_NOALIGN(asm_fred_entrypoint_kernel)
>>> 	FRED_ENTER
>>
>> .fill and .org here are redundant; in fact, there two directives mean exactly the
>> same thing except that .org implicitly subtracts the current offset.
> 
> Ah, right, .fill already does the job!
> 
> I will remove .org.
> 

Incidentally, was there a problem with .org ..., 0xcc?

Not a criticism, I just want to know to better understand current 
binutils limitations.

	-hpa
Li, Xin3 Jan. 28, 2024, 8:27 p.m. UTC | #4 
> >>> @@ -43,13 +43,12 @@ SYM_INNER_LABEL(asm_fred_exit_user,
> >> SYM_L_GLOBAL)
> >>> 	_ASM_EXTABLE_TYPE(1b, asm_fred_entrypoint_user, EX_TYPE_ERETU)
> >>> SYM_CODE_END(asm_fred_entrypoint_user)
> >>>
> >>> -.fill asm_fred_entrypoint_kernel - ., 1, 0xcc
> >>> -
> >>> /*
> >>>   * The new RIP value that FRED event delivery establishes is
> >>>   * (IA32_FRED_CONFIG & ~FFFH) + 256 for events that occur in
> >>>   * ring 0, i.e., asm_fred_entrypoint_user + 256.
> >>>   */
> >>> +	.fill asm_fred_entrypoint_user + 256 - ., 1, 0xcc
> >>> 	.org asm_fred_entrypoint_user + 256
> >>> SYM_CODE_START_NOALIGN(asm_fred_entrypoint_kernel)
> >>> 	FRED_ENTER
> >>
> >> .fill and .org here are redundant; in fact, there two directives mean
> >> exactly the same thing except that .org implicitly subtracts the current offset.
> >
> > Ah, right, .fill already does the job!
> >
> > I will remove .org.
> >
> 
> Incidentally, was there a problem with .org ..., 0xcc?

Oh, it's just that I didn't know .org can be used to fill.

 
> Not a criticism, I just want to know to better understand current binutils
> limitations.
> 
> 	-hpa
diff mbox series

Patch

diff --git a/arch/x86/entry/entry_64_fred.S b/arch/x86/entry/entry_64_fred.S
index eedf98de7538..5427e0da190d 100644
--- a/arch/x86/entry/entry_64_fred.S
+++ b/arch/x86/entry/entry_64_fred.S
@@ -43,13 +43,12 @@  SYM_INNER_LABEL(asm_fred_exit_user, SYM_L_GLOBAL)
 	_ASM_EXTABLE_TYPE(1b, asm_fred_entrypoint_user, EX_TYPE_ERETU)
 SYM_CODE_END(asm_fred_entrypoint_user)
 
-.fill asm_fred_entrypoint_kernel - ., 1, 0xcc
-
 /*
  * The new RIP value that FRED event delivery establishes is
  * (IA32_FRED_CONFIG & ~FFFH) + 256 for events that occur in
  * ring 0, i.e., asm_fred_entrypoint_user + 256.
  */
+	.fill asm_fred_entrypoint_user + 256 - ., 1, 0xcc
 	.org asm_fred_entrypoint_user + 256
 SYM_CODE_START_NOALIGN(asm_fred_entrypoint_kernel)
 	FRED_ENTER