Commit 04c04205 authored by Ravi Bangoria's avatar Ravi Bangoria Committed by Michael Ellerman
Browse files

bpf powerpc: Remove extra_pass from bpf_jit_build_body() 



In case of extra_pass, usual JIT passes are always skipped. So,
extra_pass is always false while calling bpf_jit_build_body() and
can be removed.

Signed-off-by: default avatarRavi Bangoria <ravi.bangoria@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211012123056.485795-3-hbathini@linux.ibm.com
parent c9ce7c36

arch/powerpc/net/bpf_jit.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -175,7 +175,7 @@ static inline void bpf_clear_seen_register(struct codegen_context *ctx, int i) 




void bpf_jit_emit_func_call_rel(u32 *image, struct codegen_context *ctx, u64 func);

void bpf_jit_emit_func_call_rel(u32 *image, struct codegen_context *ctx, u64 func);

int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context *ctx,

int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context *ctx,

		       u32 *addrs, bool extra_pass);

		       u32 *addrs);

void bpf_jit_build_prologue(u32 *image, struct codegen_context *ctx);

void bpf_jit_build_prologue(u32 *image, struct codegen_context *ctx);

void bpf_jit_build_epilogue(u32 *image, struct codegen_context *ctx);

void bpf_jit_build_epilogue(u32 *image, struct codegen_context *ctx);

void bpf_jit_realloc_regs(struct codegen_context *ctx);

void bpf_jit_realloc_regs(struct codegen_context *ctx);

arch/powerpc/net/bpf_jit_comp.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -149,7 +149,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp) 
	cgctx.stack_size = round_up(fp->aux->stack_depth, 16);

	cgctx.stack_size = round_up(fp->aux->stack_depth, 16);





	/* Scouting faux-generate pass 0 */

	/* Scouting faux-generate pass 0 */

	if (bpf_jit_build_body(fp, 0, &cgctx, addrs, false)) {

	if (bpf_jit_build_body(fp, 0, &cgctx, addrs)) {

		/* We hit something illegal or unsupported. */

		/* We hit something illegal or unsupported. */

		fp = org_fp;

		fp = org_fp;

		goto out_addrs;

		goto out_addrs;
@@ -162,7 +162,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp) 
	 */

	 */

	if (cgctx.seen & SEEN_TAILCALL) {

	if (cgctx.seen & SEEN_TAILCALL) {

		cgctx.idx = 0;

		cgctx.idx = 0;

		if (bpf_jit_build_body(fp, 0, &cgctx, addrs, false)) {

		if (bpf_jit_build_body(fp, 0, &cgctx, addrs)) {

			fp = org_fp;

			fp = org_fp;

			goto out_addrs;

			goto out_addrs;

		}

		}
@@ -210,7 +210,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp) 
		/* Now build the prologue, body code & epilogue for real. */

		/* Now build the prologue, body code & epilogue for real. */

		cgctx.idx = 0;

		cgctx.idx = 0;

		bpf_jit_build_prologue(code_base, &cgctx);

		bpf_jit_build_prologue(code_base, &cgctx);

		if (bpf_jit_build_body(fp, code_base, &cgctx, addrs, extra_pass)) {

		if (bpf_jit_build_body(fp, code_base, &cgctx, addrs)) {

			bpf_jit_binary_free(bpf_hdr);

			bpf_jit_binary_free(bpf_hdr);

			fp = org_fp;

			fp = org_fp;

			goto out_addrs;

			goto out_addrs;

arch/powerpc/net/bpf_jit_comp32.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -268,7 +268,7 @@ static int bpf_jit_emit_tail_call(u32 *image, struct codegen_context *ctx, u32 o 




/* Assemble the body code between the prologue & epilogue */

/* Assemble the body code between the prologue & epilogue */

int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context *ctx,

int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context *ctx,

		       u32 *addrs, bool extra_pass)

		       u32 *addrs)

{

{

	const struct bpf_insn *insn = fp->insnsi;

	const struct bpf_insn *insn = fp->insnsi;

	int flen = fp->len;

	int flen = fp->len;
@@ -862,7 +862,7 @@ int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context * 
		case BPF_JMP | BPF_CALL:

		case BPF_JMP | BPF_CALL:

			ctx->seen |= SEEN_FUNC;

			ctx->seen |= SEEN_FUNC;





			ret = bpf_jit_get_func_addr(fp, &insn[i], extra_pass,

			ret = bpf_jit_get_func_addr(fp, &insn[i], false,

						    &func_addr, &func_addr_fixed);

						    &func_addr, &func_addr_fixed);

			if (ret < 0)

			if (ret < 0)

				return ret;

				return ret;

arch/powerpc/net/bpf_jit_comp64.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -297,7 +297,7 @@ asm ( 




/* Assemble the body code between the prologue & epilogue */

/* Assemble the body code between the prologue & epilogue */

int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context *ctx,

int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context *ctx,

		       u32 *addrs, bool extra_pass)

		       u32 *addrs)

{

{

	enum stf_barrier_type stf_barrier = stf_barrier_type_get();

	enum stf_barrier_type stf_barrier = stf_barrier_type_get();

	const struct bpf_insn *insn = fp->insnsi;

	const struct bpf_insn *insn = fp->insnsi;
@@ -831,7 +831,7 @@ int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context * 
		case BPF_JMP | BPF_CALL:

		case BPF_JMP | BPF_CALL:

			ctx->seen |= SEEN_FUNC;

			ctx->seen |= SEEN_FUNC;





			ret = bpf_jit_get_func_addr(fp, &insn[i], extra_pass,

			ret = bpf_jit_get_func_addr(fp, &insn[i], false,

						    &func_addr, &func_addr_fixed);

						    &func_addr, &func_addr_fixed);

			if (ret < 0)

			if (ret < 0)

				return ret;

				return ret;