]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ARC: add compiler barrier to LLSC based cmpxchg
authorVineet Gupta <vgupta@synopsys.com>
Thu, 13 Nov 2014 10:24:01 +0000 (15:54 +0530)
committerJiri Slaby <jslaby@suse.cz>
Thu, 30 Jul 2015 12:10:47 +0000 (14:10 +0200)
commitd308de3b8d7ecb33a7b7731b32182e419707a250
treef442ed37f77d29d422b0ff227ff4e61143e3793c
parent2f14e9e8e90697915c7d31ce639eaf8fb2b2f2b5
ARC: add compiler barrier to LLSC based cmpxchg

commit d57f727264f1425a94689bafc7e99e502cb135b5 upstream.

When auditing cmpxchg call sites, Chuck noted that gcc was optimizing
away some of the desired LDs.

| do {
| new = old = *ipi_data_ptr;
| new |= 1U << msg;
| } while (cmpxchg(ipi_data_ptr, old, new) != old);

was generating to below

8015cef8: ld         r2,[r4,0]  <-- First LD
8015cefc: bset       r1,r2,r1
|
8015cf00: llock      r3,[r4]  <-- atomic op
8015cf04: brne       r3,r2,8015cf10
8015cf08: scond      r1,[r4]
8015cf0c: bnz        8015cf00
|
8015cf10: brne       r3,r2,8015cf00  <-- Branch doesn't go to orig LD

Although this was fixed by adding a ACCESS_ONCE in this call site, it
seems safer (for now at least) to add compiler barrier to LLSC based
cmpxchg

Reported-by: Chuck Jordan <cjordan@synopsys.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
arch/arc/include/asm/cmpxchg.h