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

Commit 4ad70153 authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

MIPS: BPF: Add JIT support for SKF_AD_HATYPE. 



This let's us pass some additional "modprobe test-bpf" tests with JIT
enabled.

Reuse the code for SKF_AD_IFINDEX, but substitute the offset and size
of the "type" field.

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Steven J. Hill <steven.hill@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/15744/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent bfbfa9d6

arch/mips/net/bpf_jit.c

+17 −4
Original line number Diff line number Diff line
@@ -365,6 +365,12 @@ static inline void emit_half_load(unsigned int reg, unsigned int base, 
	emit_instr(ctx, lh, reg, offset, base);

}



static inline void emit_half_load_unsigned(unsigned int reg, unsigned int base,

					   unsigned int offset, struct jit_ctx *ctx)

{

	emit_instr(ctx, lhu, reg, offset, base);

}



static inline void emit_mul(unsigned int dst, unsigned int src1,

			    unsigned int src2, struct jit_ctx *ctx)

{
@@ -1112,6 +1118,8 @@ static int build_body(struct jit_ctx *ctx) 
			break;

		case BPF_ANC | SKF_AD_IFINDEX:

			/* A = skb->dev->ifindex */

		case BPF_ANC | SKF_AD_HATYPE:

			/* A = skb->dev->type */

			ctx->flags |= SEEN_SKB | SEEN_A;

			off = offsetof(struct sk_buff, dev);

			/* Load *dev pointer */
@@ -1120,10 +1128,15 @@ static int build_body(struct jit_ctx *ctx) 
			emit_bcond(MIPS_COND_EQ, r_s0, r_zero,

				   b_imm(prog->len, ctx), ctx);

			emit_reg_move(r_ret, r_zero, ctx);

			BUILD_BUG_ON(FIELD_SIZEOF(struct net_device,

						  ifindex) != 4);

			if (code == (BPF_ANC | SKF_AD_IFINDEX)) {

				BUILD_BUG_ON(FIELD_SIZEOF(struct net_device, ifindex) != 4);

				off = offsetof(struct net_device, ifindex);

				emit_load(r_A, r_s0, off, ctx);

			} else { /* (code == (BPF_ANC | SKF_AD_HATYPE) */

				BUILD_BUG_ON(FIELD_SIZEOF(struct net_device, type) != 2);

				off = offsetof(struct net_device, type);

				emit_half_load_unsigned(r_A, r_s0, off, ctx);

			}

			break;

		case BPF_ANC | SKF_AD_MARK:

			ctx->flags |= SEEN_SKB | SEEN_A;