From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: daniel@iogearbox.net, alexei.starovoitov@gmail.com
Cc: netdev@vger.kernel.org, oss-drivers@netronome.com,
Jiong Wang <jiong.wang@netronome.com>
Subject: [RFC bpf-next 1/2] nfp: bpf: set new jit info fields
Date: Fri, 12 Jan 2018 14:06:23 -0800 [thread overview]
Message-ID: <20180112220624.14424-1-jakub.kicinski@netronome.com> (raw)
In-Reply-To: <44d1b7e5-53f1-65b6-fd0b-fbda8467aa6b@iogearbox.net>
From: Jiong Wang <jiong.wang@netronome.com>
This patch set those new jit info fields introduced in previous patch for NFP.
Signed-off-by: Jiong Wang <jiong.wang@netronome.com>
---
drivers/net/ethernet/netronome/nfp/bpf/main.h | 2 ++
drivers/net/ethernet/netronome/nfp/bpf/offload.c | 12 +++++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.h b/drivers/net/ethernet/netronome/nfp/bpf/main.h
index 66381afee2a9..41ee68eb7ddc 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.h
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.h
@@ -42,6 +42,8 @@
#include "../nfp_asm.h"
+#define NFP_ARCH_NAME "NFP-6xxx"
+
/* For relocation logic use up-most byte of branch instruction as scratch
* area. Remember to clear this before sending instructions to HW!
*/
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
index 320b2250d29a..8862d1e50bf5 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
@@ -124,6 +124,7 @@ static int nfp_bpf_translate(struct nfp_net *nn, struct bpf_prog *prog)
struct nfp_prog *nfp_prog = prog->aux->offload->dev_priv;
unsigned int stack_size;
unsigned int max_instr;
+ int err;
stack_size = nn_readb(nn, NFP_NET_CFG_BPF_STACK_SZ) * 64;
if (prog->aux->stack_depth > stack_size) {
@@ -140,7 +141,16 @@ static int nfp_bpf_translate(struct nfp_net *nn, struct bpf_prog *prog)
if (!nfp_prog->prog)
return -ENOMEM;
- return nfp_bpf_jit(nfp_prog);
+ err = nfp_bpf_jit(nfp_prog);
+ if (err)
+ return err;
+
+ prog->aux->offload->jited_len = nfp_prog->prog_len * sizeof(u64);
+ prog->aux->offload->jited_image = nfp_prog->prog;
+ memcpy(prog->aux->offload->jited_arch_name, NFP_ARCH_NAME,
+ sizeof(NFP_ARCH_NAME));
+
+ return 0;
}
static int nfp_bpf_destroy(struct nfp_net *nn, struct bpf_prog *prog)
--
2.15.1
next prev parent reply other threads:[~2018-01-12 22:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-12 0:47 [RFC bpf-next] bpf: add new jited info fields in bpf_dev_offload and bpf_prog_info Jakub Kicinski
2018-01-12 2:17 ` Jakub Kicinski
2018-01-12 11:31 ` Daniel Borkmann
2018-01-12 22:06 ` Jakub Kicinski [this message]
2018-01-12 22:06 ` [RFC bpf-next 2/2] tools: bpftool: improve architecture detection by using offload arch info Jakub Kicinski
2018-01-12 22:17 ` [RFC bpf-next] bpf: add new jited info fields in bpf_dev_offload and bpf_prog_info Jakub Kicinski
2018-01-15 12:27 ` Jiong Wang
2018-01-15 14:07 ` Daniel Borkmann
2018-01-15 17:13 ` Alexei Starovoitov
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=20180112220624.14424-1-jakub.kicinski@netronome.com \
--to=jakub.kicinski@netronome.com \
--cc=alexei.starovoitov@gmail.com \
--cc=daniel@iogearbox.net \
--cc=jiong.wang@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).