Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65a792e8 authored by Zhigang Lu's avatar Zhigang Lu Committed by Chris Metcalf
Browse files

tile/jump_label: add jump label support for TILE-Gx 



Add the arch-specific code to support jump label for TILE-Gx. This
code shares NOP instruction with ftrace, so we move it to a common
header file.

Reviewed-by: default avatarChris Metcalf <cmetcalf@ezchip.com>
Signed-off-by: default avatarZhigang Lu <zlu@ezchip.com>
Signed-off-by: default avatarChris Metcalf <cmetcalf@ezchip.com>
parent f419e6f6

arch/tile/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ config TILEGX 
	select HAVE_KRETPROBES

	select HAVE_ARCH_KGDB

	select ARCH_SUPPORTS_ATOMIC_RMW

	select HAVE_ARCH_JUMP_LABEL



config TILEPRO

	def_bool !TILEGX

arch/tile/include/asm/insn.h

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Tilera Corporation. All Rights Reserved.

 *

 *   This program is free software; you can redistribute it and/or

 *   modify it under the terms of the GNU General Public License

 *   as published by the Free Software Foundation, version 2.

 *

 *   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, GOOD TITLE or

 *   NON INFRINGEMENT.  See the GNU General Public License for

 *   more details.

 */

#ifndef __ASM_TILE_INSN_H

#define __ASM_TILE_INSN_H



#include <arch/opcode.h>



static inline tilegx_bundle_bits NOP(void)

{

	return create_UnaryOpcodeExtension_X0(FNOP_UNARY_OPCODE_X0) |

		create_RRROpcodeExtension_X0(UNARY_RRR_0_OPCODE_X0) |

		create_Opcode_X0(RRR_0_OPCODE_X0) |

		create_UnaryOpcodeExtension_X1(NOP_UNARY_OPCODE_X1) |

		create_RRROpcodeExtension_X1(UNARY_RRR_0_OPCODE_X1) |

		create_Opcode_X1(RRR_0_OPCODE_X1);

}



static inline tilegx_bundle_bits tilegx_gen_branch(unsigned long pc,

					    unsigned long addr,

					    bool link)

{

	tilegx_bundle_bits opcode_x0, opcode_x1;

	long pcrel_by_instr = (addr - pc) >> TILEGX_LOG2_BUNDLE_SIZE_IN_BYTES;



	if (link) {

		/* opcode: jal addr */

		opcode_x1 =

			create_Opcode_X1(JUMP_OPCODE_X1) |

			create_JumpOpcodeExtension_X1(JAL_JUMP_OPCODE_X1) |

			create_JumpOff_X1(pcrel_by_instr);

	} else {

		/* opcode: j addr */

		opcode_x1 =

			create_Opcode_X1(JUMP_OPCODE_X1) |

			create_JumpOpcodeExtension_X1(J_JUMP_OPCODE_X1) |

			create_JumpOff_X1(pcrel_by_instr);

	}



	/* opcode: fnop */

	opcode_x0 =

		create_UnaryOpcodeExtension_X0(FNOP_UNARY_OPCODE_X0) |

		create_RRROpcodeExtension_X0(UNARY_RRR_0_OPCODE_X0) |

		create_Opcode_X0(RRR_0_OPCODE_X0);



	return opcode_x1 | opcode_x0;

}



#endif /* __ASM_TILE_INSN_H */

arch/tile/include/asm/jump_label.h

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Tilera Corporation. All Rights Reserved.

 *

 *   This program is free software; you can redistribute it and/or

 *   modify it under the terms of the GNU General Public License

 *   as published by the Free Software Foundation, version 2.

 *

 *   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, GOOD TITLE or

 *   NON INFRINGEMENT.  See the GNU General Public License for

 *   more details.

 */



#ifndef _ASM_TILE_JUMP_LABEL_H

#define _ASM_TILE_JUMP_LABEL_H



#include <arch/opcode.h>



#define JUMP_LABEL_NOP_SIZE	TILE_BUNDLE_SIZE_IN_BYTES



static __always_inline bool arch_static_branch(struct static_key *key,

					       bool branch)

{

	asm_volatile_goto("1:\n\t"

		"nop" "\n\t"

		".pushsection __jump_table,  \"aw\"\n\t"

		".quad 1b, %l[l_yes], %0 + %1 \n\t"

		".popsection\n\t"

		: :  "i" (key), "i" (branch) : : l_yes);

	return false;

l_yes:

	return true;

}



static __always_inline bool arch_static_branch_jump(struct static_key *key,

						    bool branch)

{

	asm_volatile_goto("1:\n\t"

		"j %l[l_yes]" "\n\t"

		".pushsection __jump_table,  \"aw\"\n\t"

		".quad 1b, %l[l_yes], %0 + %1 \n\t"

		".popsection\n\t"

		: :  "i" (key), "i" (branch) : : l_yes);

	return false;

l_yes:

	return true;

}



typedef u64 jump_label_t;



struct jump_entry {

	jump_label_t code;

	jump_label_t target;

	jump_label_t key;

};



#endif /* _ASM_TILE_JUMP_LABEL_H */

arch/tile/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -32,5 +32,6 @@ obj-$(CONFIG_TILE_HVGLUE_TRACE) += hvglue_trace.o 
obj-$(CONFIG_FUNCTION_TRACER)	+= ftrace.o mcount_64.o

obj-$(CONFIG_KPROBES)		+= kprobes.o

obj-$(CONFIG_KGDB)		+= kgdb.o

obj-$(CONFIG_JUMP_LABEL)	+= jump_label.o



obj-y				+= vdso/

arch/tile/kernel/ftrace.c

+1 −10
Original line number Diff line number Diff line
@@ -20,21 +20,12 @@ 
#include <asm/cacheflush.h>

#include <asm/ftrace.h>

#include <asm/sections.h>

#include <asm/insn.h>



#include <arch/opcode.h>



#ifdef CONFIG_DYNAMIC_FTRACE



static inline tilegx_bundle_bits NOP(void)

{

	return create_UnaryOpcodeExtension_X0(FNOP_UNARY_OPCODE_X0) |

		create_RRROpcodeExtension_X0(UNARY_RRR_0_OPCODE_X0) |

		create_Opcode_X0(RRR_0_OPCODE_X0) |

		create_UnaryOpcodeExtension_X1(NOP_UNARY_OPCODE_X1) |

		create_RRROpcodeExtension_X1(UNARY_RRR_0_OPCODE_X1) |

		create_Opcode_X1(RRR_0_OPCODE_X1);

}



static int machine_stopped __read_mostly;



int ftrace_arch_code_modify_prepare(void)