From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f70.google.com (mail-wm0-f70.google.com [74.125.82.70]) by kanga.kvack.org (Postfix) with ESMTP id D08E96B0351 for ; Wed, 22 Mar 2017 08:57:44 -0400 (EDT) Received: by mail-wm0-f70.google.com with SMTP id c5so10678298wmi.0 for ; Wed, 22 Mar 2017 05:57:44 -0700 (PDT) Received: from mail-wr0-x231.google.com (mail-wr0-x231.google.com. [2a00:1450:400c:c0c::231]) by mx.google.com with ESMTPS id r185si2537603wma.136.2017.03.22.05.57.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 05:57:43 -0700 (PDT) Received: by mail-wr0-x231.google.com with SMTP id u108so129213000wrb.3 for ; Wed, 22 Mar 2017 05:57:43 -0700 (PDT) From: Dmitry Vyukov Subject: [PATCH v2] x86: s/READ_ONCE_NOCHECK/READ_ONCE/ in arch_atomic[64]_read() Date: Wed, 22 Mar 2017 13:57:40 +0100 Message-Id: <20170322125740.85337-1-dvyukov@google.com> Sender: owner-linux-mm@kvack.org List-ID: To: akpm@linux-foundation.org, arnd@arndb.de, aryabinin@virtuozzo.com Cc: Dmitry Vyukov , Mark Rutland , Peter Zijlstra , Will Deacon , linux-mm@kvack.org, x86@kernel.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com Two problems was reported with READ_ONCE_NOCHECK in arch_atomic_read: 1. Andrey Ryabinin reported significant binary size increase (+400K of text). READ_ONCE_NOCHECK is intentionally compiled to non-inlined function call, and I counted 640 copies of it in my vmlinux. 2. Arnd Bergmann reported a new splat of too large frame sizes. A single inlined KASAN check is very cheap, a non-inlined function call with KASAN/KCOV instrumentation can easily be more expensive. Switch to READ_ONCE() in arch_atomic[64]_read(). Signed-off-by: Dmitry Vyukov Reported-by: Arnd Bergmann Reported-by: Andrey Ryabinin Cc: Mark Rutland Cc: Peter Zijlstra Cc: Will Deacon Cc: Andrey Ryabinin Cc: Andrew Morton Cc: linux-mm@kvack.org Cc: x86@kernel.org Cc: linux-kernel@vger.kernel.org Cc: kasan-dev@googlegroups.com Signed-off-by: Dmitry Vyukov --- Changes since v1: - also change arch_atomic64_read() --- arch/x86/include/asm/atomic.h | 15 ++++++--------- arch/x86/include/asm/atomic64_64.h | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h index 0cde164f058a..46e53bbf7ce3 100644 --- a/arch/x86/include/asm/atomic.h +++ b/arch/x86/include/asm/atomic.h @@ -24,10 +24,13 @@ static __always_inline int arch_atomic_read(const atomic_t *v) { /* - * We use READ_ONCE_NOCHECK() because atomic_read() contains KASAN - * instrumentation. Double instrumentation is unnecessary. + * Note: READ_ONCE() here leads to double instrumentation as + * both READ_ONCE() and atomic_read() contain instrumentation. + * This is deliberate choice. READ_ONCE_NOCHECK() is compiled to a + * non-inlined function call that considerably increases binary size + * and stack usage under KASAN. */ - return READ_ONCE_NOCHECK((v)->counter); + return READ_ONCE((v)->counter); } /** @@ -39,12 +42,6 @@ static __always_inline int arch_atomic_read(const atomic_t *v) */ static __always_inline void arch_atomic_set(atomic_t *v, int i) { - /* - * We could use WRITE_ONCE_NOCHECK() if it exists, similar to - * READ_ONCE_NOCHECK() in arch_atomic_read(). But there is no such - * thing at the moment, and introducing it for this case does not - * worth it. - */ WRITE_ONCE(v->counter, i); } diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h index de9555d35cb0..d47e880e346b 100644 --- a/arch/x86/include/asm/atomic64_64.h +++ b/arch/x86/include/asm/atomic64_64.h @@ -18,7 +18,7 @@ */ static inline long arch_atomic64_read(const atomic64_t *v) { - return READ_ONCE_NOCHECK((v)->counter); + return READ_ONCE((v)->counter); } /** -- 2.12.1.500.gab5fba24ee-goog -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org