Commit 509144e2 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: bpf: remove packet marking support 



Temporarily drop support for skb->mark.  We are primarily focusing
on XDP offload, and implementing skb->mark on the new datapath has
lower priority.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 226e0e94

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

+0 −13
Original line number Diff line number Diff line
@@ -542,16 +542,6 @@ static int construct_data_ld(struct nfp_prog *nfp_prog, u16 offset, u8 size) 
	return construct_data_ind_ld(nfp_prog, offset, 0, false, size);

}



static int wrp_set_mark(struct nfp_prog *nfp_prog, u8 src)

{

	emit_alu(nfp_prog, NFP_BPF_ABI_MARK,

		 reg_none(), ALU_OP_NONE, reg_b(src));

	emit_alu(nfp_prog, NFP_BPF_ABI_FLAGS,

		 NFP_BPF_ABI_FLAGS, ALU_OP_OR, reg_imm(NFP_BPF_ABI_FLAG_MARK));



	return 0;

}



static void

wrp_alu_imm(struct nfp_prog *nfp_prog, u8 dst, enum alu_op alu_op, u32 imm)

{
@@ -1053,9 +1043,6 @@ static int mem_ldx4(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) 


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

{

	if (meta->insn.off == offsetof(struct sk_buff, mark))

		return wrp_set_mark(nfp_prog, meta->insn.src_reg * 2);



	return -EOPNOTSUPP;

}

drivers/net/ethernet/netronome/nfp/bpf/main.h

+1 −2
Original line number Diff line number Diff line
@@ -71,9 +71,8 @@ enum nfp_bpf_action_type { 
#define imm_b(np)	reg_b((np)->regs_per_thread - STATIC_REG_IMM)

#define imm_both(np)	reg_both((np)->regs_per_thread - STATIC_REG_IMM)



#define NFP_BPF_ABI_FLAGS	reg_nnr(0)

#define NFP_BPF_ABI_FLAGS	reg_imm(0)

#define   NFP_BPF_ABI_FLAG_MARK	1

#define NFP_BPF_ABI_MARK	reg_nnr(1)

#define NFP_BPF_ABI_PKT		reg_nnr(2)

#define NFP_BPF_ABI_LEN		reg_nnr(3)