From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751388AbbHAQqD (ORCPT ); Sat, 1 Aug 2015 12:46:03 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:38733 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751120AbbHAQqA (ORCPT ); Sat, 1 Aug 2015 12:46:00 -0400 From: Andrey Konovalov To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, "David S. Miller" , Peter Zijlstra , Alexander Duyck , Borislav Petkov , linux-kernel@vger.kernel.org Cc: Andrey Konovalov , Dmitry Vyukov Subject: [PATCH] x86: use WRITE_ONCE/READ_ONCE in smp_store_release/smp_load_acquire Date: Sat, 1 Aug 2015 18:45:34 +0200 Message-Id: <1438447534-14517-1-git-send-email-andreyknvl@google.com> X-Mailer: git-send-email 2.5.0.rc2.392.g76e840b Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace ACCESS_ONCE() macro in smp_store_release() and smp_load_acquire() from arch/x86/include/asm/barrier.h with WRITE_ONCE() and READ_ONCE() since ACCESS_ONCE does not work reliably on non-scalar types. WRITE_ONCE() and READ_ONCE() were introduced in the commits 230fa253df63 ("kernel: Provide READ_ONCE and ASSIGN_ONCE") and 43239cbe79fc ("kernel: Change ASSIGN_ONCE(val, x) to WRITE_ONCE(x, val)"). Signed-off-by: Andrey Konovalov --- arch/x86/include/asm/barrier.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h index e51a8f8..d2bcfbe 100644 --- a/arch/x86/include/asm/barrier.h +++ b/arch/x86/include/asm/barrier.h @@ -57,12 +57,12 @@ do { \ compiletime_assert_atomic_type(*p); \ smp_mb(); \ - ACCESS_ONCE(*p) = (v); \ + WRITE_ONCE(*p, v); \ } while (0) #define smp_load_acquire(p) \ ({ \ - typeof(*p) ___p1 = ACCESS_ONCE(*p); \ + typeof(*p) ___p1 = READ_ONCE(*p); \ compiletime_assert_atomic_type(*p); \ smp_mb(); \ ___p1; \ @@ -74,12 +74,12 @@ do { \ do { \ compiletime_assert_atomic_type(*p); \ barrier(); \ - ACCESS_ONCE(*p) = (v); \ + WRITE_ONCE(*p, v); \ } while (0) #define smp_load_acquire(p) \ ({ \ - typeof(*p) ___p1 = ACCESS_ONCE(*p); \ + typeof(*p) ___p1 = READ_ONCE(*p); \ compiletime_assert_atomic_type(*p); \ barrier(); \ ___p1; \ -- 2.5.0.rc2.392.g76e840b