2019-06-06 22:05:12

by Uros Bizjak

Subject: [PATCH] x86/resctrl: Use _ASM_BX to avoid #ifdef CONFIG_X86_64

Depending on CONFIG_X86_64 _ASM_BX expands to either rbx or ebx.

Cc: Fenghua Yu <[email protected]>
Cc: Reinette Chatre <[email protected]>
Cc: [email protected]
Signed-off-by: Uros Bizjak <[email protected]>
---
arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
index 604c0e3bcc83..09408794eab2 100644
--- a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
+++ b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
@@ -431,11 +431,7 @@ static int pseudo_lock_fn(void *_rdtgrp)
#else
register unsigned int line_size asm("esi");
register unsigned int size asm("edi");
-#ifdef CONFIG_X86_64
- register void *mem_r asm("rbx");
-#else
- register void *mem_r asm("ebx");
-#endif /* CONFIG_X86_64 */
+ register void *mem_r asm(_ASM_BX);
#endif /* CONFIG_KASAN */

/*
--
2.21.0

2019-06-10 17:33:25

by Reinette Chatre

Subject: Re: [PATCH] x86/resctrl: Use _ASM_BX to avoid #ifdef CONFIG_X86_64

Hi Uros,

On 6/6/2019 1:00 PM, Uros Bizjak wrote:
> Depending on CONFIG_X86_64 _ASM_BX expands to either rbx or ebx.
>
> Cc: Fenghua Yu <[email protected]>
> Cc: Reinette Chatre <[email protected]>
> Cc: [email protected]
> Signed-off-by: Uros Bizjak <[email protected]>
> ---
> arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
> index 604c0e3bcc83..09408794eab2 100644
> --- a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
> +++ b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
> @@ -431,11 +431,7 @@ static int pseudo_lock_fn(void *_rdtgrp)
> #else
> register unsigned int line_size asm("esi");
> register unsigned int size asm("edi");
> -#ifdef CONFIG_X86_64
> - register void *mem_r asm("rbx");
> -#else
> - register void *mem_r asm("ebx");
> -#endif /* CONFIG_X86_64 */
> + register void *mem_r asm(_ASM_BX);
> #endif /* CONFIG_KASAN */
>
> /*
>

Thank you very much for catching this. I was not aware of this macro.

Acked-by: Reinette Chatre <[email protected]>

Reinette

2019-06-10 20:54:08

by tip-bot for Vasyl Gomonovych

Subject: [tip:x86/cache] x86/resctrl: Use _ASM_BX to avoid ifdeffery

Commit-ID: 515f0453752e3daba7c47d37d9172a66509a56fd
Gitweb: https://git.kernel.org/tip/515f0453752e3daba7c47d37d9172a66509a56fd
Author: Uros Bizjak <[email protected]>
AuthorDate: Thu, 6 Jun 2019 22:00:44 +0200
Committer: Borislav Petkov <[email protected]>
CommitDate: Mon, 10 Jun 2019 22:36:38 +0200

x86/resctrl: Use _ASM_BX to avoid ifdeffery

Use the _ASM_BX macro which expands to either %rbx or %ebx, depending on
the 32-bit or 64-bit config selected.

Signed-off-by: Uros Bizjak <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Acked-by: Reinette Chatre <[email protected]>
Cc: Fenghua Yu <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: x86-ml <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
index 604c0e3bcc83..09408794eab2 100644
--- a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
+++ b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
@@ -431,11 +431,7 @@ static int pseudo_lock_fn(void *_rdtgrp)
#else
register unsigned int line_size asm("esi");
register unsigned int size asm("edi");
-#ifdef CONFIG_X86_64
- register void *mem_r asm("rbx");
-#else
- register void *mem_r asm("ebx");
-#endif /* CONFIG_X86_64 */
+ register void *mem_r asm(_ASM_BX);
#endif /* CONFIG_KASAN */

/*