From: Yonghong Song <yonghong.song@linux.dev>
To: Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
bpf@vger.kernel.org, Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <martin.lau@kernel.org>
Cc: David Faust <david.faust@oracle.com>,
Fangrui Song <maskray@google.com>,
"Jose E . Marchesi" <jose.marchesi@oracle.com>,
kernel-team@fb.com, Eduard Zingerman <eddyz87@gmail.com>
Subject: [PATCH bpf-next v4 03/17] bpf: Handle sign-extenstin ctx member accesses
Date: Wed, 26 Jul 2023 15:07:42 -0700 [thread overview]
Message-ID: <20230726220742.1092332-1-yonghong.song@linux.dev> (raw)
In-Reply-To: <20230726220726.1089817-1-yonghong.song@linux.dev>
Currently, if user accesses a ctx member with signed types,
the compiler will generate an unsigned load followed by
necessary left and right shifts.
With the introduction of sign-extension load, compiler may
just emit a ldsx insn instead. Let us do a final movsx sign
extension to the final unsigned ctx load result to
satisfy original sign extension requirement.
Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Yonghong Song <yonghong.song@linux.dev>
---
kernel/bpf/verifier.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 2f3eebcd962f..7a6945be07e3 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -17716,6 +17716,7 @@ static int convert_ctx_accesses(struct bpf_verifier_env *env)
for (i = 0; i < insn_cnt; i++, insn++) {
bpf_convert_ctx_access_t convert_ctx_access;
+ u8 mode;
if (insn->code == (BPF_LDX | BPF_MEM | BPF_B) ||
insn->code == (BPF_LDX | BPF_MEM | BPF_H) ||
@@ -17797,6 +17798,7 @@ static int convert_ctx_accesses(struct bpf_verifier_env *env)
ctx_field_size = env->insn_aux_data[i + delta].ctx_field_size;
size = BPF_LDST_BYTES(insn);
+ mode = BPF_MODE(insn->code);
/* If the read access is a narrower load of the field,
* convert to a 4/8-byte load, to minimum program type specific
@@ -17856,6 +17858,10 @@ static int convert_ctx_accesses(struct bpf_verifier_env *env)
(1ULL << size * 8) - 1);
}
}
+ if (mode == BPF_MEMSX)
+ insn_buf[cnt++] = BPF_RAW_INSN(BPF_ALU64 | BPF_MOV | BPF_X,
+ insn->dst_reg, insn->dst_reg,
+ size * 8, 0);
new_prog = bpf_patch_insn_data(env, i + delta, insn_buf, cnt);
if (!new_prog)
--
2.34.1
next prev parent reply other threads:[~2023-07-26 22:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-26 22:07 [PATCH bpf-next v4 00/17] bpf: Support new insns from cpu v4 Yonghong Song
2023-07-26 22:07 ` [PATCH bpf-next v4 01/17] bpf: Support new sign-extension load insns Yonghong Song
2023-07-26 22:07 ` [PATCH bpf-next v4 02/17] bpf: Support new sign-extension mov insns Yonghong Song
2023-07-26 22:07 ` Yonghong Song [this message]
2023-07-26 22:07 ` [PATCH bpf-next v4 04/17] bpf: Support new unconditional bswap instruction Yonghong Song
2023-07-26 22:07 ` [PATCH bpf-next v4 05/17] bpf: Support new signed div/mod instructions Yonghong Song
2023-07-26 22:07 ` [PATCH bpf-next v4 06/17] bpf: Fix jit blinding with new sdiv/smov insns Yonghong Song
2023-07-26 22:08 ` [PATCH bpf-next v4 07/17] bpf: Support new 32bit offset jmp instruction Yonghong Song
2023-07-26 22:08 ` [PATCH bpf-next v4 09/17] selftests/bpf: Fix a test_verifier failure Yonghong Song
2023-07-26 22:08 ` [PATCH bpf-next v4 10/17] selftests/bpf: Add a cpuv4 test runner for cpu=v4 testing Yonghong Song
2023-07-26 22:08 ` [PATCH bpf-next v4 11/17] selftests/bpf: Add unit tests for new sign-extension load insns Yonghong Song
2023-07-26 22:08 ` [PATCH bpf-next v4 12/17] selftests/bpf: Add unit tests for new sign-extension mov insns Yonghong Song
2023-07-26 22:08 ` [PATCH bpf-next v4 13/17] selftests/bpf: Add unit tests for new bswap insns Yonghong Song
2023-07-26 22:08 ` [PATCH bpf-next v4 14/17] selftests/bpf: Add unit tests for new sdiv/smod insns Yonghong Song
2023-07-26 22:08 ` [PATCH bpf-next v4 15/17] selftests/bpf: Add unit tests for new gotol insn Yonghong Song
2023-07-26 22:08 ` [PATCH bpf-next v4 16/17] selftests/bpf: Test ldsx with more complex cases Yonghong Song
2023-07-26 22:08 ` [PATCH bpf-next v4 17/17] docs/bpf: Add documentation for new instructions Yonghong Song
2023-07-26 22:19 ` Dave Thaler
2023-07-26 22:19 ` [Bpf] " Dave Thaler
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=20230726220742.1092332-1-yonghong.song@linux.dev \
--to=yonghong.song@linux.dev \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=david.faust@oracle.com \
--cc=eddyz87@gmail.com \
--cc=jose.marchesi@oracle.com \
--cc=kernel-team@fb.com \
--cc=martin.lau@kernel.org \
--cc=maskray@google.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