From: Quentin Monnet <quentin.monnet@netronome.com>
To: daniel@iogearbox.net, alexei.starovoitov@gmail.com,
netdev@vger.kernel.org
Cc: oss-drivers@netronome.com, jakub.kicinski@netronome.com
Subject: [PATCH bpf-next v2 06/14] nfp: bpf: move jump resolution to jit.c
Date: Wed, 10 Jan 2018 12:25:59 +0000 [thread overview]
Message-ID: <1515587167-1959-7-git-send-email-quentin.monnet@netronome.com> (raw)
In-Reply-To: <1515587167-1959-1-git-send-email-quentin.monnet@netronome.com>
From: Jakub Kicinski <jakub.kicinski@netronome.com>
Jump target resolution should be in jit.c not offload.c.
No functional changes.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Jiong Wang <jiong.wang@netronome.com>
---
drivers/net/ethernet/netronome/nfp/bpf/jit.c | 23 +++++++++++++++++++++++
drivers/net/ethernet/netronome/nfp/bpf/main.h | 1 +
drivers/net/ethernet/netronome/nfp/bpf/offload.c | 18 +-----------------
3 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
index 0de59f04da84..9caff3a7505a 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
@@ -2742,3 +2742,26 @@ int nfp_bpf_jit(struct nfp_prog *nfp_prog)
return nfp_bpf_ustore_calc(nfp_prog, (__force __le64 *)nfp_prog->prog);
}
+
+void nfp_bpf_jit_prepare(struct nfp_prog *nfp_prog, unsigned int cnt)
+{
+ struct nfp_insn_meta *meta;
+
+ /* Another pass to record jump information. */
+ list_for_each_entry(meta, &nfp_prog->insns, l) {
+ u64 code = meta->insn.code;
+
+ if (BPF_CLASS(code) == BPF_JMP && BPF_OP(code) != BPF_EXIT &&
+ BPF_OP(code) != BPF_CALL) {
+ struct nfp_insn_meta *dst_meta;
+ unsigned short dst_indx;
+
+ dst_indx = meta->n + 1 + meta->insn.off;
+ dst_meta = nfp_bpf_goto_meta(nfp_prog, meta, dst_indx,
+ cnt);
+
+ meta->jmp_dst = dst_meta;
+ dst_meta->flags |= FLAG_INSN_IS_JUMP_DST;
+ }
+ }
+}
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.h b/drivers/net/ethernet/netronome/nfp/bpf/main.h
index 89a9b6393882..0b1347f2afd1 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.h
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.h
@@ -236,6 +236,7 @@ struct nfp_bpf_vnic {
struct bpf_prog *tc_prog;
};
+void nfp_bpf_jit_prepare(struct nfp_prog *nfp_prog, unsigned int cnt);
int nfp_bpf_jit(struct nfp_prog *prog);
extern const struct bpf_prog_offload_ops nfp_bpf_analyzer_ops;
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
index 8dbf13450bab..0ca6faaacc58 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
@@ -70,23 +70,7 @@ nfp_prog_prepare(struct nfp_prog *nfp_prog, const struct bpf_insn *prog,
list_add_tail(&meta->l, &nfp_prog->insns);
}
- /* Another pass to record jump information. */
- list_for_each_entry(meta, &nfp_prog->insns, l) {
- u64 code = meta->insn.code;
-
- if (BPF_CLASS(code) == BPF_JMP && BPF_OP(code) != BPF_EXIT &&
- BPF_OP(code) != BPF_CALL) {
- struct nfp_insn_meta *dst_meta;
- unsigned short dst_indx;
-
- dst_indx = meta->n + 1 + meta->insn.off;
- dst_meta = nfp_bpf_goto_meta(nfp_prog, meta, dst_indx,
- cnt);
-
- meta->jmp_dst = dst_meta;
- dst_meta->flags |= FLAG_INSN_IS_JUMP_DST;
- }
- }
+ nfp_bpf_jit_prepare(nfp_prog, cnt);
return 0;
}
--
2.7.4
next prev parent reply other threads:[~2018-01-10 12:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-10 12:25 [PATCH bpf-next v2 00/14] nfp: bpf: relocations, verifier log, signed jumps and other updates Quentin Monnet
2018-01-10 12:25 ` [PATCH bpf-next v2 01/14] nfp: don't try to register XDP rxq structures on control queues Quentin Monnet
2018-01-10 12:25 ` [PATCH bpf-next v2 02/14] nfp: fix incumbent kdoc warnings Quentin Monnet
2018-01-10 12:25 ` [PATCH bpf-next v2 03/14] nfp: bpf: round up the size of the stack Quentin Monnet
2018-01-10 12:25 ` [PATCH bpf-next v2 04/14] nfp: bpf: don't allow changing MTU above BPF offload limit when active Quentin Monnet
2018-01-10 12:25 ` [PATCH bpf-next v2 05/14] nfp: bpf: allow disabling TC offloads when XDP active Quentin Monnet
2018-01-10 12:25 ` Quentin Monnet [this message]
2018-01-10 12:26 ` [PATCH bpf-next v2 07/14] nfp: bpf: add helpers for modifying branch addresses Quentin Monnet
2018-01-10 12:26 ` [PATCH bpf-next v2 08/14] nfp: bpf: relocate jump targets just before the load Quentin Monnet
2018-01-10 12:26 ` [PATCH bpf-next v2 09/14] nfp: bpf: don't depend on high order allocations for program image Quentin Monnet
2018-01-10 12:26 ` [PATCH bpf-next v2 10/14] nfp: bpf: use a large constant in unresolved branches Quentin Monnet
2018-01-10 12:26 ` [PATCH bpf-next v2 11/14] nfp: hand over to BPF offload app at coarser granularity Quentin Monnet
2018-01-10 12:26 ` [PATCH bpf-next v2 12/14] nfp: bpf: add signed jump insns Quentin Monnet
2018-01-10 12:26 ` [PATCH bpf-next v2 13/14] bpf: export function to write into verifier log buffer Quentin Monnet
2018-01-10 12:26 ` [PATCH bpf-next v2 14/14] nfp: bpf: reuse verifier log for debug messages Quentin Monnet
2018-01-10 14:05 ` [PATCH bpf-next v2 00/14] nfp: bpf: relocations, verifier log, signed jumps and other updates Daniel Borkmann
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=1515587167-1959-7-git-send-email-quentin.monnet@netronome.com \
--to=quentin.monnet@netronome.com \
--cc=alexei.starovoitov@gmail.com \
--cc=daniel@iogearbox.net \
--cc=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).