x86/asm changes for v2.6.35
Subsystems (2)
Linus,
Please pull the latest x86-asm-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-asm-for-linus
Thanks,
Ingo
------------------>
Jan Beulich (2):
x86, asm: Introduce and use percpu_inc()
x86-64: Reduce SMP locks table size
Roland McGrath (1):
x86: Use .cfi_sections for assembly code
arch/x86/Makefile | 5 ++- arch/x86/include/asm/alternative-asm.h | 4 +- arch/x86/include/asm/alternative.h | 4 +- arch/x86/include/asm/dwarf2.h | 12 ++++++++ arch/x86/include/asm/hardirq.h | 2 +- arch/x86/include/asm/percpu.h | 24 +++++++++++++++++ arch/x86/kernel/alternative.c | 45 +++++++++++++++++-------------- arch/x86/kernel/cpu/mcheck/mce.c | 4 +- 8 files changed, 71 insertions(+), 29 deletions(-)
arch/x86/Makefile +3 -2
@@ -95,8 +95,9 @@ sp-$(CONFIG_X86_64) := rsp cfi := $(call as-instr,.cfi_startproc\n.cfi_rel_offset $(sp-y)$(comma)0\n.cfi_endproc,-DCONFIG_AS_CFI=1) # is .cfi_signal_frame supported too? cfi-sigframe := $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1) -KBUILD_AFLAGS += $(cfi) $(cfi-sigframe) -KBUILD_CFLAGS += $(cfi) $(cfi-sigframe) +cfi-sections := $(call as-instr,.cfi_sections .debug_frame,-DCONFIG_AS_CFI_SECTIONS=1) +KBUILD_AFLAGS += $(cfi) $(cfi-sigframe) $(cfi-sections) +KBUILD_CFLAGS += $(cfi) $(cfi-sigframe) $(cfi-sections) LDFLAGS := -m elf_$(UTS_MACHINE)
arch/x86/include/asm/alternative-asm.h +2 -2
@@ -6,8 +6,8 @@ .macro LOCK_PREFIX 1: lock .section .smp_locks,"a" - _ASM_ALIGN - _ASM_PTR 1b + .balign 4 + .long 1b - . .previous .endm#else
arch/x86/include/asm/alternative.h +2 -2
@@ -30,8 +30,8 @@#ifdef CONFIG_SMP #define LOCK_PREFIX \ ".section .smp_locks,\"a\"\n" \ - _ASM_ALIGN "\n" \ - _ASM_PTR "661f\n"/* address */ \ + ".balign 4\n" \ + ".long 661f - .\n"/* offset */ \".previous\n" \"661:\n\tlock; "
arch/x86/include/asm/dwarf2.h +12 -0
@@ -34,6 +34,18 @@#define CFI_SIGNAL_FRAME #endif +#if defined(CONFIG_AS_CFI_SECTIONS ) && defined(__ASSEMBLY__) +/* +* Emit CFI data in .debug_frame sections, not .eh_frame sections. +* The latter we currently just discard since we don't do DWARF +* unwinding at runtime. So only the offline DWARF information is +* useful to anyone. Note we should not use this directive if this +* file is used in the vDSO assembly, or if vmlinux.lds.S gets +* changed so it doesn't discard .eh_frame. +*/ + .cfi_sections .debug_frame +#endif +#else /*
arch/x86/include/asm/hardirq.h +1 -1
@@ -35,7 +35,7 @@ DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);#define __ARCH_IRQ_STAT -#define inc_irq_stat (member) percpu_add(irq_stat.member, 1) +#define inc_irq_stat (member) percpu_inc(irq_stat.member)#define local_softirq_pending () percpu_read(irq_stat.__softirq_pending)
arch/x86/include/asm/percpu.h +24 -0
@@ -190,6 +190,29 @@ do { \ pfo_ret__; \ }) +#define percpu_unary_op (op, var) \ +({ \ + switch (sizeof(var)) { \ + case 1: \ + asm(op "b "__percpu_arg(0) \ + : "+m" (var)); \ + break; \ + case 2: \ + asm(op "w "__percpu_arg(0) \ + : "+m" (var)); \ + break; \ + case 4: \ + asm(op "l "__percpu_arg(0) \ + : "+m" (var)); \ + break; \ + case 8: \ + asm(op "q "__percpu_arg(0) \ + : "+m" (var)); \ + break; \ + default: __bad_percpu_size(); \ + } \ +}) +/* * percpu_read() makes gcc load the percpu variable every time it is * accessed while percpu_read_stable() allows the value to be cached.
@@ -207,6 +230,7 @@ do { \#define percpu_and (var, val) percpu_to_op("and", var, val)#define percpu_or (var, val) percpu_to_op("or", var, val)#define percpu_xor (var, val) percpu_to_op("xor", var, val) +#define percpu_inc (var) percpu_unary_op("inc", var)#define __this_cpu_read_1 (pcp) percpu_from_op("mov", (pcp), "m"(pcp))#define __this_cpu_read_2 (pcp) percpu_from_op("mov", (pcp), "m"(pcp))
arch/x86/kernel/alternative.c +25 -20
93 lines not on this page · raw message
arch/x86/kernel/cpu/mcheck/mce.c +2 -2
@@ -539,7 +539,7 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)struct mce m;int i; -__get_cpu_var (mce_poll_count)++; +percpu_inc (mce_poll_count);mce_setup (&m);
@@ -934,7 +934,7 @@ void do_machine_check(struct pt_regs *regs, long error_code)atomic_inc (&mce_entry); -__get_cpu_var (mce_exception_count)++; +percpu_inc (mce_exception_count);if (notify_die (DIE_NMI ,"machine check" , regs, error_code,18 ,SIGKILL ) ==NOTIFY_STOP )