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

Commit 9681ab06 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'nfp-bpf-rename-ALU_OP_NEG-and-support-BPF_NEG' 



Jakub Kicinski says:

====================
nfp: bpf: rename ALU_OP_NEG and support BPF_NEG

Jiong says:

  Compilers are starting to use BPF_NEG, for example LLVM. However, NFP
does not support JITing it. This patch set adds this. Unit test is added
as well.

  Meanwhile, the current NFP_ALU_NEG is actually doing bitwise NOT (one's
complement) operation, so the name is misleading. This patch set corrects
this.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 07d3c4af 254ef4d7

drivers/net/ethernet/netronome/nfp/bpf/jit.c

+25 −1
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ wrp_alu_imm(struct nfp_prog *nfp_prog, u8 dst, enum alu_op alu_op, u32 imm) 
	if (alu_op == ALU_OP_XOR) {

		if (!~imm)

			emit_alu(nfp_prog, reg_both(dst), reg_none(),

				 ALU_OP_NEG, reg_b(dst));

				 ALU_OP_NOT, reg_b(dst));

		if (!imm || !~imm)

			return;

	}
@@ -1218,6 +1218,18 @@ static int sub_imm64(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) 
	return 0;

}



static int neg_reg64(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)

{

	const struct bpf_insn *insn = &meta->insn;



	emit_alu(nfp_prog, reg_both(insn->dst_reg * 2), reg_imm(0),

		 ALU_OP_SUB, reg_b(insn->dst_reg * 2));

	emit_alu(nfp_prog, reg_both(insn->dst_reg * 2 + 1), reg_imm(0),

		 ALU_OP_SUB_C, reg_b(insn->dst_reg * 2 + 1));



	return 0;

}



static int shl_imm64(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)

{

	const struct bpf_insn *insn = &meta->insn;
@@ -1338,6 +1350,16 @@ static int sub_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) 
	return wrp_alu32_imm(nfp_prog, meta, ALU_OP_SUB, !meta->insn.imm);

}



static int neg_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)

{

	u8 dst = meta->insn.dst_reg * 2;



	emit_alu(nfp_prog, reg_both(dst), reg_imm(0), ALU_OP_SUB, reg_b(dst));

	wrp_immed(nfp_prog, reg_both(meta->insn.dst_reg * 2 + 1), 0);



	return 0;

}



static int shl_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)

{

	const struct bpf_insn *insn = &meta->insn;
@@ -1847,6 +1869,7 @@ static const instr_cb_t instr_cb[256] = { 
	[BPF_ALU64 | BPF_ADD | BPF_K] =	add_imm64,

	[BPF_ALU64 | BPF_SUB | BPF_X] =	sub_reg64,

	[BPF_ALU64 | BPF_SUB | BPF_K] =	sub_imm64,

	[BPF_ALU64 | BPF_NEG] =		neg_reg64,

	[BPF_ALU64 | BPF_LSH | BPF_K] =	shl_imm64,

	[BPF_ALU64 | BPF_RSH | BPF_K] =	shr_imm64,

	[BPF_ALU | BPF_MOV | BPF_X] =	mov_reg,
@@ -1861,6 +1884,7 @@ static const instr_cb_t instr_cb[256] = { 
	[BPF_ALU | BPF_ADD | BPF_K] =	add_imm,

	[BPF_ALU | BPF_SUB | BPF_X] =	sub_reg,

	[BPF_ALU | BPF_SUB | BPF_K] =	sub_imm,

	[BPF_ALU | BPF_NEG] =		neg_reg,

	[BPF_ALU | BPF_LSH | BPF_K] =	shl_imm,

	[BPF_ALU | BPF_END | BPF_X] =	end_reg32,

	[BPF_LD | BPF_IMM | BPF_DW] =	imm_ld8,

drivers/net/ethernet/netronome/nfp/nfp_asm.h

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ enum shf_sc { 
enum alu_op {

	ALU_OP_NONE	= 0x00,

	ALU_OP_ADD	= 0x01,

	ALU_OP_NEG	= 0x04,

	ALU_OP_NOT	= 0x04,

	ALU_OP_AND	= 0x08,

	ALU_OP_SUB_C	= 0x0d,

	ALU_OP_ADD_C	= 0x11,