From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753833AbaKXNFy (ORCPT ); Mon, 24 Nov 2014 08:05:54 -0500 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:59927 "EHLO e06smtp12.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753527AbaKXNDm (ORCPT ); Mon, 24 Nov 2014 08:03:42 -0500 From: Christian Borntraeger To: linux-kernel@vger.kernel.org Cc: "linux-arch@vger.kernel.org, linux-mips@linux-mips.org, linux-x86_64@vger.kernel.org, linux-s390"@vger.kernel.org, Paolo Bonzini , paulmck@linux.vnet.ibm.com, mingo@kernel.org, torvalds@linux-foundation.org, Catalin Marinas , Will Deacon , Christian Borntraeger Subject: [PATCH/RFC 5/7] mips: Replace ACCESS_ONCE in gup with a barrier Date: Mon, 24 Nov 2014 14:03:28 +0100 Message-Id: <1416834210-61738-6-git-send-email-borntraeger@de.ibm.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1416834210-61738-1-git-send-email-borntraeger@de.ibm.com> References: <1416834210-61738-1-git-send-email-borntraeger@de.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14112413-0009-0000-0000-0000021CB6D6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ACCESS_ONCE does not work reliably on non-scalar types. For example gcc 4.6 and 4.7 might remove the volatile tag for such accesses during the SRA (scalar replacement of aggregates) step https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58145) Let's use a barrier instead of ACCESS_ONCE to avoid that issue. Signed-off-by: Christian Borntraeger --- arch/mips/mm/gup.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/mips/mm/gup.c b/arch/mips/mm/gup.c index 06ce17c..cb2ca51 100644 --- a/arch/mips/mm/gup.c +++ b/arch/mips/mm/gup.c @@ -17,8 +17,8 @@ static inline pte_t gup_get_pte(pte_t *ptep) { -#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) pte_t pte; +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) retry: pte.pte_low = ptep->pte_low; @@ -30,7 +30,9 @@ retry: return pte; #else - return ACCESS_ONCE(*ptep); + pte = *ptep; + barrier(); + return pte; #endif } -- 1.9.3