From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: netdev@vger.kernel.org
Cc: oss-drivers@netronome.com, Jakub Kicinski <jakub.kicinski@netronome.com>
Subject: [PATCH net-next 07/15] nfp: bpf: remove packet marking support
Date: Sun, 8 Oct 2017 21:04:09 -0700 [thread overview]
Message-ID: <20171009040417.22172-8-jakub.kicinski@netronome.com> (raw)
In-Reply-To: <20171009040417.22172-1-jakub.kicinski@netronome.com>
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: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
---
drivers/net/ethernet/netronome/nfp/bpf/jit.c | 13 -------------
drivers/net/ethernet/netronome/nfp/bpf/main.h | 3 +--
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
index 469dc8a055f2..4fa220f710d2 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
@@ -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;
}
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.h b/drivers/net/ethernet/netronome/nfp/bpf/main.h
index ccc3dbea25f6..7d959757a51a 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.h
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.h
@@ -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)
--
2.14.1
next prev parent reply other threads:[~2017-10-09 4:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-09 4:04 [PATCH net-next 00/15] nfp: bpf ABIv2 and multi port Jakub Kicinski
2017-10-09 4:04 ` [PATCH net-next 01/15] nfp: output control messages to trace_devlink_hwmsg() Jakub Kicinski
2017-10-09 4:04 ` [PATCH net-next 02/15] nfp: bpf: lift the single-port limitation Jakub Kicinski
2017-10-09 4:04 ` [PATCH net-next 03/15] nfp: bpf: use the power of sparse to check we encode registers right Jakub Kicinski
2017-10-09 4:04 ` [PATCH net-next 04/15] nfp: bpf: move software reg helpers and cmd table out of translator Jakub Kicinski
2017-10-09 4:04 ` [PATCH net-next 05/15] nfp: bpf: encode all 64bit shifts Jakub Kicinski
2017-10-09 4:04 ` [PATCH net-next 06/15] nfp: bpf: remove register rename Jakub Kicinski
2017-10-09 4:04 ` Jakub Kicinski [this message]
2017-10-09 4:04 ` [PATCH net-next 08/15] nfp: add more white space to the instruction defines Jakub Kicinski
2017-10-09 4:04 ` [PATCH net-next 09/15] nfp: bpf: encode LMEM accesses Jakub Kicinski
2017-10-09 4:04 ` [PATCH net-next 10/15] nfp: bpf: encode extended LM pointer operands Jakub Kicinski
2017-10-09 4:04 ` [PATCH net-next 11/15] nfp: bpf: move to datapath ABI version 2 Jakub Kicinski
2017-10-09 4:04 ` [PATCH net-next 12/15] nfp: bpf: calculate code store ECC Jakub Kicinski
2017-10-09 4:04 ` [PATCH net-next 13/15] nfp: bpf: pad code with valid nops Jakub Kicinski
2017-10-09 4:04 ` [PATCH net-next 14/15] nfp: bpf: byte swap the instructions Jakub Kicinski
2017-10-09 4:04 ` [PATCH net-next 15/15] nfp: bpf: pass dst register to ld_field instruction Jakub Kicinski
2017-10-09 16:52 ` [PATCH net-next 00/15] nfp: bpf ABIv2 and multi port David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171009040417.22172-8-jakub.kicinski@netronome.com \
--to=jakub.kicinski@netronome.com \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).