net: filter: get rid of BPF_S_* enum (34805931) · Commits · 戴 / test

arch/arm/net/bpf_jit_32.c

+67 −72

Original line number	Original line	Diff line number	Diff line
	@@ -136,7 +136,7 @@ static u16 saved_regs(struct jit_ctx *ctx)
	u16 ret = 0;		u16 ret = 0;

	if ((ctx->skf->len > 1) \|\|		if ((ctx->skf->len > 1) \|\|
	(ctx->skf->insns[0].code == BPF_S_RET_A))		(ctx->skf->insns[0].code == (BPF_RET \| BPF_A)))
	ret \|= 1 << r_A;		ret \|= 1 << r_A;

	#ifdef CONFIG_FRAME_POINTER		#ifdef CONFIG_FRAME_POINTER
	@@ -164,18 +164,10 @@ static inline int mem_words_used(struct jit_ctx *ctx)
	static inline bool is_load_to_a(u16 inst)		static inline bool is_load_to_a(u16 inst)
	{		{
	switch (inst) {		switch (inst) {
	case BPF_S_LD_W_LEN:		case BPF_LD \| BPF_W \| BPF_LEN:
	case BPF_S_LD_W_ABS:		case BPF_LD \| BPF_W \| BPF_ABS:
	case BPF_S_LD_H_ABS:		case BPF_LD \| BPF_H \| BPF_ABS:
	case BPF_S_LD_B_ABS:		case BPF_LD \| BPF_B \| BPF_ABS:
	case BPF_S_ANC_CPU:
	case BPF_S_ANC_IFINDEX:
	case BPF_S_ANC_MARK:
	case BPF_S_ANC_PROTOCOL:
	case BPF_S_ANC_RXHASH:
	case BPF_S_ANC_VLAN_TAG:
	case BPF_S_ANC_VLAN_TAG_PRESENT:
	case BPF_S_ANC_QUEUE:
	return true;		return true;
	default:		default:
	return false;		return false;
	@@ -215,7 +207,7 @@ static void build_prologue(struct jit_ctx *ctx)
	emit(ARM_MOV_I(r_X, 0), ctx);		emit(ARM_MOV_I(r_X, 0), ctx);

	/* do not leak kernel data to userspace */		/* do not leak kernel data to userspace */
	if ((first_inst != BPF_S_RET_K) && !(is_load_to_a(first_inst)))		if ((first_inst != (BPF_RET \| BPF_K)) && !(is_load_to_a(first_inst)))
	emit(ARM_MOV_I(r_A, 0), ctx);		emit(ARM_MOV_I(r_A, 0), ctx);

	/* stack space for the BPF_MEM words */		/* stack space for the BPF_MEM words */
	@@ -480,36 +472,39 @@ static int build_body(struct jit_ctx *ctx)
	u32 k;		u32 k;

	for (i = 0; i < prog->len; i++) {		for (i = 0; i < prog->len; i++) {
			u16 code;

	inst = &(prog->insns[i]);		inst = &(prog->insns[i]);
	/* K as an immediate value operand */		/* K as an immediate value operand */
	k = inst->k;		k = inst->k;
			code = bpf_anc_helper(inst);

	/* compute offsets only in the fake pass */		/* compute offsets only in the fake pass */
	if (ctx->target == NULL)		if (ctx->target == NULL)
	ctx->offsets[i] = ctx->idx * 4;		ctx->offsets[i] = ctx->idx * 4;

	switch (inst->code) {		switch (code) {
	case BPF_S_LD_IMM:		case BPF_LD \| BPF_IMM:
	emit_mov_i(r_A, k, ctx);		emit_mov_i(r_A, k, ctx);
	break;		break;
	case BPF_S_LD_W_LEN:		case BPF_LD \| BPF_W \| BPF_LEN:
	ctx->seen \|= SEEN_SKB;		ctx->seen \|= SEEN_SKB;
	BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, len) != 4);		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, len) != 4);
	emit(ARM_LDR_I(r_A, r_skb,		emit(ARM_LDR_I(r_A, r_skb,
	offsetof(struct sk_buff, len)), ctx);		offsetof(struct sk_buff, len)), ctx);
	break;		break;
	case BPF_S_LD_MEM:		case BPF_LD \| BPF_MEM:
	/* A = scratch[k] */		/* A = scratch[k] */
	ctx->seen \|= SEEN_MEM_WORD(k);		ctx->seen \|= SEEN_MEM_WORD(k);
	emit(ARM_LDR_I(r_A, ARM_SP, SCRATCH_OFF(k)), ctx);		emit(ARM_LDR_I(r_A, ARM_SP, SCRATCH_OFF(k)), ctx);
	break;		break;
	case BPF_S_LD_W_ABS:		case BPF_LD \| BPF_W \| BPF_ABS:
	load_order = 2;		load_order = 2;
	goto load;		goto load;
	case BPF_S_LD_H_ABS:		case BPF_LD \| BPF_H \| BPF_ABS:
	load_order = 1;		load_order = 1;
	goto load;		goto load;
	case BPF_S_LD_B_ABS:		case BPF_LD \| BPF_B \| BPF_ABS:
	load_order = 0;		load_order = 0;
	load:		load:
	/* the interpreter will deal with the negative K */		/* the interpreter will deal with the negative K */
	@@ -552,31 +547,31 @@ load_common:
	emit_err_ret(ARM_COND_NE, ctx);		emit_err_ret(ARM_COND_NE, ctx);
	emit(ARM_MOV_R(r_A, ARM_R0), ctx);		emit(ARM_MOV_R(r_A, ARM_R0), ctx);
	break;		break;
	case BPF_S_LD_W_IND:		case BPF_LD \| BPF_W \| BPF_IND:
	load_order = 2;		load_order = 2;
	goto load_ind;		goto load_ind;
	case BPF_S_LD_H_IND:		case BPF_LD \| BPF_H \| BPF_IND:
	load_order = 1;		load_order = 1;
	goto load_ind;		goto load_ind;
	case BPF_S_LD_B_IND:		case BPF_LD \| BPF_B \| BPF_IND:
	load_order = 0;		load_order = 0;
	load_ind:		load_ind:
	OP_IMM3(ARM_ADD, r_off, r_X, k, ctx);		OP_IMM3(ARM_ADD, r_off, r_X, k, ctx);
	goto load_common;		goto load_common;
	case BPF_S_LDX_IMM:		case BPF_LDX \| BPF_IMM:
	ctx->seen \|= SEEN_X;		ctx->seen \|= SEEN_X;
	emit_mov_i(r_X, k, ctx);		emit_mov_i(r_X, k, ctx);
	break;		break;
	case BPF_S_LDX_W_LEN:		case BPF_LDX \| BPF_W \| BPF_LEN:
	ctx->seen \|= SEEN_X \| SEEN_SKB;		ctx->seen \|= SEEN_X \| SEEN_SKB;
	emit(ARM_LDR_I(r_X, r_skb,		emit(ARM_LDR_I(r_X, r_skb,
	offsetof(struct sk_buff, len)), ctx);		offsetof(struct sk_buff, len)), ctx);
	break;		break;
	case BPF_S_LDX_MEM:		case BPF_LDX \| BPF_MEM:
	ctx->seen \|= SEEN_X \| SEEN_MEM_WORD(k);		ctx->seen \|= SEEN_X \| SEEN_MEM_WORD(k);
	emit(ARM_LDR_I(r_X, ARM_SP, SCRATCH_OFF(k)), ctx);		emit(ARM_LDR_I(r_X, ARM_SP, SCRATCH_OFF(k)), ctx);
	break;		break;
	case BPF_S_LDX_B_MSH:		case BPF_LDX \| BPF_B \| BPF_MSH:
	/* x = (((frame + k)) & 0xf) << 2; /		/* x = (((frame + k)) & 0xf) << 2; /
	ctx->seen \|= SEEN_X \| SEEN_DATA \| SEEN_CALL;		ctx->seen \|= SEEN_X \| SEEN_DATA \| SEEN_CALL;
	/* the interpreter should deal with the negative K */		/* the interpreter should deal with the negative K */
	@@ -606,113 +601,113 @@ load_ind:
	emit(ARM_AND_I(r_X, ARM_R0, 0x00f), ctx);		emit(ARM_AND_I(r_X, ARM_R0, 0x00f), ctx);
	emit(ARM_LSL_I(r_X, r_X, 2), ctx);		emit(ARM_LSL_I(r_X, r_X, 2), ctx);
	break;		break;
	case BPF_S_ST:		case BPF_ST:
	ctx->seen \|= SEEN_MEM_WORD(k);		ctx->seen \|= SEEN_MEM_WORD(k);
	emit(ARM_STR_I(r_A, ARM_SP, SCRATCH_OFF(k)), ctx);		emit(ARM_STR_I(r_A, ARM_SP, SCRATCH_OFF(k)), ctx);
	break;		break;
	case BPF_S_STX:		case BPF_STX:
	update_on_xread(ctx);		update_on_xread(ctx);
	ctx->seen \|= SEEN_MEM_WORD(k);		ctx->seen \|= SEEN_MEM_WORD(k);
	emit(ARM_STR_I(r_X, ARM_SP, SCRATCH_OFF(k)), ctx);		emit(ARM_STR_I(r_X, ARM_SP, SCRATCH_OFF(k)), ctx);
	break;		break;
	case BPF_S_ALU_ADD_K:		case BPF_ALU \| BPF_ADD \| BPF_K:
	/* A += K */		/* A += K */
	OP_IMM3(ARM_ADD, r_A, r_A, k, ctx);		OP_IMM3(ARM_ADD, r_A, r_A, k, ctx);
	break;		break;
	case BPF_S_ALU_ADD_X:		case BPF_ALU \| BPF_ADD \| BPF_X:
	update_on_xread(ctx);		update_on_xread(ctx);
	emit(ARM_ADD_R(r_A, r_A, r_X), ctx);		emit(ARM_ADD_R(r_A, r_A, r_X), ctx);
	break;		break;
	case BPF_S_ALU_SUB_K:		case BPF_ALU \| BPF_SUB \| BPF_K:
	/* A -= K */		/* A -= K */
	OP_IMM3(ARM_SUB, r_A, r_A, k, ctx);		OP_IMM3(ARM_SUB, r_A, r_A, k, ctx);
	break;		break;
	case BPF_S_ALU_SUB_X:		case BPF_ALU \| BPF_SUB \| BPF_X:
	update_on_xread(ctx);		update_on_xread(ctx);
	emit(ARM_SUB_R(r_A, r_A, r_X), ctx);		emit(ARM_SUB_R(r_A, r_A, r_X), ctx);
	break;		break;
	case BPF_S_ALU_MUL_K:		case BPF_ALU \| BPF_MUL \| BPF_K:
	/* A = K /		/* A = K /
	emit_mov_i(r_scratch, k, ctx);		emit_mov_i(r_scratch, k, ctx);
	emit(ARM_MUL(r_A, r_A, r_scratch), ctx);		emit(ARM_MUL(r_A, r_A, r_scratch), ctx);
	break;		break;
	case BPF_S_ALU_MUL_X:		case BPF_ALU \| BPF_MUL \| BPF_X:
	update_on_xread(ctx);		update_on_xread(ctx);
	emit(ARM_MUL(r_A, r_A, r_X), ctx);		emit(ARM_MUL(r_A, r_A, r_X), ctx);
	break;		break;
	case BPF_S_ALU_DIV_K:		case BPF_ALU \| BPF_DIV \| BPF_K:
	if (k == 1)		if (k == 1)
	break;		break;
	emit_mov_i(r_scratch, k, ctx);		emit_mov_i(r_scratch, k, ctx);
	emit_udiv(r_A, r_A, r_scratch, ctx);		emit_udiv(r_A, r_A, r_scratch, ctx);
	break;		break;
	case BPF_S_ALU_DIV_X:		case BPF_ALU \| BPF_DIV \| BPF_X:
	update_on_xread(ctx);		update_on_xread(ctx);
	emit(ARM_CMP_I(r_X, 0), ctx);		emit(ARM_CMP_I(r_X, 0), ctx);
	emit_err_ret(ARM_COND_EQ, ctx);		emit_err_ret(ARM_COND_EQ, ctx);
	emit_udiv(r_A, r_A, r_X, ctx);		emit_udiv(r_A, r_A, r_X, ctx);
	break;		break;
	case BPF_S_ALU_OR_K:		case BPF_ALU \| BPF_OR \| BPF_K:
	/* A \|= K */		/* A \|= K */
	OP_IMM3(ARM_ORR, r_A, r_A, k, ctx);		OP_IMM3(ARM_ORR, r_A, r_A, k, ctx);
	break;		break;
	case BPF_S_ALU_OR_X:		case BPF_ALU \| BPF_OR \| BPF_X:
	update_on_xread(ctx);		update_on_xread(ctx);
	emit(ARM_ORR_R(r_A, r_A, r_X), ctx);		emit(ARM_ORR_R(r_A, r_A, r_X), ctx);
	break;		break;
	case BPF_S_ALU_XOR_K:		case BPF_ALU \| BPF_XOR \| BPF_K:
	/* A ^= K; */		/* A ^= K; */
	OP_IMM3(ARM_EOR, r_A, r_A, k, ctx);		OP_IMM3(ARM_EOR, r_A, r_A, k, ctx);
	break;		break;
	case BPF_S_ANC_ALU_XOR_X:		case BPF_ANC \| SKF_AD_ALU_XOR_X:
	case BPF_S_ALU_XOR_X:		case BPF_ALU \| BPF_XOR \| BPF_X:
	/* A ^= X */		/* A ^= X */
	update_on_xread(ctx);		update_on_xread(ctx);
	emit(ARM_EOR_R(r_A, r_A, r_X), ctx);		emit(ARM_EOR_R(r_A, r_A, r_X), ctx);
	break;		break;
	case BPF_S_ALU_AND_K:		case BPF_ALU \| BPF_AND \| BPF_K:
	/* A &= K */		/* A &= K */
	OP_IMM3(ARM_AND, r_A, r_A, k, ctx);		OP_IMM3(ARM_AND, r_A, r_A, k, ctx);
	break;		break;
	case BPF_S_ALU_AND_X:		case BPF_ALU \| BPF_AND \| BPF_X:
	update_on_xread(ctx);		update_on_xread(ctx);
	emit(ARM_AND_R(r_A, r_A, r_X), ctx);		emit(ARM_AND_R(r_A, r_A, r_X), ctx);
	break;		break;
	case BPF_S_ALU_LSH_K:		case BPF_ALU \| BPF_LSH \| BPF_K:
	if (unlikely(k > 31))		if (unlikely(k > 31))
	return -1;		return -1;
	emit(ARM_LSL_I(r_A, r_A, k), ctx);		emit(ARM_LSL_I(r_A, r_A, k), ctx);
	break;		break;
	case BPF_S_ALU_LSH_X:		case BPF_ALU \| BPF_LSH \| BPF_X:
	update_on_xread(ctx);		update_on_xread(ctx);
	emit(ARM_LSL_R(r_A, r_A, r_X), ctx);		emit(ARM_LSL_R(r_A, r_A, r_X), ctx);
	break;		break;
	case BPF_S_ALU_RSH_K:		case BPF_ALU \| BPF_RSH \| BPF_K:
	if (unlikely(k > 31))		if (unlikely(k > 31))
	return -1;		return -1;
	emit(ARM_LSR_I(r_A, r_A, k), ctx);		emit(ARM_LSR_I(r_A, r_A, k), ctx);
	break;		break;
	case BPF_S_ALU_RSH_X:		case BPF_ALU \| BPF_RSH \| BPF_X:
	update_on_xread(ctx);		update_on_xread(ctx);
	emit(ARM_LSR_R(r_A, r_A, r_X), ctx);		emit(ARM_LSR_R(r_A, r_A, r_X), ctx);
	break;		break;
	case BPF_S_ALU_NEG:		case BPF_ALU \| BPF_NEG:
	/* A = -A */		/* A = -A */
	emit(ARM_RSB_I(r_A, r_A, 0), ctx);		emit(ARM_RSB_I(r_A, r_A, 0), ctx);
	break;		break;
	case BPF_S_JMP_JA:		case BPF_JMP \| BPF_JA:
	/* pc += K */		/* pc += K */
	emit(ARM_B(b_imm(i + k + 1, ctx)), ctx);		emit(ARM_B(b_imm(i + k + 1, ctx)), ctx);
	break;		break;
	case BPF_S_JMP_JEQ_K:		case BPF_JMP \| BPF_JEQ \| BPF_K:
	/* pc += (A == K) ? pc->jt : pc->jf */		/* pc += (A == K) ? pc->jt : pc->jf */
	condt = ARM_COND_EQ;		condt = ARM_COND_EQ;
	goto cmp_imm;		goto cmp_imm;
	case BPF_S_JMP_JGT_K:		case BPF_JMP \| BPF_JGT \| BPF_K:
	/* pc += (A > K) ? pc->jt : pc->jf */		/* pc += (A > K) ? pc->jt : pc->jf */
	condt = ARM_COND_HI;		condt = ARM_COND_HI;
	goto cmp_imm;		goto cmp_imm;
	case BPF_S_JMP_JGE_K:		case BPF_JMP \| BPF_JGE \| BPF_K:
	/* pc += (A >= K) ? pc->jt : pc->jf */		/* pc += (A >= K) ? pc->jt : pc->jf */
	condt = ARM_COND_HS;		condt = ARM_COND_HS;
	cmp_imm:		cmp_imm:
	@@ -731,22 +726,22 @@ cond_jump:
	_emit(condt ^ 1, ARM_B(b_imm(i + inst->jf + 1,		_emit(condt ^ 1, ARM_B(b_imm(i + inst->jf + 1,
	ctx)), ctx);		ctx)), ctx);
	break;		break;
	case BPF_S_JMP_JEQ_X:		case BPF_JMP \| BPF_JEQ \| BPF_X:
	/* pc += (A == X) ? pc->jt : pc->jf */		/* pc += (A == X) ? pc->jt : pc->jf */
	condt = ARM_COND_EQ;		condt = ARM_COND_EQ;
	goto cmp_x;		goto cmp_x;
	case BPF_S_JMP_JGT_X:		case BPF_JMP \| BPF_JGT \| BPF_X:
	/* pc += (A > X) ? pc->jt : pc->jf */		/* pc += (A > X) ? pc->jt : pc->jf */
	condt = ARM_COND_HI;		condt = ARM_COND_HI;
	goto cmp_x;		goto cmp_x;
	case BPF_S_JMP_JGE_X:		case BPF_JMP \| BPF_JGE \| BPF_X:
	/* pc += (A >= X) ? pc->jt : pc->jf */		/* pc += (A >= X) ? pc->jt : pc->jf */
	condt = ARM_COND_CS;		condt = ARM_COND_CS;
	cmp_x:		cmp_x:
	update_on_xread(ctx);		update_on_xread(ctx);
	emit(ARM_CMP_R(r_A, r_X), ctx);		emit(ARM_CMP_R(r_A, r_X), ctx);
	goto cond_jump;		goto cond_jump;
	case BPF_S_JMP_JSET_K:		case BPF_JMP \| BPF_JSET \| BPF_K:
	/* pc += (A & K) ? pc->jt : pc->jf */		/* pc += (A & K) ? pc->jt : pc->jf */
	condt = ARM_COND_NE;		condt = ARM_COND_NE;
	/* not set iff all zeroes iff Z==1 iff EQ */		/* not set iff all zeroes iff Z==1 iff EQ */
	@@ -759,16 +754,16 @@ cmp_x:
	emit(ARM_TST_I(r_A, imm12), ctx);		emit(ARM_TST_I(r_A, imm12), ctx);
	}		}
	goto cond_jump;		goto cond_jump;
	case BPF_S_JMP_JSET_X:		case BPF_JMP \| BPF_JSET \| BPF_X:
	/* pc += (A & X) ? pc->jt : pc->jf */		/* pc += (A & X) ? pc->jt : pc->jf */
	update_on_xread(ctx);		update_on_xread(ctx);
	condt = ARM_COND_NE;		condt = ARM_COND_NE;
	emit(ARM_TST_R(r_A, r_X), ctx);		emit(ARM_TST_R(r_A, r_X), ctx);
	goto cond_jump;		goto cond_jump;
	case BPF_S_RET_A:		case BPF_RET \| BPF_A:
	emit(ARM_MOV_R(ARM_R0, r_A), ctx);		emit(ARM_MOV_R(ARM_R0, r_A), ctx);
	goto b_epilogue;		goto b_epilogue;
	case BPF_S_RET_K:		case BPF_RET \| BPF_K:
	if ((k == 0) && (ctx->ret0_fp_idx < 0))		if ((k == 0) && (ctx->ret0_fp_idx < 0))
	ctx->ret0_fp_idx = i;		ctx->ret0_fp_idx = i;
	emit_mov_i(ARM_R0, k, ctx);		emit_mov_i(ARM_R0, k, ctx);
	@@ -776,17 +771,17 @@ b_epilogue:
	if (i != ctx->skf->len - 1)		if (i != ctx->skf->len - 1)
	emit(ARM_B(b_imm(prog->len, ctx)), ctx);		emit(ARM_B(b_imm(prog->len, ctx)), ctx);
	break;		break;
	case BPF_S_MISC_TAX:		case BPF_MISC \| BPF_TAX:
	/* X = A */		/* X = A */
	ctx->seen \|= SEEN_X;		ctx->seen \|= SEEN_X;
	emit(ARM_MOV_R(r_X, r_A), ctx);		emit(ARM_MOV_R(r_X, r_A), ctx);
	break;		break;
	case BPF_S_MISC_TXA:		case BPF_MISC \| BPF_TXA:
	/* A = X */		/* A = X */
	update_on_xread(ctx);		update_on_xread(ctx);
	emit(ARM_MOV_R(r_A, r_X), ctx);		emit(ARM_MOV_R(r_A, r_X), ctx);
	break;		break;
	case BPF_S_ANC_PROTOCOL:		case BPF_ANC \| SKF_AD_PROTOCOL:
	/* A = ntohs(skb->protocol) */		/* A = ntohs(skb->protocol) */
	ctx->seen \|= SEEN_SKB;		ctx->seen \|= SEEN_SKB;
	BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,
	@@ -795,7 +790,7 @@ b_epilogue:
	emit(ARM_LDRH_I(r_scratch, r_skb, off), ctx);		emit(ARM_LDRH_I(r_scratch, r_skb, off), ctx);
	emit_swap16(r_A, r_scratch, ctx);		emit_swap16(r_A, r_scratch, ctx);
	break;		break;
	case BPF_S_ANC_CPU:		case BPF_ANC \| SKF_AD_CPU:
	/* r_scratch = current_thread_info() */		/* r_scratch = current_thread_info() */
	OP_IMM3(ARM_BIC, r_scratch, ARM_SP, THREAD_SIZE - 1, ctx);		OP_IMM3(ARM_BIC, r_scratch, ARM_SP, THREAD_SIZE - 1, ctx);
	/* A = current_thread_info()->cpu */		/* A = current_thread_info()->cpu */
	@@ -803,7 +798,7 @@ b_epilogue:
	off = offsetof(struct thread_info, cpu);		off = offsetof(struct thread_info, cpu);
	emit(ARM_LDR_I(r_A, r_scratch, off), ctx);		emit(ARM_LDR_I(r_A, r_scratch, off), ctx);
	break;		break;
	case BPF_S_ANC_IFINDEX:		case BPF_ANC \| SKF_AD_IFINDEX:
	/* A = skb->dev->ifindex */		/* A = skb->dev->ifindex */
	ctx->seen \|= SEEN_SKB;		ctx->seen \|= SEEN_SKB;
	off = offsetof(struct sk_buff, dev);		off = offsetof(struct sk_buff, dev);
	@@ -817,30 +812,30 @@ b_epilogue:
	off = offsetof(struct net_device, ifindex);		off = offsetof(struct net_device, ifindex);
	emit(ARM_LDR_I(r_A, r_scratch, off), ctx);		emit(ARM_LDR_I(r_A, r_scratch, off), ctx);
	break;		break;
	case BPF_S_ANC_MARK:		case BPF_ANC \| SKF_AD_MARK:
	ctx->seen \|= SEEN_SKB;		ctx->seen \|= SEEN_SKB;
	BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, mark) != 4);		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, mark) != 4);
	off = offsetof(struct sk_buff, mark);		off = offsetof(struct sk_buff, mark);
	emit(ARM_LDR_I(r_A, r_skb, off), ctx);		emit(ARM_LDR_I(r_A, r_skb, off), ctx);
	break;		break;
	case BPF_S_ANC_RXHASH:		case BPF_ANC \| SKF_AD_RXHASH:
	ctx->seen \|= SEEN_SKB;		ctx->seen \|= SEEN_SKB;
	BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, hash) != 4);		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, hash) != 4);
	off = offsetof(struct sk_buff, hash);		off = offsetof(struct sk_buff, hash);
	emit(ARM_LDR_I(r_A, r_skb, off), ctx);		emit(ARM_LDR_I(r_A, r_skb, off), ctx);
	break;		break;
	case BPF_S_ANC_VLAN_TAG:		case BPF_ANC \| SKF_AD_VLAN_TAG:
	case BPF_S_ANC_VLAN_TAG_PRESENT:		case BPF_ANC \| SKF_AD_VLAN_TAG_PRESENT:
	ctx->seen \|= SEEN_SKB;		ctx->seen \|= SEEN_SKB;
	BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, vlan_tci) != 2);		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, vlan_tci) != 2);
	off = offsetof(struct sk_buff, vlan_tci);		off = offsetof(struct sk_buff, vlan_tci);
	emit(ARM_LDRH_I(r_A, r_skb, off), ctx);		emit(ARM_LDRH_I(r_A, r_skb, off), ctx);
	if (inst->code == BPF_S_ANC_VLAN_TAG)		if (code == (BPF_ANC \| SKF_AD_VLAN_TAG))
	OP_IMM3(ARM_AND, r_A, r_A, VLAN_VID_MASK, ctx);		OP_IMM3(ARM_AND, r_A, r_A, VLAN_VID_MASK, ctx);
	else		else
	OP_IMM3(ARM_AND, r_A, r_A, VLAN_TAG_PRESENT, ctx);		OP_IMM3(ARM_AND, r_A, r_A, VLAN_TAG_PRESENT, ctx);
	break;		break;
	case BPF_S_ANC_QUEUE:		case BPF_ANC \| SKF_AD_QUEUE:
	ctx->seen \|= SEEN_SKB;		ctx->seen \|= SEEN_SKB;
	BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,
	queue_mapping) != 2);		queue_mapping) != 2);

arch/powerpc/net/bpf_jit_64.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -78,7 +78,7 @@ sk_load_byte_positive_offset:
	blr		blr

	/*		/*
	* BPF_S_LDX_B_MSH: ldxb 4*([offset]&0xf)		* BPF_LDX \| BPF_B \| BPF_MSH: ldxb 4*([offset]&0xf)
	* r_addr is the offset value		* r_addr is the offset value
	*/		*/
	.globl sk_load_byte_msh		.globl sk_load_byte_msh

arch/powerpc/net/bpf_jit_comp.c

+75 −82

Original line number	Original line	Diff line number	Diff line
	@@ -79,19 +79,11 @@ static void bpf_jit_build_prologue(struct sk_filter fp, u32 image,
	}		}

	switch (filter[0].code) {		switch (filter[0].code) {
	case BPF_S_RET_K:		case BPF_RET \| BPF_K:
	case BPF_S_LD_W_LEN:		case BPF_LD \| BPF_W \| BPF_LEN:
	case BPF_S_ANC_PROTOCOL:		case BPF_LD \| BPF_W \| BPF_ABS:
	case BPF_S_ANC_IFINDEX:		case BPF_LD \| BPF_H \| BPF_ABS:
	case BPF_S_ANC_MARK:		case BPF_LD \| BPF_B \| BPF_ABS:
	case BPF_S_ANC_RXHASH:
	case BPF_S_ANC_VLAN_TAG:
	case BPF_S_ANC_VLAN_TAG_PRESENT:
	case BPF_S_ANC_CPU:
	case BPF_S_ANC_QUEUE:
	case BPF_S_LD_W_ABS:
	case BPF_S_LD_H_ABS:
	case BPF_S_LD_B_ABS:
	/* first instruction sets A register (or is RET 'constant') */		/* first instruction sets A register (or is RET 'constant') */
	break;		break;
	default:		default:
	@@ -144,6 +136,7 @@ static int bpf_jit_build_body(struct sk_filter fp, u32 image,

	for (i = 0; i < flen; i++) {		for (i = 0; i < flen; i++) {
	unsigned int K = filter[i].k;		unsigned int K = filter[i].k;
			u16 code = bpf_anc_helper(&filter[i]);

	/*		/*
	* addrs[] maps a BPF bytecode address into a real offset from		* addrs[] maps a BPF bytecode address into a real offset from
	@@ -151,35 +144,35 @@ static int bpf_jit_build_body(struct sk_filter fp, u32 image,
	*/		*/
	addrs[i] = ctx->idx * 4;		addrs[i] = ctx->idx * 4;

	switch (filter[i].code) {		switch (code) {
	/* ALU ops */		/* ALU ops */
	case BPF_S_ALU_ADD_X: /* A += X; */		case BPF_ALU \| BPF_ADD \| BPF_X: /* A += X; */
	ctx->seen \|= SEEN_XREG;		ctx->seen \|= SEEN_XREG;
	PPC_ADD(r_A, r_A, r_X);		PPC_ADD(r_A, r_A, r_X);
	break;		break;
	case BPF_S_ALU_ADD_K: /* A += K; */		case BPF_ALU \| BPF_ADD \| BPF_K: /* A += K; */
	if (!K)		if (!K)
	break;		break;
	PPC_ADDI(r_A, r_A, IMM_L(K));		PPC_ADDI(r_A, r_A, IMM_L(K));
	if (K >= 32768)		if (K >= 32768)
	PPC_ADDIS(r_A, r_A, IMM_HA(K));		PPC_ADDIS(r_A, r_A, IMM_HA(K));
	break;		break;
	case BPF_S_ALU_SUB_X: /* A -= X; */		case BPF_ALU \| BPF_SUB \| BPF_X: /* A -= X; */
	ctx->seen \|= SEEN_XREG;		ctx->seen \|= SEEN_XREG;
	PPC_SUB(r_A, r_A, r_X);		PPC_SUB(r_A, r_A, r_X);
	break;		break;
	case BPF_S_ALU_SUB_K: /* A -= K */		case BPF_ALU \| BPF_SUB \| BPF_K: /* A -= K */
	if (!K)		if (!K)
	break;		break;
	PPC_ADDI(r_A, r_A, IMM_L(-K));		PPC_ADDI(r_A, r_A, IMM_L(-K));
	if (K >= 32768)		if (K >= 32768)
	PPC_ADDIS(r_A, r_A, IMM_HA(-K));		PPC_ADDIS(r_A, r_A, IMM_HA(-K));
	break;		break;
	case BPF_S_ALU_MUL_X: /* A = X; /		case BPF_ALU \| BPF_MUL \| BPF_X: /* A = X; /
	ctx->seen \|= SEEN_XREG;		ctx->seen \|= SEEN_XREG;
	PPC_MUL(r_A, r_A, r_X);		PPC_MUL(r_A, r_A, r_X);
	break;		break;
	case BPF_S_ALU_MUL_K: /* A = K /		case BPF_ALU \| BPF_MUL \| BPF_K: /* A = K /
	if (K < 32768)		if (K < 32768)
	PPC_MULI(r_A, r_A, K);		PPC_MULI(r_A, r_A, K);
	else {		else {
	@@ -187,7 +180,7 @@ static int bpf_jit_build_body(struct sk_filter fp, u32 image,
	PPC_MUL(r_A, r_A, r_scratch1);		PPC_MUL(r_A, r_A, r_scratch1);
	}		}
	break;		break;
	case BPF_S_ALU_MOD_X: /* A %= X; */		case BPF_ALU \| BPF_MOD \| BPF_X: /* A %= X; */
	ctx->seen \|= SEEN_XREG;		ctx->seen \|= SEEN_XREG;
	PPC_CMPWI(r_X, 0);		PPC_CMPWI(r_X, 0);
	if (ctx->pc_ret0 != -1) {		if (ctx->pc_ret0 != -1) {
	@@ -201,13 +194,13 @@ static int bpf_jit_build_body(struct sk_filter fp, u32 image,
	PPC_MUL(r_scratch1, r_X, r_scratch1);		PPC_MUL(r_scratch1, r_X, r_scratch1);
	PPC_SUB(r_A, r_A, r_scratch1);		PPC_SUB(r_A, r_A, r_scratch1);
	break;		break;
	case BPF_S_ALU_MOD_K: /* A %= K; */		case BPF_ALU \| BPF_MOD \| BPF_K: /* A %= K; */
	PPC_LI32(r_scratch2, K);		PPC_LI32(r_scratch2, K);
	PPC_DIVWU(r_scratch1, r_A, r_scratch2);		PPC_DIVWU(r_scratch1, r_A, r_scratch2);
	PPC_MUL(r_scratch1, r_scratch2, r_scratch1);		PPC_MUL(r_scratch1, r_scratch2, r_scratch1);
	PPC_SUB(r_A, r_A, r_scratch1);		PPC_SUB(r_A, r_A, r_scratch1);
	break;		break;
	case BPF_S_ALU_DIV_X: /* A /= X; */		case BPF_ALU \| BPF_DIV \| BPF_X: /* A /= X; */
	ctx->seen \|= SEEN_XREG;		ctx->seen \|= SEEN_XREG;
	PPC_CMPWI(r_X, 0);		PPC_CMPWI(r_X, 0);
	if (ctx->pc_ret0 != -1) {		if (ctx->pc_ret0 != -1) {
	@@ -223,17 +216,17 @@ static int bpf_jit_build_body(struct sk_filter fp, u32 image,
	}		}
	PPC_DIVWU(r_A, r_A, r_X);		PPC_DIVWU(r_A, r_A, r_X);
	break;		break;
	case BPF_S_ALU_DIV_K: /* A /= K */		case BPF_ALU \| BPF_DIV \| BPF_K: /* A /= K */
	if (K == 1)		if (K == 1)
	break;		break;
	PPC_LI32(r_scratch1, K);		PPC_LI32(r_scratch1, K);
	PPC_DIVWU(r_A, r_A, r_scratch1);		PPC_DIVWU(r_A, r_A, r_scratch1);
	break;		break;
	case BPF_S_ALU_AND_X:		case BPF_ALU \| BPF_AND \| BPF_X:
	ctx->seen \|= SEEN_XREG;		ctx->seen \|= SEEN_XREG;
	PPC_AND(r_A, r_A, r_X);		PPC_AND(r_A, r_A, r_X);
	break;		break;
	case BPF_S_ALU_AND_K:		case BPF_ALU \| BPF_AND \| BPF_K:
	if (!IMM_H(K))		if (!IMM_H(K))
	PPC_ANDI(r_A, r_A, K);		PPC_ANDI(r_A, r_A, K);
	else {		else {
	@@ -241,51 +234,51 @@ static int bpf_jit_build_body(struct sk_filter fp, u32 image,
	PPC_AND(r_A, r_A, r_scratch1);		PPC_AND(r_A, r_A, r_scratch1);
	}		}
	break;		break;
	case BPF_S_ALU_OR_X:		case BPF_ALU \| BPF_OR \| BPF_X:
	ctx->seen \|= SEEN_XREG;		ctx->seen \|= SEEN_XREG;
	PPC_OR(r_A, r_A, r_X);		PPC_OR(r_A, r_A, r_X);
	break;		break;
	case BPF_S_ALU_OR_K:		case BPF_ALU \| BPF_OR \| BPF_K:
	if (IMM_L(K))		if (IMM_L(K))
	PPC_ORI(r_A, r_A, IMM_L(K));		PPC_ORI(r_A, r_A, IMM_L(K));
	if (K >= 65536)		if (K >= 65536)
	PPC_ORIS(r_A, r_A, IMM_H(K));		PPC_ORIS(r_A, r_A, IMM_H(K));
	break;		break;
	case BPF_S_ANC_ALU_XOR_X:		case BPF_ANC \| SKF_AD_ALU_XOR_X:
	case BPF_S_ALU_XOR_X: /* A ^= X */		case BPF_ALU \| BPF_XOR \| BPF_X: /* A ^= X */
	ctx->seen \|= SEEN_XREG;		ctx->seen \|= SEEN_XREG;
	PPC_XOR(r_A, r_A, r_X);		PPC_XOR(r_A, r_A, r_X);
	break;		break;
	case BPF_S_ALU_XOR_K: /* A ^= K */		case BPF_ALU \| BPF_XOR \| BPF_K: /* A ^= K */
	if (IMM_L(K))		if (IMM_L(K))
	PPC_XORI(r_A, r_A, IMM_L(K));		PPC_XORI(r_A, r_A, IMM_L(K));
	if (K >= 65536)		if (K >= 65536)
	PPC_XORIS(r_A, r_A, IMM_H(K));		PPC_XORIS(r_A, r_A, IMM_H(K));
	break;		break;
	case BPF_S_ALU_LSH_X: /* A <<= X; */		case BPF_ALU \| BPF_LSH \| BPF_X: /* A <<= X; */
	ctx->seen \|= SEEN_XREG;		ctx->seen \|= SEEN_XREG;
	PPC_SLW(r_A, r_A, r_X);		PPC_SLW(r_A, r_A, r_X);
	break;		break;
	case BPF_S_ALU_LSH_K:		case BPF_ALU \| BPF_LSH \| BPF_K:
	if (K == 0)		if (K == 0)
	break;		break;
	else		else
	PPC_SLWI(r_A, r_A, K);		PPC_SLWI(r_A, r_A, K);
	break;		break;
	case BPF_S_ALU_RSH_X: /* A >>= X; */		case BPF_ALU \| BPF_RSH \| BPF_X: /* A >>= X; */
	ctx->seen \|= SEEN_XREG;		ctx->seen \|= SEEN_XREG;
	PPC_SRW(r_A, r_A, r_X);		PPC_SRW(r_A, r_A, r_X);
	break;		break;
	case BPF_S_ALU_RSH_K: /* A >>= K; */		case BPF_ALU \| BPF_RSH \| BPF_K: /* A >>= K; */
	if (K == 0)		if (K == 0)
	break;		break;
	else		else
	PPC_SRWI(r_A, r_A, K);		PPC_SRWI(r_A, r_A, K);
	break;		break;
	case BPF_S_ALU_NEG:		case BPF_ALU \| BPF_NEG:
	PPC_NEG(r_A, r_A);		PPC_NEG(r_A, r_A);
	break;		break;
	case BPF_S_RET_K:		case BPF_RET \| BPF_K:
	PPC_LI32(r_ret, K);		PPC_LI32(r_ret, K);
	if (!K) {		if (!K) {
	if (ctx->pc_ret0 == -1)		if (ctx->pc_ret0 == -1)
	@@ -312,7 +305,7 @@ static int bpf_jit_build_body(struct sk_filter fp, u32 image,
	PPC_BLR();		PPC_BLR();
	}		}
	break;		break;
	case BPF_S_RET_A:		case BPF_RET \| BPF_A:
	PPC_MR(r_ret, r_A);		PPC_MR(r_ret, r_A);
	if (i != flen - 1) {		if (i != flen - 1) {
	if (ctx->seen)		if (ctx->seen)
	@@ -321,53 +314,53 @@ static int bpf_jit_build_body(struct sk_filter fp, u32 image,
	PPC_BLR();		PPC_BLR();
	}		}
	break;		break;
	case BPF_S_MISC_TAX: /* X = A */		case BPF_MISC \| BPF_TAX: /* X = A */
	PPC_MR(r_X, r_A);		PPC_MR(r_X, r_A);
	break;		break;
	case BPF_S_MISC_TXA: /* A = X */		case BPF_MISC \| BPF_TXA: /* A = X */
	ctx->seen \|= SEEN_XREG;		ctx->seen \|= SEEN_XREG;
	PPC_MR(r_A, r_X);		PPC_MR(r_A, r_X);
	break;		break;

	/* Constant loads/M[] access */		/* Constant loads/M[] access */
	case BPF_S_LD_IMM: /* A = K */		case BPF_LD \| BPF_IMM: /* A = K */
	PPC_LI32(r_A, K);		PPC_LI32(r_A, K);
	break;		break;
	case BPF_S_LDX_IMM: /* X = K */		case BPF_LDX \| BPF_IMM: /* X = K */
	PPC_LI32(r_X, K);		PPC_LI32(r_X, K);
	break;		break;
	case BPF_S_LD_MEM: /* A = mem[K] */		case BPF_LD \| BPF_MEM: /* A = mem[K] */
	PPC_MR(r_A, r_M + (K & 0xf));		PPC_MR(r_A, r_M + (K & 0xf));
	ctx->seen \|= SEEN_MEM \| (1<<(K & 0xf));		ctx->seen \|= SEEN_MEM \| (1<<(K & 0xf));
	break;		break;
	case BPF_S_LDX_MEM: /* X = mem[K] */		case BPF_LDX \| BPF_MEM: /* X = mem[K] */
	PPC_MR(r_X, r_M + (K & 0xf));		PPC_MR(r_X, r_M + (K & 0xf));
	ctx->seen \|= SEEN_MEM \| (1<<(K & 0xf));		ctx->seen \|= SEEN_MEM \| (1<<(K & 0xf));
	break;		break;
	case BPF_S_ST: /* mem[K] = A */		case BPF_ST: /* mem[K] = A */
	PPC_MR(r_M + (K & 0xf), r_A);		PPC_MR(r_M + (K & 0xf), r_A);
	ctx->seen \|= SEEN_MEM \| (1<<(K & 0xf));		ctx->seen \|= SEEN_MEM \| (1<<(K & 0xf));
	break;		break;
	case BPF_S_STX: /* mem[K] = X */		case BPF_STX: /* mem[K] = X */
	PPC_MR(r_M + (K & 0xf), r_X);		PPC_MR(r_M + (K & 0xf), r_X);
	ctx->seen \|= SEEN_XREG \| SEEN_MEM \| (1<<(K & 0xf));		ctx->seen \|= SEEN_XREG \| SEEN_MEM \| (1<<(K & 0xf));
	break;		break;
	case BPF_S_LD_W_LEN: /* A = skb->len; */		case BPF_LD \| BPF_W \| BPF_LEN: /* A = skb->len; */
	BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, len) != 4);		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, len) != 4);
	PPC_LWZ_OFFS(r_A, r_skb, offsetof(struct sk_buff, len));		PPC_LWZ_OFFS(r_A, r_skb, offsetof(struct sk_buff, len));
	break;		break;
	case BPF_S_LDX_W_LEN: /* X = skb->len; */		case BPF_LDX \| BPF_W \| BPF_LEN: /* X = skb->len; */
	PPC_LWZ_OFFS(r_X, r_skb, offsetof(struct sk_buff, len));		PPC_LWZ_OFFS(r_X, r_skb, offsetof(struct sk_buff, len));
	break;		break;

	/* Ancillary info loads */		/* Ancillary info loads */
	case BPF_S_ANC_PROTOCOL: /* A = ntohs(skb->protocol); */		case BPF_ANC \| SKF_AD_PROTOCOL: /* A = ntohs(skb->protocol); */
	BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,
	protocol) != 2);		protocol) != 2);
	PPC_NTOHS_OFFS(r_A, r_skb, offsetof(struct sk_buff,		PPC_NTOHS_OFFS(r_A, r_skb, offsetof(struct sk_buff,
	protocol));		protocol));
	break;		break;
	case BPF_S_ANC_IFINDEX:		case BPF_ANC \| SKF_AD_IFINDEX:
	PPC_LD_OFFS(r_scratch1, r_skb, offsetof(struct sk_buff,		PPC_LD_OFFS(r_scratch1, r_skb, offsetof(struct sk_buff,
	dev));		dev));
	PPC_CMPDI(r_scratch1, 0);		PPC_CMPDI(r_scratch1, 0);
	@@ -384,33 +377,33 @@ static int bpf_jit_build_body(struct sk_filter fp, u32 image,
	PPC_LWZ_OFFS(r_A, r_scratch1,		PPC_LWZ_OFFS(r_A, r_scratch1,
	offsetof(struct net_device, ifindex));		offsetof(struct net_device, ifindex));
	break;		break;
	case BPF_S_ANC_MARK:		case BPF_ANC \| SKF_AD_MARK:
	BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, mark) != 4);		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, mark) != 4);
	PPC_LWZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,		PPC_LWZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,
	mark));		mark));
	break;		break;
	case BPF_S_ANC_RXHASH:		case BPF_ANC \| SKF_AD_RXHASH:
	BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, hash) != 4);		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, hash) != 4);
	PPC_LWZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,		PPC_LWZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,
	hash));		hash));
	break;		break;
	case BPF_S_ANC_VLAN_TAG:		case BPF_ANC \| SKF_AD_VLAN_TAG:
	case BPF_S_ANC_VLAN_TAG_PRESENT:		case BPF_ANC \| SKF_AD_VLAN_TAG_PRESENT:
	BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, vlan_tci) != 2);		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, vlan_tci) != 2);
	PPC_LHZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,		PPC_LHZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,
	vlan_tci));		vlan_tci));
	if (filter[i].code == BPF_S_ANC_VLAN_TAG)		if (code == (BPF_ANC \| SKF_AD_VLAN_TAG))
	PPC_ANDI(r_A, r_A, VLAN_VID_MASK);		PPC_ANDI(r_A, r_A, VLAN_VID_MASK);
	else		else
	PPC_ANDI(r_A, r_A, VLAN_TAG_PRESENT);		PPC_ANDI(r_A, r_A, VLAN_TAG_PRESENT);
	break;		break;
	case BPF_S_ANC_QUEUE:		case BPF_ANC \| SKF_AD_QUEUE:
	BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,		BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,
	queue_mapping) != 2);		queue_mapping) != 2);
	PPC_LHZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,		PPC_LHZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,
	queue_mapping));		queue_mapping));
	break;		break;
	case BPF_S_ANC_CPU:		case BPF_ANC \| SKF_AD_CPU:
	#ifdef CONFIG_SMP		#ifdef CONFIG_SMP
	/*		/*
	* PACA ptr is r13:		* PACA ptr is r13:
	@@ -426,13 +419,13 @@ static int bpf_jit_build_body(struct sk_filter fp, u32 image,
	break;		break;

	/* Absolute loads from packet header/data */		/* Absolute loads from packet header/data */
	case BPF_S_LD_W_ABS:		case BPF_LD \| BPF_W \| BPF_ABS:
	func = CHOOSE_LOAD_FUNC(K, sk_load_word);		func = CHOOSE_LOAD_FUNC(K, sk_load_word);
	goto common_load;		goto common_load;
	case BPF_S_LD_H_ABS:		case BPF_LD \| BPF_H \| BPF_ABS:
	func = CHOOSE_LOAD_FUNC(K, sk_load_half);		func = CHOOSE_LOAD_FUNC(K, sk_load_half);
	goto common_load;		goto common_load;
	case BPF_S_LD_B_ABS:		case BPF_LD \| BPF_B \| BPF_ABS:
	func = CHOOSE_LOAD_FUNC(K, sk_load_byte);		func = CHOOSE_LOAD_FUNC(K, sk_load_byte);
	common_load:		common_load:
	/* Load from [K]. */		/* Load from [K]. */
	@@ -449,13 +442,13 @@ static int bpf_jit_build_body(struct sk_filter fp, u32 image,
	break;		break;

	/* Indirect loads from packet header/data */		/* Indirect loads from packet header/data */
	case BPF_S_LD_W_IND:		case BPF_LD \| BPF_W \| BPF_IND:
	func = sk_load_word;		func = sk_load_word;
	goto common_load_ind;		goto common_load_ind;
	case BPF_S_LD_H_IND:		case BPF_LD \| BPF_H \| BPF_IND:
	func = sk_load_half;		func = sk_load_half;
	goto common_load_ind;		goto common_load_ind;
	case BPF_S_LD_B_IND:		case BPF_LD \| BPF_B \| BPF_IND:
	func = sk_load_byte;		func = sk_load_byte;
	common_load_ind:		common_load_ind:
	/*		/*
	@@ -473,31 +466,31 @@ static int bpf_jit_build_body(struct sk_filter fp, u32 image,
	PPC_BCC(COND_LT, exit_addr);		PPC_BCC(COND_LT, exit_addr);
	break;		break;

	case BPF_S_LDX_B_MSH:		case BPF_LDX \| BPF_B \| BPF_MSH:
	func = CHOOSE_LOAD_FUNC(K, sk_load_byte_msh);		func = CHOOSE_LOAD_FUNC(K, sk_load_byte_msh);
	goto common_load;		goto common_load;
	break;		break;

	/* Jump and branches */		/* Jump and branches */
	case BPF_S_JMP_JA:		case BPF_JMP \| BPF_JA:
	if (K != 0)		if (K != 0)
	PPC_JMP(addrs[i + 1 + K]);		PPC_JMP(addrs[i + 1 + K]);
	break;		break;

	case BPF_S_JMP_JGT_K:		case BPF_JMP \| BPF_JGT \| BPF_K:
	case BPF_S_JMP_JGT_X:		case BPF_JMP \| BPF_JGT \| BPF_X:
	true_cond = COND_GT;		true_cond = COND_GT;
	goto cond_branch;		goto cond_branch;
	case BPF_S_JMP_JGE_K:		case BPF_JMP \| BPF_JGE \| BPF_K:
	case BPF_S_JMP_JGE_X:		case BPF_JMP \| BPF_JGE \| BPF_X:
	true_cond = COND_GE;		true_cond = COND_GE;
	goto cond_branch;		goto cond_branch;
	case BPF_S_JMP_JEQ_K:		case BPF_JMP \| BPF_JEQ \| BPF_K:
	case BPF_S_JMP_JEQ_X:		case BPF_JMP \| BPF_JEQ \| BPF_X:
	true_cond = COND_EQ;		true_cond = COND_EQ;
	goto cond_branch;		goto cond_branch;
	case BPF_S_JMP_JSET_K:		case BPF_JMP \| BPF_JSET \| BPF_K:
	case BPF_S_JMP_JSET_X:		case BPF_JMP \| BPF_JSET \| BPF_X:
	true_cond = COND_NE;		true_cond = COND_NE;
	/* Fall through */		/* Fall through */
	cond_branch:		cond_branch:
	@@ -508,20 +501,20 @@ static int bpf_jit_build_body(struct sk_filter fp, u32 image,
	break;		break;
	}		}

	switch (filter[i].code) {		switch (code) {
	case BPF_S_JMP_JGT_X:		case BPF_JMP \| BPF_JGT \| BPF_X:
	case BPF_S_JMP_JGE_X:		case BPF_JMP \| BPF_JGE \| BPF_X:
	case BPF_S_JMP_JEQ_X:		case BPF_JMP \| BPF_JEQ \| BPF_X:
	ctx->seen \|= SEEN_XREG;		ctx->seen \|= SEEN_XREG;
	PPC_CMPLW(r_A, r_X);		PPC_CMPLW(r_A, r_X);
	break;		break;
	case BPF_S_JMP_JSET_X:		case BPF_JMP \| BPF_JSET \| BPF_X:
	ctx->seen \|= SEEN_XREG;		ctx->seen \|= SEEN_XREG;
	PPC_AND_DOT(r_scratch1, r_A, r_X);		PPC_AND_DOT(r_scratch1, r_A, r_X);
	break;		break;
	case BPF_S_JMP_JEQ_K:		case BPF_JMP \| BPF_JEQ \| BPF_K:
	case BPF_S_JMP_JGT_K:		case BPF_JMP \| BPF_JGT \| BPF_K:
	case BPF_S_JMP_JGE_K:		case BPF_JMP \| BPF_JGE \| BPF_K:
	if (K < 32768)		if (K < 32768)
	PPC_CMPLWI(r_A, K);		PPC_CMPLWI(r_A, K);
	else {		else {
	@@ -529,7 +522,7 @@ static int bpf_jit_build_body(struct sk_filter fp, u32 image,
	PPC_CMPLW(r_A, r_scratch1);		PPC_CMPLW(r_A, r_scratch1);
	}		}
	break;		break;
	case BPF_S_JMP_JSET_K:		case BPF_JMP \| BPF_JSET \| BPF_K:
	if (K < 32768)		if (K < 32768)
	/* PPC_ANDI is /only/ dot-form */		/* PPC_ANDI is /only/ dot-form */
	PPC_ANDI(r_scratch1, r_A, K);		PPC_ANDI(r_scratch1, r_A, K);

arch/s390/net/bpf_jit_comp.c

+78 −85

File changed.

Preview size limit exceeded, changes collapsed.

arch/sparc/net/bpf_jit_comp.c

+73 −81

File changed.

Preview size limit exceeded, changes collapsed.

Admin message