All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nick Desaulniers <ndesaulniers@google.com>
To: Brian Gerst <brgerst@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
	"maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)"
	<x86@kernel.org>, Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@kernel.org>, Borislav Petkov <bp@alien8.de>,
	"H . Peter Anvin" <hpa@zytor.com>,
	Andy Lutomirski <luto@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>
Subject: Re: [PATCH 6/7] x86/percpu: Clean up percpu_xchg_op()
Date: Mon, 18 May 2020 15:15:58 -0700	[thread overview]
Message-ID: <CAKwvOdkEiUuNqnAqdLFx3PEm8DHhs7N6Bkk7m0b4mbEMGKPwHA@mail.gmail.com> (raw)
In-Reply-To: <20200517152916.3146539-7-brgerst@gmail.com>

On Sun, May 17, 2020 at 8:29 AM Brian Gerst <brgerst@gmail.com> wrote:
>
> The core percpu macros already have a switch on the data size, so the switch
> in the x86 code is redundant and produces more dead code.
>
> Also use appropriate types for the width of the instructions.  This avoids
> errors when compiling with Clang.
>
> Signed-off-by: Brian Gerst <brgerst@gmail.com>

Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>

> ---
>  arch/x86/include/asm/percpu.h | 61 +++++++++++------------------------
>  1 file changed, 18 insertions(+), 43 deletions(-)
>
> diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
> index ac8c391a190e..3c95ab3c99cd 100644
> --- a/arch/x86/include/asm/percpu.h
> +++ b/arch/x86/include/asm/percpu.h
> @@ -215,46 +215,21 @@ do {                                                                      \
>   * expensive due to the implied lock prefix.  The processor cannot prefetch
>   * cachelines if xchg is used.
>   */
> -#define percpu_xchg_op(qual, var, nval)                                        \
> +#define percpu_xchg_op(size, qual, _var, _nval)                                \
>  ({                                                                     \
> -       typeof(var) pxo_ret__;                                          \
> -       typeof(var) pxo_new__ = (nval);                                 \
> -       switch (sizeof(var)) {                                          \
> -       case 1:                                                         \
> -               asm qual ("\n\tmov "__percpu_arg(1)",%%al"              \
> -                   "\n1:\tcmpxchgb %2, "__percpu_arg(1)                \
> -                   "\n\tjnz 1b"                                        \
> -                           : "=&a" (pxo_ret__), "+m" (var)             \
> -                           : "q" (pxo_new__)                           \
> -                           : "memory");                                \
> -               break;                                                  \
> -       case 2:                                                         \
> -               asm qual ("\n\tmov "__percpu_arg(1)",%%ax"              \
> -                   "\n1:\tcmpxchgw %2, "__percpu_arg(1)                \
> -                   "\n\tjnz 1b"                                        \
> -                           : "=&a" (pxo_ret__), "+m" (var)             \
> -                           : "r" (pxo_new__)                           \
> -                           : "memory");                                \
> -               break;                                                  \
> -       case 4:                                                         \
> -               asm qual ("\n\tmov "__percpu_arg(1)",%%eax"             \
> -                   "\n1:\tcmpxchgl %2, "__percpu_arg(1)                \
> -                   "\n\tjnz 1b"                                        \
> -                           : "=&a" (pxo_ret__), "+m" (var)             \
> -                           : "r" (pxo_new__)                           \
> -                           : "memory");                                \
> -               break;                                                  \
> -       case 8:                                                         \
> -               asm qual ("\n\tmov "__percpu_arg(1)",%%rax"             \
> -                   "\n1:\tcmpxchgq %2, "__percpu_arg(1)                \
> -                   "\n\tjnz 1b"                                        \
> -                           : "=&a" (pxo_ret__), "+m" (var)             \
> -                           : "r" (pxo_new__)                           \
> -                           : "memory");                                \
> -               break;                                                  \
> -       default: __bad_percpu_size();                                   \
> -       }                                                               \
> -       pxo_ret__;                                                      \
> +       __pcpu_type_##size pxo_old__;                                   \
> +       __pcpu_type_##size pxo_new__ = __pcpu_cast_##size(_nval);       \
> +       asm qual (__pcpu_op2_##size("mov", __percpu_arg([var]),         \
> +                                   "%[oval]")                          \
> +                 "\n1:\t"                                              \
> +                 __pcpu_op2_##size("cmpxchg", "%[nval]",               \
> +                                   __percpu_arg([var]))                \
> +                 "\n\tjnz 1b"                                          \
> +                 : [oval] "=&a" (pxo_old__),                           \
> +                   [var] "+m" (_var)                                   \
> +                 : [nval] __pcpu_reg_##size(, pxo_new__)               \
> +                 : "memory");                                          \
> +       (typeof(_var))(unsigned long) pxo_old__;                        \
>  })
>
>  /*
> @@ -354,9 +329,9 @@ do {                                                                        \
>  #define this_cpu_or_1(pcp, val)                percpu_to_op(1, volatile, "or", (pcp), val)
>  #define this_cpu_or_2(pcp, val)                percpu_to_op(2, volatile, "or", (pcp), val)
>  #define this_cpu_or_4(pcp, val)                percpu_to_op(4, volatile, "or", (pcp), val)
> -#define this_cpu_xchg_1(pcp, nval)     percpu_xchg_op(volatile, pcp, nval)
> -#define this_cpu_xchg_2(pcp, nval)     percpu_xchg_op(volatile, pcp, nval)
> -#define this_cpu_xchg_4(pcp, nval)     percpu_xchg_op(volatile, pcp, nval)
> +#define this_cpu_xchg_1(pcp, nval)     percpu_xchg_op(1, volatile, pcp, nval)
> +#define this_cpu_xchg_2(pcp, nval)     percpu_xchg_op(2, volatile, pcp, nval)
> +#define this_cpu_xchg_4(pcp, nval)     percpu_xchg_op(4, volatile, pcp, nval)
>
>  #define raw_cpu_add_return_1(pcp, val)         percpu_add_return_op(1, , pcp, val)
>  #define raw_cpu_add_return_2(pcp, val)         percpu_add_return_op(2, , pcp, val)
> @@ -409,7 +384,7 @@ do {                                                                        \
>  #define this_cpu_and_8(pcp, val)               percpu_to_op(8, volatile, "and", (pcp), val)
>  #define this_cpu_or_8(pcp, val)                        percpu_to_op(8, volatile, "or", (pcp), val)
>  #define this_cpu_add_return_8(pcp, val)                percpu_add_return_op(8, volatile, pcp, val)
> -#define this_cpu_xchg_8(pcp, nval)             percpu_xchg_op(volatile, pcp, nval)
> +#define this_cpu_xchg_8(pcp, nval)             percpu_xchg_op(8, volatile, pcp, nval)
>  #define this_cpu_cmpxchg_8(pcp, oval, nval)    percpu_cmpxchg_op(volatile, pcp, oval, nval)
>
>  /*
> --
> 2.25.4
>


-- 
Thanks,
~Nick Desaulniers

  reply	other threads:[~2020-05-18 22:16 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-17 15:29 [PATCH 0/7] x86: Clean up percpu operations Brian Gerst
2020-05-17 15:29 ` [PATCH 1/7] x86/percpu: Introduce size abstraction macros Brian Gerst
2020-05-18 23:48   ` Nick Desaulniers
2020-05-17 15:29 ` [PATCH 2/7] x86/percpu: Clean up percpu_to_op() Brian Gerst
2020-05-18 21:15   ` Nick Desaulniers
2020-05-19  3:38     ` Brian Gerst
2020-05-20 17:26       ` Nick Desaulniers
2020-05-21 13:06         ` Brian Gerst
2020-05-26 17:54           ` Nick Desaulniers
2020-05-17 15:29 ` [PATCH 3/7] x86/percpu: Clean up percpu_from_op() Brian Gerst
2020-05-18 21:27   ` Nick Desaulniers
2020-05-17 15:29 ` [PATCH 4/7] x86/percpu: Clean up percpu_add_op() Brian Gerst
2020-05-17 19:18   ` kbuild test robot
2020-05-17 19:18     ` kbuild test robot
2020-05-17 20:04   ` kbuild test robot
2020-05-17 20:04     ` kbuild test robot
2020-05-18 23:42   ` Nick Desaulniers
2020-05-17 15:29 ` [PATCH 5/7] x86/percpu: Clean up percpu_add_return_op() Brian Gerst
2020-05-18 22:46   ` Nick Desaulniers
2020-05-18 23:45     ` Brian Gerst
2020-05-17 15:29 ` [PATCH 6/7] x86/percpu: Clean up percpu_xchg_op() Brian Gerst
2020-05-18 22:15   ` Nick Desaulniers [this message]
2020-05-17 15:29 ` [PATCH 7/7] x86/percpu: Clean up percpu_cmpxchg_op() Brian Gerst
2020-05-18 22:28   ` Nick Desaulniers
2020-05-18 19:19 ` [PATCH 0/7] x86: Clean up percpu operations Nick Desaulniers
2020-05-18 23:54   ` Nick Desaulniers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAKwvOdkEiUuNqnAqdLFx3PEm8DHhs7N6Bkk7m0b4mbEMGKPwHA@mail.gmail.com \
    --to=ndesaulniers@google.com \
    --cc=bp@alien8.de \
    --cc=brgerst@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.