From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757034Ab0JAVt6 (ORCPT ); Fri, 1 Oct 2010 17:49:58 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:58987 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757004Ab0JAVtt (ORCPT ); Fri, 1 Oct 2010 17:49:49 -0400 X-Authority-Analysis: v=1.1 cv=exbvkCqEOBXDkHq+8n3wanotOBQtbe7qbIajSD+JluU= c=1 sm=0 a=uvfLreBbox8A:10 a=Q9fys5e9bTEA:10 a=OPBmh+XkhLl+Enan7BmTLg==:17 a=enOvQawGAAAA:8 a=meVymXHHAAAA:8 a=20KFwNOVAAAA:8 a=WPyIoOwQAAAA:8 a=Hx5pILiFvEqqr8uhplEA:9 a=jIOVN5da72WwMPl4kRwA:7 a=NxdjpJlFlzmN4xm9QMDJcBaA3tsA:4 a=PUjeQqilurYA:10 a=bkT6KWdcy0IA:10 a=jeBq3FmKZ4MA:10 a=jEp0ucaQiEUA:10 a=1DbiqZag68YA:10 a=OPBmh+XkhLl+Enan7BmTLg==:117 X-Cloudmark-Score: 0 X-Originating-IP: 67.242.120.143 Subject: Re: [PATCH] jump label: Add MIPS support. From: Steven Rostedt To: David Daney Cc: linux-mips@linux-mips.org, ralf@linux-mips.org, linux-kernel@vger.kernel.org, jbaron@redhat.com In-Reply-To: <1285697432-29244-1-git-send-email-ddaney@caviumnetworks.com> References: <1285697432-29244-1-git-send-email-ddaney@caviumnetworks.com> Content-Type: text/plain; charset="ISO-8859-15" Date: Fri, 01 Oct 2010 17:49:46 -0400 Message-ID: <1285969786.6750.19.camel@gandalf.stny.rr.com> Mime-Version: 1.0 X-Mailer: Evolution 2.30.2 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2010-09-28 at 11:10 -0700, David Daney wrote: > When in Rome... > > In order not to be left behind, we add jump label support for MIPS. > > Tested on 64-bit big endian (Octeon), and 32-bit little endian > (malta/qemu). > > Signed-off-by: David Daney > Cc: Steven Rostedt > Cc: Jason Baron > Cc: Ralf Baechle I can pull this into tip with an Acked-by from Ralf. He was just in Tokyo with me, and I don't know when he'll be available to do so. -- Steve > --- > arch/mips/Kconfig | 1 + > arch/mips/include/asm/jump_label.h | 48 ++++++++++++++++++++++++++++ > arch/mips/kernel/Makefile | 3 +- > arch/mips/kernel/jump_label.c | 60 ++++++++++++++++++++++++++++++++++++ > arch/mips/kernel/module.c | 5 +++ > 5 files changed, 116 insertions(+), 1 deletions(-) > create mode 100644 arch/mips/include/asm/jump_label.h > create mode 100644 arch/mips/kernel/jump_label.c > > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig > index 3ad59dd..6b3bdb5 100644 > --- a/arch/mips/Kconfig > +++ b/arch/mips/Kconfig > @@ -13,6 +13,7 @@ config MIPS > select HAVE_KPROBES > select HAVE_KRETPROBES > select RTC_LIB if !MACH_LOONGSON > + select HAVE_ARCH_JUMP_LABEL > > mainmenu "Linux/MIPS Kernel Configuration" > > diff --git a/arch/mips/include/asm/jump_label.h b/arch/mips/include/asm/jump_label.h > new file mode 100644 > index 0000000..7622ccf > --- /dev/null > +++ b/arch/mips/include/asm/jump_label.h > @@ -0,0 +1,48 @@ > +/* > + * This file is subject to the terms and conditions of the GNU General Public > + * License. See the file "COPYING" in the main directory of this archive > + * for more details. > + * > + * Copyright (c) 2010 Cavium Networks, Inc. > + */ > +#ifndef _ASM_MIPS_JUMP_LABEL_H > +#define _ASM_MIPS_JUMP_LABEL_H > + > +#include > + > +#ifdef __KERNEL__ > + > +#define JUMP_LABEL_NOP_SIZE 4 > + > +#ifdef CONFIG_64BIT > +#define WORD_INSN ".dword" > +#else > +#define WORD_INSN ".word" > +#endif > + > +#define JUMP_LABEL(key, label) \ > + do { \ > + asm goto("1:\tnop\n\t" \ > + "nop\n\t" \ > + ".pushsection __jump_table, \"a\"\n\t" \ > + WORD_INSN " 1b, %l[" #label "], %0\n\t" \ > + ".popsection\n\t" \ > + : : "i" (key) : : label); \ > + } while (0) > + > + > +#endif /* __KERNEL__ */ > + > +#ifdef CONFIG_64BIT > +typedef u64 jump_label_t; > +#else > +typedef u32 jump_label_t; > +#endif > + > +struct jump_entry { > + jump_label_t code; > + jump_label_t target; > + jump_label_t key; > +}; > + > +#endif /* _ASM_MIPS_JUMP_LABEL_H */ > diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile > index 06f8482..db4feb9 100644 > --- a/arch/mips/kernel/Makefile > +++ b/arch/mips/kernel/Makefile > @@ -6,7 +6,8 @@ extra-y := head.o init_task.o vmlinux.lds > > obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \ > ptrace.o reset.o setup.o signal.o syscall.o \ > - time.o topology.o traps.o unaligned.o watch.o vdso.o > + time.o topology.o traps.o unaligned.o watch.o vdso.o \ > + jump_label.o > > ifdef CONFIG_FUNCTION_TRACER > CFLAGS_REMOVE_ftrace.o = -pg > diff --git a/arch/mips/kernel/jump_label.c b/arch/mips/kernel/jump_label.c > new file mode 100644 > index 0000000..3c145a8 > --- /dev/null > +++ b/arch/mips/kernel/jump_label.c > @@ -0,0 +1,60 @@ > +/* > + * This file is subject to the terms and conditions of the GNU General Public > + * License. See the file "COPYING" in the main directory of this archive > + * for more details. > + * > + * Copyright (c) 2010 Cavium Networks, Inc. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include > +#include > + > +#define J_RANGE_MASK ((1ul << 28) - 1) > + > +void arch_jump_label_transform(struct jump_entry *e, > + enum jump_label_type type) > +{ > + union mips_instruction insn; > + union mips_instruction *insn_p = > + (union mips_instruction *)(unsigned long)e->code; > + > + /* Jump only works within a 256MB aligned region. */ > + BUG_ON((e->target & ~J_RANGE_MASK) != (e->code & ~J_RANGE_MASK)); > + > + /* Target must have 4 byte alignment. */ > + BUG_ON((e->target & 3) != 0); > + > + if (type == JUMP_LABEL_ENABLE) { > + insn.j_format.opcode = j_op; > + insn.j_format.target = (e->target & J_RANGE_MASK) >> 2; > + } else { > + insn.word = 0; /* nop */ > + } > + > + get_online_cpus(); > + mutex_lock(&text_mutex); > + *insn_p = insn; > + > + flush_icache_range((unsigned long)insn_p, > + (unsigned long)insn_p + sizeof(*insn_p)); > + > + mutex_unlock(&text_mutex); > + put_online_cpus(); > +} > + > +void arch_jump_label_text_poke_early(jump_label_t addr) > +{ > + union mips_instruction *insn_p = > + (union mips_instruction *)(unsigned long)addr; > + > + insn_p->word = 0; /* nop */ > + flush_icache_range((unsigned long)insn_p, > + (unsigned long)insn_p + sizeof(*insn_p)); > +} > diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c > index 6f51dda..bb9cde4 100644 > --- a/arch/mips/kernel/module.c > +++ b/arch/mips/kernel/module.c > @@ -30,6 +30,8 @@ > #include > #include > #include > +#include > + > #include /* MODULE_START */ > > struct mips_hi16 { > @@ -390,6 +392,9 @@ int module_finalize(const Elf_Ehdr *hdr, > const Elf_Shdr *s; > char *secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; > > + /* Make jump label nops. */ > + jump_label_apply_nops(me); > + > INIT_LIST_HEAD(&me->arch.dbe_list); > for (s = sechdrs; s < sechdrs + hdr->e_shnum; s++) { > if (strcmp("__dbe_table", secstrings + s->sh_name) != 0)