[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1416834210-61738-6-git-send-email-borntraeger@de.ibm.com>
Date: Mon, 24 Nov 2014 14:03:28 +0100
From: Christian Borntraeger <borntraeger@...ibm.com>
To: linux-kernel@...r.kernel.org
Cc: "linux-arch@...r.kernel.org, linux-mips@...ux-mips.org, linux-x86_64@...r.kernel.org, linux-s390"@vger.kernel.org,
Paolo Bonzini <pbonzini@...hat.com>,
paulmck@...ux.vnet.ibm.com, mingo@...nel.org,
torvalds@...ux-foundation.org,
Catalin Marinas <catalin.marinas@....com>,
Will Deacon <will.deacon@....com>,
Christian Borntraeger <borntraeger@...ibm.com>
Subject: [PATCH/RFC 5/7] mips: Replace ACCESS_ONCE in gup with a barrier
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 <borntraeger@...ibm.com>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists