PATCH: EDAC atomic scrub operations
Subsystems (5)
EDAC requires a way to scrub memory if an ECC error is found and the chipset does not do the work automatically. That means rewriting memory locations atomically with respect to all CPUs _and_ bus masters. That means we can't use atomic_add(foo, 0) as it gets optimised for non-SMP
This adds a function to include/asm-foo/atomic.h for the platforms currently supported which implements a scrub of a mapped block.
It also adjusts a few other files include order where atomic.h is included before types.h as this now causes an error as atomic_scrub uses u32.
Alan
drivers/md/kcopyd.c +1 -0
@@ -8,6 +8,7 @@* completion notification. */ +#include <asm/types.h> #include <asm/atomic.h> #include <linux/blkdev.h>
drivers/w1/matrox_w1.c +1 -1
@@ -19,8 +19,8 @@* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <asm/atomic.h> #include <asm/types.h> +#include <asm/atomic.h> #include <asm/io.h> #include <linux/delay.h>
fs/nfsctl.c +1 -0
@@ -5,6 +5,7 @@* */ #include <linux/config.h> +#include <linux/types.h> #include <linux/file.h> #include <linux/fs.h> #include <linux/sunrpc/svc.h>
include/asm-i386/atomic.h +11 -0
@@ -237,4 +237,15 @@#define smp_mb__before_atomic_inc () barrier()#define smp_mb__after_atomic_inc () barrier() +/* ECC atomic, DMA, SMP and interrupt safe scrub function */ + +static __inline__void atomic_scrub (unsigned long *virt_addr,u32 size) +{ +u32 i; +for (i =0 ; i < size /4 ; i++, virt_addr++) +/* Very carefully read and write to memory atomically +* so we are interrupt, DMA and SMP safe. +*/ + __asm__ __volatile__("lock; addl $0, %0" ::"m" (*virt_addr)); +}#endif
include/asm-x86_64/atomic.h +12 -0
@@ -378,4 +378,16 @@#define smp_mb__before_atomic_inc () barrier()#define smp_mb__after_atomic_inc () barrier() +/* ECC atomic, DMA, SMP and interrupt safe scrub function */ + +static __inline__void atomic_scrub (unsigned long *virt_addr,u32 size) +{ +u32 i; +for (i =0 ; i < size /4 ; i++, virt_addr++) +/* Very carefully read and write to memory atomically +* so we are interrupt, DMA and SMP safe. +*/ + __asm__ __volatile__("lock; addl $0, %0" ::"m" (*virt_addr)); +} +#endif
kernel/audit.c +1 -1
@@ -42,8 +42,8 @@*/ #include <linux/init.h> -#include <asm/atomic.h> #include <asm/types.h> +#include <asm/atomic.h> #include <linux/mm.h> #include <linux/module.h> #include <linux/err.h>
kernel/auditsc.c +1 -1
@@ -30,8 +30,8 @@*/ #include <linux/init.h> -#include <asm/atomic.h> #include <asm/types.h> +#include <asm/atomic.h> #include <linux/mm.h> #include <linux/module.h> #include <linux/mount.h>
net/ipv4/raw.c +1 -1
@@ -40,12 +40,12 @@*/ #include <linux/config.h> +#include <linux/types.h> #include <asm/atomic.h> #include <asm/byteorder.h> #include <asm/current.h> #include <asm/uaccess.h> #include <asm/ioctls.h> -#include <linux/types.h> #include <linux/stddef.h> #include <linux/slab.h> #include <linux/errno.h>
Quoted 5 lines · Alan Cox
linux-2.6.14-rc2-mm1/include/asm-x86_64/atomic.h
include/asm-x86_64/atomic.h line 387
Quoted 10 lines
include/asm-x86_64/atomic.h +6
-0@@ -378,4 +378,16 @@#define smp_mb__before_atomic_inc () barrier()#define smp_mb__after_atomic_inc () barrier() +/* ECC atomic, DMA, SMP and interrupt safe scrub function */ + +static __inline__void atomic_scrub (unsigned long *virt_addr,u32 size) +{ +u32 i; +for (i =0 ; i < size /4 ; i++, virt_addr++)
(size+7) / 8? or increment virt_addr by 0.5? :)
include/asm-x86_64/atomic.h line 391
Quoted 6 lines
include/asm-x86_64/atomic.h +4
-0+/* Very carefully read and write to memory atomically +* so we are interrupt, DMA and SMP safe. +*/ + __asm__ __volatile__("lock; addl $0, %0" ::"m" (*virt_addr));
shouldn't that be addq?
Quoted 5 lines
include/asm-x86_64/atomic.h +2
-0+} +#endif
Signature · 1 line
Do not meddle in the internals of kernels, for they are subtle and quick to panic.
Quoted 8 lines · Avi Kivity
include/asm-i386/atomic.h line 245
Quoted 6 lines
include/asm-i386/atomic.h +4
-0+static __inline__void atomic_scrub (unsigned long *virt_addr,u32 size) +{ +u32 i; +for (i =0 ; i < size /4 ; i++, virt_addr++)(size+7) / 8? or increment
virt_addrby 0.5? :)
Quoted 7 lines
include/asm-i386/atomic.h line 249
Quoted 6 lines
include/asm-i386/atomic.h +4
-0+/* Very carefully read and write to memory atomically +* so we are interrupt, DMA and SMP safe. +*/ + __asm__ __volatile__("lock; addl $0, %0" ::"m" (*virt_addr));shouldn't that be addq?
Should be u32 * for the address used. Well spotted.
Alan