Sparc SMP build fixes
Hi Marcelo and David,
The recent addition of an smp_rmb() in kfree_skb() by Herbert Xu broke SMP builds on sparc and sparc64, but it's not Herbert's fault, it's because of a few extra semi-colons in system.h for both archs.
The smp_rmb() has been inserted this way :
if (likely(atomic_read(&skb->users) == 1))
smp_rmb();
else if (likely(!atomic_dec_and_test(&skb->users)))
return;But it's defined like this on sparc and sparc64 :
#define smp_rmb() __asm__ __volatile__("":::"memory");So you get it :-)
I quickly grepped include/asm-* and found 85 obvious similar cases in various files and on various defines. I'm not sure that everything builds on every arch.
However, while I was fixing system.h for sparc and sparc64, I also fixed a few more defines in the same file which had the same problem. In case of sparc64, the use of "mb();" would have resulted in 3 consecutive semi-colons.
Please consider including this.
Cheers,
Willy
include/asm-sparc/system.h renamed from include/asm-sparc/system.h.bad +3 -3
@@ -295,9 +295,9 @@#define wmb () mb()#define set_mb (__var, __value) do { __var = __value; mb(); } while(0)#define set_wmb (__var, __value) set_mb(__var, __value) -#define smp_mb () __asm__ __volatile__("":::"memory"); -#define smp_rmb () __asm__ __volatile__("":::"memory"); -#define smp_wmb () __asm__ __volatile__("":::"memory"); +#define smp_mb () __asm__ __volatile__("":::"memory") +#define smp_rmb () __asm__ __volatile__("":::"memory") +#define smp_wmb () __asm__ __volatile__("":::"memory")#define nop () __asm__ __volatile__ ("nop");
include/asm-sparc64/system.h renamed from include/asm-sparc64/system.h.bad +6 -6
@@ -106,9 +106,9 @@#define nop () __asm__ __volatile__ ("nop") -#define membar (type) __asm__ __volatile__ ("membar " type : : : "memory"); +#define membar (type) __asm__ __volatile__ ("membar " type : : : "memory")#define mb () \ - membar("#LoadLoad | #LoadStore | #StoreStore | #StoreLoad"); + membar("#LoadLoad | #LoadStore | #StoreStore | #StoreLoad")#define rmb () membar("#LoadLoad")#define wmb () membar("#StoreStore")#define set_mb (__var, __value) \
@@ -121,9 +121,9 @@#define smp_rmb () rmb()#define smp_wmb () wmb()#else -#define smp_mb () __asm__ __volatile__("":::"memory"); -#define smp_rmb () __asm__ __volatile__("":::"memory"); -#define smp_wmb () __asm__ __volatile__("":::"memory"); +#define smp_mb () __asm__ __volatile__("":::"memory") +#define smp_rmb () __asm__ __volatile__("":::"memory") +#define smp_wmb () __asm__ __volatile__("":::"memory")#endif #define flushi (addr) __asm__ __volatile__ ("flush %0" : : "r" (addr) : "memory")
@@ -132,7 +132,7 @@/* Performance counter register access. */ #define read_pcr (__p) __asm__ __volatile__("rd %%pcr, %0" : "=r" (__p)) -#define write_pcr (__p) __asm__ __volatile__("wr %0, 0x0, %%pcr" : : "r" (__p)); +#define write_pcr (__p) __asm__ __volatile__("wr %0, 0x0, %%pcr" : : "r" (__p))#define read_pic (__p) __asm__ __volatile__("rd %%pic, %0" : "=r" (__p))/* Blackbird errata workaround. See commentary in
Quoted 3 lines · On Sat, 12 Feb 2005 11:13:49 +0100 Willy Tarreau <[email protected]> wrote:
The recent addition of an
smp_rmb()inkfree_skb()by Herbert Xu broke SMP builds on sparc and sparc64, but it's not Herbert's fault, it's because of a few extra semi-colons insystem.hfor both archs.
I pushed this independantly to Marcelo yesterday, he just hasn't pulled it in yet.
Sit tight :-)