Commit 4d0b8c0b authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Alexei Starovoitov
Browse files

bpf: x64: Do not emit sub/add 0, %rsp when !stack_depth 



There is no particular reason for keeping the "sub 0, %rsp" insn within
the BPF's x64 JIT prologue.

When tail call code was skipping the whole prologue section these 7
bytes that represent the rsp subtraction could not be simply discarded
as the jump target address would be broken. An option to address that
would be to substitute it with nop7.

Right now tail call is skipping only first 11 bytes of target program's
prologue and "sub X, %rsp" is the first insn that is processed, so if
stack depth is zero then this insn could be omitted without the need for
nop7 swap.

Therefore, do not emit the "sub 0, %rsp" in prologue when program is not
making use of R10 register. Also, make the emission of "add X, %rsp"
conditional in tail call code logic and take into account the presence
of mentioned insn when calculating the jump offsets.

Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200929204653.4325-3-maciej.fijalkowski@intel.com
parent d207929d

arch/x86/net/bpf_jit_comp.c

+23 −10
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ static void emit_prologue(u8 **pprog, u32 stack_depth, bool ebpf_from_cbpf, 
	EMIT1(0x55);             /* push rbp */

	EMIT3(0x48, 0x89, 0xE5); /* mov rbp, rsp */

	/* sub rsp, rounded_stack_depth */

	if (stack_depth)

		EMIT3_off32(0x48, 0x81, 0xEC, round_up(stack_depth, 8));

	if (tail_call_reachable)

		EMIT1(0x50);         /* push rax */
@@ -407,9 +408,9 @@ static void emit_bpf_tail_call_indirect(u8 **pprog, bool *callee_regs_used, 
	int tcc_off = -4 - round_up(stack_depth, 8);

	u8 *prog = *pprog;

	int pop_bytes = 0;

	int off1 = 49;

	int off2 = 38;

	int off3 = 16;

	int off1 = 42;

	int off2 = 31;

	int off3 = 9;

	int cnt = 0;



	/* count the additional bytes used for popping callee regs from stack
@@ -421,6 +422,12 @@ static void emit_bpf_tail_call_indirect(u8 **pprog, bool *callee_regs_used, 
	off2 += pop_bytes;

	off3 += pop_bytes;



	if (stack_depth) {

		off1 += 7;

		off2 += 7;

		off3 += 7;

	}



	/*

	 * rdi - pointer to ctx

	 * rsi - pointer to bpf_array
@@ -465,6 +472,7 @@ static void emit_bpf_tail_call_indirect(u8 **pprog, bool *callee_regs_used, 
	prog = *pprog;



	EMIT1(0x58);                              /* pop rax */

	if (stack_depth)

		EMIT3_off32(0x48, 0x81, 0xC4,     /* add rsp, sd */

			    round_up(stack_depth, 8));
@@ -491,7 +499,7 @@ static void emit_bpf_tail_call_direct(struct bpf_jit_poke_descriptor *poke, 
	int tcc_off = -4 - round_up(stack_depth, 8);

	u8 *prog = *pprog;

	int pop_bytes = 0;

	int off1 = 27;

	int off1 = 20;

	int poke_off;

	int cnt = 0;
@@ -506,10 +514,14 @@ static void emit_bpf_tail_call_direct(struct bpf_jit_poke_descriptor *poke, 
	 * total bytes for:

	 * - nop5/ jmpq $off

	 * - pop callee regs

	 * - sub rsp, $val

	 * - sub rsp, $val if depth > 0

	 * - pop rax

	 */

	poke_off = X86_PATCH_SIZE + pop_bytes + 7 + 1;

	poke_off = X86_PATCH_SIZE + pop_bytes + 1;

	if (stack_depth) {

		poke_off += 7;

		off1 += 7;

	}



	/*

	 * if (tail_call_cnt > MAX_TAIL_CALL_CNT)
@@ -533,6 +545,7 @@ static void emit_bpf_tail_call_direct(struct bpf_jit_poke_descriptor *poke, 
	pop_callee_regs(pprog, callee_regs_used);

	prog = *pprog;

	EMIT1(0x58);                                  /* pop rax */

	if (stack_depth)

		EMIT3_off32(0x48, 0x81, 0xC4, round_up(stack_depth, 8));



	memcpy(prog, ideal_nops[NOP_ATOMIC5], X86_PATCH_SIZE);

CRA Git | Maintained and supported by SUSTech CRA and CCSE