[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAJF2gTSwzb9rOvuubgz0PNeweOVQ_94mqDXyTfdprVZDcEp+FA@mail.gmail.com>
Date: Mon, 10 May 2021 21:27:10 +0800
From: Guo Ren <guoren@...nel.org>
To: Mark Rutland <mark.rutland@....com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Will Deacon <will@...nel.org>, boqun.feng@...il.com,
Peter Zijlstra <peterz@...radead.org>,
Albert Ou <aou@...s.berkeley.edu>,
Arnd Bergmann <arnd@...db.de>,
Brian Cain <bcain@...eaurora.org>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Chris Zankel <chris@...kel.net>, Rich Felker <dalias@...c.org>,
David Miller <davem@...emloft.net>,
Vincent Chen <deanbo422@...il.com>,
Helge Deller <deller@....de>,
Geert Uytterhoeven <geert@...ux-m68k.org>,
Greentime Hu <green.hu@...il.com>,
Ivan Kokshaysky <ink@...assic.park.msu.ru>,
"James E.J. Bottomley" <James.Bottomley@...senpartnership.com>,
Max Filippov <jcmvbkbc@...il.com>,
Jonas Bonn <jonas@...thpole.se>,
Ley Foon Tan <ley.foon.tan@...el.com>,
Russell King <linux@...linux.org.uk>,
Matt Turner <mattst88@...il.com>,
Michal Simek <monstr@...str.eu>,
Michael Ellerman <mpe@...erman.id.au>,
Nick Hu <nickhu@...estech.com>,
Palmer Dabbelt <palmer@...belt.com>,
Paul Mackerras <paulus@...ba.org>,
Paul Walmsley <paul.walmsley@...ive.com>,
Richard Henderson <rth@...ddle.net>,
Stafford Horne <shorne@...il.com>,
Stefan Kristiansson <stefan.kristiansson@...nalahti.fi>,
Thomas Bogendoerfer <tsbogend@...ha.franken.de>,
Vineet Gupta <vgupta@...opsys.com>,
Yoshinori Sato <ysato@...rs.sourceforge.jp>
Subject: Re: [PATCH 16/33] locking/atomic: csky: move to ARCH_ATOMIC
On Mon, May 10, 2021 at 5:41 PM Mark Rutland <mark.rutland@....com> wrote:
>
> We'd like all architectures to convert to ARCH_ATOMIC, as once all
> architectures are converted it will be possible to make significant
> cleanups to the atomics headers, and this will make it much easier to
> generically enable atomic functionality (e.g. debug logic in the
> instrumented wrappers).
>
> As a step towards that, this patch migrates csky to ARCH_ATOMIC. The
> arch code provides arch_{atomic,atomic64,xchg,cmpxchg}*(), and common
> code wraps these with optional instrumentation to provide the regular
> functions.
>
> Signed-off-by: Mark Rutland <mark.rutland@....com>
> Cc: Boqun Feng <boqun.feng@...il.com>
> Cc: Guo Ren <guoren@...nel.org>
> Cc: Peter Zijlstra <peterz@...radead.org>
> Cc: Will Deacon <will@...nel.org>
> ---
> arch/csky/Kconfig | 1 +
> arch/csky/include/asm/cmpxchg.h | 8 ++++----
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig
> index 8de5b987edb9..3521f14bcd96 100644
> --- a/arch/csky/Kconfig
> +++ b/arch/csky/Kconfig
> @@ -2,6 +2,7 @@
> config CSKY
> def_bool y
> select ARCH_32BIT_OFF_T
> + select ARCH_ATOMIC
> select ARCH_HAS_DMA_PREP_COHERENT
> select ARCH_HAS_GCOV_PROFILE_ALL
> select ARCH_HAS_SYNC_DMA_FOR_CPU
> diff --git a/arch/csky/include/asm/cmpxchg.h b/arch/csky/include/asm/cmpxchg.h
> index dabc8e46ce7b..d1bef11f8dc9 100644
> --- a/arch/csky/include/asm/cmpxchg.h
> +++ b/arch/csky/include/asm/cmpxchg.h
> @@ -31,7 +31,7 @@ extern void __bad_xchg(void);
> __ret; \
> })
>
> -#define xchg_relaxed(ptr, x) \
> +#define arch_xchg_relaxed(ptr, x) \
> (__xchg_relaxed((x), (ptr), sizeof(*(ptr))))
>
> #define __cmpxchg_relaxed(ptr, old, new, size) \
> @@ -61,14 +61,14 @@ extern void __bad_xchg(void);
> __ret; \
> })
>
> -#define cmpxchg_relaxed(ptr, o, n) \
> +#define arch_cmpxchg_relaxed(ptr, o, n) \
> (__cmpxchg_relaxed((ptr), (o), (n), sizeof(*(ptr))))
>
> -#define cmpxchg(ptr, o, n) \
> +#define arch_cmpxchg(ptr, o, n) \
> ({ \
> __typeof__(*(ptr)) __ret; \
> __smp_release_fence(); \
> - __ret = cmpxchg_relaxed(ptr, o, n); \
> + __ret = arch_cmpxchg_relaxed(ptr, o, n); \
> __smp_acquire_fence(); \
> __ret; \
> })
> --
> 2.11.0
>
Acked-by: Guo Ren <guoren@...nel.org>
--
Best Regards
Guo Ren
ML: https://lore.kernel.org/linux-csky/
Powered by blists - more mailing lists