Commit 24c94559 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Greg Kroah-Hartman

x86/xen/p2m: Replace ACCESS_ONCE with READ_ONCE

commit 1760f1eb upstream.

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)

Change the p2m code to replace ACCESS_ONCE with READ_ONCE.
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Acked-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dcc2e51a
...@@ -554,7 +554,7 @@ static bool alloc_p2m(unsigned long pfn) ...@@ -554,7 +554,7 @@ static bool alloc_p2m(unsigned long pfn)
mid_mfn = NULL; mid_mfn = NULL;
} }
p2m_pfn = pte_pfn(ACCESS_ONCE(*ptep)); p2m_pfn = pte_pfn(READ_ONCE(*ptep));
if (p2m_pfn == PFN_DOWN(__pa(p2m_identity)) || if (p2m_pfn == PFN_DOWN(__pa(p2m_identity)) ||
p2m_pfn == PFN_DOWN(__pa(p2m_missing))) { p2m_pfn == PFN_DOWN(__pa(p2m_missing))) {
/* p2m leaf page is missing */ /* p2m leaf page is missing */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment