[PATCH] x86: SMP alternatives

Implement SMP alternatives, i.e.  switching at runtime between different
code versions for UP and SMP.  The code can patch both SMP->UP and UP->SMP.
The UP->SMP case is useful for CPU hotplug.

With CONFIG_CPU_HOTPLUG enabled the code switches to UP at boot time and
when the number of CPUs goes down to 1, and switches to SMP when the number
of CPUs goes up to 2.

Without CONFIG_CPU_HOTPLUG or on non-SMP-capable systems the code is
patched once at boot time (if needed) and the tables are released
afterwards.

The changes in detail:

  * The current alternatives bits are moved to a separate file,
    the SMP alternatives code is added there.

  * The patch adds some new elf sections to the kernel:
    .smp_altinstructions
	like .altinstructions, also contains a list
	of alt_instr structs.
    .smp_altinstr_replacement
	like .altinstr_replacement, but also has some space to
	save original instruction before replaving it.
    .smp_locks
	list of pointers to lock prefixes which can be nop'ed
	out on UP.
    The first two are used to replace more complex instruction
    sequences such as spinlocks and semaphores.  It would be possible
    to deal with the lock prefixes with that as well, but by handling
    them as special case the table sizes become much smaller.

 * The sections are page-aligned and padded up to page size, so they
   can be free if they are not needed.

 * Splitted the code to release init pages to a separate function and
   use it to release the elf sections if they are unused.

Signed-off-by: Gerd Hoffmann <kraxel@suse.de>
Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 30 insertions, 26 deletions

diff --git a/include/asm-i386/rwlock.h b/include/asm-i386/rwlock.h
index b57cc7afdf7e..94f00195d543 100644
--- a/include/asm-i386/rwlock.h
+++ b/include/asm-i386/rwlock.h
@@ -21,21 +21,23 @@
 #define RW_LOCK_BIAS_STR        "0x01000000"
 
 #define __build_read_lock_ptr(rw, helper)   \
-        asm volatile(LOCK "subl $1,(%0)\n\t" \
-                     "jns 1f\n" \
-                     "call " helper "\n\t" \
-                     "1:\n" \
-                     ::"a" (rw) : "memory")
+        alternative_smp("lock; subl $1,(%0)\n\t" \
+                        "jns 1f\n" \
+                        "call " helper "\n\t" \
+                        "1:\n", \
+                        "subl $1,(%0)\n\t", \
+                        :"a" (rw) : "memory")
 
 #define __build_read_lock_const(rw, helper)   \
-        asm volatile(LOCK "subl $1,%0\n\t" \
-                     "jns 1f\n" \
-                     "pushl %%eax\n\t" \
-                     "leal %0,%%eax\n\t" \
-                     "call " helper "\n\t" \
-                     "popl %%eax\n\t" \
-                     "1:\n" \
-                     :"=m" (*(volatile int *)rw) : : "memory")
+        alternative_smp("lock; subl $1,%0\n\t" \
+                        "jns 1f\n" \
+                        "pushl %%eax\n\t" \
+                        "leal %0,%%eax\n\t" \
+                        "call " helper "\n\t" \
+                        "popl %%eax\n\t" \
+                        "1:\n", \
+                        "subl $1,%0\n\t", \
+                        "=m" (*(volatile int *)rw) : : "memory")
 
 #define __build_read_lock(rw, helper)   do { \
                                                 if (__builtin_constant_p(rw)) \
@@ -45,21 +47,23 @@
                                         } while (0)
 
 #define __build_write_lock_ptr(rw, helper) \
-        asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
-                     "jz 1f\n" \
-                     "call " helper "\n\t" \
-                     "1:\n" \
-                     ::"a" (rw) : "memory")
+        alternative_smp("lock; subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
+                        "jz 1f\n" \
+                        "call " helper "\n\t" \
+                        "1:\n", \
+                        "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t", \
+                        :"a" (rw) : "memory")
 
 #define __build_write_lock_const(rw, helper) \
-        asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
-                     "jz 1f\n" \
-                     "pushl %%eax\n\t" \
-                     "leal %0,%%eax\n\t" \
-                     "call " helper "\n\t" \
-                     "popl %%eax\n\t" \
-                     "1:\n" \
-                     :"=m" (*(volatile int *)rw) : : "memory")
+        alternative_smp("lock; subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
+                        "jz 1f\n" \
+                        "pushl %%eax\n\t" \
+                        "leal %0,%%eax\n\t" \
+                        "call " helper "\n\t" \
+                        "popl %%eax\n\t" \
+                        "1:\n", \
+                        "subl $" RW_LOCK_BIAS_STR ",%0\n\t", \
+                        "=m" (*(volatile int *)rw) : : "memory")
 
 #define __build_write_lock(rw, helper)  do { \
                                                 if (__builtin_constant_p(rw)) \