MMIO 32-bit copy routine, the final frontier
PATCH 1/1 MMIO 32-bit copy routine, the final frontier
After yet more review comments from several people, here is a reworked set of 32-bit MMIO copy patches. This may even be the final set.
These define the generic __raw_memcpy_toio32 as a weak symbol, which arches are free to override. We provide a specialised implementation for x86_64.
These patches should apply cleanly against current -git, and have been tested on i386 and x86_64.
The patch series is as follows:
raw_memcpy_io.patch
Introduce the generic MMIO 32-bit copy routine.
x86_64-memcpy32.patch
Add memcpy32 routine to x86_64.
arch-specific-raw_memcpy_io.patch
Get each arch to use generic memcpy_io code, except x86_64, which uses memcpy32.
PATCH 1/1 memcpy32 for x86_64
Introduce an x86_64-specific memcpy32 routine. The routine is similar to memcpy, but is guaranteed to work in units of 32 bits at a time.
arch/x86_64/kernel/x8664_ksyms.c +2 -0
@@ -163,6 +163,8 @@EXPORT_SYMBOL (memcpy);EXPORT_SYMBOL (__memcpy); +EXPORT_SYMBOL_GPL (memcpy32); +#ifdef CONFIG_RWSEM_XCHGADD_ALGORITHM /* prototypes are wrong, these are assembly with custom calling functions */ extern void rwsem_down_read_failed_thunk (void );
arch/x86_64/lib/Makefile +1 -1
@@ -9,4 +9,4 @@ lib-y := csum-partial.o csum-copy.o csum-wrappers.o delay.o \ usercopy.o getuser.o putuser.o \ thunk.o clear_page.o copy_page.o bitstr.o bitops.o -lib-y += memcpy.o memmove.o memset.o copy_user.o +lib-y += memcpy.o memcpy32.o memmove.o memset.o copy_user.o
include/asm-x86_64/string.h +3 -0
@@ -45,6 +45,9 @@#define __HAVE_ARCH_MEMMOVEvoid *memmove (void * dest,const void *src,size_t count); +/* copy data, 32 bits at a time */ +void memcpy32 (void *dst,const void *src,size_t count); +/* Use C out of line version for memcmp */ #define memcmp __builtin_memcmpint memcmp (const void * cs,const void * ct,size_t count);
arch/x86_64/lib/memcpy32.S new file +32 -0
@@ -0,0 +1,32 @@ +/* + * Copyright 2006 PathScale, Inc. All Rights Reserved. + * + * This file is free software; you can redistribute it and/or modify + * it under the terms of version 2 of the GNU General Public License + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** + * memcpy32 - copy data, in units of 32 bits at a time + * @dst: destination (must be 32-bit aligned) + * @src: source (must be 32-bit aligned) + * @count: number of 32-bit quantities to copy + */ + .globl memcpy32 +memcpy32: + movl %edx,%ecx + shrl $1,%ecx + andl $1,%edx + rep movsq + movl %edx,%ecx + rep movsd + ret
PATCH 1/1 Introduce __raw_memcpy_toio32
In reply to Bryan O'SullivanThis arch-independent routine copies data to a memory-mapped I/O region, using 32-bit accesses. It does not guarantee access ordering, nor does it perform a memory barrier afterwards. This style of access is required by some devices.
lib/Makefile +1 -1
@@ -5,7 +5,7 @@ lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \ bust_spinlocks.o rbtree.o radix-tree.o dump_stack.o \ idr.o div64.o int_sqrt.o bitmap.o extable.o prio_tree.o \ - sha1.o + sha1.o raw_memcpy_io.o lib-y += kobject.o kref.o kobject_uevent.o klist.o
lib/raw_memcpy_io.c new file +41 -0
41 lines not on this page · raw message
PATCH 1/1 Add __raw_memcpy_toio32 to each arch
In reply to Bryan O'SullivanMost arches use the generic routine. x86_64 uses memcpy32 instead; this is substantially faster, even over a bus that is much slower than the CPU.
arch/x86_64/lib/io.c +6 -0
@@ -21,3 +21,9 @@memset ((void *)a,b,c); }EXPORT_SYMBOL (memset_io); + +/* override generic definition in lib/raw_memcpy_io.c */ +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count) +{ +memcpy32 ((void __force *) to, from, count); +}
include/asm-alpha/io.h +2 -0
@@ -504,6 +504,8 @@extern void memcpy_toio (volatile void __iomem *,const void *,long );extern void _memset_c_io (volatile void __iomem *,unsigned long ,long ); +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +static inline void memset_io (volatile void __iomem *addr,u8 c,long len) {_memset_c_io (addr,0x0101010101010101UL * c, len);
include/asm-arm/io.h +2 -0
@@ -189,6 +189,8 @@#define memset_io (c,v,l) _memset_io(__mem_pci(c),(v),(l))#define memcpy_fromio (a,c,l) _memcpy_fromio((a),__mem_pci(c),(l))#define memcpy_toio (c,a,l) _memcpy_toio(__mem_pci(c),(a),(l)) + +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count);#define eth_io_copy_and_sum (s,c,l,b) \ eth_copy_and_sum((s),__mem_pci(c),(l),(b))
include/asm-cris/io.h +2 -0
@@ -121,6 +121,8 @@#define memcpy_fromio (a,b,c) memcpy((a),(void *)(b),(c))#define memcpy_toio (a,b,c) memcpy((void *)(a),(b),(c)) +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +/* * Again, CRIS does not require mem IO specific function. */
include/asm-frv/io.h +2 -0
@@ -127,6 +127,8 @@memcpy ((void __force *) dst, src, count); } +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +static inline uint8_t inb (unsigned long addr) {return __builtin_read8 ((void *)addr);
include/asm-h8300/io.h +2 -0
@@ -209,6 +209,8 @@#define memcpy_fromio (a,b,c) memcpy((a),(void *)(b),(c))#define memcpy_toio (a,b,c) memcpy((void *)(a),(b),(c)) +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +#define mmiowb ()#define inb (addr) ((h8300_buswidth(addr))?readw((addr) & ~1) & 0xff:readb(addr))
include/asm-i386/io.h +2 -0
@@ -203,6 +203,8 @@ {__memcpy ((void __force *) dst, src, count); } + +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count);/* * ISA space is 'always mapped' on a typical x86 system, no need to
include/asm-ia64/io.h +2 -0
@@ -444,6 +444,8 @@extern void memcpy_toio (volatile void __iomem *dst,const void *src,long n);extern void memset_io (volatile void __iomem *s,int c,long n); +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +#define dma_cache_inv (_start,_size) do { } while (0)#define dma_cache_wback (_start,_size) do { } while (0)#define dma_cache_wback_inv (_start,_size) do { } while (0)
include/asm-m32r/io.h +2 -0
@@ -216,6 +216,8 @@memcpy ((void __force *) dst, src, count); } +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +/* * Convert a physical pointer to a virtual kernel pointer for /dev/mem * access
include/asm-m68knommu/io.h +2 -0
@@ -113,6 +113,8 @@#define memcpy_fromio (a,b,c) memcpy((a),(void *)(b),(c))#define memcpy_toio (a,b,c) memcpy((void *)(a),(b),(c)) +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +#define inb (addr) readb(addr)#define inw (addr) readw(addr)#define inl (addr) readl(addr)
include/asm-mips/io.h +2 -0
@@ -534,6 +534,8 @@memcpy ((void __force *) dst, src, count); } +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +/* * Memory Mapped I/O */
include/asm-parisc/io.h +2 -0
@@ -294,6 +294,8 @@void memcpy_fromio (void *dst,const volatile void __iomem *src,int count);void memcpy_toio (volatile void __iomem *dst,const void *src,int count); +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +/* Support old drivers which don't ioremap. * NB this interface is scheduled to disappear in 2.5 */
include/asm-powerpc/io.h +2 -0
@@ -64,6 +64,8 @@#define memcpy_fromio (a,b,c) iSeries_memcpy_fromio((a), (b), (c))#define memcpy_toio (a,b,c) iSeries_memcpy_toio((a), (b), (c)) +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +#define inb (addr) readb(((void __iomem *)(long)(addr)))#define inw (addr) readw(((void __iomem *)(long)(addr)))#define inl (addr) readl(((void __iomem *)(long)(addr)))
include/asm-ppc/io.h +2 -0
@@ -369,6 +369,8 @@ }#endif +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +#define eth_io_copy_and_sum (a,b,c,d) eth_copy_and_sum((a),(void __force *)(void __iomem *)(b),(c),(d))/*
include/asm-s390/io.h +2 -0
@@ -99,6 +99,8 @@#define memcpy_fromio (a,b,c) memcpy((a),__io_virt(b),(c))#define memcpy_toio (a,b,c) memcpy(__io_virt(a),(b),(c)) +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +#define inb_p (addr) readb(addr)#define inb (addr) readb(addr)
include/asm-sh/io.h +2 -0
@@ -177,6 +177,8 @@extern void memcpy_toio (unsigned long ,const void *,unsigned long );extern void memset_io (unsigned long ,int ,unsigned long ); +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +/* SuperH on-chip I/O functions */ static __inline__unsigned char ctrl_inb (unsigned long addr) {
include/asm-sh64/io.h +2 -0
@@ -125,6 +125,8 @@void memcpy_toio (void __iomem *to,const void *from,long count);void memcpy_fromio (void *to,void __iomem *from,long count); + +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count);#define mmiowb ()
include/asm-sparc/io.h +2 -0
@@ -239,6 +239,8 @@#define memcpy_toio (d,s,sz) _memcpy_toio(d,s,sz) +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +#ifdef __KERNEL__/*
include/asm-sparc64/io.h +2 -0
@@ -440,6 +440,8 @@#define memcpy_toio (d,s,sz) _memcpy_toio(d,s,sz) +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +static inline int check_signature (void __iomem *io_addr,const unsigned char *signature,int length)
include/asm-v850/io.h +2 -0
@@ -130,6 +130,8 @@#define memcpy_fromio (dst, src, len) memcpy (dst, (void *)src, len)#define memcpy_toio (dst, src, len) memcpy ((void *)dst, src, len) +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +/* * Convert a physical pointer to a virtual kernel pointer for /dev/mem * access
include/asm-x86_64/io.h +2 -0
@@ -252,6 +252,8 @@__memcpy_toio ((unsigned long )to,from,len); } +void __raw_memcpy_toio32 (void __iomem *dst,const void *src,size_t count); +void memset_io (volatile void __iomem *a,int b,size_t c);/*
include/asm-xtensa/io.h +2 -0
@@ -159,6 +159,8 @@#define memcpy_fromio (a,b,c) memcpy((a),(void *)(b),(c))#define memcpy_toio (a,b,c) memcpy((void *)(a),(b),(c)) +void __raw_memcpy_toio32 (void __iomem *to,const void *from,size_t count); +/* At this point the Xtensa doesn't provide byte swap instructions */ #ifdef __XTENSA_EB__
Re: [PATCH 1 of 3] Introduce __raw_memcpy_toio32
In reply to Bryan O'SullivanQuoted 6 lines · Bryan O'Sullivan
lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \
bust_spinlocks.o rbtree.o radix-tree.o dump_stack.o \
idr.o div64.o int_sqrt.o bitmap.o extable.o prio_tree.o \
- sha1.o
+ sha1.o raw_memcpy_io.o
You'll find that if nothing in vmlinux references __raw_memcpy_toio32 then this file won't be included in vmlinux and __raw_memcpy_toio32 won't be available to modules.
I'll move this to obj-y, which does the right thing.
Re: [PATCH 2 of 3] memcpy32 for x86_64
In reply to Bryan O'SullivanQuoted 5 lines
arch/x86_64/lib/memcpy32.S new file +5
-0+/** + * memcpy32 - copy data, in units of 32 bits at a time + * @dst: destination (must be 32-bit aligned) + * @src: source (must be 32-bit aligned) + * @count: number of 32-bit quantities to copy
arch/x86_64/lib/memcpy32.S line 32
Quoted 10 lines
arch/x86_64/lib/memcpy32.S new file +10
-0+ */ + .globl memcpy32 +memcpy32: + movl %edx,%ecx + shrl $1,%ecx + andl $1,%edx + rep movsq + movl %edx,%ecx + rep movsd + ret
Sorry to keep this going still further, but I'm still confused. Why can't this assembly just define __raw_memcpy_toio32() directly? In other words, Why do we need to introduce the indirection of having a stub in C that calls the memcpy32 assembly routine? Is there some reason having to do with linker magic and weak symbols? Could it be solved by using gcc inline assembly rather than putting the assembly in a .S file?
Also why does memcpy32() need to be exported? There are no users other than the x86_64 version of __raw_memcpy_toio32(), and memcpy32() doesn't seem like an API we want to add to every arch anyway.
- R.
Re: [PATCH 3 of 3] Add __raw_memcpy_toio32 to each arch
In reply to Bryan O'SullivanQuoted 27 lines · Bryan O'Sullivan
Most arches use the generic routine.
x86_64uses memcpy32 instead;
this is substantially faster, even over a bus that is much slower than the CPU.Signed-off-by Bryan O'Sullivan <[email protected]>diff -r
1052904816d7-ree6ce7e55dc7arch/x86_64/lib/io.c
---a/arch/x86_64/lib/io.cWed Jan 11 14:35:45 2006 -0800
+++b/arch/x86_64/lib/io.cWed Jan 11 14:35:45 2006 -0800
@@ -21,3 +21,9 @@
memset((void *)a,b,c);
}
EXPORT_SYMBOL(memset_io);
+
+/* override generic definition inlib/raw_memcpy_io.c*/
+void__raw_memcpy_toio32(void __iomem *to, const void *from, size_t count)+{
+memcpy32((void __force *) to, from, count);
+}
diff -r1052904816d7-ree6ce7e55dc7include/asm-alpha/io.h
---a/include/asm-alpha/io.hWed Jan 11 14:35:45 2006 -0800
+++b/include/asm-alpha/io.hWed Jan 11 14:35:45 2006 -0800
@@ -504,6 +504,8 @@
extern voidmemcpy_toio(volatile void __iomem *, const void *, long); extern void_memset_c_io(volatile void __iomem *, unsigned long, long);
Quoted 2 lines
+void
__raw_memcpy_toio32(void __iomem *to, const void *from, size_t count); +
<etc>
How's about we add a new linux/io.h which does:
#include <asm/io.h>
void __raw_memcpy_toio32(void __iomem *to, const void *from, size_t count);
?
Re: [PATCH 2 of 3] memcpy32 for x86_64
In reply to Roland DreierQuoted 2 lines · Roland Dreier
Sorry to keep this going still further, but I'm still confused. Why can't this assembly just define
__raw_memcpy_toio32()directly?
It certainly can. I've just been buried in this bloody thing for a little too long.
<b
Re: [PATCH 3 of 3] Add __raw_memcpy_toio32 to each arch
In reply to Andrew MortonQuoted 4 lines · Andrew Morton
How's about we add a new
linux/io.hwhich does:#include <
asm/io.h>
void__raw_memcpy_toio32(void __iomem *to, const void *from, size_t count);
I thought about this, and about moving other duplicated definitions from asm-*/io.h in here, but I couldn't find any other obvious candidates, so I wasn't anxious to introduce a new file.
If you think that's OK, though, it obviously makes the patch a lot smaller, and gives a common place to put future cross-arch definitions.
I'll run another spin of the patch with your and Roland's suggestions.
<b
Re: [PATCH 3 of 3] Add __raw_memcpy_toio32 to each arch
Quoted 12 lines · Bryan O'Sullivan
Quoted 4 lines · Andrew Morton
How's about we add a new
linux/io.hwhich does:#include <
asm/io.h>
void__raw_memcpy_toio32(void __iomem *to, const void *from, size_t count);I thought about this, and about moving other duplicated definitions from
asm-*/io.hin here, but I couldn't find any other obvious candidates, so I wasn't anxious to introduce a new file.
Well it's obviously better than duplicating the thing.
There are other common things which can be hoisted to linux/io.h, but if we do that then zillions of .c files need to be changed to include linux/io.h rather than asm/io.h. That's a good janitorial thing to do, but I doubt if you want to do it ;)
Re: [PATCH 3 of 3] Add __raw_memcpy_toio32 to each arch
Quoted 3 lines · Andrew Morton
There are other common things which can be hoisted to
linux/io.h, but if we do that then zillions of .c files need to be changed to includelinux/io.hrather thanasm/io.h.
Right.
Quoted 2 lines
That's a good janitorial thing to do, but I doubt if you want to do it ;)
Not as part of these patches, anyway. They've left me a dried-up husk.
<b