Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: bpf_jit_comp: Remove inline from static function definitions

Browse Source 
Let the compiler decide instead.

No change in object size x86-64 -O2 no profiling

Signed-off-by: Joe Perches <joe@perches.com>
Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2014-12-04 17:01:24 -08:00 committed by David S. Miller
parent d148134be5
commit 5cccc702fd
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/x86/net/bpf_jit_comp.c
View File

@ -24,7 +24,7 @@ extern u8 sk_load_byte_positive_offset[];
extern u8 sk_load_word_negative_offset[], sk_load_half_negative_offset[]; extern u8 sk_load_word_negative_offset[], sk_load_half_negative_offset[];
extern u8 sk_load_byte_negative_offset[]; extern u8 sk_load_byte_negative_offset[];
static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len) static u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
{ {
if (len == 1) if (len == 1)
*ptr = bytes; *ptr = bytes;
@ -52,12 +52,12 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
#define EMIT4_off32(b1, b2, b3, b4, off) \ #define EMIT4_off32(b1, b2, b3, b4, off) \
do {EMIT4(b1, b2, b3, b4); EMIT(off, 4); } while (0) do {EMIT4(b1, b2, b3, b4); EMIT(off, 4); } while (0)
static inline bool is_imm8(int value) static bool is_imm8(int value)
{ {
return value <= 127 && value >= -128; return value <= 127 && value >= -128;
} }
static inline bool is_simm32(s64 value) static bool is_simm32(s64 value)
{ {
return value == (s64) (s32) value; return value == (s64) (s32) value;
} }
@ -94,7 +94,7 @@ static int bpf_size_to_x86_bytes(int bpf_size)
#define X86_JGE 0x7D #define X86_JGE 0x7D
#define X86_JG 0x7F #define X86_JG 0x7F
static inline void bpf_flush_icache(void *start, void *end) static void bpf_flush_icache(void *start, void *end)
{ {
mm_segment_t old_fs = get_fs(); mm_segment_t old_fs = get_fs();
@ -133,7 +133,7 @@ static const int reg2hex[] = {
* which need extra byte of encoding. * which need extra byte of encoding.
* rax,rcx,...,rbp have simpler encoding * rax,rcx,...,rbp have simpler encoding
*/ */
static inline bool is_ereg(u32 reg) static bool is_ereg(u32 reg)
{ {
return (1 << reg) & (BIT(BPF_REG_5) | return (1 << reg) & (BIT(BPF_REG_5) |
BIT(AUX_REG) | BIT(AUX_REG) |
@ -143,14 +143,14 @@ static inline bool is_ereg(u32 reg)
} }
/* add modifiers if 'reg' maps to x64 registers r8..r15 */ /* add modifiers if 'reg' maps to x64 registers r8..r15 */
static inline u8 add_1mod(u8 byte, u32 reg) static u8 add_1mod(u8 byte, u32 reg)
{ {
if (is_ereg(reg)) if (is_ereg(reg))
byte |= 1; byte |= 1;
return byte; return byte;
} }
static inline u8 add_2mod(u8 byte, u32 r1, u32 r2) static u8 add_2mod(u8 byte, u32 r1, u32 r2)
{ {
if (is_ereg(r1)) if (is_ereg(r1))
byte |= 1; byte |= 1;
@ -160,13 +160,13 @@ static inline u8 add_2mod(u8 byte, u32 r1, u32 r2)
} }
/* encode 'dst_reg' register into x64 opcode 'byte' */ /* encode 'dst_reg' register into x64 opcode 'byte' */
static inline u8 add_1reg(u8 byte, u32 dst_reg) static u8 add_1reg(u8 byte, u32 dst_reg)
{ {
return byte + reg2hex[dst_reg]; return byte + reg2hex[dst_reg];
} }
/* encode 'dst_reg' and 'src_reg' registers into x64 opcode 'byte' */ /* encode 'dst_reg' and 'src_reg' registers into x64 opcode 'byte' */
static inline u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg) static u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
{ {
return byte + reg2hex[dst_reg] + (reg2hex[src_reg] << 3); return byte + reg2hex[dst_reg] + (reg2hex[src_reg] << 3);
} }