From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: alexei.starovoitov@gmail.com, daniel@iogearbox.net
Cc: yhs@fb.com, netdev@vger.kernel.org, oss-drivers@netronome.com,
kafai@fb.com, Jakub Kicinski <jakub.kicinski@netronome.com>
Subject: [PATCH bpf-next v5 08/12] nfp: bpf: don't use instruction number for jump target
Date: Tue, 22 Jan 2019 22:45:25 -0800 [thread overview]
Message-ID: <20190123064529.13518-9-jakub.kicinski@netronome.com> (raw)
In-Reply-To: <20190123064529.13518-1-jakub.kicinski@netronome.com>
Instruction number is meaningless at code gen phase. The target
of the instruction is overwritten by nfp_fixup_branches(). The
convention is to put the raw offset in target address as a place
holder. See cmp_* functions.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
---
drivers/net/ethernet/netronome/nfp/bpf/jit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
index e23ca90289f7..323587dee498 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
@@ -3182,7 +3182,7 @@ bpf_to_bpf_call(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
wrp_immed_relo(nfp_prog, imm_b(nfp_prog), 0, RELO_IMMED_REL);
} else {
ret_tgt = nfp_prog_current_offset(nfp_prog) + 2;
- emit_br(nfp_prog, BR_UNC, meta->n + 1 + meta->insn.imm, 1);
+ emit_br(nfp_prog, BR_UNC, meta->insn.imm, 1);
offset_br = nfp_prog_current_offset(nfp_prog);
}
wrp_immed_relo(nfp_prog, ret_reg(nfp_prog), ret_tgt, RELO_IMMED_REL);
--
2.19.2
next prev parent reply other threads:[~2019-01-23 6:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-23 6:45 [PATCH bpf-next v5 00/12] bpf: dead code elimination Jakub Kicinski
2019-01-23 6:45 ` [PATCH bpf-next v5 01/12] bpf: change parameters of call/branch offset adjustment Jakub Kicinski
2019-01-23 6:45 ` [PATCH bpf-next v5 02/12] bpf: verifier: hard wire branches to dead code Jakub Kicinski
2019-01-23 6:45 ` [PATCH bpf-next v5 03/12] bpf: verifier: remove " Jakub Kicinski
2019-01-23 6:45 ` [PATCH bpf-next v5 04/12] bpf: verifier: remove unconditional branches by 0 Jakub Kicinski
2019-01-23 6:45 ` [PATCH bpf-next v5 05/12] selftests: bpf: add tests for dead code removal Jakub Kicinski
2019-01-23 6:45 ` [PATCH bpf-next v5 06/12] bpf: verifier: record original instruction index Jakub Kicinski
2019-01-23 6:45 ` [PATCH bpf-next v5 07/12] bpf: notify offload JITs about optimizations Jakub Kicinski
2019-01-23 6:45 ` Jakub Kicinski [this message]
2019-01-23 6:45 ` [PATCH bpf-next v5 09/12] nfp: bpf: split up the skip flag Jakub Kicinski
2019-01-23 6:45 ` [PATCH bpf-next v5 10/12] nfp: bpf: save original program length Jakub Kicinski
2019-01-23 6:45 ` [PATCH bpf-next v5 11/12] nfp: bpf: support optimizing dead branches Jakub Kicinski
2019-01-23 6:45 ` [PATCH bpf-next v5 12/12] nfp: bpf: support removing dead code Jakub Kicinski
2019-01-24 1:42 ` [PATCH bpf-next v5 00/12] bpf: dead code elimination Alexei Starovoitov
-- strict thread matches above, loose matches on Subject: below --
2019-01-19 18:06 [PATCH bpf-next v4 " Jakub Kicinski
2019-01-19 18:06 ` [PATCH bpf-next v5 08/12] nfp: bpf: don't use instruction number for jump target Jakub Kicinski
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=20190123064529.13518-9-jakub.kicinski@netronome.com \
--to=jakub.kicinski@netronome.com \
--cc=alexei.starovoitov@gmail.com \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
--cc=yhs@fb.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