Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1606377 > unrolled thread

[PATCH] asm-generic: fix compilation failure in cmpxchg_double()

Started byDmitry Vyukov <dvyukov@google.com>
First post2017-03-22 12:20 +0100
Last post2017-03-23 14:40 +0100
Articles 5 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] asm-generic: fix compilation failure in cmpxchg_double() Dmitry Vyukov <dvyukov@google.com> - 2017-03-22 12:20 +0100
    Re: [PATCH] asm-generic: fix compilation failure in cmpxchg_double() Arnd Bergmann <arnd@arndb.de> - 2017-03-22 12:30 +0100
      Re: [PATCH] asm-generic: fix compilation failure in cmpxchg_double() Arnd Bergmann <arnd@arndb.de> - 2017-03-22 22:30 +0100
        Re: [PATCH] asm-generic: fix compilation failure in cmpxchg_double() Dmitry Vyukov <dvyukov@google.com> - 2017-03-23 10:00 +0100
          Re: [PATCH] asm-generic: fix compilation failure in cmpxchg_double() Arnd Bergmann <arnd@arndb.de> - 2017-03-23 14:40 +0100

#1606377 — [PATCH] asm-generic: fix compilation failure in cmpxchg_double()

FromDmitry Vyukov <dvyukov@google.com>
Date2017-03-22 12:20 +0100
Subject[PATCH] asm-generic: fix compilation failure in cmpxchg_double()
Message-ID<tnMt3-1zh-15@gated-at.bofh.it>
Arnd reported that the new code leads to compilation failures
with some versions of gcc. I've filed gcc issue 72873,
but we need a kernel fix as well.

Remove instrumentation from cmpxchg_double() for now.

Signed-off-by: Dmitry Vyukov <dvyukov@google.com>
Reported-by: Arnd Bergmann <arnd@arndb.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org
---
 include/asm-generic/atomic-instrumented.h | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/include/asm-generic/atomic-instrumented.h b/include/asm-generic/atomic-instrumented.h
index 951bcd083925..de6c2a562a6e 100644
--- a/include/asm-generic/atomic-instrumented.h
+++ b/include/asm-generic/atomic-instrumented.h
@@ -229,18 +229,23 @@ INSTR_RET_BOOL2(add_negative);
 	arch_cmpxchg64_local(____ptr, (old), (new));	\
 })
 
+/*
+ * Originally we had the following code here:
+ *	__typeof__(p1) ____p1 = (p1);
+ *	kasan_check_write(____p1, 2 * sizeof(*____p1));
+ *	arch_cmpxchg_double(____p1, (p2), (o1), (o2), (n1), (n2));
+ * But it leads to compilation failures (see gcc issue 72873).
+ * So for now it's left non-instrumented.
+ * There are few callers of cmpxchg_double(), so it's not critical.
+ */
 #define cmpxchg_double(p1, p2, o1, o2, n1, n2)				\
 ({									\
-	__typeof__(p1) ____p1 = (p1);					\
-	kasan_check_write(____p1, 2 * sizeof(*____p1));			\
-	arch_cmpxchg_double(____p1, (p2), (o1), (o2), (n1), (n2));	\
+	arch_cmpxchg_double((p1), (p2), (o1), (o2), (n1), (n2));	\
 })
 
 #define cmpxchg_double_local(p1, p2, o1, o2, n1, n2)			\
 ({									\
-	__typeof__(p1) ____p1 = (p1);					\
-	kasan_check_write(____p1, 2 * sizeof(*____p1));			\
-	arch_cmpxchg_double_local(____p1, (p2), (o1), (o2), (n1), (n2));\
+	arch_cmpxchg_double_local((p1), (p2), (o1), (o2), (n1), (n2));	\
 })
 
 #endif /* _LINUX_ATOMIC_INSTRUMENTED_H */
-- 
2.12.1.500.gab5fba24ee-goog

[toc] | [next] | [standalone]


#1606385

FromArnd Bergmann <arnd@arndb.de>
Date2017-03-22 12:30 +0100
Message-ID<tnMCK-1Dh-15@gated-at.bofh.it>
In reply to#1606377
On Wed, Mar 22, 2017 at 12:10 PM, Dmitry Vyukov <dvyukov@google.com> wrote:
> Arnd reported that the new code leads to compilation failures
> with some versions of gcc. I've filed gcc issue 72873,
> but we need a kernel fix as well.
>
> Remove instrumentation from cmpxchg_double() for now.

Thanks, I also checked that fixes the build error for me.

       Arnd

[toc] | [prev] | [next] | [standalone]


#1607033

FromArnd Bergmann <arnd@arndb.de>
Date2017-03-22 22:30 +0100
Message-ID<tnVZn-rc-1@gated-at.bofh.it>
In reply to#1606385
On Wed, Mar 22, 2017 at 12:27 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Wed, Mar 22, 2017 at 12:10 PM, Dmitry Vyukov <dvyukov@google.com> wrote:
>> Arnd reported that the new code leads to compilation failures
>> with some versions of gcc. I've filed gcc issue 72873,
>> but we need a kernel fix as well.
>>
>> Remove instrumentation from cmpxchg_double() for now.
>
> Thanks, I also checked that fixes the build error for me.

I got a new variant of the bug in
arch/x86/include/asm/cmpxchg_32.h:set_64bit() now.

In file included from /git/arm-soc/arch/x86/include/asm/cmpxchg.h:142:0,
                 from /git/arm-soc/arch/x86/include/asm/atomic.h:7,
                 from /git/arm-soc/arch/x86/include/asm/msr.h:66,
                 from /git/arm-soc/arch/x86/include/asm/processor.h:20,
                 from /git/arm-soc/arch/x86/include/asm/cpufeature.h:4,
                 from /git/arm-soc/arch/x86/include/asm/thread_info.h:52,
                 from /git/arm-soc/include/linux/thread_info.h:25,
                 from /git/arm-soc/arch/x86/include/asm/preempt.h:6,
                 from /git/arm-soc/include/linux/preempt.h:80,
                 from /git/arm-soc/include/linux/spinlock.h:50,
                 from /git/arm-soc/include/linux/mmzone.h:7,
                 from /git/arm-soc/include/linux/gfp.h:5,
                 from /git/arm-soc/include/linux/mm.h:9,
                 from /git/arm-soc/mm/khugepaged.c:3:
/git/arm-soc/mm/khugepaged.c: In function 'khugepaged':
/git/arm-soc/arch/x86/include/asm/cmpxchg_32.h:29:2: error: 'asm'
operand has impossible constraints
  asm volatile("\n1:\t"

Defconfig is at http://pastebin.com/raw/Pthhv5iU

       Arnd

[toc] | [prev] | [next] | [standalone]


#1607269

FromDmitry Vyukov <dvyukov@google.com>
Date2017-03-23 10:00 +0100
Message-ID<to6L8-8hs-11@gated-at.bofh.it>
In reply to#1607033
On Wed, Mar 22, 2017 at 10:27 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Wed, Mar 22, 2017 at 12:27 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>> On Wed, Mar 22, 2017 at 12:10 PM, Dmitry Vyukov <dvyukov@google.com> wrote:
>>> Arnd reported that the new code leads to compilation failures
>>> with some versions of gcc. I've filed gcc issue 72873,
>>> but we need a kernel fix as well.
>>>
>>> Remove instrumentation from cmpxchg_double() for now.
>>
>> Thanks, I also checked that fixes the build error for me.
>
> I got a new variant of the bug in
> arch/x86/include/asm/cmpxchg_32.h:set_64bit() now.
>
> In file included from /git/arm-soc/arch/x86/include/asm/cmpxchg.h:142:0,
>                  from /git/arm-soc/arch/x86/include/asm/atomic.h:7,
>                  from /git/arm-soc/arch/x86/include/asm/msr.h:66,
>                  from /git/arm-soc/arch/x86/include/asm/processor.h:20,
>                  from /git/arm-soc/arch/x86/include/asm/cpufeature.h:4,
>                  from /git/arm-soc/arch/x86/include/asm/thread_info.h:52,
>                  from /git/arm-soc/include/linux/thread_info.h:25,
>                  from /git/arm-soc/arch/x86/include/asm/preempt.h:6,
>                  from /git/arm-soc/include/linux/preempt.h:80,
>                  from /git/arm-soc/include/linux/spinlock.h:50,
>                  from /git/arm-soc/include/linux/mmzone.h:7,
>                  from /git/arm-soc/include/linux/gfp.h:5,
>                  from /git/arm-soc/include/linux/mm.h:9,
>                  from /git/arm-soc/mm/khugepaged.c:3:
> /git/arm-soc/mm/khugepaged.c: In function 'khugepaged':
> /git/arm-soc/arch/x86/include/asm/cmpxchg_32.h:29:2: error: 'asm'
> operand has impossible constraints
>   asm volatile("\n1:\t"
>
> Defconfig is at http://pastebin.com/raw/Pthhv5iU


I can't reproduce it with gcc 4.8.4, 7.0.0, 7.0.1.

Are you sure it's related to my recent change? I did not touch set_64bit.

[toc] | [prev] | [next] | [standalone]


#1607498

FromArnd Bergmann <arnd@arndb.de>
Date2017-03-23 14:40 +0100
Message-ID<tob86-2Oe-7@gated-at.bofh.it>
In reply to#1607269
On Thu, Mar 23, 2017 at 9:49 AM, Dmitry Vyukov <dvyukov@google.com> wrote:
> On Wed, Mar 22, 2017 at 10:27 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>> On Wed, Mar 22, 2017 at 12:27 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>>> On Wed, Mar 22, 2017 at 12:10 PM, Dmitry Vyukov <dvyukov@google.com> wrote:
>>>> Arnd reported that the new code leads to compilation failures
>>>> with some versions of gcc. I've filed gcc issue 72873,
>>>> but we need a kernel fix as well.
>>>>
>>>> Remove instrumentation from cmpxchg_double() for now.
>>>
>>> Thanks, I also checked that fixes the build error for me.
>>
>> I got a new variant of the bug in
>> arch/x86/include/asm/cmpxchg_32.h:set_64bit() now.
>>
>> In file included from /git/arm-soc/arch/x86/include/asm/cmpxchg.h:142:0,
>>                  from /git/arm-soc/arch/x86/include/asm/atomic.h:7,
>>                  from /git/arm-soc/arch/x86/include/asm/msr.h:66,
>>                  from /git/arm-soc/arch/x86/include/asm/processor.h:20,
>>                  from /git/arm-soc/arch/x86/include/asm/cpufeature.h:4,
>>                  from /git/arm-soc/arch/x86/include/asm/thread_info.h:52,
>>                  from /git/arm-soc/include/linux/thread_info.h:25,
>>                  from /git/arm-soc/arch/x86/include/asm/preempt.h:6,
>>                  from /git/arm-soc/include/linux/preempt.h:80,
>>                  from /git/arm-soc/include/linux/spinlock.h:50,
>>                  from /git/arm-soc/include/linux/mmzone.h:7,
>>                  from /git/arm-soc/include/linux/gfp.h:5,
>>                  from /git/arm-soc/include/linux/mm.h:9,
>>                  from /git/arm-soc/mm/khugepaged.c:3:
>> /git/arm-soc/mm/khugepaged.c: In function 'khugepaged':
>> /git/arm-soc/arch/x86/include/asm/cmpxchg_32.h:29:2: error: 'asm'
>> operand has impossible constraints
>>   asm volatile("\n1:\t"
>>
>> Defconfig is at http://pastebin.com/raw/Pthhv5iU
>
>
> I can't reproduce it with gcc 4.8.4, 7.0.0, 7.0.1.
>
> Are you sure it's related to my recent change? I did not touch set_64bit.

You are right, this is different, it just appeared on the same day with
almost exactly the same symptom as the other one, so I mistakenly
assumed it was the same root cause.

Reverting your patches doesn't fix it, and I only see it with the
latest gcc-7.0.1 snapshot, not with one from a few weeks ago.
I'll open a gcc bug for it.

       Arnd

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web