2006-03-23 03:59:32 -07:00
|
|
|
#include <linux/module.h>
|
2006-10-17 23:47:25 -06:00
|
|
|
#include <linux/sched.h>
|
2008-05-12 13:21:01 -06:00
|
|
|
#include <linux/mutex.h>
|
2006-03-23 03:59:32 -07:00
|
|
|
#include <linux/list.h>
|
2009-08-19 01:40:48 -06:00
|
|
|
#include <linux/stringify.h>
|
2007-07-22 03:12:31 -06:00
|
|
|
#include <linux/kprobes.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/vmalloc.h>
|
2009-03-06 08:37:22 -07:00
|
|
|
#include <linux/memory.h>
|
2006-03-23 03:59:32 -07:00
|
|
|
#include <asm/alternative.h>
|
|
|
|
#include <asm/sections.h>
|
2007-07-22 03:12:31 -06:00
|
|
|
#include <asm/pgtable.h>
|
2007-07-22 03:12:32 -06:00
|
|
|
#include <asm/mce.h>
|
|
|
|
#include <asm/nmi.h>
|
2007-10-14 14:57:45 -06:00
|
|
|
#include <asm/vsyscall.h>
|
2008-03-06 06:48:49 -07:00
|
|
|
#include <asm/cacheflush.h>
|
2009-03-06 08:37:54 -07:00
|
|
|
#include <asm/tlbflush.h>
|
2008-03-06 06:48:49 -07:00
|
|
|
#include <asm/io.h>
|
2009-03-06 08:37:54 -07:00
|
|
|
#include <asm/fixmap.h>
|
2006-03-23 03:59:32 -07:00
|
|
|
|
2007-08-10 14:31:03 -06:00
|
|
|
#define MAX_PATCH_LEN (255-1)
|
|
|
|
|
2007-07-21 09:10:25 -06:00
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
static int smp_alt_once;
|
2006-03-23 03:59:32 -07:00
|
|
|
|
2006-06-26 05:56:16 -06:00
|
|
|
static int __init bootonly(char *str)
|
|
|
|
{
|
|
|
|
smp_alt_once = 1;
|
|
|
|
return 1;
|
|
|
|
}
|
2007-05-02 11:27:13 -06:00
|
|
|
__setup("smp-alt-boot", bootonly);
|
2007-07-21 09:10:25 -06:00
|
|
|
#else
|
|
|
|
#define smp_alt_once 1
|
|
|
|
#endif
|
|
|
|
|
2009-08-19 01:40:48 -06:00
|
|
|
static int __initdata_or_module debug_alternative;
|
2007-05-02 11:27:13 -06:00
|
|
|
|
2006-06-26 05:56:16 -06:00
|
|
|
static int __init debug_alt(char *str)
|
|
|
|
{
|
|
|
|
debug_alternative = 1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
__setup("debug-alternative", debug_alt);
|
|
|
|
|
2007-07-21 09:10:25 -06:00
|
|
|
static int noreplace_smp;
|
|
|
|
|
2007-05-02 11:27:13 -06:00
|
|
|
static int __init setup_noreplace_smp(char *str)
|
|
|
|
{
|
|
|
|
noreplace_smp = 1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
__setup("noreplace-smp", setup_noreplace_smp);
|
|
|
|
|
2007-05-02 11:27:16 -06:00
|
|
|
#ifdef CONFIG_PARAVIRT
|
2009-08-19 01:40:48 -06:00
|
|
|
static int __initdata_or_module noreplace_paravirt = 0;
|
2007-05-02 11:27:16 -06:00
|
|
|
|
|
|
|
static int __init setup_noreplace_paravirt(char *str)
|
|
|
|
{
|
|
|
|
noreplace_paravirt = 1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
__setup("noreplace-paravirt", setup_noreplace_paravirt);
|
|
|
|
#endif
|
2007-05-02 11:27:13 -06:00
|
|
|
|
2006-06-26 05:56:16 -06:00
|
|
|
#define DPRINTK(fmt, args...) if (debug_alternative) \
|
|
|
|
printk(KERN_DEBUG fmt, args)
|
|
|
|
|
2009-08-19 01:40:48 -06:00
|
|
|
#if defined(GENERIC_NOP1) && !defined(CONFIG_X86_64)
|
2006-03-23 03:59:32 -07:00
|
|
|
/* Use inline assembly to define this because the nops are defined
|
|
|
|
as inline assembly strings in the include files and we cannot
|
|
|
|
get them easily into strings. */
|
2009-08-19 01:40:48 -06:00
|
|
|
asm("\t" __stringify(__INITRODATA_OR_MODULE) "\nintelnops: "
|
2006-03-23 03:59:32 -07:00
|
|
|
GENERIC_NOP1 GENERIC_NOP2 GENERIC_NOP3 GENERIC_NOP4 GENERIC_NOP5 GENERIC_NOP6
|
2008-04-09 17:04:07 -06:00
|
|
|
GENERIC_NOP7 GENERIC_NOP8
|
|
|
|
"\t.previous");
|
2007-10-17 10:04:37 -06:00
|
|
|
extern const unsigned char intelnops[];
|
2009-08-19 01:40:48 -06:00
|
|
|
static const unsigned char *const __initconst_or_module
|
|
|
|
intel_nops[ASM_NOP_MAX+1] = {
|
2006-03-23 03:59:32 -07:00
|
|
|
NULL,
|
|
|
|
intelnops,
|
|
|
|
intelnops + 1,
|
|
|
|
intelnops + 1 + 2,
|
|
|
|
intelnops + 1 + 2 + 3,
|
|
|
|
intelnops + 1 + 2 + 3 + 4,
|
|
|
|
intelnops + 1 + 2 + 3 + 4 + 5,
|
|
|
|
intelnops + 1 + 2 + 3 + 4 + 5 + 6,
|
|
|
|
intelnops + 1 + 2 + 3 + 4 + 5 + 6 + 7,
|
|
|
|
};
|
2006-06-26 05:56:16 -06:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef K8_NOP1
|
2009-08-19 01:40:48 -06:00
|
|
|
asm("\t" __stringify(__INITRODATA_OR_MODULE) "\nk8nops: "
|
2006-06-26 05:56:16 -06:00
|
|
|
K8_NOP1 K8_NOP2 K8_NOP3 K8_NOP4 K8_NOP5 K8_NOP6
|
2008-04-09 17:04:07 -06:00
|
|
|
K8_NOP7 K8_NOP8
|
|
|
|
"\t.previous");
|
2007-10-17 10:04:37 -06:00
|
|
|
extern const unsigned char k8nops[];
|
2009-08-19 01:40:48 -06:00
|
|
|
static const unsigned char *const __initconst_or_module
|
|
|
|
k8_nops[ASM_NOP_MAX+1] = {
|
2006-03-23 03:59:32 -07:00
|
|
|
NULL,
|
|
|
|
k8nops,
|
|
|
|
k8nops + 1,
|
|
|
|
k8nops + 1 + 2,
|
|
|
|
k8nops + 1 + 2 + 3,
|
|
|
|
k8nops + 1 + 2 + 3 + 4,
|
|
|
|
k8nops + 1 + 2 + 3 + 4 + 5,
|
|
|
|
k8nops + 1 + 2 + 3 + 4 + 5 + 6,
|
|
|
|
k8nops + 1 + 2 + 3 + 4 + 5 + 6 + 7,
|
|
|
|
};
|
2006-06-26 05:56:16 -06:00
|
|
|
#endif
|
|
|
|
|
2009-08-19 01:40:48 -06:00
|
|
|
#if defined(K7_NOP1) && !defined(CONFIG_X86_64)
|
|
|
|
asm("\t" __stringify(__INITRODATA_OR_MODULE) "\nk7nops: "
|
2006-06-26 05:56:16 -06:00
|
|
|
K7_NOP1 K7_NOP2 K7_NOP3 K7_NOP4 K7_NOP5 K7_NOP6
|
2008-04-09 17:04:07 -06:00
|
|
|
K7_NOP7 K7_NOP8
|
|
|
|
"\t.previous");
|
2007-10-17 10:04:37 -06:00
|
|
|
extern const unsigned char k7nops[];
|
2009-08-19 01:40:48 -06:00
|
|
|
static const unsigned char *const __initconst_or_module
|
|
|
|
k7_nops[ASM_NOP_MAX+1] = {
|
2006-03-23 03:59:32 -07:00
|
|
|
NULL,
|
|
|
|
k7nops,
|
|
|
|
k7nops + 1,
|
|
|
|
k7nops + 1 + 2,
|
|
|
|
k7nops + 1 + 2 + 3,
|
|
|
|
k7nops + 1 + 2 + 3 + 4,
|
|
|
|
k7nops + 1 + 2 + 3 + 4 + 5,
|
|
|
|
k7nops + 1 + 2 + 3 + 4 + 5 + 6,
|
|
|
|
k7nops + 1 + 2 + 3 + 4 + 5 + 6 + 7,
|
|
|
|
};
|
2006-06-26 05:56:16 -06:00
|
|
|
#endif
|
|
|
|
|
2007-10-17 10:04:41 -06:00
|
|
|
#ifdef P6_NOP1
|
2009-08-19 01:40:48 -06:00
|
|
|
asm("\t" __stringify(__INITRODATA_OR_MODULE) "\np6nops: "
|
2007-10-17 10:04:41 -06:00
|
|
|
P6_NOP1 P6_NOP2 P6_NOP3 P6_NOP4 P6_NOP5 P6_NOP6
|
2008-04-09 17:04:07 -06:00
|
|
|
P6_NOP7 P6_NOP8
|
|
|
|
"\t.previous");
|
2007-10-17 10:04:41 -06:00
|
|
|
extern const unsigned char p6nops[];
|
2009-08-19 01:40:48 -06:00
|
|
|
static const unsigned char *const __initconst_or_module
|
|
|
|
p6_nops[ASM_NOP_MAX+1] = {
|
2007-10-17 10:04:41 -06:00
|
|
|
NULL,
|
|
|
|
p6nops,
|
|
|
|
p6nops + 1,
|
|
|
|
p6nops + 1 + 2,
|
|
|
|
p6nops + 1 + 2 + 3,
|
|
|
|
p6nops + 1 + 2 + 3 + 4,
|
|
|
|
p6nops + 1 + 2 + 3 + 4 + 5,
|
|
|
|
p6nops + 1 + 2 + 3 + 4 + 5 + 6,
|
|
|
|
p6nops + 1 + 2 + 3 + 4 + 5 + 6 + 7,
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
2006-06-26 05:56:16 -06:00
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
|
|
|
|
extern char __vsyscall_0;
|
2009-08-19 01:40:48 -06:00
|
|
|
static const unsigned char *const *__init_or_module find_nop_table(void)
|
2006-06-26 05:56:16 -06:00
|
|
|
{
|
2008-08-18 18:50:33 -06:00
|
|
|
if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL &&
|
|
|
|
boot_cpu_has(X86_FEATURE_NOPL))
|
|
|
|
return p6_nops;
|
|
|
|
else
|
|
|
|
return k8_nops;
|
2006-06-26 05:56:16 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
#else /* CONFIG_X86_64 */
|
|
|
|
|
2009-08-19 01:40:48 -06:00
|
|
|
static const unsigned char *const *__init_or_module find_nop_table(void)
|
2006-03-23 03:59:32 -07:00
|
|
|
{
|
2008-08-18 18:50:33 -06:00
|
|
|
if (boot_cpu_has(X86_FEATURE_K8))
|
|
|
|
return k8_nops;
|
|
|
|
else if (boot_cpu_has(X86_FEATURE_K7))
|
|
|
|
return k7_nops;
|
|
|
|
else if (boot_cpu_has(X86_FEATURE_NOPL))
|
|
|
|
return p6_nops;
|
|
|
|
else
|
|
|
|
return intel_nops;
|
2006-03-23 03:59:32 -07:00
|
|
|
}
|
|
|
|
|
2006-06-26 05:56:16 -06:00
|
|
|
#endif /* CONFIG_X86_64 */
|
|
|
|
|
2007-08-10 14:31:03 -06:00
|
|
|
/* Use this to add nops to a buffer, then text_poke the whole buffer. */
|
2009-08-19 01:40:48 -06:00
|
|
|
static void __init_or_module add_nops(void *insns, unsigned int len)
|
2006-12-06 18:14:08 -07:00
|
|
|
{
|
2007-10-17 10:04:37 -06:00
|
|
|
const unsigned char *const *noptable = find_nop_table();
|
2006-12-06 18:14:08 -07:00
|
|
|
|
|
|
|
while (len > 0) {
|
|
|
|
unsigned int noplen = len;
|
|
|
|
if (noplen > ASM_NOP_MAX)
|
|
|
|
noplen = ASM_NOP_MAX;
|
2007-08-10 14:31:03 -06:00
|
|
|
memcpy(insns, noptable[noplen], noplen);
|
2006-12-06 18:14:08 -07:00
|
|
|
insns += noplen;
|
|
|
|
len -= noplen;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-06-26 05:56:16 -06:00
|
|
|
extern struct alt_instr __alt_instructions[], __alt_instructions_end[];
|
|
|
|
extern u8 *__smp_locks[], *__smp_locks_end[];
|
2009-08-19 01:40:48 -06:00
|
|
|
static void *text_poke_early(void *addr, const void *opcode, size_t len);
|
2006-06-26 05:56:16 -06:00
|
|
|
|
2006-03-23 03:59:32 -07:00
|
|
|
/* Replace instructions with better alternatives for this CPU type.
|
|
|
|
This runs before SMP is initialized to avoid SMP problems with
|
|
|
|
self modifying code. This implies that assymetric systems where
|
|
|
|
APs have less capabilities than the boot processor are not handled.
|
|
|
|
Tough. Make sure you disable such features by hand. */
|
|
|
|
|
2009-08-19 01:40:48 -06:00
|
|
|
void __init_or_module apply_alternatives(struct alt_instr *start,
|
|
|
|
struct alt_instr *end)
|
2006-03-23 03:59:32 -07:00
|
|
|
{
|
|
|
|
struct alt_instr *a;
|
2007-08-10 14:31:03 -06:00
|
|
|
char insnbuf[MAX_PATCH_LEN];
|
2006-03-23 03:59:32 -07:00
|
|
|
|
2008-03-03 12:37:23 -07:00
|
|
|
DPRINTK("%s: alt table %p -> %p\n", __func__, start, end);
|
2006-03-23 03:59:32 -07:00
|
|
|
for (a = start; a < end; a++) {
|
2007-08-10 14:31:03 -06:00
|
|
|
u8 *instr = a->instr;
|
2006-03-23 03:59:32 -07:00
|
|
|
BUG_ON(a->replacementlen > a->instrlen);
|
2007-08-10 14:31:03 -06:00
|
|
|
BUG_ON(a->instrlen > sizeof(insnbuf));
|
2006-03-23 03:59:32 -07:00
|
|
|
if (!boot_cpu_has(a->cpuid))
|
|
|
|
continue;
|
2006-06-26 05:56:16 -06:00
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
/* vsyscall code is not mapped yet. resolve it manually. */
|
|
|
|
if (instr >= (u8 *)VSYSCALL_START && instr < (u8*)VSYSCALL_END) {
|
|
|
|
instr = __va(instr - (u8*)VSYSCALL_START + (u8*)__pa_symbol(&__vsyscall_0));
|
|
|
|
DPRINTK("%s: vsyscall fixup: %p => %p\n",
|
2008-03-03 12:37:23 -07:00
|
|
|
__func__, a->instr, instr);
|
2006-06-26 05:56:16 -06:00
|
|
|
}
|
|
|
|
#endif
|
2007-08-10 14:31:03 -06:00
|
|
|
memcpy(insnbuf, a->replacement, a->replacementlen);
|
|
|
|
add_nops(insnbuf + a->replacementlen,
|
|
|
|
a->instrlen - a->replacementlen);
|
2008-03-06 06:48:49 -07:00
|
|
|
text_poke_early(instr, insnbuf, a->instrlen);
|
2006-03-23 03:59:32 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-07-01 05:36:18 -06:00
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
|
2006-03-23 03:59:32 -07:00
|
|
|
static void alternatives_smp_lock(u8 **start, u8 **end, u8 *text, u8 *text_end)
|
|
|
|
{
|
|
|
|
u8 **ptr;
|
|
|
|
|
2009-03-06 08:37:22 -07:00
|
|
|
mutex_lock(&text_mutex);
|
2006-03-23 03:59:32 -07:00
|
|
|
for (ptr = start; ptr < end; ptr++) {
|
|
|
|
if (*ptr < text)
|
|
|
|
continue;
|
|
|
|
if (*ptr > text_end)
|
|
|
|
continue;
|
x86: alternatives : fix LOCK_PREFIX race with preemptible kernel and CPU hotplug
If a kernel thread is preempted in single-cpu mode right after the NOP (nop
about to be turned into a lock prefix), then we CPU hotplug a CPU, and then the
thread is scheduled back again, a SMP-unsafe atomic operation will be used on
shared SMP variables, leading to corruption. No corruption would happen in the
reverse case : going from SMP to UP is ok because we split a bit instruction
into tiny pieces, which does not present this condition.
Changing the 0x90 (single-byte nop) currently used into a 0x3E DS segment
override prefix should fix this issue. Since the default of the atomic
instructions is to use the DS segment anyway, it should not affect the
behavior.
The exception to this are references that use ESP/RSP and EBP/RBP as
the base register (they will use the SS segment), however, in Linux
(a) DS == SS at all times, and (b) we do not distinguish between
segment violations reported as #SS as opposed to #GP, so there is no
need to disassemble the instruction to figure out the suitable segment.
This patch assumes that the 0x3E prefix will leave atomic operations as-is (thus
assuming they normally touch data in the DS segment). Since there seem to be no
obvious ill-use of other segment override prefixes for atomic operations, it
should be safe. It can be verified with a quick
grep -r LOCK_PREFIX include/asm-x86/
grep -A 1 -r LOCK_PREFIX arch/x86/
Taken from
This source :
AMD64 Architecture Programmer's Manual Volume 3: General-Purpose and System
Instructions
States
"Instructions that Reference a Non-Stack Segment—If an instruction encoding
references any base register other than rBP or rSP, or if an instruction
contains an immediate offset, the default segment is the data segment (DS).
These instructions can use the segment-override prefix to select one of the
non-default segments, as shown in Table 1-5."
Therefore, forcing the DS segment on the atomic operations, which already use
the DS segment, should not change.
This source :
http://wiki.osdev.org/X86_Instruction_Encoding
States
"In 64-bit the CS, SS, DS and ES segment overrides are ignored."
Confirmed by "AMD 64-Bit Technology" A.7
http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/x86-64_overview.pdf
"In 64-bit mode, the DS, ES, SS and CS segment-override prefixes have no effect.
These four prefixes are no longer treated as segment-override prefixes in the
context of multipleprefix rules. Instead, they are treated as null prefixes."
This patch applies to 2.6.27-rc2, but would also have to be applied to earlier
kernels (2.6.26, 2.6.25, ...).
Performance impact of the fix : tests done on "xaddq" and "xaddl" shows it
actually improves performances on Intel Xeon, AMD64, Pentium M. It does not
change the performance on Pentium II, Pentium 3 and Pentium 4.
Xeon E5405 2.0GHz :
NR_TESTS 10000000
test empty cycles : 162207948
test test 1-byte nop xadd cycles : 170755422
test test DS override prefix xadd cycles : 170000118 *
test test LOCK xadd cycles : 472012134
AMD64 2.0GHz :
NR_TESTS 10000000
test empty cycles : 146674549
test test 1-byte nop xadd cycles : 150273860
test test DS override prefix xadd cycles : 149982382 *
test test LOCK xadd cycles : 270000690
Pentium 4 3.0GHz
NR_TESTS 10000000
test empty cycles : 290001195
test test 1-byte nop xadd cycles : 310000560
test test DS override prefix xadd cycles : 310000575 *
test test LOCK xadd cycles : 1050103740
Pentium M 2.0GHz
NR_TESTS 10000000
test empty cycles : 180000523
test test 1-byte nop xadd cycles : 320000345
test test DS override prefix xadd cycles : 310000374 *
test test LOCK xadd cycles : 480000357
Pentium 3 550MHz
NR_TESTS 10000000
test empty cycles : 510000231
test test 1-byte nop xadd cycles : 620000128
test test DS override prefix xadd cycles : 620000110 *
test test LOCK xadd cycles : 800000088
Pentium II 350MHz
NR_TESTS 10000000
test empty cycles : 200833494
test test 1-byte nop xadd cycles : 340000130
test test DS override prefix xadd cycles : 340000126 *
test test LOCK xadd cycles : 530000078
Speed test modules can be found at
http://ltt.polymtl.ca/svn/trunk/tests/kernel/test-prefix-speed-32.c
http://ltt.polymtl.ca/svn/trunk/tests/kernel/test-prefix-speed.c
Macro-benchmarks
2.0GHz E5405 Core 2 dual Quad-Core Xeon
Summary
* replace smp lock prefixes with DS segment selector prefixes
no lock prefix (s) with lock prefix (s) Speedup
make -j1 kernel/ 33.94 +/- 0.07 34.91 +/- 0.27 2.8 %
hackbench 50 2.99 +/- 0.01 3.74 +/- 0.01 25.1 %
* replace smp lock prefixes with 0x90 nops
no lock prefix (s) with lock prefix (s) Speedup
make -j1 kernel/ 34.16 +/- 0.32 34.91 +/- 0.27 2.2 %
hackbench 50 3.00 +/- 0.01 3.74 +/- 0.01 24.7 %
Detail :
1 CPU, replace smp lock prefixes with DS segment selector prefixes
make -j1 kernel/
real 0m34.067s
user 0m30.630s
sys 0m2.980s
real 0m33.867s
user 0m30.582s
sys 0m3.024s
real 0m33.939s
user 0m30.738s
sys 0m2.876s
real 0m33.913s
user 0m30.806s
sys 0m2.808s
avg : 33.94s
std. dev. : 0.07s
hackbench 50
Time: 2.978
Time: 2.982
Time: 3.010
Time: 2.984
Time: 2.982
avg : 2.99
std. dev. : 0.01
1 CPU, noreplace-smp
make -j1 kernel/
real 0m35.326s
user 0m30.630s
sys 0m3.260s
real 0m34.325s
user 0m30.802s
sys 0m3.084s
real 0m35.568s
user 0m30.722s
sys 0m3.168s
real 0m34.435s
user 0m30.886s
sys 0m2.996s
avg.: 34.91s
std. dev. : 0.27s
hackbench 50
Time: 3.733
Time: 3.750
Time: 3.761
Time: 3.737
Time: 3.741
avg : 3.74
std. dev. : 0.01
1 CPU, replace smp lock prefixes with 0x90 nops
make -j1 kernel/
real 0m34.139s
user 0m30.782s
sys 0m2.820s
real 0m34.010s
user 0m30.630s
sys 0m2.976s
real 0m34.777s
user 0m30.658s
sys 0m2.916s
real 0m33.924s
user 0m30.634s
sys 0m2.924s
real 0m33.962s
user 0m30.774s
sys 0m2.800s
real 0m34.141s
user 0m30.770s
sys 0m2.828s
avg : 34.16
std. dev. : 0.32
hackbench 50
Time: 2.999
Time: 2.994
Time: 3.004
Time: 2.991
Time: 2.988
avg : 3.00
std. dev. : 0.01
I did more runs (20 runs of each) to compare the nop case to the DS
prefix case. Results in seconds. They actually does not seems to show a
significant difference.
NOP
34.155
33.955
34.012
35.299
35.679
34.141
33.995
35.016
34.254
33.957
33.957
34.008
35.013
34.494
33.893
34.295
34.314
34.854
33.991
34.132
DS
34.080
34.304
34.374
35.095
34.291
34.135
33.940
34.208
35.276
34.288
33.861
33.898
34.610
34.709
33.851
34.256
35.161
34.283
33.865
35.078
Used http://www.graphpad.com/quickcalcs/ttest1.cfm?Format=C to do the
T-test (yeah, I'm lazy) :
Group Group One (DS prefix) Group Two (nops)
Mean 34.37815 34.37070
SD 0.46108 0.51905
SEM 0.10310 0.11606
N 20 20
P value and statistical significance:
The two-tailed P value equals 0.9620
By conventional criteria, this difference is considered to be not statistically significant.
Confidence interval:
The mean of Group One minus Group Two equals 0.00745
95% confidence interval of this difference: From -0.30682 to 0.32172
Intermediate values used in calculations:
t = 0.0480
df = 38
standard error of difference = 0.155
So, unless these calculus are completely bogus, the difference between the nop
and the DS case seems not to be statistically significant.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: H. Peter Anvin <hpa@zytor.com>
CC: Linus Torvalds <torvalds@linux-foundation.org>
CC: Jeremy Fitzhardinge <jeremy@goop.org>
CC: Roland McGrath <roland@redhat.com>
CC: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>
CC: Steven Rostedt <srostedt@redhat.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Peter Zijlstra <peterz@infradead.org>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: David Miller <davem@davemloft.net>
CC: Ulrich Drepper <drepper@redhat.com>
CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Gregory Haskins <ghaskins@novell.com>
CC: Arnaldo Carvalho de Melo <acme@redhat.com>
CC: "Luis Claudio R. Goncalves" <lclaudio@uudg.org>
CC: Clark Williams <williams@redhat.com>
CC: Christoph Lameter <cl@linux-foundation.org>
CC: Andi Kleen <andi@firstfloor.org>
CC: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2008-08-14 14:58:15 -06:00
|
|
|
/* turn DS segment override prefix into lock prefix */
|
|
|
|
text_poke(*ptr, ((unsigned char []){0xf0}), 1);
|
2006-03-23 03:59:32 -07:00
|
|
|
};
|
2009-03-06 08:37:22 -07:00
|
|
|
mutex_unlock(&text_mutex);
|
2006-03-23 03:59:32 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void alternatives_smp_unlock(u8 **start, u8 **end, u8 *text, u8 *text_end)
|
|
|
|
{
|
|
|
|
u8 **ptr;
|
|
|
|
|
2007-05-02 11:27:13 -06:00
|
|
|
if (noreplace_smp)
|
|
|
|
return;
|
|
|
|
|
2009-03-06 08:37:22 -07:00
|
|
|
mutex_lock(&text_mutex);
|
2006-03-23 03:59:32 -07:00
|
|
|
for (ptr = start; ptr < end; ptr++) {
|
|
|
|
if (*ptr < text)
|
|
|
|
continue;
|
|
|
|
if (*ptr > text_end)
|
|
|
|
continue;
|
x86: alternatives : fix LOCK_PREFIX race with preemptible kernel and CPU hotplug
If a kernel thread is preempted in single-cpu mode right after the NOP (nop
about to be turned into a lock prefix), then we CPU hotplug a CPU, and then the
thread is scheduled back again, a SMP-unsafe atomic operation will be used on
shared SMP variables, leading to corruption. No corruption would happen in the
reverse case : going from SMP to UP is ok because we split a bit instruction
into tiny pieces, which does not present this condition.
Changing the 0x90 (single-byte nop) currently used into a 0x3E DS segment
override prefix should fix this issue. Since the default of the atomic
instructions is to use the DS segment anyway, it should not affect the
behavior.
The exception to this are references that use ESP/RSP and EBP/RBP as
the base register (they will use the SS segment), however, in Linux
(a) DS == SS at all times, and (b) we do not distinguish between
segment violations reported as #SS as opposed to #GP, so there is no
need to disassemble the instruction to figure out the suitable segment.
This patch assumes that the 0x3E prefix will leave atomic operations as-is (thus
assuming they normally touch data in the DS segment). Since there seem to be no
obvious ill-use of other segment override prefixes for atomic operations, it
should be safe. It can be verified with a quick
grep -r LOCK_PREFIX include/asm-x86/
grep -A 1 -r LOCK_PREFIX arch/x86/
Taken from
This source :
AMD64 Architecture Programmer's Manual Volume 3: General-Purpose and System
Instructions
States
"Instructions that Reference a Non-Stack Segment—If an instruction encoding
references any base register other than rBP or rSP, or if an instruction
contains an immediate offset, the default segment is the data segment (DS).
These instructions can use the segment-override prefix to select one of the
non-default segments, as shown in Table 1-5."
Therefore, forcing the DS segment on the atomic operations, which already use
the DS segment, should not change.
This source :
http://wiki.osdev.org/X86_Instruction_Encoding
States
"In 64-bit the CS, SS, DS and ES segment overrides are ignored."
Confirmed by "AMD 64-Bit Technology" A.7
http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/x86-64_overview.pdf
"In 64-bit mode, the DS, ES, SS and CS segment-override prefixes have no effect.
These four prefixes are no longer treated as segment-override prefixes in the
context of multipleprefix rules. Instead, they are treated as null prefixes."
This patch applies to 2.6.27-rc2, but would also have to be applied to earlier
kernels (2.6.26, 2.6.25, ...).
Performance impact of the fix : tests done on "xaddq" and "xaddl" shows it
actually improves performances on Intel Xeon, AMD64, Pentium M. It does not
change the performance on Pentium II, Pentium 3 and Pentium 4.
Xeon E5405 2.0GHz :
NR_TESTS 10000000
test empty cycles : 162207948
test test 1-byte nop xadd cycles : 170755422
test test DS override prefix xadd cycles : 170000118 *
test test LOCK xadd cycles : 472012134
AMD64 2.0GHz :
NR_TESTS 10000000
test empty cycles : 146674549
test test 1-byte nop xadd cycles : 150273860
test test DS override prefix xadd cycles : 149982382 *
test test LOCK xadd cycles : 270000690
Pentium 4 3.0GHz
NR_TESTS 10000000
test empty cycles : 290001195
test test 1-byte nop xadd cycles : 310000560
test test DS override prefix xadd cycles : 310000575 *
test test LOCK xadd cycles : 1050103740
Pentium M 2.0GHz
NR_TESTS 10000000
test empty cycles : 180000523
test test 1-byte nop xadd cycles : 320000345
test test DS override prefix xadd cycles : 310000374 *
test test LOCK xadd cycles : 480000357
Pentium 3 550MHz
NR_TESTS 10000000
test empty cycles : 510000231
test test 1-byte nop xadd cycles : 620000128
test test DS override prefix xadd cycles : 620000110 *
test test LOCK xadd cycles : 800000088
Pentium II 350MHz
NR_TESTS 10000000
test empty cycles : 200833494
test test 1-byte nop xadd cycles : 340000130
test test DS override prefix xadd cycles : 340000126 *
test test LOCK xadd cycles : 530000078
Speed test modules can be found at
http://ltt.polymtl.ca/svn/trunk/tests/kernel/test-prefix-speed-32.c
http://ltt.polymtl.ca/svn/trunk/tests/kernel/test-prefix-speed.c
Macro-benchmarks
2.0GHz E5405 Core 2 dual Quad-Core Xeon
Summary
* replace smp lock prefixes with DS segment selector prefixes
no lock prefix (s) with lock prefix (s) Speedup
make -j1 kernel/ 33.94 +/- 0.07 34.91 +/- 0.27 2.8 %
hackbench 50 2.99 +/- 0.01 3.74 +/- 0.01 25.1 %
* replace smp lock prefixes with 0x90 nops
no lock prefix (s) with lock prefix (s) Speedup
make -j1 kernel/ 34.16 +/- 0.32 34.91 +/- 0.27 2.2 %
hackbench 50 3.00 +/- 0.01 3.74 +/- 0.01 24.7 %
Detail :
1 CPU, replace smp lock prefixes with DS segment selector prefixes
make -j1 kernel/
real 0m34.067s
user 0m30.630s
sys 0m2.980s
real 0m33.867s
user 0m30.582s
sys 0m3.024s
real 0m33.939s
user 0m30.738s
sys 0m2.876s
real 0m33.913s
user 0m30.806s
sys 0m2.808s
avg : 33.94s
std. dev. : 0.07s
hackbench 50
Time: 2.978
Time: 2.982
Time: 3.010
Time: 2.984
Time: 2.982
avg : 2.99
std. dev. : 0.01
1 CPU, noreplace-smp
make -j1 kernel/
real 0m35.326s
user 0m30.630s
sys 0m3.260s
real 0m34.325s
user 0m30.802s
sys 0m3.084s
real 0m35.568s
user 0m30.722s
sys 0m3.168s
real 0m34.435s
user 0m30.886s
sys 0m2.996s
avg.: 34.91s
std. dev. : 0.27s
hackbench 50
Time: 3.733
Time: 3.750
Time: 3.761
Time: 3.737
Time: 3.741
avg : 3.74
std. dev. : 0.01
1 CPU, replace smp lock prefixes with 0x90 nops
make -j1 kernel/
real 0m34.139s
user 0m30.782s
sys 0m2.820s
real 0m34.010s
user 0m30.630s
sys 0m2.976s
real 0m34.777s
user 0m30.658s
sys 0m2.916s
real 0m33.924s
user 0m30.634s
sys 0m2.924s
real 0m33.962s
user 0m30.774s
sys 0m2.800s
real 0m34.141s
user 0m30.770s
sys 0m2.828s
avg : 34.16
std. dev. : 0.32
hackbench 50
Time: 2.999
Time: 2.994
Time: 3.004
Time: 2.991
Time: 2.988
avg : 3.00
std. dev. : 0.01
I did more runs (20 runs of each) to compare the nop case to the DS
prefix case. Results in seconds. They actually does not seems to show a
significant difference.
NOP
34.155
33.955
34.012
35.299
35.679
34.141
33.995
35.016
34.254
33.957
33.957
34.008
35.013
34.494
33.893
34.295
34.314
34.854
33.991
34.132
DS
34.080
34.304
34.374
35.095
34.291
34.135
33.940
34.208
35.276
34.288
33.861
33.898
34.610
34.709
33.851
34.256
35.161
34.283
33.865
35.078
Used http://www.graphpad.com/quickcalcs/ttest1.cfm?Format=C to do the
T-test (yeah, I'm lazy) :
Group Group One (DS prefix) Group Two (nops)
Mean 34.37815 34.37070
SD 0.46108 0.51905
SEM 0.10310 0.11606
N 20 20
P value and statistical significance:
The two-tailed P value equals 0.9620
By conventional criteria, this difference is considered to be not statistically significant.
Confidence interval:
The mean of Group One minus Group Two equals 0.00745
95% confidence interval of this difference: From -0.30682 to 0.32172
Intermediate values used in calculations:
t = 0.0480
df = 38
standard error of difference = 0.155
So, unless these calculus are completely bogus, the difference between the nop
and the DS case seems not to be statistically significant.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: H. Peter Anvin <hpa@zytor.com>
CC: Linus Torvalds <torvalds@linux-foundation.org>
CC: Jeremy Fitzhardinge <jeremy@goop.org>
CC: Roland McGrath <roland@redhat.com>
CC: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>
CC: Steven Rostedt <srostedt@redhat.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Peter Zijlstra <peterz@infradead.org>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: David Miller <davem@davemloft.net>
CC: Ulrich Drepper <drepper@redhat.com>
CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Gregory Haskins <ghaskins@novell.com>
CC: Arnaldo Carvalho de Melo <acme@redhat.com>
CC: "Luis Claudio R. Goncalves" <lclaudio@uudg.org>
CC: Clark Williams <williams@redhat.com>
CC: Christoph Lameter <cl@linux-foundation.org>
CC: Andi Kleen <andi@firstfloor.org>
CC: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2008-08-14 14:58:15 -06:00
|
|
|
/* turn lock prefix into DS segment override prefix */
|
|
|
|
text_poke(*ptr, ((unsigned char []){0x3E}), 1);
|
2006-03-23 03:59:32 -07:00
|
|
|
};
|
2009-03-06 08:37:22 -07:00
|
|
|
mutex_unlock(&text_mutex);
|
2006-03-23 03:59:32 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
struct smp_alt_module {
|
|
|
|
/* what is this ??? */
|
|
|
|
struct module *mod;
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
/* ptrs to lock prefixes */
|
|
|
|
u8 **locks;
|
|
|
|
u8 **locks_end;
|
|
|
|
|
|
|
|
/* .text segment, needed to avoid patching init code ;) */
|
|
|
|
u8 *text;
|
|
|
|
u8 *text_end;
|
|
|
|
|
|
|
|
struct list_head next;
|
|
|
|
};
|
|
|
|
static LIST_HEAD(smp_alt_modules);
|
2008-05-12 13:21:01 -06:00
|
|
|
static DEFINE_MUTEX(smp_alt);
|
2008-01-30 05:33:17 -07:00
|
|
|
static int smp_mode = 1; /* protected by smp_alt */
|
2006-03-23 03:59:32 -07:00
|
|
|
|
2009-08-19 01:40:48 -06:00
|
|
|
void __init_or_module alternatives_smp_module_add(struct module *mod,
|
|
|
|
char *name,
|
|
|
|
void *locks, void *locks_end,
|
|
|
|
void *text, void *text_end)
|
2006-03-23 03:59:32 -07:00
|
|
|
{
|
|
|
|
struct smp_alt_module *smp;
|
|
|
|
|
2007-05-02 11:27:13 -06:00
|
|
|
if (noreplace_smp)
|
|
|
|
return;
|
|
|
|
|
2006-03-23 03:59:32 -07:00
|
|
|
if (smp_alt_once) {
|
|
|
|
if (boot_cpu_has(X86_FEATURE_UP))
|
|
|
|
alternatives_smp_unlock(locks, locks_end,
|
|
|
|
text, text_end);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
smp = kzalloc(sizeof(*smp), GFP_KERNEL);
|
|
|
|
if (NULL == smp)
|
|
|
|
return; /* we'll run the (safe but slow) SMP code then ... */
|
|
|
|
|
|
|
|
smp->mod = mod;
|
|
|
|
smp->name = name;
|
|
|
|
smp->locks = locks;
|
|
|
|
smp->locks_end = locks_end;
|
|
|
|
smp->text = text;
|
|
|
|
smp->text_end = text_end;
|
|
|
|
DPRINTK("%s: locks %p -> %p, text %p -> %p, name %s\n",
|
2008-03-03 12:37:23 -07:00
|
|
|
__func__, smp->locks, smp->locks_end,
|
2006-03-23 03:59:32 -07:00
|
|
|
smp->text, smp->text_end, smp->name);
|
|
|
|
|
2008-05-12 13:21:01 -06:00
|
|
|
mutex_lock(&smp_alt);
|
2006-03-23 03:59:32 -07:00
|
|
|
list_add_tail(&smp->next, &smp_alt_modules);
|
|
|
|
if (boot_cpu_has(X86_FEATURE_UP))
|
|
|
|
alternatives_smp_unlock(smp->locks, smp->locks_end,
|
|
|
|
smp->text, smp->text_end);
|
2008-05-12 13:21:01 -06:00
|
|
|
mutex_unlock(&smp_alt);
|
2006-03-23 03:59:32 -07:00
|
|
|
}
|
|
|
|
|
2009-08-19 01:40:48 -06:00
|
|
|
void __init_or_module alternatives_smp_module_del(struct module *mod)
|
2006-03-23 03:59:32 -07:00
|
|
|
{
|
|
|
|
struct smp_alt_module *item;
|
|
|
|
|
2007-05-02 11:27:13 -06:00
|
|
|
if (smp_alt_once || noreplace_smp)
|
2006-03-23 03:59:32 -07:00
|
|
|
return;
|
|
|
|
|
2008-05-12 13:21:01 -06:00
|
|
|
mutex_lock(&smp_alt);
|
2006-03-23 03:59:32 -07:00
|
|
|
list_for_each_entry(item, &smp_alt_modules, next) {
|
|
|
|
if (mod != item->mod)
|
|
|
|
continue;
|
|
|
|
list_del(&item->next);
|
2008-05-12 13:21:01 -06:00
|
|
|
mutex_unlock(&smp_alt);
|
2008-03-03 12:37:23 -07:00
|
|
|
DPRINTK("%s: %s\n", __func__, item->name);
|
2006-03-23 03:59:32 -07:00
|
|
|
kfree(item);
|
|
|
|
return;
|
|
|
|
}
|
2008-05-12 13:21:01 -06:00
|
|
|
mutex_unlock(&smp_alt);
|
2006-03-23 03:59:32 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void alternatives_smp_switch(int smp)
|
|
|
|
{
|
|
|
|
struct smp_alt_module *mod;
|
|
|
|
|
2006-07-03 01:24:57 -06:00
|
|
|
#ifdef CONFIG_LOCKDEP
|
|
|
|
/*
|
2008-01-30 05:33:24 -07:00
|
|
|
* Older binutils section handling bug prevented
|
|
|
|
* alternatives-replacement from working reliably.
|
|
|
|
*
|
|
|
|
* If this still occurs then you should see a hang
|
|
|
|
* or crash shortly after this line:
|
2006-07-03 01:24:57 -06:00
|
|
|
*/
|
2008-01-30 05:33:24 -07:00
|
|
|
printk("lockdep: fixing up alternatives.\n");
|
2006-07-03 01:24:57 -06:00
|
|
|
#endif
|
|
|
|
|
2007-05-02 11:27:13 -06:00
|
|
|
if (noreplace_smp || smp_alt_once)
|
2006-03-23 03:59:32 -07:00
|
|
|
return;
|
|
|
|
BUG_ON(!smp && (num_online_cpus() > 1));
|
|
|
|
|
2008-05-12 13:21:01 -06:00
|
|
|
mutex_lock(&smp_alt);
|
2008-01-30 05:33:17 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Avoid unnecessary switches because it forces JIT based VMs to
|
|
|
|
* throw away all cached translations, which can be quite costly.
|
|
|
|
*/
|
|
|
|
if (smp == smp_mode) {
|
|
|
|
/* nothing */
|
|
|
|
} else if (smp) {
|
2006-03-23 03:59:32 -07:00
|
|
|
printk(KERN_INFO "SMP alternatives: switching to SMP code\n");
|
2008-01-30 05:30:55 -07:00
|
|
|
clear_cpu_cap(&boot_cpu_data, X86_FEATURE_UP);
|
|
|
|
clear_cpu_cap(&cpu_data(0), X86_FEATURE_UP);
|
2006-03-23 03:59:32 -07:00
|
|
|
list_for_each_entry(mod, &smp_alt_modules, next)
|
|
|
|
alternatives_smp_lock(mod->locks, mod->locks_end,
|
|
|
|
mod->text, mod->text_end);
|
|
|
|
} else {
|
|
|
|
printk(KERN_INFO "SMP alternatives: switching to UP code\n");
|
2008-01-30 05:30:55 -07:00
|
|
|
set_cpu_cap(&boot_cpu_data, X86_FEATURE_UP);
|
|
|
|
set_cpu_cap(&cpu_data(0), X86_FEATURE_UP);
|
2006-03-23 03:59:32 -07:00
|
|
|
list_for_each_entry(mod, &smp_alt_modules, next)
|
|
|
|
alternatives_smp_unlock(mod->locks, mod->locks_end,
|
|
|
|
mod->text, mod->text_end);
|
|
|
|
}
|
2008-01-30 05:33:17 -07:00
|
|
|
smp_mode = smp;
|
2008-05-12 13:21:01 -06:00
|
|
|
mutex_unlock(&smp_alt);
|
2006-03-23 03:59:32 -07:00
|
|
|
}
|
|
|
|
|
2010-02-02 14:49:11 -07:00
|
|
|
/* Return 1 if the address range is reserved for smp-alternatives */
|
|
|
|
int alternatives_text_reserved(void *start, void *end)
|
|
|
|
{
|
|
|
|
struct smp_alt_module *mod;
|
|
|
|
u8 **ptr;
|
2010-02-05 10:16:47 -07:00
|
|
|
u8 *text_start = start;
|
|
|
|
u8 *text_end = end;
|
2010-02-02 14:49:11 -07:00
|
|
|
|
|
|
|
list_for_each_entry(mod, &smp_alt_modules, next) {
|
2010-02-05 10:16:47 -07:00
|
|
|
if (mod->text > text_end || mod->text_end < text_start)
|
2010-02-02 14:49:11 -07:00
|
|
|
continue;
|
|
|
|
for (ptr = mod->locks; ptr < mod->locks_end; ptr++)
|
2010-02-05 10:16:47 -07:00
|
|
|
if (text_start <= *ptr && text_end >= *ptr)
|
2010-02-02 14:49:11 -07:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2006-07-01 05:36:18 -06:00
|
|
|
#endif
|
|
|
|
|
2006-12-06 18:14:08 -07:00
|
|
|
#ifdef CONFIG_PARAVIRT
|
2009-08-19 01:40:48 -06:00
|
|
|
void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
|
|
|
|
struct paravirt_patch_site *end)
|
2006-12-06 18:14:08 -07:00
|
|
|
{
|
2007-05-02 11:27:14 -06:00
|
|
|
struct paravirt_patch_site *p;
|
2007-08-10 14:31:03 -06:00
|
|
|
char insnbuf[MAX_PATCH_LEN];
|
2006-12-06 18:14:08 -07:00
|
|
|
|
2007-05-02 11:27:16 -06:00
|
|
|
if (noreplace_paravirt)
|
|
|
|
return;
|
|
|
|
|
2006-12-06 18:14:08 -07:00
|
|
|
for (p = start; p < end; p++) {
|
|
|
|
unsigned int used;
|
|
|
|
|
2007-08-10 14:31:03 -06:00
|
|
|
BUG_ON(p->len > MAX_PATCH_LEN);
|
2007-08-18 15:31:41 -06:00
|
|
|
/* prep the buffer with the original instructions */
|
|
|
|
memcpy(insnbuf, p->instr, p->len);
|
2007-10-16 12:51:29 -06:00
|
|
|
used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
|
|
|
|
(unsigned long)p->instr, p->len);
|
2007-05-02 11:27:13 -06:00
|
|
|
|
2007-05-02 11:27:14 -06:00
|
|
|
BUG_ON(used > p->len);
|
|
|
|
|
2006-12-06 18:14:08 -07:00
|
|
|
/* Pad the rest with nops */
|
2007-08-10 14:31:03 -06:00
|
|
|
add_nops(insnbuf + used, p->len - used);
|
2008-03-06 06:48:49 -07:00
|
|
|
text_poke_early(p->instr, insnbuf, p->len);
|
2006-12-06 18:14:08 -07:00
|
|
|
}
|
|
|
|
}
|
2007-05-02 11:27:14 -06:00
|
|
|
extern struct paravirt_patch_site __start_parainstructions[],
|
2006-12-06 18:14:08 -07:00
|
|
|
__stop_parainstructions[];
|
|
|
|
#endif /* CONFIG_PARAVIRT */
|
|
|
|
|
2006-03-23 03:59:32 -07:00
|
|
|
void __init alternative_instructions(void)
|
|
|
|
{
|
2007-07-22 03:12:32 -06:00
|
|
|
/* The patching is not fully atomic, so try to avoid local interruptions
|
|
|
|
that might execute the to be patched code.
|
|
|
|
Other CPUs are not running. */
|
|
|
|
stop_nmi();
|
2009-02-12 05:39:27 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Don't stop machine check exceptions while patching.
|
|
|
|
* MCEs only happen when something got corrupted and in this
|
|
|
|
* case we must do something about the corruption.
|
|
|
|
* Ignoring it is worse than a unlikely patching race.
|
|
|
|
* Also machine checks tend to be broadcast and if one CPU
|
|
|
|
* goes into machine check the others follow quickly, so we don't
|
|
|
|
* expect a machine check to cause undue problems during to code
|
|
|
|
* patching.
|
|
|
|
*/
|
2007-07-22 03:12:32 -06:00
|
|
|
|
2006-03-23 03:59:32 -07:00
|
|
|
apply_alternatives(__alt_instructions, __alt_instructions_end);
|
|
|
|
|
|
|
|
/* switch to patch-once-at-boottime-only mode and free the
|
|
|
|
* tables in case we know the number of CPUs will never ever
|
|
|
|
* change */
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
if (num_possible_cpus() < 2)
|
|
|
|
smp_alt_once = 1;
|
|
|
|
#endif
|
|
|
|
|
2006-07-01 05:36:18 -06:00
|
|
|
#ifdef CONFIG_SMP
|
2006-03-23 03:59:32 -07:00
|
|
|
if (smp_alt_once) {
|
|
|
|
if (1 == num_possible_cpus()) {
|
|
|
|
printk(KERN_INFO "SMP alternatives: switching to UP code\n");
|
2008-01-30 05:30:55 -07:00
|
|
|
set_cpu_cap(&boot_cpu_data, X86_FEATURE_UP);
|
|
|
|
set_cpu_cap(&cpu_data(0), X86_FEATURE_UP);
|
|
|
|
|
2006-03-23 03:59:32 -07:00
|
|
|
alternatives_smp_unlock(__smp_locks, __smp_locks_end,
|
|
|
|
_text, _etext);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
alternatives_smp_module_add(NULL, "core kernel",
|
|
|
|
__smp_locks, __smp_locks_end,
|
|
|
|
_text, _etext);
|
2008-01-30 05:33:17 -07:00
|
|
|
|
|
|
|
/* Only switch to UP mode if we don't immediately boot others */
|
2008-10-05 08:52:24 -06:00
|
|
|
if (num_present_cpus() == 1 || setup_max_cpus <= 1)
|
2008-01-30 05:33:17 -07:00
|
|
|
alternatives_smp_switch(0);
|
2006-03-23 03:59:32 -07:00
|
|
|
}
|
2006-07-01 05:36:18 -06:00
|
|
|
#endif
|
2007-05-02 11:27:16 -06:00
|
|
|
apply_paravirt(__parainstructions, __parainstructions_end);
|
2007-07-22 03:12:32 -06:00
|
|
|
|
2007-10-17 10:04:34 -06:00
|
|
|
if (smp_alt_once)
|
|
|
|
free_init_pages("SMP alternatives",
|
|
|
|
(unsigned long)__smp_locks,
|
|
|
|
(unsigned long)__smp_locks_end);
|
|
|
|
|
2007-07-22 03:12:32 -06:00
|
|
|
restart_nmi();
|
2006-03-23 03:59:32 -07:00
|
|
|
}
|
2007-07-22 03:12:31 -06:00
|
|
|
|
2008-03-06 06:48:49 -07:00
|
|
|
/**
|
|
|
|
* text_poke_early - Update instructions on a live kernel at boot time
|
|
|
|
* @addr: address to modify
|
|
|
|
* @opcode: source of the copy
|
|
|
|
* @len: length to copy
|
|
|
|
*
|
2007-07-22 03:12:31 -06:00
|
|
|
* When you use this code to patch more than one byte of an instruction
|
|
|
|
* you need to make sure that other CPUs cannot execute this code in parallel.
|
2008-03-06 06:48:49 -07:00
|
|
|
* Also no thread must be currently preempted in the middle of these
|
|
|
|
* instructions. And on the local CPU you need to be protected again NMI or MCE
|
|
|
|
* handlers seeing an inconsistent instruction while you patch.
|
2007-07-22 03:12:31 -06:00
|
|
|
*/
|
2009-08-19 01:40:48 -06:00
|
|
|
static void *__init_or_module text_poke_early(void *addr, const void *opcode,
|
|
|
|
size_t len)
|
2007-07-22 03:12:31 -06:00
|
|
|
{
|
2008-03-06 06:48:49 -07:00
|
|
|
unsigned long flags;
|
|
|
|
local_irq_save(flags);
|
2007-07-22 03:12:31 -06:00
|
|
|
memcpy(addr, opcode, len);
|
2008-03-06 06:48:49 -07:00
|
|
|
sync_core();
|
2009-09-09 19:53:50 -06:00
|
|
|
local_irq_restore(flags);
|
2008-03-06 06:48:49 -07:00
|
|
|
/* Could also do a CLFLUSH here to speed up CPU recovery; but
|
|
|
|
that causes hangs on some VIA CPUs. */
|
|
|
|
return addr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* text_poke - Update instructions on a live kernel
|
|
|
|
* @addr: address to modify
|
|
|
|
* @opcode: source of the copy
|
|
|
|
* @len: length to copy
|
|
|
|
*
|
|
|
|
* Only atomic text poke/set should be allowed when not doing early patching.
|
|
|
|
* It means the size must be writable atomically and the address must be aligned
|
|
|
|
* in a way that permits an atomic write. It also makes sure we fit on a single
|
|
|
|
* page.
|
2009-03-06 08:37:54 -07:00
|
|
|
*
|
|
|
|
* Note: Must be called under text_mutex.
|
2008-03-06 06:48:49 -07:00
|
|
|
*/
|
|
|
|
void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
|
|
|
|
{
|
2009-03-06 08:37:54 -07:00
|
|
|
unsigned long flags;
|
2008-03-06 06:48:49 -07:00
|
|
|
char *vaddr;
|
2008-04-24 09:03:33 -06:00
|
|
|
struct page *pages[2];
|
|
|
|
int i;
|
2008-03-06 06:48:49 -07:00
|
|
|
|
2008-04-24 09:03:33 -06:00
|
|
|
if (!core_kernel_text((unsigned long)addr)) {
|
|
|
|
pages[0] = vmalloc_to_page(addr);
|
|
|
|
pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
|
x86: fix test_poke for vmalloced pages
* Ingo Molnar (mingo@elte.hu) wrote:
>
> * Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> wrote:
>
> > The shadow vmap for DEBUG_RODATA kernel text modification uses
> > virt_to_page to get the pages from the pointer address.
> >
> > However, I think vmalloc_to_page would be required in case the page is
> > used for modules.
> >
> > Since only the core kernel text is marked read-only, use
> > kernel_text_address() to make sure we only shadow map the core kernel
> > text, not modules.
>
> actually, i think we should mark module text readonly too.
>
Yes, but in the meantime, the x86 tree would need this patch to make
kprobes work correctly on modules.
I suspect that without this fix, with the enhanced hotplug and kprobes
patch, kprobes will use text_poke to insert breakpoints in modules
(vmalloced pages used), which will map the wrong pages and corrupt
random kernel locations instead of updating the correct page.
Work that would write protect the module pages should clearly be done,
but it can come in a later time. We have to make sure we interact
correctly with the page allocation debugging, as an example.
Here is the patch against x86.git 2.6.25-rc5 :
The shadow vmap for DEBUG_RODATA kernel text modification uses virt_to_page to
get the pages from the pointer address.
However, I think vmalloc_to_page would be required in case the page is used for
modules.
Since only the core kernel text is marked read-only, use kernel_text_address()
to make sure we only shadow map the core kernel text, not modules.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: akpm@linux-foundation.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-03-12 09:54:16 -06:00
|
|
|
} else {
|
2008-04-24 09:03:33 -06:00
|
|
|
pages[0] = virt_to_page(addr);
|
2008-04-25 09:07:03 -06:00
|
|
|
WARN_ON(!PageReserved(pages[0]));
|
2008-04-24 09:03:33 -06:00
|
|
|
pages[1] = virt_to_page(addr + PAGE_SIZE);
|
2008-03-06 06:48:49 -07:00
|
|
|
}
|
2008-04-24 09:03:33 -06:00
|
|
|
BUG_ON(!pages[0]);
|
2009-03-09 10:40:40 -06:00
|
|
|
local_irq_save(flags);
|
2009-03-06 08:37:54 -07:00
|
|
|
set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
|
|
|
|
if (pages[1])
|
|
|
|
set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
|
|
|
|
vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
|
2008-04-24 09:03:33 -06:00
|
|
|
memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
|
2009-03-06 08:37:54 -07:00
|
|
|
clear_fixmap(FIX_TEXT_POKE0);
|
|
|
|
if (pages[1])
|
|
|
|
clear_fixmap(FIX_TEXT_POKE1);
|
|
|
|
local_flush_tlb();
|
2007-07-22 03:12:31 -06:00
|
|
|
sync_core();
|
2007-09-06 08:59:52 -06:00
|
|
|
/* Could also do a CLFLUSH here to speed up CPU recovery; but
|
|
|
|
that causes hangs on some VIA CPUs. */
|
2008-04-24 09:03:33 -06:00
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
|
2009-03-09 10:40:40 -06:00
|
|
|
local_irq_restore(flags);
|
2008-03-06 06:48:49 -07:00
|
|
|
return addr;
|
2007-07-22 03:12:31 -06:00
|
|
|
}
|